Hello list,

inside the automatic U-Boot patch tracking system a new ticket [DNX#2006112542000012] was created:

<snip>

Somewhere during development of U-Boot-1.1.3 CONFIG_BOOTBINFUNC was renamed into CONFIG_INIT_CRITICAL which was 04 Apr 2005 replaced with CONFIG_SKIP_LOWLEVEL_INIT and CONFIG_SKIP_RELOCATE_UBOOT. However CONFIG_SKIP_LOWLEVEL_INIT has oposite meaning to CONFIG_BOOTBINFUNC, so fix configuration to reflect this fact. Once here, fix whitespaces and remove nowhere used struct bd_info_ext.

CHANGELOG

• Fix U-Boot base address depending on CONFIG_SKIP_LOWLEVEL_INIT

Signed-off-by: Ladislav Michl ladis@linux-mips.org

diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h index 8fad55d..ee0c395 100644 --- a/include/configs/at91rm9200dk.h +++ b/include/configs/at91rm9200dk.h @@ -152,8 +152,8 @@

#define CONFIG_HAS_DATAFLASH 1 #define CFG_SPI_WRITE_TOUT (5*CFG_HZ) -#define CFG_MAX_DATAFLASH_BANKS 2 -#define CFG_MAX_DATAFLASH_PAGES 16384 +#define CFG_MAX_DATAFLASH_BANKS 2 +#define CFG_MAX_DATAFLASH_PAGES 16384 #define CFG_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 /* Logical adress for CS0 */ #define CFG_DATAFLASH_LOGIC_ADDR_CS3 0xD0000000 /* Logical adress for CS3 */

@@ -174,11 +174,11 @@ #else #define CFG_ENV_IS_IN_FLASH 1 #ifdef CONFIG_SKIP_LOWLEVEL_INIT -#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x60000) /* after u-boot.bin */ -#define CFG_ENV_SIZE 0x10000 /* sectors are 64K here */ -#else #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0xe000) /* between boot.bin and u-boot.bin.gz */ #define CFG_ENV_SIZE 0x2000 /* 0x8000 */ +#else +#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x60000) /* after u-boot.bin */ +#define CFG_ENV_SIZE 0x10000 /* sectors are 64K here */ #endif /* CONFIG_SKIP_LOWLEVEL_INIT */ #endif /* CFG_ENV_IS_IN_DATAFLASH */

@@ -186,44 +186,25 @@ #define CFG_LOAD_ADDR 0x21000000 /* default load address */

#ifdef CONFIG_SKIP_LOWLEVEL_INIT -#define CFG_BOOT_SIZE 0x00 /* 0 KBytes */ -#define CFG_U_BOOT_BASE PHYS_FLASH_1 -#define CFG_U_BOOT_SIZE 0x60000 /* 384 KBytes */ -#else #define CFG_BOOT_SIZE 0x6000 /* 24 KBytes */ #define CFG_U_BOOT_BASE (PHYS_FLASH_1 + 0x10000) #define CFG_U_BOOT_SIZE 0x10000 /* 64 KBytes */ +#else +#define CFG_BOOT_SIZE 0x00 /* 0 KBytes */ +#define CFG_U_BOOT_BASE PHYS_FLASH_1 +#define CFG_U_BOOT_SIZE 0x60000 /* 384 KBytes */ #endif /* CONFIG_SKIP_LOWLEVEL_INIT */

-#define CFG_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 } +#define CFG_BAUDRATE_TABLE { 115200, 19200, 38400, 57600, 9600 }

#define CFG_PROMPT "U-Boot> " /* Monitor Command Prompt */ #define CFG_CBSIZE 256 /* Console I/O Buffer Size */ #define CFG_MAXARGS 16 /* max number of command args */ #define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */

-#ifndef __ASSEMBLY__ -/*-----------------------------------------------------------------------

• • Board specific extension for bd_info
• • This structure is embedded in the global bd_info (bd_t) structure
• • and can be used by the board specific code (eg board/...)
• */

-struct bd_info_ext {

• /* helper variable for board environment handling

• *
  

• * env_crc_valid == 0    =>   uninitialised
  

• * env_crc_valid  > 0    =>   environment crc in flash is valid
  

• * env_crc_valid  < 0    =>   environment crc in flash is invalid
  

• */
  

• int env_crc_valid;

-}; -#endif

#define CFG_HZ 1000 #define CFG_HZ_CLOCK AT91C_MASTER_CLOCK/2 /* AT91C_TC0_CMR is implicitly set to */

• 			/* AT91C_TC_TIMER_DIV1_CLOCK */
  

• 				/* AT91C_TC_TIMER_DIV1_CLOCK */
  
  

#define CONFIG_STACKSIZE (32*1024) /* regular stack */

</snip>

Your U-Boot support team