mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] ARM pca-a-l1: call omap3_core_init from board code
@ 2012-01-20 21:25 Juergen Kilb
  2012-01-20 21:25 ` [PATCH] ARM pca-a-l1: delete platform.S Juergen Kilb
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Juergen Kilb @ 2012-01-20 21:25 UTC (permalink / raw)
  To: barebox; +Cc: Juergen Kilb

since commit ae2ac15105cbf198ebd2b7ac0428641423b83c08
a_init was renamed to omap3_core_init and called from board code.

Signed-off-by: Juergen Kilb <J.Kilb@phytec.de>
---
 arch/arm/boards/phycard-a-l1/pca-a-l1.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

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 0518894..8015087 100644
--- a/arch/arm/boards/phycard-a-l1/pca-a-l1.c
+++ b/arch/arm/boards/phycard-a-l1/pca-a-l1.c
@@ -226,6 +226,8 @@ static int pcaal1_board_init(void)
 {
 	int in_sdram = running_in_sdram();
 
+	omap3_core_init();
+
 	pcaal1_mux_config();
 
 	/* Dont reconfigure SDRAM while running in SDRAM! */
-- 
1.7.0.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 8+ messages in thread
* [PATCH] ARM pca-a-l1: fix board_init
@ 2012-01-17 10:23 Sascha Hauer
  0 siblings, 0 replies; 8+ messages in thread
From: Sascha Hauer @ 2012-01-17 10:23 UTC (permalink / raw)
  To: barebox; +Cc: Juergen Kilb

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

^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-01-23 21:18 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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: delete platform.S 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
2012-01-20 21:25 ` [PATCH] ARM pca-a-l1: should depend on ARCH_OMAP3 Juergen Kilb
  -- strict thread matches above, loose matches on Subject: below --
2012-01-17 10:23 [PATCH] ARM pca-a-l1: fix board_init Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox