From 51fad42204d5b1cdd3bdc89fd8685fcd3414a2a0 Mon Sep 17 00:00:00 2001
From: Dipen Dudhat <dipen.dudhat@freescale.com>
Date: Wed, 7 Oct 2009 15:47:47 -0400
Subject: u-boot-2009.03-p2020rdb-RAMBOOT-support-over-SDCARD-boot

RAMBOOT support over SDCARD boot

RAMBOOT support to run uboot on uboot prompt itself,
Usage is,
        tftp 0x11000000
        go 11000000

Signed-off-by: Dipen Dudhat <dipen.dudhat@freescale.com>
---
 Makefile               | 10 ++++++++++
 cpu/mpc85xx/cpu_init.c |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/Makefile b/Makefile
index fb2536ef68..81f806fd10 100644
--- a/Makefile
+++ b/Makefile
@@ -2446,6 +2446,7 @@ MPC8572DS_config:       unconfig
 
 P2020RDB_config \
 P2020RDB_SDCARD_config \
+P2020RDB_RAMBOOT_config \
 P1021RDB_config \
 P1020RDB_config:	unconfig
 	@mkdir -p $(obj)include
@@ -2454,12 +2455,21 @@ P1020RDB_config:	unconfig
 		echo "#define CONFIG_SDCARD_U_BOOT" >> $(obj)include/config.h ; \
 		$(XECHO) "...SDCARD Boot" ; \
 	fi ;
+	@if [ "$(findstring _RAMBOOT_,$@)" ] ; then \
+		echo "#define CONFIG_SDCARD_U_BOOT" >> $(obj)include/config.h ; \
+		echo "#define CONFIG_SYS_RAMBOOT" >> $(obj)include/config.h ; \
+		$(XECHO) "...RAM Boot" ; \
+	fi ;
 	@$(XECHO) "... setting CONFIG_MP." ;
 	@$(MKCONFIG) -a P10XX_20XX_RDB  ppc mpc85xx p10xx_p20xx_rdb freescale
 	@if [ "$(findstring _SDCARD_,$@)" ] ; then \
 		echo "TEXT_BASE = 0x11001000" > $(obj)board/freescale/p10xx_p20xx_rdb/config.tmp ; \
 		echo "CONFIG_SDCARD_U_BOOT = y" >> $(obj)include/config.mk ; \
 	fi ;
+	@if [ "$(findstring _RAMBOOT_,$@)" ] ; then \
+		echo "TEXT_BASE = 0x11001000" > $(obj)board/freescale/p10xx_p20xx_rdb/config.tmp ; \
+		echo "CONFIG_SDCARD_U_BOOT = y" >> $(obj)include/config.mk ; \
+	fi ;
 
 P1011RDB_config \
 P1012RDB_config:	unconfig
diff --git a/cpu/mpc85xx/cpu_init.c b/cpu/mpc85xx/cpu_init.c
index 91db6e2fbd..653f327dbf 100644
--- a/cpu/mpc85xx/cpu_init.c
+++ b/cpu/mpc85xx/cpu_init.c
@@ -180,6 +180,7 @@ void cpu_init_early_f_sd(void)
 {
 	unsigned int law_size;
 
+#if !defined(CONFIG_SYS_RAMBOOT)
 	/* set up CCSR if we want it moved */
 #if (CONFIG_SYS_CCSRBAR_DEFAULT != CONFIG_SYS_CCSRBAR_PHYS)
 	{
@@ -189,6 +190,7 @@ void cpu_init_early_f_sd(void)
 
 		temp = in_be32((volatile u32 *)CONFIG_SYS_CCSRBAR);
 	}
+#endif
 #endif
 
 	/* Pointer is writable since we allocated a register for it.
-- 
cgit v1.2.3