diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-01-27 15:06:14 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-01-28 09:33:10 -0500 |
commit | c42f3ad7f1bf17f31c3febdc71034ed6d793d40f (patch) | |
tree | 5a56c44717cf8fe4a5f402370506e5fbb78368e4 /include/asm-ppc/ppcboot.h | |
parent | 3155f7f23f7865e64f7eb14e226a2dff8197e51f (diff) |
[PPC] Remove 85xx from arch/ppc
85xx exists in arch/powerpc as well as cuImage support to boot from
a u-boot that doesn't support device trees.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'include/asm-ppc/ppcboot.h')
-rw-r--r-- | include/asm-ppc/ppcboot.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-ppc/ppcboot.h b/include/asm-ppc/ppcboot.h index 18d04e8164ca..3819e17cd7b0 100644 --- a/include/asm-ppc/ppcboot.h +++ b/include/asm-ppc/ppcboot.h | |||
@@ -38,7 +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 | unsigned long bi_immr_base; /* base of IMMR register */ | 42 | unsigned long bi_immr_base; /* base of IMMR register */ |
43 | #endif | 43 | #endif |
44 | #if defined(CONFIG_PPC_MPC52xx) | 44 | #if defined(CONFIG_PPC_MPC52xx) |
@@ -72,12 +72,11 @@ typedef struct bd_info { | |||
72 | #if defined(CONFIG_HYMOD) | 72 | #if defined(CONFIG_HYMOD) |
73 | hymod_conf_t bi_hymod_conf; /* hymod configuration information */ | 73 | hymod_conf_t bi_hymod_conf; /* hymod configuration information */ |
74 | #endif | 74 | #endif |
75 | #if defined(CONFIG_EVB64260) || defined(CONFIG_405EP) || defined(CONFIG_44x) || \ | 75 | #if defined(CONFIG_EVB64260) || defined(CONFIG_405EP) || defined(CONFIG_44x) |
76 | defined(CONFIG_85xx) | ||
77 | /* second onboard ethernet port */ | 76 | /* second onboard ethernet port */ |
78 | unsigned char bi_enet1addr[6]; | 77 | unsigned char bi_enet1addr[6]; |
79 | #endif | 78 | #endif |
80 | #if defined(CONFIG_EVB64260) || defined(CONFIG_440GX) || defined(CONFIG_85xx) | 79 | #if defined(CONFIG_EVB64260) || defined(CONFIG_440GX) |
81 | /* third onboard ethernet ports */ | 80 | /* third onboard ethernet ports */ |
82 | unsigned char bi_enet2addr[6]; | 81 | unsigned char bi_enet2addr[6]; |
83 | #endif | 82 | #endif |