diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2018-01-06 22:11:17 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-01-09 11:34:32 +0100 |
| commit | 120a41b2707f735fc4eeee2f9f8e6443c752f29a (patch) | |
| tree | 201940063169c2123c6017103ddfcd9fd653629c /arch | |
| parent | 38d0b2326ff8ff2a6341026f2036640b08ff4f35 (diff) | |
| download | barebox-120a41b2707f735fc4eeee2f9f8e6443c752f29a.tar.gz barebox-120a41b2707f735fc4eeee2f9f8e6443c752f29a.tar.xz | |
at91rm9200ek: move reset vector to board code
Include deletion of now unused at91rm9200_lowlevel_init.c
and related CONFIG symbols
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boards/at91rm9200ek/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/boards/at91rm9200ek/lowlevel.c (renamed from arch/arm/mach-at91/at91rm9200_lowlevel_init.c) | 14 | ||||
| -rw-r--r-- | arch/arm/mach-at91/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-at91/Makefile | 1 |
4 files changed, 9 insertions, 12 deletions
diff --git a/arch/arm/boards/at91rm9200ek/Makefile b/arch/arm/boards/at91rm9200ek/Makefile index dec1c50455..a07c06a6d9 100644 --- a/arch/arm/boards/at91rm9200ek/Makefile +++ b/arch/arm/boards/at91rm9200ek/Makefile @@ -1,2 +1,5 @@ obj-y += init.o + +lwl-y += lowlevel.o + bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-at91rm9200ek diff --git a/arch/arm/mach-at91/at91rm9200_lowlevel_init.c b/arch/arm/boards/at91rm9200ek/lowlevel.c index f78e368086..a85a22e797 100644 --- a/arch/arm/mach-at91/at91rm9200_lowlevel_init.c +++ b/arch/arm/boards/at91rm9200ek/lowlevel.c @@ -4,19 +4,17 @@ * Under GPLv2 */ -#define __LOWLEVEL_INIT__ - #include <common.h> -#include <asm/system.h> -#include <asm/barebox-arm.h> +#include <init.h> + #include <asm/barebox-arm-head.h> -#include <mach/hardware.h> -#include <mach/at91rm9200.h> +#include <asm/barebox-arm.h> + #include <mach/at91rm9200_mc.h> +#include <mach/at91rm9200.h> #include <mach/at91_pio.h> #include <mach/at91_pmc.h> -#include <mach/io.h> -#include <init.h> +#include <mach/hardware.h> void static inline access_sdram(void) { diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 1d2ac085df..74e1a862b9 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -47,8 +47,6 @@ config AT91SAM9260_LWL bool config AT91SAM9263_LWL bool -config AT91RM9200_LWL - bool config AT91SAM9_SMC bool @@ -251,7 +249,6 @@ choice config MACH_AT91RM9200EK bool "Atmel AT91RM9200-EK Evaluation Kit" select HAVE_AT91_DATAFLASH_CARD - select AT91RM9200_LWL help Select this if you are using Atmel's AT91RM9200-EK Evaluation Kit. <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3507> diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index c430498ffa..7193b8690c 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -10,7 +10,6 @@ obj-$(CONFIG_AT91_BOOTSTRAP) += bootstrap.o lwl-$(CONFIG_AT91SAM926X_LWL) += at91sam926x_lowlevel_init.o -lwl-$(CONFIG_AT91RM9200_LWL) += at91rm9200_lowlevel_init.o lwl-$(CONFIG_AT91SAM9260_LWL) += at91sam9260_lowlevel_init.o lwl-$(CONFIG_AT91SAM9263_LWL) += at91sam9263_lowlevel_init.o |