diff options
| author | Tom Rini <trini@ti.com> | 2014-10-27 11:03:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-27 11:03:00 -0400 |
| commit | 0cf876154922118d8fb1b4c30f527c95a113bef3 (patch) | |
| tree | 83eb6a7966a1949526e1e6066470952162f51c1d /arch/powerpc/include/asm | |
| parent | 0ce4af99c07acebf4fce9a91f1099d2460629293 (diff) | |
| parent | f06f9a1fb1cd332435b9e8660355f57d7d3f98d8 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxx
Diffstat (limited to 'arch/powerpc/include/asm')
| -rw-r--r-- | arch/powerpc/include/asm/immap_512x.h | 1 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/u-boot.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/immap_512x.h b/arch/powerpc/include/asm/immap_512x.h index 6086a73ba9..bed80aa933 100644 --- a/arch/powerpc/include/asm/immap_512x.h +++ b/arch/powerpc/include/asm/immap_512x.h @@ -59,6 +59,7 @@ typedef struct sysconf512x { u8 res2[0x28]; law512x_t ddrlaw; /* DDR Local Access Window */ u8 res3[0x18]; + u32 mbxbar; /* MBX Base Address */ u32 srambar; /* SRAM Base Address */ u32 nfcbar; /* NFC Base Address */ u8 res4[0x34]; diff --git a/arch/powerpc/include/asm/u-boot.h b/arch/powerpc/include/asm/u-boot.h index e1b566fa56..a61e998df6 100644 --- a/arch/powerpc/include/asm/u-boot.h +++ b/arch/powerpc/include/asm/u-boot.h @@ -77,9 +77,6 @@ typedef struct bd_info { unsigned int bi_pci_busfreq; /* PCI Bus speed, in Hz */ unsigned char bi_pci_enetaddr[6]; /* PCI Ethernet MAC address */ #endif -#if defined(CONFIG_HYMOD) - hymod_conf_t bi_hymod_conf; /* hymod configuration information */ -#endif #ifdef CONFIG_HAS_ETH1 unsigned char bi_enet1addr[6]; /* OLD: see README.enetaddr */ |