[U-Boot] [Patch V2] update board EB+CPUx9K2

[Jens Scharsig <js_at_ng@scharsoft.de>]

* update to support arm reloaction
* unnecessary environment variables removed


Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
---

changes since V1

* make conform with  Rename TEXT_BASE into CONFIG_SYS_TEXT_BASE patch

 board/BuS/eb_cpux9k2/config.mk |    1 -
 board/BuS/eb_cpux9k2/cpux9k2.c |    7 +++----
 include/configs/eb_cpux9k2.h   |   23 ++++++++---------------
 3 files changed, 11 insertions(+), 20 deletions(-)
 delete mode 100644 board/BuS/eb_cpux9k2/config.mk

diff --git a/board/BuS/eb_cpux9k2/config.mk b/board/BuS/eb_cpux9k2/config.mk
deleted file mode 100644
index e554a45..0000000
--- a/board/BuS/eb_cpux9k2/config.mk
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SYS_TEXT_BASE = 0x23f00000
diff --git a/board/BuS/eb_cpux9k2/cpux9k2.c b/board/BuS/eb_cpux9k2/cpux9k2.c
index bbceaf3..fe62a0f 100644
--- a/board/BuS/eb_cpux9k2/cpux9k2.c
+++ b/board/BuS/eb_cpux9k2/cpux9k2.c
@@ -66,7 +66,7 @@ int board_init(void)
 
 	gd->bd->bi_arch_number = MACH_TYPE_EB_CPUX9K2;
 	/* adress of boot parameters */
-	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
+	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
 
 #ifdef CONFIG_STATUS_LED
 	status_led_set(STATUS_LED_BOOT, STATUS_LED_ON);
@@ -134,9 +134,8 @@ void reset_phy(void)
 
 int dram_init(void)
 {
-	gd->bd->bi_dram[0].start = PHYS_SDRAM;
-	gd->bd->bi_dram[0].size =
-		get_ram_size((volatile long *) PHYS_SDRAM, PHYS_SDRAM_SIZE);
+	gd->ram_size = get_ram_size((volatile long *)CONFIG_SYS_SDRAM_BASE,
+			CONFIG_SYS_SDRAM_SIZE);
 	return 0;
 }
 
diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h
index 4ff4a85..8d8af93 100644
--- a/include/configs/eb_cpux9k2.h
+++ b/include/configs/eb_cpux9k2.h
@@ -42,7 +42,7 @@
 #define CONFIG_MISC_INIT_R
 
 /*--------------------------------------------------------------------------*/
-
+#define CONFIG_SYS_TEXT_BASE 		0x00000000
 #define CONFIG_SYS_LOAD_ADDR		0x21000000  /* default load address */
 
 #define CONFIG_SYS_BOOT_SIZE		0x00 /* 0 KBytes */
@@ -98,12 +98,14 @@
  */
 
 #define CONFIG_NR_DRAM_BANKS		1
-#define PHYS_SDRAM 			0x20000000
-#define PHYS_SDRAM_SIZE			0x04000000  /* 64 megs */
 
-#define CONFIG_SYS_MEMTEST_START	PHYS_SDRAM
+#define CONFIG_SYS_SDRAM_BASE		0x20000000
+#define CONFIG_SYS_SDRAM_SIZE		0x04000000  /* 64 megs */
+#define CONFIG_SYS_INIT_SP_ADDR		0x00204000  /* use internal SRAM */
+
+#define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \
-					PHYS_SDRAM_SIZE - 0x00400000 - \
+					CONFIG_SYS_SDRAM_SIZE - 0x00400000 - \
 					CONFIG_SYS_MALLOC_LEN)
 
 #define CONFIG_SYS_PIOC_ASR_VAL		0xFFFF0000 /* PIOC as D16/D31 */
@@ -249,6 +251,7 @@
 /* FLASH organization */
 
 /*  NOR-FLASH */
+#define CONFIG_FLASH_SHOW_PROGRESS	45
 
 #define CONFIG_FLASH_CFI_DRIVER	1
 
@@ -396,16 +399,6 @@
 	"nandboot=run bootargsdefaults;"				\
 		"set bootargs $(bootargs) root=initramfs boot=nand "	\
 		";bootm $(kerneladdr)\0"				\
-	"uu=run update_uboot\0"						\
-	"ur=run update_root;run nk\0"					\
-	"nk=run bootargsdefaults;set bootargs $(bootargs) root=initramfs " \
-		"boot=local "						\
-		";echo $(bootargs)"					\
-		";dhcp uImage_cpux9k2;bootm\0"				\
-	"nn=run bootargsdefaults;set bootargs $(bootargs) root=initramfs " \
-		"boot=nand "						\
-		";echo $(bootargs)"					\
-		";dhcp uImage_cpux9k2;bootm\0"				\
 	" "
 
 /*--------------------------------------------------------------------------*/
-- 
1.7.1