From: Wolfgang Denk Date: Mon, 3 Sep 2012 19:22:02 +0000 (+0200) Subject: Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx X-Git-Tag: v2012.10-rc1~59 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6c43d11f3db5289398f882fc9d4158c5abe3a344;hp=5d1c88332951d2f58e9f7000a0523543b22d9a90;p=karo-tx-uboot.git Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx * 'master' of git://git.denx.de/u-boot-ppc4xx: ppc4xx: Canyonlands/Glacier: Squeeze NAND image a bit to fit again Signed-off-by: Wolfgang Denk --- diff --git a/arch/powerpc/include/asm/u-boot.h b/arch/powerpc/include/asm/u-boot.h index 1552054117..b2fa2b574b 100644 --- a/arch/powerpc/include/asm/u-boot.h +++ b/arch/powerpc/include/asm/u-boot.h @@ -63,6 +63,7 @@ typedef struct bd_info { unsigned long bi_vcofreq; /* VCO Freq, in MHz */ #endif unsigned long bi_bootflags; /* boot / reboot flag (Unused) */ + unsigned long bi_ip_addr; /* IP Address */ unsigned char bi_enetaddr[6]; /* OLD: see README.enetaddr */ unsigned short bi_ethspeed; /* Ethernet speed in Mbps */ unsigned long bi_intfreq; /* Internal Freq, in MHz */