Get MPC8641HPCN flash images working.

    Enable the CFI driver.
    Remove bogus LAWBAR7 cruft.
    Use correct TEXT_BASE, Fixup load script.
    Enable SPD EEPROM during DDR setup.
    Use generic RFC 1918 IP addresses by default.

4 files changed, 17 insertions, 37 deletions

diff --git a/board/mpc8641hpcn/config.mk b/board/mpc8641hpcn/config.mk
index 63b9779af0..4bdceec4dc 100644
--- a/board/mpc8641hpcn/config.mk
+++ b/board/mpc8641hpcn/config.mk
@@ -25,8 +25,7 @@
 # default CCSRBAR is at 0xff700000
 # assume U-Boot is less than 0.5MB
 #
-#TEXT_BASE = 0xfff01000
-TEXT_BASE = 0x00400000
+TEXT_BASE = 0xfff01000
 
 PLATFORM_CPPFLAGS += -DCONFIG_MPC86xx=1
 PLATFORM_CPPFLAGS += -DCONFIG_MPC8641=1 -maltivec -mabi=altivec -msoft-float
diff --git a/board/mpc8641hpcn/init.S b/board/mpc8641hpcn/init.S
index 9d43de5539..4d555a509f 100644
--- a/board/mpc8641hpcn/init.S
+++ b/board/mpc8641hpcn/init.S
@@ -80,23 +80,6 @@
  #define LAWAR7	(LAWAR_EN | LAWAR_TRGT_IF_LBC | (LAWAR_SIZE & LAWAR_SIZE_32M))
 
 
-/*
- * Rapid IO at 0xc000_0000 for 512 M
- */
-/*
-#ifdef CFG_INIT_RAM_LOCK
-#define LAWBAR7 ((CFG_RIO_MEM_BASE>>12) & 0xffffff)
-#define LAWAR7	(LAWAR_EN | LAWAR_TRGT_IF_RIO | (LAWAR_SIZE & LAWAR_SIZE_512M))
-#endif
-*/
-/*
- * Stack at 0xfc00_0000 for 32M on LBC
- */
-#if !defined(CFG_INIT_RAM_LOCK)
-#define LAWBAR7 ((CFG_INIT_RAM_ADDR>>12) & 0xffffff)
-#define LAWAR7 (LAWAR_EN | LAWAR_TRGT_IF_LBC | (LAWAR_SIZE & LAWAR_SIZE_32M))
-#endif
-
       	.section .bootpg, "ax"
 	.globl	law_entry
 law_entry:
diff --git a/board/mpc8641hpcn/u-boot.lds b/board/mpc8641hpcn/u-boot.lds
index dbe8e4fab1..c5c40e7eb4 100644
--- a/board/mpc8641hpcn/u-boot.lds
+++ b/board/mpc8641hpcn/u-boot.lds
@@ -28,7 +28,7 @@ SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/
    __DYNAMIC = 0;    */
 SECTIONS
 {
-/*  .resetvec 0xFFF00100 :
+  .resetvec 0xFFF00100 :
   {
     *(.resetvec)
   } = 0xffff
@@ -38,7 +38,7 @@ SECTIONS
     cpu/mpc86xx/start.o	(.bootpg)
     board/mpc8641hpcn/init.o (.bootpg)
   } = 0xffff
-*/
+
   /* Read-only sections, merged into text segment: */
   . = + 1024;
   .interp : { *(.interp) }
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 76efd7c604..d4a28edf9b 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -51,6 +51,7 @@
 #define CONFIG_TSEC_ENET 		/* tsec ethernet support */
 #define CONFIG_ENV_OVERWRITE
 
+#define CONFIG_SPD_EEPROM		/* Use SPD EEPROM for DDR setup*/
 #undef CONFIG_DDR_DLL			/* possible DLL fix needed */
 #define CONFIG_DDR_2T_TIMING		/* Sets the 2T timing bit */
 #define CONFIG_DDR_ECC			/* only for ECC DDR module */
@@ -102,11 +103,9 @@
 
 #else
     /*
-     * Manually set up DDR parameters
+     * Manually set up DDR1 parameters
      */
 
-/* DDR I */
-#if 1
     #define CFG_SDRAM_SIZE	256		/* DDR is 256MB */
 
     #define CFG_DDR_CS0_BNDS	0x0000000F
@@ -125,15 +124,14 @@
     #define CFG_DDR_CONTROL	0xe3008000	/* Type = DDR2 */
     #define CFG_DDR_CONTROL2	0x04400000
 
-    //Not used in fixed_sdram function
+    /* Not used in fixed_sdram function */
 
     #define CFG_DDR_MODE	0x00000022
     #define CFG_DDR_CS1_BNDS	0x00000000
-    #define CFG_DDR_CS2_BNDS	0x00000FFF  //Not done
-    #define CFG_DDR_CS3_BNDS	0x00000FFF  //Not done
-    #define CFG_DDR_CS4_BNDS	0x00000FFF  //Not done
-    #define CFG_DDR_CS5_BNDS	0x00000FFF  //Not done
-#endif
+    #define CFG_DDR_CS2_BNDS	0x00000FFF	/* Not done */
+    #define CFG_DDR_CS3_BNDS	0x00000FFF	/* Not done */
+    #define CFG_DDR_CS4_BNDS	0x00000FFF	/* Not done */
+    #define CFG_DDR_CS5_BNDS	0x00000FFF	/* Not done */
 #endif
 
 
@@ -190,6 +188,7 @@
 #define CFG_FLASH_WRITE_TOUT	500	/* Flash Write Timeout (ms) */
 #define CFG_MONITOR_BASE    	TEXT_BASE	/* start of monitor */
 
+#define CFG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_EMPTY_INFO
 
@@ -199,14 +198,14 @@
 #undef  CFG_RAMBOOT
 #endif
 
-#if !defined(CFG_RAMBOOT)
-#define CONFIG_SPD_EEPROM        	/* Use SPD EEPROM for DDR setup*/
+#if !defined(CONFIG_SPD_EEPROM) && !defined(CFG_RAMBOOT)
+#undef CONFIG_SPD_EEPROM        	/* Use SPD EEPROM for DDR setup*/
 #endif
 
 #undef CONFIG_CLOCKS_IN_MHZ
 
 #define CONFIG_L1_INIT_RAM
-#undef CFG_INIT_RAM_LOCK
+#define CFG_INIT_RAM_LOCK	1
 #ifndef CFG_INIT_RAM_LOCK
 #define CFG_INIT_RAM_ADDR	0x0fd00000	/* Initial RAM address */
 #else
@@ -540,22 +539,21 @@
 #define CONFIG_HAS_ETH2		1
 #define CONFIG_HAS_ETH3		1
 
-#define CONFIG_IPADDR	10.82.193.138
+#define CONFIG_IPADDR		192.168.1.100
 
 #define CONFIG_HOSTNAME		unknown
 #define CONFIG_ROOTPATH		/opt/nfsroot
 #define CONFIG_BOOTFILE		uImage
 
 #define CONFIG_SERVERIP		192.168.1.1
-#define CONFIG_GATEWAYIP	10.82.193.104
+#define CONFIG_GATEWAYIP	192.168.1.1
 #define CONFIG_NETMASK		255.255.255.0
 
 /* default location for tftp and bootm */
 #define CONFIG_LOADADDR		1000000
 
 #define CONFIG_BOOTDELAY 10	/* -1 disables auto-boot */
-//#undef  CONFIG_BOOTARGS	/* the boot command will set bootargs */
-#define CONFIG_BOOTARGS       "root=/dev/ram rw console=ttyS0,115200"
+#undef  CONFIG_BOOTARGS		/* the boot command will set bootargs */
 
 #define CONFIG_BAUDRATE	115200