diff options
author | Wolfgang Denk <wd@denx.de> | 2009-07-13 23:45:10 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-07-13 23:45:10 +0200 |
commit | bb272ec8df6e35b7e19ce1237cae28798167a624 (patch) | |
tree | 9e8b05cce8c18296234c7596d6099038ae086485 /include/asm-arm/arch-at91/hardware.h | |
parent | 9833865a2b84ad2bddb54fa9d896f0890be71797 (diff) | |
parent | c3ae126c2cad03f04be36c92dd9437b9ee2385b6 (diff) | |
download | u-boot-imx-bb272ec8df6e35b7e19ce1237cae28798167a624.zip u-boot-imx-bb272ec8df6e35b7e19ce1237cae28798167a624.tar.gz u-boot-imx-bb272ec8df6e35b7e19ce1237cae28798167a624.tar.bz2 |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'include/asm-arm/arch-at91/hardware.h')
-rw-r--r-- | include/asm-arm/arch-at91/hardware.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/asm-arm/arch-at91/hardware.h b/include/asm-arm/arch-at91/hardware.h index 8704106..de06a10 100644 --- a/include/asm-arm/arch-at91/hardware.h +++ b/include/asm-arm/arch-at91/hardware.h @@ -23,7 +23,7 @@ #define AT91_BASE_SPI AT91SAM9260_BASE_SPI0 #define AT91_ID_UHP AT91SAM9260_ID_UHP #define AT91_PMC_UHP AT91SAM926x_PMC_UHP -#elif defined(CONFIG_AT91SAM9261) +#elif defined(CONFIG_AT91SAM9261) || defined(CONFIG_AT91SAM9G10) #include <asm/arch/at91sam9261.h> #define AT91_BASE_SPI AT91SAM9261_BASE_SPI0 #define AT91_ID_UHP AT91SAM9261_ID_UHP @@ -37,6 +37,12 @@ #include <asm/arch/at91sam9rl.h> #define AT91_BASE_SPI AT91SAM9RL_BASE_SPI #define AT91_ID_UHP AT91SAM9RL_ID_UHP +#elif defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) +#include <asm/arch/at91sam9g45.h> +#define AT91_BASE_EMAC AT91SAM9G45_BASE_EMAC +#define AT91_BASE_SPI AT91SAM9G45_BASE_SPI0 +#define AT91_ID_UHP AT91SAM9G45_ID_UHPHS +#define AT91_PMC_UHP AT91SAM926x_PMC_UHP #elif defined(CONFIG_AT91CAP9) #include <asm/arch/at91cap9.h> #define AT91_BASE_SPI AT91CAP9_BASE_SPI0 |