summaryrefslogtreecommitdiff
path: root/arch/powerpc/include/asm
diff options
context:
space:
mode:
authorAnatolij Gustschin <agust@denx.de>2012-09-02 09:09:00 +0000
committerWolfgang Denk <wd@denx.de>2012-09-02 22:55:59 +0200
commite5ab702a6c458ad2eb041692aed3db114b5846e1 (patch)
tree7d2c45b228ddaf5b8c76ffe9e6935605c58805b4 /arch/powerpc/include/asm
parenta005f19eff946454985785788c344f10616d571e (diff)
downloadu-boot-imx-e5ab702a6c458ad2eb041692aed3db114b5846e1.zip
u-boot-imx-e5ab702a6c458ad2eb041692aed3db114b5846e1.tar.gz
u-boot-imx-e5ab702a6c458ad2eb041692aed3db114b5846e1.tar.bz2
powerpc: re-add bi_ip_addr to bd_t struct
Since commit 50a47d0523e8efebe912bef539a77ffd42116451 (net: punt bd->bi_ip_addr) booting old 2.4.x ppc kernels is broken due to changed offsets of the fields in struct bd_t. Offsets of the fields after removed bi_ip_addr are wrong, causing wrong bus clocks and console baudrate configurations and various other issues. Re-add the bi_ip_addr field to preserve backward compatibility with older ppc kernels. Setting bi_ip_addr in board.c is not really needed, grepping in the 2.4 linux tree shows that bi_ip_addr is not accessed there. Adding bi_ip_addr to struct bd_t for other arches isn't needed it seems. bd_t is not used by other arches in the 2.4 linux tree. Signed-off-by: Anatolij Gustschin <agust@denx.de> Acked-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/powerpc/include/asm')
-rw-r--r--arch/powerpc/include/asm/u-boot.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/u-boot.h b/arch/powerpc/include/asm/u-boot.h
index 1552054..b2fa2b5 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 */