From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Juergen Kilb <J.Kilb@phytec.de>
Subject: [PATCH] ARM pca-a-l1: fix board_init
Date: Tue, 17 Jan 2012 11:23:09 +0100 [thread overview]
Message-ID: <1326795789-10058-1-git-send-email-s.hauer@pengutronix.de> (raw)
board_init is now called omap3_board_init. broken since:
commit 494a12f703c33f80fe96e2a728545c490347eceb
Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Sat Jan 14 15:51:05 2012 +0100
omap3: move platform lowlevel init to mach-omap
this will allow to switch omap3 to standard organisation
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/boards/phycard-a-l1/Makefile | 1 -
arch/arm/boards/phycard-a-l1/lowlevel.c | 39 -------------------------------
arch/arm/boards/phycard-a-l1/pca-a-l1.c | 2 +-
3 files changed, 1 insertions(+), 41 deletions(-)
delete mode 100644 arch/arm/boards/phycard-a-l1/lowlevel.c
diff --git a/arch/arm/boards/phycard-a-l1/Makefile b/arch/arm/boards/phycard-a-l1/Makefile
index cb0106b..db48b6d 100644
--- a/arch/arm/boards/phycard-a-l1/Makefile
+++ b/arch/arm/boards/phycard-a-l1/Makefile
@@ -18,5 +18,4 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA
-obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += lowlevel.o
obj-y += pca-a-l1.o
diff --git a/arch/arm/boards/phycard-a-l1/lowlevel.c b/arch/arm/boards/phycard-a-l1/lowlevel.c
deleted file mode 100644
index bffbb08..0000000
--- a/arch/arm/boards/phycard-a-l1/lowlevel.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * (C) Copyright 2011
- * Phytec Messtechnik GmbH <www.phytec.de>
- * Juergen Kilb <j.kilb@phytec.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-#include <common.h>
-#include <asm/barebox-arm.h>
-#include <mach/sdrc.h>
-#include <mach/omap3-silicon.h>
-
-void __naked board_init_lowlevel(void)
-{
- uint32_t r;
-
- /* setup a stack */
- r = OMAP_SRAM_STACK;
- __asm__ __volatile__("mov sp, %0" : : "r"(r));
-
- board_init();
-
- board_init_lowlevel_return();
-}
diff --git a/arch/arm/boards/phycard-a-l1/pca-a-l1.c b/arch/arm/boards/phycard-a-l1/pca-a-l1.c
index 7b127f3..11e8638 100644
--- a/arch/arm/boards/phycard-a-l1/pca-a-l1.c
+++ b/arch/arm/boards/phycard-a-l1/pca-a-l1.c
@@ -224,7 +224,7 @@ static void pcaal1_mux_config(void)
*
* @return void
*/
-void board_init(void)
+void omap3_board_init(void)
{
int in_sdram = running_in_sdram();
--
1.7.8.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2012-01-17 10:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-17 10:23 Sascha Hauer [this message]
2012-01-20 21:25 [PATCH] ARM pca-a-l1: call omap3_core_init from board code Juergen Kilb
2012-01-20 21:25 ` [PATCH] ARM pca-a-l1: fix board_init Juergen Kilb
2012-01-23 8:35 ` Sascha Hauer
2012-01-23 10:40 ` Jean-Christophe PLAGNIOL-VILLARD
2012-01-23 21:17 ` Jürgen Kilb
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=1326795789-10058-1-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=J.Kilb@phytec.de \
--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