update board EB+CPUx9K2

* update to support arm reloaction
* unnecessary environment variables removed

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
This commit is contained in:
Jens Scharsig 2010-10-19 19:37:15 +02:00 committed by Wolfgang Denk
parent 7c957c0e74
commit cebcf7da21
3 changed files with 11 additions and 20 deletions

View File

@ -1 +0,0 @@
CONFIG_SYS_TEXT_BASE = 0x23f00000

View File

@ -66,7 +66,7 @@ int board_init(void)
gd->bd->bi_arch_number = MACH_TYPE_EB_CPUX9K2; gd->bd->bi_arch_number = MACH_TYPE_EB_CPUX9K2;
/* adress of boot parameters */ /* 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 #ifdef CONFIG_STATUS_LED
status_led_set(STATUS_LED_BOOT, STATUS_LED_ON); status_led_set(STATUS_LED_BOOT, STATUS_LED_ON);
@ -134,9 +134,8 @@ void reset_phy(void)
int dram_init(void) int dram_init(void)
{ {
gd->bd->bi_dram[0].start = PHYS_SDRAM; gd->ram_size = get_ram_size((volatile long *)CONFIG_SYS_SDRAM_BASE,
gd->bd->bi_dram[0].size = CONFIG_SYS_SDRAM_SIZE);
get_ram_size((volatile long *) PHYS_SDRAM, PHYS_SDRAM_SIZE);
return 0; return 0;
} }

View File

@ -42,7 +42,7 @@
#define CONFIG_MISC_INIT_R #define CONFIG_MISC_INIT_R
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
#define CONFIG_SYS_TEXT_BASE 0x00000000
#define CONFIG_SYS_LOAD_ADDR 0x21000000 /* default load address */ #define CONFIG_SYS_LOAD_ADDR 0x21000000 /* default load address */
#define CONFIG_SYS_BOOT_SIZE 0x00 /* 0 KBytes */ #define CONFIG_SYS_BOOT_SIZE 0x00 /* 0 KBytes */
@ -98,12 +98,14 @@
*/ */
#define CONFIG_NR_DRAM_BANKS 1 #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 + \ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \
PHYS_SDRAM_SIZE - 0x00400000 - \ CONFIG_SYS_SDRAM_SIZE - 0x00400000 - \
CONFIG_SYS_MALLOC_LEN) CONFIG_SYS_MALLOC_LEN)
#define CONFIG_SYS_PIOC_ASR_VAL 0xFFFF0000 /* PIOC as D16/D31 */ #define CONFIG_SYS_PIOC_ASR_VAL 0xFFFF0000 /* PIOC as D16/D31 */
@ -249,6 +251,7 @@
/* FLASH organization */ /* FLASH organization */
/* NOR-FLASH */ /* NOR-FLASH */
#define CONFIG_FLASH_SHOW_PROGRESS 45
#define CONFIG_FLASH_CFI_DRIVER 1 #define CONFIG_FLASH_CFI_DRIVER 1
@ -396,16 +399,6 @@
"nandboot=run bootargsdefaults;" \ "nandboot=run bootargsdefaults;" \
"set bootargs $(bootargs) root=initramfs boot=nand " \ "set bootargs $(bootargs) root=initramfs boot=nand " \
";bootm $(kerneladdr)\0" \ ";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" \
" " " "
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/