diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-14 00:00:04 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-14 00:00:04 +0200 |
| commit | 87abce6e91b668390d07b578100d4053283a67e8 (patch) | |
| tree | 230c7bad063d766fc9cbd34ab89bce338a811739 /include/configs/at91sam9261ek.h | |
| parent | c9969947a4687de90e2bb58e76842b491aa0e0b9 (diff) | |
| parent | bb272ec8df6e35b7e19ce1237cae28798167a624 (diff) | |
| download | u-boot-imx-87abce6e91b668390d07b578100d4053283a67e8.zip u-boot-imx-87abce6e91b668390d07b578100d4053283a67e8.tar.gz u-boot-imx-87abce6e91b668390d07b578100d4053283a67e8.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'include/configs/at91sam9261ek.h')
| -rw-r--r-- | include/configs/at91sam9261ek.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 83e05b3..6d24023 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -32,8 +32,11 @@ #define CONFIG_SYS_HZ 1000 #define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */ +#ifdef CONFIG_AT91SAM9G10EK +#define CONFIG_AT91SAM9G10 1 /* It's an Atmel AT91SAM9G10 SoC*/ +#else #define CONFIG_AT91SAM9261 1 /* It's an Atmel AT91SAM9261 SoC*/ -#define CONFIG_AT91SAM9261EK 1 /* on an AT91SAM9261EK Board */ +#endif #define CONFIG_ARCH_CPU_INIT #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ @@ -62,7 +65,11 @@ #define CONFIG_LCD_INFO_BELOW_LOGO 1 #define CONFIG_SYS_WHITE_ON_BLACK 1 #define CONFIG_ATMEL_LCD 1 +#ifdef CONFIG_AT91SAM9261EK #define CONFIG_ATMEL_LCD_BGR555 1 +#else +#define CONFIG_AT91SAM9G10_LCD_BASE 0x23E00000 /* LCD is no more in SRAM */ +#endif #define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 /* LED */ @@ -147,7 +154,11 @@ #define CONFIG_DOS_PARTITION 1 #define CONFIG_SYS_USB_OHCI_CPU_INIT 1 #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000 /* AT91SAM9261_UHP_BASE */ +#ifdef CONFIG_AT91SAM9G10EK +#define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9g10" +#else #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9261" +#endif #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 #define CONFIG_USB_STORAGE 1 #define CONFIG_CMD_FAT 1 |