diff options
| author | wdenk <wdenk> | 2004-10-10 21:21:55 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-10-10 21:21:55 +0000 |
| commit | 03f5c55021c2d6297e66cc11bfea75f149a5d71c (patch) | |
| tree | 658bdbc75b90b7a122c061fa2aca6d6eb94dfb67 /include/asm-ppc | |
| parent | cf33678e51e02143ed67850b3f13646fd51fb489 (diff) | |
| download | u-boot-03f5c55021c2d6297e66cc11bfea75f149a5d71c.tar.gz u-boot-03f5c55021c2d6297e66cc11bfea75f149a5d71c.tar.xz u-boot-03f5c55021c2d6297e66cc11bfea75f149a5d71c.zip | |
Patches by Jon Loeliger, 24 Aug 2004:
- Add support for the MPC8541 and MPC8555 CDS boards
- Cleanup eth?addr handling: make dependent on CONFIG_ETH?ADDR
Diffstat (limited to 'include/asm-ppc')
| -rw-r--r-- | include/asm-ppc/immap_85xx.h | 8 | ||||
| -rw-r--r-- | include/asm-ppc/u-boot.h | 18 |
2 files changed, 11 insertions, 15 deletions
diff --git a/include/asm-ppc/immap_85xx.h b/include/asm-ppc/immap_85xx.h index 5db0f667ed..542a7d5712 100644 --- a/include/asm-ppc/immap_85xx.h +++ b/include/asm-ppc/immap_85xx.h @@ -156,7 +156,9 @@ typedef struct ccsr_i2c { char res6[4075]; } ccsr_i2c_t; -#if defined (CONFIG_MPC8540) || defined (CONFIG_MPC8555) +#if defined(CONFIG_MPC8540) \ + || defined(CONFIG_MPC8541) \ + || defined(CONFIG_MPC8555) /* DUART Registers(0x4000-0x5000) */ typedef struct ccsr_duart { char res1[1280]; @@ -1021,7 +1023,9 @@ typedef struct ccsr_pic { } ccsr_pic_t; /* CPM Block(0x8_0000-0xc_0000) */ -#if defined (CONFIG_MPC8540) || defined (CONFIG_MPC8555) +#if defined(CONFIG_MPC8540) \ + || defined(CONFIG_MPC8541) \ + || defined(CONFIG_MPC8555) typedef struct ccsr_cpm { char res[262144]; } ccsr_cpm_t; diff --git a/include/asm-ppc/u-boot.h b/include/asm-ppc/u-boot.h index 21d28c8e18..4608a288b9 100644 --- a/include/asm-ppc/u-boot.h +++ b/include/asm-ppc/u-boot.h @@ -77,27 +77,19 @@ typedef struct bd_info { #if defined(CONFIG_HYMOD) hymod_conf_t bi_hymod_conf; /* hymod configuration information */ #endif -#if defined(CFG_GT_6426x) || \ - defined(CONFIG_PN62) || \ - defined(CONFIG_PPCHAMELEONEVB) || \ - defined(CONFIG_SXNI855T) || \ - defined(CONFIG_SVM_SC8xx) || \ - defined(CONFIG_MPC8540ADS) || \ - defined(CONFIG_MPC8555CDS) || \ - defined(CONFIG_MPC8560ADS) || \ - defined(CONFIG_440_GX) + +#if defined(CONFIG_ETH1ADDR) /* second onboard ethernet port */ unsigned char bi_enet1addr[6]; #endif -#if defined(CFG_GT_6426x) || defined(CONFIG_SVM_SC8xx) || \ - defined(CONFIG_MPC8540ADS) || defined(CONFIG_MPC8560ADS) || \ - defined(CONFIG_MPC8555CDS) || defined(CONFIG_440_GX) +#if defined(CONFIG_ETH2ADDR) /* third onboard ethernet port */ unsigned char bi_enet2addr[6]; #endif -#if defined(CONFIG_440_GX) +#if defined(CONFIG_ETH3ADDR) unsigned char bi_enet3addr[6]; #endif + #if defined(CONFIG_405GP) || defined(CONFIG_405EP) || defined (CONFIG_440_GX) unsigned int bi_opbfreq; /* OPB clock in Hz */ int bi_iic_fast[2]; /* Use fast i2c mode */ |