diff options
author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2019-05-23 17:39:38 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-05-27 10:07:00 +0200 |
commit | 794589136e4c1732f5127e8fefbee36a0321e52e (patch) | |
tree | d90fd6c733832f64efbf0c599a1b1356ee477daa /arch/arm/mach-at91 | |
parent | 256bb5c178915fbadd95c6da58f838e199aa84ee (diff) | |
download | barebox-794589136e4c1732f5127e8fefbee36a0321e52e.tar.gz barebox-794589136e4c1732f5127e8fefbee36a0321e52e.tar.xz |
ARM: at91: remove no-longer needed subarch #ifdefery
c16bcbc644 ("ARM: at91: remove unused defines") removed conflicting
definitions from the headers, so they can now be included all at
the same time. Do this.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r-- | arch/arm/mach-at91/include/mach/hardware.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h index 58dc6edfa9..21462030e9 100644 --- a/arch/arm/mach-at91/include/mach/hardware.h +++ b/arch/arm/mach-at91/include/mach/hardware.h @@ -22,27 +22,15 @@ /* sama5d4 */ #define AT91_BASE_DBGU2 0xfc069000 -#if defined(CONFIG_ARCH_AT91RM9200) #include <mach/at91rm9200.h> -#elif defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20) #include <mach/at91sam9260.h> -#elif defined(CONFIG_ARCH_AT91SAM9261) || defined(CONFIG_ARCH_AT91SAM9G10) #include <mach/at91sam9261.h> -#elif defined(CONFIG_ARCH_AT91SAM9263) #include <mach/at91sam9263.h> -#elif defined(CONFIG_ARCH_AT91SAM9G45) #include <mach/at91sam9g45.h> -#elif defined(CONFIG_ARCH_AT91SAM9N12) #include <mach/at91sam9n12.h> -#elif defined(CONFIG_ARCH_AT91SAM9X5) #include <mach/at91sam9x5.h> -#elif defined(CONFIG_ARCH_SAMA5D3) #include <mach/sama5d3.h> -#elif defined(CONFIG_ARCH_SAMA5D4) #include <mach/sama5d4.h> -#else -#error "Unsupported AT91 processor" -#endif /* External Memory Map */ #define AT91_CHIPSELECT_0 0x10000000 |