diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-11-21 11:26:11 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-08 09:35:43 -0500 |
| commit | 36da51ebacdc549b9d034a9241b6d88b06a951c5 (patch) | |
| tree | 8a467f2058a6648e50913a36980ef27799e20d19 /common | |
| parent | 814b661448d50462c37232a456d3d09450fd9f72 (diff) | |
| download | u-boot-imx-36da51ebacdc549b9d034a9241b6d88b06a951c5.zip u-boot-imx-36da51ebacdc549b9d034a9241b6d88b06a951c5.tar.gz u-boot-imx-36da51ebacdc549b9d034a9241b6d88b06a951c5.tar.bz2 | |
powerpc: mpc8xx: remove hermes board support
This board sprinkles #ifdef(CONFIG_HERMES) over various global files
such as include/common.h, common/board_r.c, common/cmd_bdinfo.c.
Let's zap such an ill-behaved board.
It has not been converted to generic board yet and mpc8xx is old
enough.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_r.c | 24 | ||||
| -rw-r--r-- | common/cmd_bdinfo.c | 3 |
2 files changed, 0 insertions, 27 deletions
diff --git a/common/board_r.c b/common/board_r.c index 1b8998d..1ef79ce 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -454,24 +454,6 @@ static int initr_env(void) return 0; } -#ifdef CONFIG_HERMES -static int initr_hermes(void) -{ - if ((gd->board_type >> 16) == 2) - gd->bd->bi_ethspeed = gd->board_type & 0xFFFF; - else - gd->bd->bi_ethspeed = 0xFFFF; - return 0; -} - -static int initr_hermes_start(void) -{ - if (gd->bd->bi_ethspeed != 0xFFFF) - hermes_start_lxt980((int) gd->bd->bi_ethspeed); - return 0; -} -#endif - #ifdef CONFIG_SC3 /* TODO: with new initcalls, move this into the driver */ extern void sc3_read_eeprom(void); @@ -803,9 +785,6 @@ init_fnc_t init_sequence_r[] = { #ifdef CONFIG_SC3 initr_sc3_read_eeprom, #endif -#ifdef CONFIG_HERMES - initr_hermes, -#endif #if defined(CONFIG_ID_EEPROM) || defined(CONFIG_SYS_I2C_MAC_OFFSET) mac_read_from_eeprom, #endif @@ -831,9 +810,6 @@ init_fnc_t init_sequence_r[] = { #ifdef CONFIG_MISC_INIT_R misc_init_r, /* miscellaneous platform-dependent init */ #endif -#ifdef CONFIG_HERMES - initr_hermes_start, -#endif INIT_FUNC_WATCHDOG_RESET #ifdef CONFIG_CMD_KGDB initr_kgdb, diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c index 3d37a86..f0b713c 100644 --- a/common/cmd_bdinfo.c +++ b/common/cmd_bdinfo.c @@ -144,9 +144,6 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_eth(5); #endif -#ifdef CONFIG_HERMES - print_mhz("ethspeed", bd->bi_ethspeed); -#endif printf("IP addr = %s\n", getenv("ipaddr")); printf("baudrate = %6u bps\n", gd->baudrate); print_num("relocaddr", gd->relocaddr); |