diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2018-01-06 22:11:11 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-01-09 11:34:31 +0100 |
| commit | 709559beec0fc093052616a1d4b2e76ff6b8f662 (patch) | |
| tree | efc9aa3d8627391a1d7b8e8483048299e6a1d147 /arch | |
| parent | 3b7de0a1a5e2f2f6cfb210c4f5b2c72a1a45e131 (diff) | |
| download | barebox-709559beec0fc093052616a1d4b2e76ff6b8f662.tar.gz barebox-709559beec0fc093052616a1d4b2e76ff6b8f662.tar.xz | |
at91sam9n12ek: move reset vector to board code
Delete the unused at91sam9n12_lowlevel_init.c
Create new lowlevel.c that contains the reset vector.
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/at91sam9n12ek/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/boards/at91sam9n12ek/lowlevel.c (renamed from arch/arm/mach-at91/at91sam9n12_lowlevel_init.c) | 15 | ||||
| -rw-r--r-- | arch/arm/mach-at91/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-at91/Makefile | 1 |
4 files changed, 9 insertions, 13 deletions
diff --git a/arch/arm/boards/at91sam9n12ek/Makefile b/arch/arm/boards/at91sam9n12ek/Makefile index f5d125a0e7..458b055918 100644 --- a/arch/arm/boards/at91sam9n12ek/Makefile +++ b/arch/arm/boards/at91sam9n12ek/Makefile @@ -1,2 +1,5 @@ obj-y += init.o + +lwl-y += lowlevel.o + bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-at91sam9n12ek diff --git a/arch/arm/mach-at91/at91sam9n12_lowlevel_init.c b/arch/arm/boards/at91sam9n12ek/lowlevel.c index 2b5cb158b0..47079336e6 100644 --- a/arch/arm/mach-at91/at91sam9n12_lowlevel_init.c +++ b/arch/arm/boards/at91sam9n12ek/lowlevel.c @@ -2,19 +2,16 @@ * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> * * 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/io.h> +#include <asm/barebox-arm.h> + #include <mach/at91sam9_ddrsdr.h> -#include <init.h> -#include <linux/sizes.h> +#include <mach/hardware.h> void __naked __bare_init barebox_arm_reset_vector(void) { diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 9f05d4884a..44d57209fe 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -49,8 +49,6 @@ config AT91SAM9263_LWL bool config AT91SAM9G45_LWL bool -config AT91SAM9N12_LWL - bool config AT91RM9200_LWL bool @@ -497,7 +495,6 @@ choice config MACH_AT91SAM9N12EK bool "Atmel AT91SAM9N12 Evaluation Kit" - select AT91SAM9N12_LWL help Select this if you are using Atmel's AT91SAM9N12-EK Evaluation Kit. diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index cb8dade6db..b51f1873b7 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -14,7 +14,6 @@ lwl-$(CONFIG_AT91RM9200_LWL) += at91rm9200_lowlevel_init.o lwl-$(CONFIG_AT91SAM9260_LWL) += at91sam9260_lowlevel_init.o lwl-$(CONFIG_AT91SAM9263_LWL) += at91sam9263_lowlevel_init.o lwl-$(CONFIG_AT91SAM9G45_LWL) += at91sam9g45_lowlevel_init.o -lwl-$(CONFIG_AT91SAM9N12_LWL) += at91sam9n12_lowlevel_init.o obj-$(CONFIG_AT91SAM9_RESET) += at91sam9_reset.o obj-$(CONFIG_AT91SAM9G45_RESET) += at91sam9g45_reset.o |