summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHunter, Jon <jon-hunter@ti.com>2013-04-03 09:35:34 +0000
committerTom Rini <trini@ti.com>2013-04-08 11:29:05 -0400
commit47f58a7357c27ad10b7853cdd7cd018692bfbae0 (patch)
tree50e4609b91a7f22cad270d51eced7d47375e212a /arch
parent335d9394c9d9d5f9bec12428f5cc2b84d092bdb6 (diff)
downloadtalos-obmc-uboot-47f58a7357c27ad10b7853cdd7cd018692bfbae0.tar.gz
talos-obmc-uboot-47f58a7357c27ad10b7853cdd7cd018692bfbae0.zip
omap2420-h4: Fix booting from NOR flash
The omap2420-h4 board is using a RAM based address as the linker location for code. This is causing several problems when attempting to run the latest u-boot code base on this board from flash. Update the default linker location for code to be in NOR flash. Please note that OMAP maps the NOR flash to address 0x08000000 by default and so use this as the default address for the NOR flash. Also remove legacy code that attempts to calculate where in flash the sdata structure, that holds the memory interface configuration data, is located. By changing the default linker location for code to flash this is no longer necessary. Signed-off-by: Jon Hunter <jon-hunter@ti.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/include/asm/arch-omap24xx/omap2420.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/include/asm/arch-omap24xx/omap2420.h b/arch/arm/include/asm/arch-omap24xx/omap2420.h
index d8d5647e80..5724f5d4ba 100644
--- a/arch/arm/include/asm/arch-omap24xx/omap2420.h
+++ b/arch/arm/include/asm/arch-omap24xx/omap2420.h
@@ -212,9 +212,9 @@
# define H4_CS1_BASE 0x04000000 /* debug board */
# define H4_CS2_BASE 0x0A000000 /* wifi board */
#else
-# define H4_CS0_BASE 0x04000000 /* flash (64 Meg aligned) */
-# define H4_CS1_BASE 0x08000000 /* debug board */
-# define H4_CS2_BASE 0x0A000000 /* wifi board */
+# define H4_CS0_BASE 0x08000000 /* flash (64 Meg aligned) */
+# define H4_CS1_BASE 0x04000000 /* debug board */
+# define H4_CS2_BASE 0x0C000000 /* wifi board */
#endif
/* base address for indirect vectors (internal boot mode) */
OpenPOWER on IntegriCloud