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/m68k | |
| 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/m68k')
| -rw-r--r-- | arch/m68k/include/asm/u-boot.h | 1 | ||||
| -rw-r--r-- | arch/m68k/lib/board.c | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/arch/m68k/include/asm/u-boot.h b/arch/m68k/include/asm/u-boot.h index 0a48bbdbe6..973c9ee098 100644 --- a/arch/m68k/include/asm/u-boot.h +++ b/arch/m68k/include/asm/u-boot.h @@ -47,7 +47,6 @@ typedef struct bd_info { unsigned long bi_mbar_base; /* base of internal registers */ unsigned long bi_bootflags; /* boot / reboot flag (for LynxOS) */ unsigned long bi_boot_params; /* where this board expects params */ - 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/m68k/lib/board.c b/arch/m68k/lib/board.c index 1526967fe3..ffd91a83fe 100644 --- a/arch/m68k/lib/board.c +++ b/arch/m68k/lib/board.c @@ -507,15 +507,6 @@ void board_init_r (gd_t *id, ulong dest_addr) /* relocate environment function pointers etc. */ env_relocate (); - /* - * Fill in missing fields of bd_info. - * We do this here, where we have "normal" access to the - * environment; we used to do this still running from ROM, - * where had to use getenv_f(), which can be pretty slow when - * the environment is in EEPROM. - */ - bd->bi_ip_addr = getenv_IPaddr ("ipaddr"); - WATCHDOG_RESET (); #if defined(CONFIG_PCI) |
