From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-ee0-f51.google.com ([74.125.83.51]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ue8HY-0005pf-OQ for barebox@lists.infradead.org; Sun, 19 May 2013 18:24:41 +0000 Received: by mail-ee0-f51.google.com with SMTP id e51so3491063eek.24 for ; Sun, 19 May 2013 11:24:10 -0700 (PDT) From: Sebastian Hesselbarth Date: Sun, 19 May 2013 20:23:55 +0200 Message-Id: <1368987835-13323-12-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1368987835-13323-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1368987835-13323-1-git-send-email-sebastian.hesselbarth@gmail.com> 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 Subject: [PATCH 11/11] arm: mvebu: convert Globalscale Guruplug to common init To: Sebastian Hesselbarth Cc: Thomas Petazzoni , barebox@lists.infradead.org With Marvell Kirkwood 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 Tested-by: Thomas Petazzoni --- Cc: Thomas Petazzoni Cc: Sascha Hauer Cc: barebox@lists.infradead.org --- arch/arm/boards/globalscale-guruplug/Makefile | 3 +-- .../{globalscale-guruplug.c => board.c} | 15 +++-------- arch/arm/boards/globalscale-guruplug/lowlevel.c | 26 -------------------- 3 files changed, 4 insertions(+), 40 deletions(-) rename arch/arm/boards/globalscale-guruplug/{globalscale-guruplug.c => board.c} (63%) delete mode 100644 arch/arm/boards/globalscale-guruplug/lowlevel.c diff --git a/arch/arm/boards/globalscale-guruplug/Makefile b/arch/arm/boards/globalscale-guruplug/Makefile index 3b48b32..dcfc293 100644 --- a/arch/arm/boards/globalscale-guruplug/Makefile +++ b/arch/arm/boards/globalscale-guruplug/Makefile @@ -1,2 +1 @@ -obj-y = globalscale-guruplug.o -lwl-y += lowlevel.o +obj-y += board.o diff --git a/arch/arm/boards/globalscale-guruplug/globalscale-guruplug.c b/arch/arm/boards/globalscale-guruplug/board.c similarity index 63% rename from arch/arm/boards/globalscale-guruplug/globalscale-guruplug.c rename to arch/arm/boards/globalscale-guruplug/board.c index dfc1d1a..9c800c5 100644 --- a/arch/arm/boards/globalscale-guruplug/globalscale-guruplug.c +++ b/arch/arm/boards/globalscale-guruplug/board.c @@ -1,5 +1,6 @@ /* - * Copyright (C) 2013 Thomas Petazzoni + * Copyright + * (C) 2013 Thomas Petazzoni * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -13,14 +14,4 @@ * */ -#include -#include -#include -#include - -static int globalscale_guruplug_console_init(void) -{ - return kirkwood_add_uart0(); -} - -console_initcall(globalscale_guruplug_console_init); +/* empty */ diff --git a/arch/arm/boards/globalscale-guruplug/lowlevel.c b/arch/arm/boards/globalscale-guruplug/lowlevel.c deleted file mode 100644 index d270cda..0000000 --- a/arch/arm/boards/globalscale-guruplug/lowlevel.c +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2013 Thomas Petazzoni - * - * 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 -#include -#include -#include -#include - -void __naked barebox_arm_reset_vector(void) -{ - arm_cpu_lowlevel_init(); - kirkwood_barebox_entry(); -} -- 1.7.10.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox