diff --git a/include/configs/jornada.h b/include/configs/jornada.h
index 41b09aa..a8efb02 100644
--- a/include/configs/jornada.h
+++ b/include/configs/jornada.h
@@ -29,7 +29,7 @@
 #define CONFIG_JORNADA700		1	/* on an HP Jornada 700 series */
 #define CONFIG_SYS_FLASH_PROTECTION	1
 
-#define CONFIG_SYS_TEXT_BASE		0xC1F00000
+#define CONFIG_SYS_TEXT_BASE		0x0
 
 /* we will never enable dcache, because we have to setup MMU first */
 #define CONFIG_SYS_NO_DCACHE
@@ -71,7 +71,6 @@
 #define CONFIG_BOOTARGS	"root=/dev/hda1 console=ttySA0,19200n8 console=tty1"
 #define CONFIG_BOOTCOMMAND	"run boot_kernel"
 #define CONFIG_SYS_AUTOLOAD	"n"	/* No autoload */
-#define CONFIG_SYS_LOAD_ADDR	0xc0000000
 
 /*
  * Miscellaneous configurable options
@@ -128,15 +127,19 @@
 */
 
 #define CONFIG_NR_DRAM_BANKS		2
-#define CONFIG_SYS_SDRAM_BASE		0x00000000
-#define CONFIG_SYS_INTRAM_BASE		INTERNAL_SRAM_BASE
-#define CONFIG_SYS_INTRAM_SIZE		INTERNAL_SRAM_SIZE
-#define CONFIG_SYS_INIT_SP_ADDR	0x0
 #define PHYS_SDRAM_1			0xc0000000	/* SDRAM Bank #1 */
 #define PHYS_SDRAM_2			0xc4000000	/* SDRAM Bank #2 */
 #define PHYS_SDRAM_1_SIZE		0x04000000	/* 64 MB */
 #define PHYS_SDRAM_2_SIZE		0x04000000	/* 64 MB */
 
+#define CONFIG_NR_DRAM_BANKS		2
+#define CONFIG_SYS_DRAM_BASE		PHYS_SDRAM_1
+#define CONFIG_SYS_DRAM_SIZE		0x04000000
+
+#define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR	(PHYS_SDRAM_1 + GENERATED_GBL_DATA_SIZE + 0x2048)
+#define CONFIG_SYS_LOAD_ADDR	(CONFIG_SYS_DRAM_BASE + 0x8000)
+
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_FLASH_CFI_MTD