diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-07-05 16:25:22 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-07-06 16:17:19 -0400 |
commit | daab59ac05d8fd1092e34a4c695ac265ae700141 (patch) | |
tree | c9fe90a80281235d0bf3043d1d2e7c218f3ed383 /drivers | |
parent | 747c4c68c042babb2179b52b60bc78611e3e1183 (diff) | |
download | u-boot-daab59ac05d8fd1092e34a4c695ac265ae700141.tar.gz |
avr32: Retire AVR32 for good
AVR32 is gone. It's already more than two years for no support in Buildroot,
even longer there is no support in GCC (last version is heavily patched 4.2.4).
Linux kernel v4.12 got rid of it (and v4.11 didn't build successfully).
There is no good point to keep this support in U-Boot either.
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/i2c/soft_i2c.c | 5 | ||||
-rw-r--r-- | drivers/spi/Kconfig | 4 | ||||
-rw-r--r-- | drivers/usb/gadget/atmel_usba_udc.h | 5 | ||||
-rw-r--r-- | drivers/usb/musb-new/musb_io.h | 2 | ||||
-rw-r--r-- | drivers/video/atmel_lcdfb.c | 4 | ||||
-rw-r--r-- | drivers/video/cfb_console.c | 2 |
6 files changed, 7 insertions, 15 deletions
diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c index de3758d946..50597a7d5a 100644 --- a/drivers/i2c/soft_i2c.c +++ b/drivers/i2c/soft_i2c.c @@ -17,8 +17,9 @@ */ #include <common.h> -#if defined(CONFIG_AVR32) -#include <asm/arch/portmux.h> +#ifdef CONFIG_MPC8260 /* only valid for MPC8260 */ +#include <ioports.h> +#include <asm/io.h> #endif #if defined(CONFIG_AT91FAMILY) #include <asm/io.h> diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index bef864f46e..fe01c737d7 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -37,8 +37,8 @@ config ATMEL_SPI depends on ARCH_AT91 help This enables driver for the Atmel SPI Controller, present on - many AT32 (AVR32) and AT91 (ARM) chips. This driver can be - used to access the SPI Flash, such as AT25DF321. + many AT91 (ARM) chips. This driver can be used to access + the SPI Flash, such as AT25DF321. config CADENCE_QSPI bool "Cadence QSPI driver" diff --git a/drivers/usb/gadget/atmel_usba_udc.h b/drivers/usb/gadget/atmel_usba_udc.h index 92e462db60..c6d12d3a8e 100644 --- a/drivers/usb/gadget/atmel_usba_udc.h +++ b/drivers/usb/gadget/atmel_usba_udc.h @@ -44,13 +44,8 @@ #define USBA_REMOTE_WAKE_UP (1 << 10) #define USBA_PULLD_DIS (1 << 11) -#if defined(CONFIG_AVR32) -#define USBA_ENABLE_MASK USBA_EN_USBA -#define USBA_DISABLE_MASK 0 -#elif defined(CONFIG_AT91FAMILY) #define USBA_ENABLE_MASK (USBA_EN_USBA | USBA_PULLD_DIS) #define USBA_DISABLE_MASK USBA_DETACH -#endif /* CONFIG_ARCH_AT91 */ /* Bitfields in FNUM */ #define USBA_MICRO_FRAME_NUM_OFFSET 0 diff --git a/drivers/usb/musb-new/musb_io.h b/drivers/usb/musb-new/musb_io.h index 76682120f4..a4f4a6f8f4 100644 --- a/drivers/usb/musb-new/musb_io.h +++ b/drivers/usb/musb-new/musb_io.h @@ -22,7 +22,7 @@ #endif #if !defined(CONFIG_ARM) && !defined(CONFIG_SUPERH) \ - && !defined(CONFIG_AVR32) && !defined(CONFIG_PPC32) \ + && !defined(CONFIG_PPC32) \ && !defined(CONFIG_PPC64) && !defined(CONFIG_MIPS) \ && !defined(CONFIG_M68K) static inline void readsl(const void __iomem *addr, void *buf, int len) diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index ed2bd306c6..2b9482a091 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -150,11 +150,7 @@ static void atmel_fb_init(ulong addr, struct display_timing *timing, int bpix, value << ATMEL_LCDC_CLKVAL_OFFSET); /* Initialize control register 2 */ -#ifdef CONFIG_AVR32 - value = ATMEL_LCDC_MEMOR_BIG | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE; -#else value = ATMEL_LCDC_MEMOR_LITTLE | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE; -#endif if (tft) value |= ATMEL_LCDC_DISTYPE_TFT; diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index d75abb660f..f54802052e 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -1968,7 +1968,7 @@ static void *video_logo(void) static int cfb_fb_is_in_dram(void) { bd_t *bd = gd->bd; -#if defined(CONFIG_ARM) || defined(CONFIG_AVR32) || defined(CONFIG_NDS32) || \ +#if defined(CONFIG_ARM) || defined(CONFIG_NDS32) || \ defined(CONFIG_SANDBOX) || defined(CONFIG_X86) ulong start, end; int i; |