[PATCH 10/11] arm: mvebu: convert Marvell Armada XP GP board to common init

Sebastian Hesselbarth sebastian.hesselbarth at gmail.com
Sun May 19 14:23:54 EDT 2013


With Marvell Armada XP converted to common SoC init, board specific
lowlevel and init code can be removed. This patch leaves an empty board
source file to allow to have board specific quirks.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth at gmail.com>
---
Cc: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
Cc: Sascha Hauer <s.hauer at pengutronix.de>
Cc: barebox at lists.infradead.org
---
 arch/arm/boards/marvell-armada-xp-gp/Makefile      |    3 +--
 .../{marvell-armada-xp-gp.c => board.c}            |   14 +++--------
 arch/arm/boards/marvell-armada-xp-gp/lowlevel.c    |   25 --------------------
 3 files changed, 4 insertions(+), 38 deletions(-)
 rename arch/arm/boards/marvell-armada-xp-gp/{marvell-armada-xp-gp.c => board.c} (65%)
 delete mode 100644 arch/arm/boards/marvell-armada-xp-gp/lowlevel.c

diff --git a/arch/arm/boards/marvell-armada-xp-gp/Makefile b/arch/arm/boards/marvell-armada-xp-gp/Makefile
index ea89963..dcfc293 100644
--- a/arch/arm/boards/marvell-armada-xp-gp/Makefile
+++ b/arch/arm/boards/marvell-armada-xp-gp/Makefile
@@ -1,2 +1 @@
-obj-y = marvell-armada-xp-gp.o
-lwl-y += lowlevel.o
+obj-y += board.o
diff --git a/arch/arm/boards/marvell-armada-xp-gp/marvell-armada-xp-gp.c b/arch/arm/boards/marvell-armada-xp-gp/board.c
similarity index 65%
rename from arch/arm/boards/marvell-armada-xp-gp/marvell-armada-xp-gp.c
rename to arch/arm/boards/marvell-armada-xp-gp/board.c
index 7351329..9c800c5 100644
--- a/arch/arm/boards/marvell-armada-xp-gp/marvell-armada-xp-gp.c
+++ b/arch/arm/boards/marvell-armada-xp-gp/board.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2013 Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
+ * Copyright
+ * (C) 2013 Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -13,13 +14,4 @@
  *
  */
 
-#include <common.h>
-#include <init.h>
-#include <mach/mvebu.h>
-
-static int marvell_armada_xp_gp_console_init(void)
-{
-	return mvebu_add_uart0();
-}
-
-console_initcall(marvell_armada_xp_gp_console_init);
+/* empty */
diff --git a/arch/arm/boards/marvell-armada-xp-gp/lowlevel.c b/arch/arm/boards/marvell-armada-xp-gp/lowlevel.c
deleted file mode 100644
index e9b2e30..0000000
--- a/arch/arm/boards/marvell-armada-xp-gp/lowlevel.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2013 Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#include <common.h>
-#include <mach/mvebu.h>
-#include <asm/barebox-arm.h>
-#include <asm/barebox-arm-head.h>
-
-void __naked barebox_arm_reset_vector(void)
-{
-	arm_cpu_lowlevel_init();
-	mvebu_barebox_entry();
-}
-- 
1.7.10.4




More information about the barebox mailing list