update board EB+CPUx9K2
PATCH 1/1 update board EB+CPUx9K2
* update to support arm reloaction
* unnecessary environment variables removed
--- board/BuS/eb_cpux9k2/config.mk | 2 +- board/BuS/eb_cpux9k2/cpux9k2.c | 7 +++---- include/configs/eb_cpux9k2.h | 21 +++++++-------------- 3 files changed, 11 insertions(+), 19 deletions(-)
board/BuS/eb_cpux9k2/config.mk +1 -1
@@ -1 +1 @@ -TEXT_BASE = 0x23f00000 +TEXT_BASE = 0x00000000
board/BuS/eb_cpux9k2/cpux9k2.c +3 -4
@@ -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 ; }
include/configs/eb_cpux9k2.h +7 -14
@@ -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" \" " /*--------------------------------------------------------------------------*/
Signature · 1 line
1.7.1
PATCH v2 1/1 update board EB+CPUx9K2
* update to support arm reloaction
* unnecessary environment variables removed
---
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
board/BuS/eb_cpux9k2/config.mk deleted +0 -1
@@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x23f00000
board/BuS/eb_cpux9k2/cpux9k2.c +3 -4
@@ -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 ; }
include/configs/eb_cpux9k2.h +8 -15
@@ -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" \" " /*--------------------------------------------------------------------------*/
Signature · 1 line
1.7.1
PATCH v2 1/1 update board EB+CPUx9K2
Dear Jens Scharsig,
I would ensure that I find AT91 relevant patches when the subject contains "AT91" ;)
Quoted 1 line
/* adress of boot parameters */
address...
Quoted 1 line
+#define
CONFIG_SYS_TEXT_BASE0x00000000
How does this work with a text base of 0? Am I missing something?
Quoted 1 line
#define CONFIG_FLASH_CFI_DRIVER 1
Wherever we touch a file, we try to remove the "1" in not numerically used defines.
Best Regards,
Reinhard
PATCH v2 1/1 update board EB+CPUx9K2
In reply to Jens ScharsigDear Jens Scharsig,
Quoted 9 lines · In message <[email protected]> you wrote:
* update to support arm reloaction
* unnecessary environment variables removedSigned-off-by Jens Scharsig <[email protected]>---
changes since V1
Quoted 7 lines
* make conform with Rename
TEXT_BASEintoCONFIG_SYS_TEXT_BASEpatchboard/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
Applied to u-boot-arm. Thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "Here's a fish hangs in the net like a poor man's right in the law. 'Twill hardly come out." - Shakespeare, Pericles, Act II, Scene 1
PATCH v2 1/1 update board EB+CPUx9K2
In reply to Reinhard MeyerDear Reinhard Meyer,
Am 19.10.2010 um 20:30 schrieb Reinhard Meyer:
Quoted 2 lines
Quoted 1 line
+#define
CONFIG_SYS_TEXT_BASE0x00000000How does this work with a text base of 0? Am I missing something?
This should work when booting from NOR. The first MiB (0x00000000-0x00100000) is mapped to internal SRAM, internal ROM _or_ NOR on CS0 depending on 'BMS' Pin and REMAP command -> datasheet at91rm9200 p17. Nevertheless I would prefer to explicitly address NOR flash on CS0 with 0x10000000.
regards
Andreas Bie?mann
PATCH v2 1/1 update board EB+CPUx9K2
Am 2010-10-20 08:48, schrieb Andreas Bie?mann:
Quoted 8 lines
Dear Reinhard Meyer,
Am 19.10.2010 um 20:30 schrieb Reinhard Meyer:
Quoted 2 lines
Quoted 1 line
+#define
CONFIG_SYS_TEXT_BASE0x00000000How does this work with a text base of 0? Am I missing something?
This should work when booting from NOR. The first MiB (0x00000000-0x00100000) is mapped to internal SRAM, internal ROM _or_ NOR on CS0 depending on 'BMS' Pin and REMAP command -> datasheet at91rm9200 p17. Nevertheless I would prefer to explicitly address NOR flash on CS0 with
0x10000000.
This is right. The board boot from a 16-bit NOR Flash.
regards
Jens Scharsig