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/x86 | |
| parent | e1902ac698194fdf20b473bd2d9c592c45554b72 (diff) | |
| download | u-boot-imx-50a47d0523e8efebe912bef539a77ffd42116451.zip u-boot-imx-50a47d0523e8efebe912bef539a77ffd42116451.tar.gz u-boot-imx-50a47d0523e8efebe912bef539a77ffd42116451.tar.bz2 | |
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/x86')
| -rw-r--r-- | arch/x86/include/asm/init_helpers.h | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/u-boot.h | 1 | ||||
| -rw-r--r-- | arch/x86/lib/board.c | 3 | ||||
| -rw-r--r-- | arch/x86/lib/init_helpers.c | 8 |
4 files changed, 0 insertions, 13 deletions
diff --git a/arch/x86/include/asm/init_helpers.h b/arch/x86/include/asm/init_helpers.h index 192f18e..8d2e0ba 100644 --- a/arch/x86/include/asm/init_helpers.h +++ b/arch/x86/include/asm/init_helpers.h @@ -36,7 +36,6 @@ int set_reloc_flag_r(void); int mem_malloc_init_r(void); int init_bd_struct_r(void); int flash_init_r(void); -int init_ip_address_r(void); int status_led_set_r(void); int set_bootfile_r(void); int set_load_addr_r(void); diff --git a/arch/x86/include/asm/u-boot.h b/arch/x86/include/asm/u-boot.h index 26450eb..da667c5 100644 --- a/arch/x86/include/asm/u-boot.h +++ b/arch/x86/include/asm/u-boot.h @@ -45,7 +45,6 @@ typedef struct bd_info { unsigned long bi_sramstart; /* start of SRAM memory */ unsigned long bi_sramsize; /* size of SRAM memory */ unsigned long bi_bootflags; /* boot / reboot flag (for LynxOS) */ - unsigned long bi_ip_addr; /* IP Address */ unsigned short bi_ethspeed; /* Ethernet speed in Mbps */ unsigned long bi_intfreq; /* Internal Freq, in MHz */ unsigned long bi_busfreq; /* Bus Freq, in MHz */ diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index 5f0b62c..15b4ae2 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -157,9 +157,6 @@ init_fnc_t *init_sequence_r[] = { flash_init_r, #endif env_relocate_r, -#ifdef CONFIG_CMD_NET - init_ip_address_r, -#endif #ifdef CONFIG_PCI pci_init_r, #endif diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index 9f4dee0..a8741d0 100644 --- a/arch/x86/lib/init_helpers.c +++ b/arch/x86/lib/init_helpers.c @@ -179,14 +179,6 @@ int flash_init_r(void) } #endif -int init_ip_address_r(void) -{ - /* IP Address */ - bd_data.bi_ip_addr = getenv_IPaddr("ipaddr"); - - return 0; -} - #ifdef CONFIG_STATUS_LED int status_led_set_r(void) { |