mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 11/36] ARM ep93xx boards: switch to barebox_arm_entry
Date: Sun,  3 Feb 2013 16:10:11 +0100	[thread overview]
Message-ID: <1359904236-11622-11-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1359904236-11622-1-git-send-email-plagnioj@jcrosoft.com>

From: Sascha Hauer <s.hauer@pengutronix.de>

This architecture is a bit strange. It has up to four SDRAM banks, but
all have a quite limited size. The SDRAM size for the different boards
currently is unknown as it's configurable with Kconfig. We use a SDRAM
size based on the value of the only board we have in the defconfigs:
edb9301. This likely breaks other ep93xx boards.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/Kconfig                     |    2 ++
 arch/arm/boards/edb93xx/sdram_cfg.c  |    4 ++++
 arch/arm/mach-ep93xx/Kconfig         |    8 --------
 arch/arm/mach-ep93xx/Makefile        |    4 ++--
 arch/arm/mach-ep93xx/lowlevel_init.S |   11 ++++++++++-
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index dd8f01e..7b0e59a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -49,6 +49,8 @@ config ARCH_EP93XX
 	bool "Cirrus Logic EP93xx"
 	select CPU_ARM920T
 	select GENERIC_GPIO
+	select MACH_HAS_LOWLEVEL_INIT
+	select MACH_DO_LOWLEVEL_INIT
 
 config ARCH_IMX
 	bool "Freescale iMX-based"
diff --git a/arch/arm/boards/edb93xx/sdram_cfg.c b/arch/arm/boards/edb93xx/sdram_cfg.c
index 9442129..5c2a537 100644
--- a/arch/arm/boards/edb93xx/sdram_cfg.c
+++ b/arch/arm/boards/edb93xx/sdram_cfg.c
@@ -36,6 +36,10 @@ static void program_mode_registers(void);
 void sdram_cfg(void)
 {
 	struct sdram_regs *sdram = (struct sdram_regs *)SDRAM_BASE;
+	unsigned long pc = get_pc();
+
+	if (pc < CONFIG_EP93XX_SDRAM_BANK3_BASE + CONFIG_EP93XX_SDRAM_BANK3_SIZE)
+		return;
 
 	writel(SDRAM_DEVCFG_VAL, &sdram->SDRAM_DEVCFG_REG);
 
diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig
index ed6e986..90859d5 100644
--- a/arch/arm/mach-ep93xx/Kconfig
+++ b/arch/arm/mach-ep93xx/Kconfig
@@ -38,7 +38,6 @@ choice
 config MACH_EDB9301
 	bool "Cirrus Logic EDB9301"
 	select EP93XX_SDCE3_SYNC_PHYS_OFFSET
-	select MACH_HAS_LOWLEVEL_INIT
 	help
 	  Say y here if you are using Cirrus Logic's EDB9301 Evaluation board
 
@@ -103,14 +102,12 @@ choice
 config MACH_EDB9302
 	bool "Cirrus Logic EDB9302"
 	select EP93XX_SDCE3_SYNC_PHYS_OFFSET
-	select MACH_HAS_LOWLEVEL_INIT
 	help
 	  Say y here if you are using Cirrus Logic's EDB9302 Evaluation board
 
 config MACH_EDB9302A
 	bool "Cirrus Logic EDB9302A"
 	select EP93XX_SDCE0_PHYS_OFFSET
-	select MACH_HAS_LOWLEVEL_INIT
 	help
 	  Say y here if you are using Cirrus Logic's EDB9302A Evaluation board
 
@@ -222,14 +219,12 @@ choice
 config MACH_EDB9307
 	bool "Cirrus Logic EDB9307"
 	select EP93XX_SDCE3_SYNC_PHYS_OFFSET
-	select MACH_HAS_LOWLEVEL_INIT
 	help
 	  Say y here if you are using Cirrus Logic's EDB9307 Evaluation board
 
 config MACH_EDB9307A
 	bool "Cirrus Logic EDB9307A"
 	select EP93XX_SDCE0_PHYS_OFFSET
-	select MACH_HAS_LOWLEVEL_INIT
 	help
 	  Say y here if you are using Cirrus Logic's EDB9307A Evaluation board
 
@@ -309,7 +304,6 @@ choice
 config MACH_EDB9312
 	bool "Cirrus Logic EDB9312"
 	select EP93XX_SDCE3_SYNC_PHYS_OFFSET
-	select MACH_HAS_LOWLEVEL_INIT
 	help
 	  Say y here if you are using Cirrus Logic's EDB9312 Evaluation board
 
@@ -358,14 +352,12 @@ choice
 config MACH_EDB9315
 	bool "Cirrus Logic EDB9315"
 	select EP93XX_SDCE3_SYNC_PHYS_OFFSET
-	select MACH_HAS_LOWLEVEL_INIT
 	help
 	  Say y here if you are using Cirrus Logic's EDB9315 Evaluation board
 
 config MACH_EDB9315A
 	bool "Cirrus Logic EDB9315A"
 	select EP93XX_SDCE0_PHYS_OFFSET
-	select MACH_HAS_LOWLEVEL_INIT
 	help
 	  Say y here if you are using Cirrus Logic's EDB9315A Evaluation board
 
diff --git a/arch/arm/mach-ep93xx/Makefile b/arch/arm/mach-ep93xx/Makefile
index 5615394..0ff0b66 100644
--- a/arch/arm/mach-ep93xx/Makefile
+++ b/arch/arm/mach-ep93xx/Makefile
@@ -1,4 +1,4 @@
 obj-y += clocksource.o gpio.o led.o header.o
 
-obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += lowlevel_init.o
-pbl-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += lowlevel_init.o led.o
+obj-y += lowlevel_init.o
+pbl-y += lowlevel_init.o led.o
diff --git a/arch/arm/mach-ep93xx/lowlevel_init.S b/arch/arm/mach-ep93xx/lowlevel_init.S
index 6de53dd..154d38d 100644
--- a/arch/arm/mach-ep93xx/lowlevel_init.S
+++ b/arch/arm/mach-ep93xx/lowlevel_init.S
@@ -20,6 +20,7 @@
  *
  */
 
+#include <sizes.h>
 #include <mach/ep93xx-regs.h>
 #include <asm/barebox-arm-head.h>
 
@@ -52,4 +53,12 @@ reset:
 	orr r0, r0, #0xc0000000
 	mcr p15, 0, r0, c1, c0, 0
 
-	b board_init_lowlevel_return
+	/*
+	 * FIXME: This is suitable for the edb9301, the
+	 * only ep93xx board we have in our defconfigs.
+	 * Other boards need different values here.
+	 */
+	mov	r0, #0x05000000
+	mov	r1, #SZ_8M
+	mov	r2, #0
+	b	barebox_arm_entry
-- 
1.7.10.4


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

  parent reply	other threads:[~2013-02-03 15:12 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-03 15:03 [PATCH v3] Add new ARM entry point for barebox Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10 ` [PATCH 01/36] ARM: Add new " Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 02/36] ARM: add __noreturn to board_init_lowlevel_return Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 03/36] ARM i.MX: Use SRAM stack in lowlevel code Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 04/36] ARM i.MX: Add i.MX specific entry point for barebox Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 05/36] ARM i.MX: prepare external nand boot for SoC specific entry Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 06/36] ARM i.MX boards: switch to barebox_arm_entry Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 07/36] ARM MXS " Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 08/36] ARM OMAP " Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 09/36] ARM Samsung " Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 10/36] ARM PXA " Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2013-02-03 15:10   ` [PATCH 12/36] ARM tegra " Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 13/36] ARM nomadik " Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 14/36] ARM versatile " Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 15/36] ARM netx " Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 16/36] ARM clep7212: " Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 17/36] ARM raspberrypi: " Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 18/36] ARM AT91: switch at91sam9 to barebox_arm_entry part1 Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 19/36] ARM AT91: switch at91rm9200 board to barebox_arm_entry Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 20/36] ARM AT91: switch at91sam9g45 " Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 21/36] ARM AT91: switch at91sam9x5 " Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 22/36] ARM AT91: switch at91sam9n12 " Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 23/36] ARM AT91: switch sama5d3 " Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 24/36] ARM: remove now unused MACH_[HAS|DO]_LOWLEVEL_INIT Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 25/36] ARM start-pbl: make board_init_lowlevel_return static Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 26/36] ARM start-pbl: call uncompressed binary with arguments Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 27/36] ARM start: pickup parameters from pbl Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 28/36] ARM: Setup stack at end of SDRAM Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 29/36] ARM pbl: Use dynamic parameters for early malloc space Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 30/36] ARM mmu: pickup already enabled mmu Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 31/36] ARM: Factor out early mmu code Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 32/36] ARM: Enable mmu early Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 33/36] ARM: Automatically determine malloc size Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 34/36] generic memory layout: fix deps for [MALLOC|STACK]_BASE Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 35/36] ARM: disable HAVE_CONFIGURABLE_MEMORY_LAYOUT Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:10   ` [PATCH 36/36] ARM pbl: inline decompress function Jean-Christophe PLAGNIOL-VILLARD

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=1359904236-11622-11-git-send-email-plagnioj@jcrosoft.com \
    --to=plagnioj@jcrosoft.com \
    --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