diff mbox

[U-Boot,v4,1/2] at91rm9200ek: add configure target for RAM boot

Message ID 1289150428-60114-1-git-send-email-andreas.devel@googlemail.com
State Superseded
Delegated to: Reinhard Meyer
Headers show

Commit Message

Andreas Bießmann Nov. 7, 2010, 5:20 p.m. UTC 
This patch also removes now unnecessary config.mk in board directory and
make usage of new features in boards.cfg.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
---
changes since v1:
 - add MAKEALL target
 - move settings from boards.cfg to i/c/at91rm9200ek.h
changes since v2:
 - remove MAKEALL stuff from this patch
changes since v3:
 - fix RAMBOOT address
 - based on top of 7d44af08b823b9f83e328a4bc2192ab7cbb31e9a u-boot-atmel/at91

 board/atmel/at91rm9200ek/config.mk |    2 --
 boards.cfg                         |    3 ++-
 include/configs/at91rm9200ek.h     |   14 ++++++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)
 delete mode 100644 board/atmel/at91rm9200ek/config.mk
diff mbox

Patch

diff --git a/board/atmel/at91rm9200ek/config.mk b/board/atmel/at91rm9200ek/config.mk
deleted file mode 100644
index c7323fe..0000000
--- a/board/atmel/at91rm9200ek/config.mk
+++ /dev/null
@@ -1,2 +0,0 @@ 
-# currently only NOR flash booting is supported
-CONFIG_SYS_TEXT_BASE = 0x10000000
diff --git a/boards.cfg b/boards.cfg
index 6c2a667..6f7dc54 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -359,7 +359,8 @@  modnet50	arm	arm720t
 lpc2292sodimm	arm	arm720t		-		-		lpc2292
 eb_cpux9k2	arm	arm920t		-		BuS		at91
 at91rm9200dk	arm	arm920t		-		atmel		at91rm9200
-at91rm9200ek	arm	arm920t		-		atmel		at91
+at91rm9200ek	arm	arm920t		at91rm9200ek	atmel		at91	at91rm9200ek
+at91rm9200ek_ram	arm	arm920t		at91rm9200ek	atmel		at91	at91rm9200ek:RAMBOOT
 sbc2410x	arm	arm920t		-		-		s3c24x0
 smdk2400	arm	arm920t		-		samsung		s3c24x0
 smdk2410	arm	arm920t		-		samsung		s3c24x0
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index 14559f5..ba2e9d3 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -33,6 +33,20 @@ 
 #include <asm/sizes.h>
 
 /*
+ * set some initial configurations depending on configure target
+ *
+ * at91rm9200ek_config     -> boot from 0x0 in NOR Flash at CS0
+ * at91rm9200ek_ram_config -> continue booting from 0x20100000 in RAM; lowlevel
+ *                            initialisation was done by some preloader
+ */
+#ifdef CONFIG_RAMBOOT
+#define CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_SYS_TEXT_BASE 0x20100000
+#else
+#define CONFIG_SYS_TEXT_BASE 0x10000000
+#endif
+
+/*
  * AT91C_XTAL_CLOCK is the frequency of external xtal in hertz
  * AT91C_MAIN_CLOCK is the frequency of PLLA output
  * AT91C_MASTER_CLOCK is the peripherial clock