summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLadislav Michl <ladis@linux-mips.org>2007-12-06 22:59:16 +0100
committerWolfgang Denk <wd@denx.de>2008-02-04 00:12:36 +0100
commit481f28b1db5cd21deb55f69399ba240e107af4c7 (patch)
treeda42e3048dfa24911ea96eaa41c2bfefcee2b5a1
parentc95219fae2a7add7daa2f91aedca65b1698465c7 (diff)
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.
-rw-r--r--include/configs/at91rm9200dk.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h
index a65c5f3422f..1e42fa59f74 100644
--- a/include/configs/at91rm9200dk.h
+++ b/include/configs/at91rm9200dk.h
@@ -192,11 +192,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 */
@@ -204,13 +204,13 @@
#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 }