From: Sam Ravnborg <sam@ravnborg.org>
To: Barebox List <barebox@lists.infradead.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Subject: [PATCH v5 15/22] at91sam9n12ek: move reset vector to board code
Date: Sat, 6 Jan 2018 22:11:11 +0100 [thread overview]
Message-ID: <20180106211118.24249-15-sam@ravnborg.org> (raw)
In-Reply-To: <20180106210450.GA21127@ravnborg.org>
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>
---
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 <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 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
next prev parent reply other threads:[~2018-01-06 21:12 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-06 21:04 [PATCH v5 0/22] at91: " Sam Ravnborg
2018-01-06 21:10 ` [PATCH v5 01/22] at91: mmccpu: remove board support for mmccpu Sam Ravnborg
2018-01-06 21:10 ` [PATCH v5 02/22] arm: at91: refactor lowlevel_init selection Sam Ravnborg
2018-01-06 21:10 ` [PATCH v5 03/22] arm: at91: drop unused at91sam9x5_lowlevel_init.c Sam Ravnborg
2018-01-06 21:11 ` [PATCH v5 04/22] arm: at91: add at91sam926x_board_init.h Sam Ravnborg
2018-01-06 21:11 ` [PATCH v5 05/22] arm: at91: code cleanup in at91sam926x_board_init Sam Ravnborg
2018-01-06 21:11 ` [PATCH v5 06/22] at91sam9263ek: move reset vector to board code Sam Ravnborg
2018-01-06 21:11 ` [PATCH v5 07/22] at91sam9261ek, at91sam9g10ek: " Sam Ravnborg
2018-01-06 21:11 ` [PATCH v5 08/22] pm9261: " Sam Ravnborg
2018-01-06 21:11 ` [PATCH v5 09/22] at91: drop unused at91sam9261_lowlevel_init Sam Ravnborg
2018-01-06 21:11 ` [PATCH v5 10/22] pm9263: move reset vector to board code Sam Ravnborg
2018-01-06 21:11 ` [PATCH v5 11/22] {usb,tny}-a926x: " Sam Ravnborg
2018-01-06 21:11 ` [PATCH v5 12/22] qil-a926x: " Sam Ravnborg
2018-01-06 21:11 ` [PATCH v5 13/22] haba-knx: " Sam Ravnborg
2018-01-06 21:11 ` [PATCH v5 14/22] sama5d{3, 4}{xek, xplained}: " Sam Ravnborg
2018-01-06 21:11 ` Sam Ravnborg [this message]
2018-01-06 21:11 ` [PATCH v5 16/22] at91sam9260ek, at91sam9g20ek: " Sam Ravnborg
2018-01-06 21:11 ` [PATCH v5 17/22] at91sam9m10g45ek, at91sam9m10ihd, pm9g45: " Sam Ravnborg
2018-01-06 21:11 ` [PATCH v5 18/22] animeo: " Sam Ravnborg
2018-01-06 21:11 ` [PATCH v5 19/22] telit-evk-pro3: " Sam Ravnborg
2018-01-06 21:11 ` [PATCH v5 20/22] dss11: " Sam Ravnborg
2018-01-06 21:11 ` [PATCH v5 21/22] at91rm9200ek: " Sam Ravnborg
2018-01-06 21:11 ` [PATCH v5 22/22] arm: at91: remove leftovers from moving reset code in mach-at91 Sam Ravnborg
2018-01-09 10:35 ` [PATCH v5 0/22] at91: move reset vector to board code Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180106211118.24249-15-sam@ravnborg.org \
--to=sam@ravnborg.org \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox