From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eXvkq-0007sa-NY for barebox@lists.infradead.org; Sat, 06 Jan 2018 21:12:16 +0000 Received: by mail-lf0-x244.google.com with SMTP id u84so8482526lff.7 for ; Sat, 06 Jan 2018 13:11:45 -0800 (PST) From: Sam Ravnborg Subject: [PATCH v5 15/22] at91sam9n12ek: move reset vector to board code Date: Sat, 6 Jan 2018 22:11:11 +0100 Message-Id: <20180106211118.24249-15-sam@ravnborg.org> In-Reply-To: <20180106210450.GA21127@ravnborg.org> References: <20180106210450.GA21127@ravnborg.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org To: Barebox List Cc: Sam Ravnborg Delete the unused at91sam9n12_lowlevel_init.c Create new lowlevel.c that contains the reset vector. Signed-off-by: Sam Ravnborg Reviewed-by: Andrey Smirnov --- arch/arm/boards/at91sam9n12ek/Makefile | 3 +++ .../at91sam9n12ek/lowlevel.c} | 15 ++++++--------- arch/arm/mach-at91/Kconfig | 3 --- arch/arm/mach-at91/Makefile | 1 - 4 files changed, 9 insertions(+), 13 deletions(-) rename arch/arm/{mach-at91/at91sam9n12_lowlevel_init.c => boards/at91sam9n12ek/lowlevel.c} (83%) diff --git a/arch/arm/boards/at91sam9n12ek/Makefile b/arch/arm/boards/at91sam9n12ek/Makefile index f5d125a0e..458b05591 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 similarity index 83% rename from arch/arm/mach-at91/at91sam9n12_lowlevel_init.c rename to arch/arm/boards/at91sam9n12ek/lowlevel.c index 2b5cb158b..47079336e 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 * * Under GPLv2 - */ - -#define __LOWLEVEL_INIT__ + */ #include -#include -#include +#include + #include -#include -#include +#include + #include -#include -#include +#include void __naked __bare_init barebox_arm_reset_vector(void) { diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 9f05d4884..44d57209f 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 cb8dade6d..b51f1873b 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 -- 2.12.0 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox