diff options
| author | Tom Rini <trini@konsulko.com> | 2015-05-14 06:59:30 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-05-14 06:59:30 -0400 |
| commit | 14c15daecc3d5837b1a8639c909805466fc46ed7 (patch) | |
| tree | 63349b449dc9ade79329a08d22838b133ec71b93 /arch/arm | |
| parent | ce49e79450ce4889616d4ee079a7963aa59f183c (diff) | |
| parent | 9aee8d835751773ad7a6b8d618566814c0a3205c (diff) | |
| download | u-boot-imx-14c15daecc3d5837b1a8639c909805466fc46ed7.zip u-boot-imx-14c15daecc3d5837b1a8639c909805466fc46ed7.tar.gz u-boot-imx-14c15daecc3d5837b1a8639c909805466fc46ed7.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-at91/Kconfig | 15 | ||||
| -rw-r--r-- | arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c | 2 |
2 files changed, 1 insertions, 16 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 7dfa520..bbf4228 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -24,10 +24,6 @@ config TARGET_ETHERNUT5 bool "Ethernut5 board" select CPU_ARM926EJS -config TARGET_TNY_A9260 - bool "Caloa TNY A9260 board" - select CPU_ARM926EJS - config TARGET_SNAPPER9260 bool "Support snapper9260" select CPU_ARM926EJS @@ -35,10 +31,6 @@ config TARGET_SNAPPER9260 select DM_SERIAL select DM_GPIO -config TARGET_AFEB9260 - bool "Support afeb9260" - select CPU_ARM926EJS - config TARGET_AT91SAM9261EK bool "Atmel at91sam9261 reference board" select CPU_ARM926EJS @@ -59,10 +51,6 @@ config TARGET_PM9263 bool "Ronetix pm9263 board" select CPU_ARM926EJS -config TARGET_SBC35_A9G20 - bool "Support sbc35_a9g20" - select CPU_ARM926EJS - config TARGET_STAMP9G20 bool "Support stamp9g20" select CPU_ARM926EJS @@ -155,11 +143,8 @@ source "board/atmel/sama5d4_xplained/Kconfig" source "board/atmel/sama5d4ek/Kconfig" source "board/BuS/eb_cpux9k2/Kconfig" source "board/eukrea/cpuat91/Kconfig" -source "board/afeb9260/Kconfig" source "board/bluewater/snapper9260/Kconfig" source "board/BuS/vl_ma2sc/Kconfig" -source "board/calao/sbc35_a9g20/Kconfig" -source "board/calao/tny_a9260/Kconfig" source "board/calao/usb_a9263/Kconfig" source "board/egnite/ethernut5/Kconfig" source "board/esd/meesc/Kconfig" diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c index efb53d6..5e0c0f5 100644 --- a/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c +++ b/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c @@ -166,7 +166,7 @@ void at91_macb_hw_init(void) at91_set_b_periph(AT91_PIO_PORTA, 25, 0); /* ERX2 */ at91_set_b_periph(AT91_PIO_PORTA, 26, 0); /* ERX3 */ at91_set_b_periph(AT91_PIO_PORTA, 27, 0); /* ERXCK */ -#if defined(CONFIG_AT91SAM9260EK) || defined(CONFIG_AFEB9260) +#if defined(CONFIG_AT91SAM9260EK) /* * use PA10, PA11 for ETX2, ETX3. * PA23 and PA24 are for TWI EEPROM |