diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2012-04-04 18:53:40 +0000 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2012-05-15 17:32:05 -0500 |
| commit | 50a47d0523e8efebe912bef539a77ffd42116451 (patch) | |
| tree | 4501fa8c08405a3d9595a252df1ce725e27f3a0b /arch/sh | |
| parent | e1902ac698194fdf20b473bd2d9c592c45554b72 (diff) | |
| download | talos-obmc-uboot-50a47d0523e8efebe912bef539a77ffd42116451.tar.gz talos-obmc-uboot-50a47d0523e8efebe912bef539a77ffd42116451.zip | |
net: punt bd->bi_ip_addr
This field gets read in one place (by "bdinfo"), and we can replace
that with getenv("ipaddr"). After all, the bi_ip_addr field is kept
up-to-date implicitly with the value of the ipaddr env var.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/asm/u-boot.h | 1 | ||||
| -rw-r--r-- | arch/sh/lib/board.c | 11 |
2 files changed, 0 insertions, 12 deletions
diff --git a/arch/sh/include/asm/u-boot.h b/arch/sh/include/asm/u-boot.h index 45745129a0..6c04daf3bc 100644 --- a/arch/sh/include/asm/u-boot.h +++ b/arch/sh/include/asm/u-boot.h @@ -33,7 +33,6 @@ typedef struct bd_info { unsigned long bi_flashoffset; /* reserved area for startup monitor */ unsigned long bi_sramstart; /* start of SRAM memory */ unsigned long bi_sramsize; /* size of SRAM memory */ - unsigned long bi_ip_addr; /* IP Address */ unsigned long bi_baudrate; /* Console Baudrate */ unsigned long bi_boot_params; /* where this board expects params */ } bd_t; diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c index eb021e806c..d71cca4465 100644 --- a/arch/sh/lib/board.c +++ b/arch/sh/lib/board.c @@ -100,14 +100,6 @@ static int sh_mem_env_init(void) return 0; } -#if defined(CONFIG_CMD_NET) -static int sh_net_init(void) -{ - gd->bd->bi_ip_addr = getenv_IPaddr("ipaddr"); - return 0; -} -#endif - #if defined(CONFIG_CMD_MMC) static int sh_mmc_init(void) { @@ -145,9 +137,6 @@ init_fnc_t *init_sequence[] = #ifdef CONFIG_BOARD_LATE_INIT board_late_init, #endif -#if defined(CONFIG_CMD_NET) - sh_net_init, /* SH specific eth init */ -#endif #if defined(CONFIG_CMD_MMC) sh_mmc_init, #endif |
