Merge branch 'master' of git://git.denx.de/u-boot-imx

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

diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index fc7128e738e53da5eb414d543585054b29cd0cbf..96ffc6a0d52b5df39f86214893abb99b123ed288 100644 (file)
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -29,6 +29,9 @@
 #define CONFIG_MPC5xxx                 1       /* This is an MPC5xxx CPU */
 #define CONFIG_MPC5200                 1       /* This is an MPC5200 CPU */
 #define CONFIG_V38B                    1       /* ...on V38B board */
+
+#define        CONFIG_SYS_TEXT_BASE            0xFF000000
+
 #define CONFIG_SYS_MPC5XXX_CLKIN       33000000        /* ...running at 33.000000MHz */
 
 #define CONFIG_RTC_PCF8563             1       /* has PCF8563 RTC */
@@ -40,12 +43,10 @@
 
 #define CONFIG_BOARD_EARLY_INIT_R      1       /* do board-specific init */
 #define CONFIG_BOARD_EARLY_INIT_F      1       /* do board-specific init */
+#define CONFIG_MISC_INIT_R
 
 #define CONFIG_SYS_XLB_PIPELINING              1       /* gives better performance */
 
-#define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH  */
-#define BOOTFLAG_WARM          0x02    /* Software reboot */
-
 #define CONFIG_HIGH_BATS       1       /* High BATs supported */
 
 /*
@@ -153,7 +154,7 @@
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
                "nfsroot=$(serverip):$(rootpath) wdt=off\0"             \
        "hostname=v38b\0"                                               \
-       "ethact=FEC ETHERNET\0"                                         \
+       "ethact=FEC\0"                                                  \
        "rootpath=/opt/eldk-3.1.1/ppc_6xx\0"                            \
        "update=prot off ff000000 ff03ffff; era ff000000 ff03ffff; "    \
                "cp.b 200000 ff000000 $(filesize);"                     \
@@ -169,12 +170,10 @@
 
 #define CONFIG_BOOTCOMMAND     "run net_nfs"
 
-#if defined(CONFIG_MPC5200)
 /*
  * IPB Bus clocking configuration.
  */
 #undef CONFIG_SYS_IPBCLK_EQUALS_XLBCLK                 /* define for 133MHz speed */
-#endif
 
 /*
  * I2C configuration
@@ -234,7 +233,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #   define CONFIG_SYS_RAMBOOT          1
 #endif