Merge with /home/wd/git/u-boot/custodian/u-boot-testing

[karo-tx-uboot.git] / include / configs / MPC8641HPCN.h

diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 246ac7f316fb4e2ad13e3ebbaeb2eeb53b1650ee..12af24f74994942ee310d9c40d26356091a14126 100644 (file)
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -212,7 +212,6 @@
 #endif
 
 #if defined(CFG_RAMBOOT)
-#undef CFG_FLASH_CFI_DRIVER
 #undef CONFIG_SPD_EEPROM
 #define CFG_SDRAM_SIZE 256
 #endif
@@ -360,14 +359,14 @@
 
 #define CONFIG_MII             1       /* MII PHY management */
 
-#define CONFIG_MPC86XX_TSEC1    1
-#define CONFIG_MPC86XX_TSEC1_NAME       "eTSEC1"
-#define CONFIG_MPC86XX_TSEC2    1
-#define CONFIG_MPC86XX_TSEC2_NAME       "eTSEC2"
-#define CONFIG_MPC86XX_TSEC3    1
-#define CONFIG_MPC86XX_TSEC3_NAME       "eTSEC3"
-#define CONFIG_MPC86XX_TSEC4    1
-#define CONFIG_MPC86XX_TSEC4_NAME       "eTSEC4"
+#define CONFIG_TSEC1    1
+#define CONFIG_TSEC1_NAME       "eTSEC1"
+#define CONFIG_TSEC2    1
+#define CONFIG_TSEC2_NAME       "eTSEC2"
+#define CONFIG_TSEC3    1
+#define CONFIG_TSEC3_NAME       "eTSEC3"
+#define CONFIG_TSEC4    1
+#define CONFIG_TSEC4_NAME       "eTSEC4"
 
 #define TSEC1_PHY_ADDR         0
 #define TSEC2_PHY_ADDR         1
@@ -468,7 +467,6 @@
     #define CFG_ENV_SECT_SIZE          0x40000 /* 256K(one sector) for env */
     #define CFG_ENV_SIZE               0x2000
 #else
-    #define CFG_NO_FLASH               1       /* Flash is not usable now */
     #define CFG_ENV_IS_NOWHERE 1       /* Store ENV in memory only */
     #define CFG_ENV_ADDR               (CFG_MONITOR_BASE - 0x1000)
     #define CFG_ENV_SIZE               0x2000
@@ -486,21 +484,13 @@
                                 | CFG_CMD_SCSI         \
                                 | CFG_CMD_EXT2)        \
                                &                       \
-                                ~(CFG_CMD_ENV          \
-                                 | CFG_CMD_IMLS        \
-                                 | CFG_CMD_FLASH       \
-                                 | CFG_CMD_LOADS))
+                                ~(CFG_CMD_ENV))
   #else
     #define  CONFIG_COMMANDS   ((CONFIG_CMD_DFL        \
                                 | CFG_CMD_PING         \
-                                | CFG_CMD_I2C          \
-                                | CFG_CMD_SCSI         \
-                                | CGF_CMD_EXT2)        \
+                                | CFG_CMD_I2C)         \
                                &                       \
-                                ~(CFG_CMD_ENV          \
-                                | CFG_CMD_IMLS         \
-                                | CFG_CMD_FLASH        \
-                                | CFG_CMD_LOADS))
+                                ~(CFG_CMD_ENV))
   #endif
 #else
   #if defined(CONFIG_PCI)
@@ -587,6 +577,7 @@
 #define CONFIG_HOSTNAME                unknown
 #define CONFIG_ROOTPATH                /opt/nfsroot
 #define CONFIG_BOOTFILE                uImage
+#define CONFIG_UBOOTPATH       u-boot.bin      /* U-Boot image on TFTP server */
 
 #define CONFIG_SERVERIP                192.168.1.1
 #define CONFIG_GATEWAYIP       192.168.1.1
@@ -602,10 +593,17 @@
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
    "netdev=eth0\0"                                                      \
+   "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                              \
+   "tftpflash=tftpboot $loadaddr $uboot; "                     \
+       "protect off " MK_STR(TEXT_BASE) " +$filesize; "        \
+       "erase " MK_STR(TEXT_BASE) " +$filesize; "              \
+       "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
+       "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
+       "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
    "consoledev=ttyS0\0"                                                 \
    "ramdiskaddr=2000000\0"                                             \
    "ramdiskfile=your.ramdisk.u-boot\0"                                  \
-   "dtbaddr=400000\0"                                          \
+   "dtbaddr=c00000\0"                                          \
    "dtbfile=mpc8641_hpcn.dtb\0"                                  \
    "en-wd=mw.b f8100010 0x08; echo -expect:- 08; md.b f8100010 1\0" \
    "dis-wd=mw.b f8100010 0x00; echo -expect:- 00; md.b f8100010 1\0" \