mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 07:34:31 +00:00
ARM: Fix at91rm9200dk base address
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. I'm sending this patch 4th (!) time in hope it produces at least some reaction. Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Fix at91rm9200dk base and environment address.
This commit is contained in:
parent
c95219fae2
commit
481f28b1db
1 changed files with 7 additions and 7 deletions
|
@ -192,11 +192,11 @@
|
||||||
#else
|
#else
|
||||||
#define CFG_ENV_IS_IN_FLASH 1
|
#define CFG_ENV_IS_IN_FLASH 1
|
||||||
#ifdef CONFIG_SKIP_LOWLEVEL_INIT
|
#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_ADDR (PHYS_FLASH_1 + 0xe000) /* between boot.bin and u-boot.bin.gz */
|
||||||
#define CFG_ENV_SIZE 0x2000 /* 0x8000 */
|
#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 /* CONFIG_SKIP_LOWLEVEL_INIT */
|
||||||
#endif /* CFG_ENV_IS_IN_DATAFLASH */
|
#endif /* CFG_ENV_IS_IN_DATAFLASH */
|
||||||
|
|
||||||
|
@ -204,13 +204,13 @@
|
||||||
#define CFG_LOAD_ADDR 0x21000000 /* default load address */
|
#define CFG_LOAD_ADDR 0x21000000 /* default load address */
|
||||||
|
|
||||||
#ifdef CONFIG_SKIP_LOWLEVEL_INIT
|
#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_BOOT_SIZE 0x6000 /* 24 KBytes */
|
||||||
#define CFG_U_BOOT_BASE (PHYS_FLASH_1 + 0x10000)
|
#define CFG_U_BOOT_BASE (PHYS_FLASH_1 + 0x10000)
|
||||||
#define CFG_U_BOOT_SIZE 0x10000 /* 64 KBytes */
|
#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 */
|
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
|
||||||
|
|
||||||
#define CFG_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 }
|
#define CFG_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 }
|
||||||
|
|
Loading…
Reference in a new issue