update board EB+CPUx9K2

* update to support arm reloaction
* unnecessary environment variables removed

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

diff --git a/board/BuS/eb_cpux9k2/config.mk b/board/BuS/eb_cpux9k2/config.mk
deleted file mode 100644 (file)
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 bbceaf37ae7228e4e72901c32abfbc523b68379c..fe62a0fcafaf80bfddaa439cc9ff378748b56bc9 100644 (file)
--- 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 4ff4a85cb52be0aefc7cbedf64a274f58f6f3262..8d8af93792fb7ccbea8f86ebcd8a8a6f03f16af6 100644 (file)
--- 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"                          \
        " "
 
 /*--------------------------------------------------------------------------*/