diff options
Diffstat (limited to 'include/asm-ppc/ppcboot.h')
-rw-r--r-- | include/asm-ppc/ppcboot.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/asm-ppc/ppcboot.h b/include/asm-ppc/ppcboot.h index 6b7b63f71daa..3819e17cd7b0 100644 --- a/include/asm-ppc/ppcboot.h +++ b/include/asm-ppc/ppcboot.h | |||
@@ -38,8 +38,7 @@ typedef struct bd_info { | |||
38 | unsigned long bi_flashoffset; /* reserved area for startup monitor */ | 38 | unsigned long bi_flashoffset; /* reserved area for startup monitor */ |
39 | unsigned long bi_sramstart; /* start of SRAM memory */ | 39 | unsigned long bi_sramstart; /* start of SRAM memory */ |
40 | unsigned long bi_sramsize; /* size of SRAM memory */ | 40 | unsigned long bi_sramsize; /* size of SRAM memory */ |
41 | #if defined(CONFIG_8xx) || defined(CONFIG_CPM2) || defined(CONFIG_85xx) ||\ | 41 | #if defined(CONFIG_8xx) || defined(CONFIG_CPM2) |
42 | defined(CONFIG_83xx) | ||
43 | unsigned long bi_immr_base; /* base of IMMR register */ | 42 | unsigned long bi_immr_base; /* base of IMMR register */ |
44 | #endif | 43 | #endif |
45 | #if defined(CONFIG_PPC_MPC52xx) | 44 | #if defined(CONFIG_PPC_MPC52xx) |
@@ -73,12 +72,11 @@ typedef struct bd_info { | |||
73 | #if defined(CONFIG_HYMOD) | 72 | #if defined(CONFIG_HYMOD) |
74 | hymod_conf_t bi_hymod_conf; /* hymod configuration information */ | 73 | hymod_conf_t bi_hymod_conf; /* hymod configuration information */ |
75 | #endif | 74 | #endif |
76 | #if defined(CONFIG_EVB64260) || defined(CONFIG_405EP) || defined(CONFIG_44x) || \ | 75 | #if defined(CONFIG_EVB64260) || defined(CONFIG_405EP) || defined(CONFIG_44x) |
77 | defined(CONFIG_85xx) || defined(CONFIG_83xx) | ||
78 | /* second onboard ethernet port */ | 76 | /* second onboard ethernet port */ |
79 | unsigned char bi_enet1addr[6]; | 77 | unsigned char bi_enet1addr[6]; |
80 | #endif | 78 | #endif |
81 | #if defined(CONFIG_EVB64260) || defined(CONFIG_440GX) || defined(CONFIG_85xx) | 79 | #if defined(CONFIG_EVB64260) || defined(CONFIG_440GX) |
82 | /* third onboard ethernet ports */ | 80 | /* third onboard ethernet ports */ |
83 | unsigned char bi_enet2addr[6]; | 81 | unsigned char bi_enet2addr[6]; |
84 | #endif | 82 | #endif |