rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/idmr.h b/include/configs/idmr.h
index 404e88a4fcde235f8921d72d16bb9380c41e743d..a1f1517dfb7d3336b45240f7286662ba54021ef7 100644 (file)
--- a/include/configs/idmr.h
+++ b/include/configs/idmr.h
@@ -57,7 +57,7 @@
 #define CONFIG_NETMASK         255.255.0.0
 #define CONFIG_HOSTNAME                idmr
 #define CONFIG_BOOTFILE                /tftpboot/idmr/uImage
-#define CONFIG_PREBOOT         "echo;echo Type \"run flash_nfs\" to mount root " \
+#define CONFIG_PREBOOT         "echo;echo Type \\\"run flash_nfs\\\" to mount root " \
                                "filesystem over NFS; echo"
 
 #define CONFIG_MCFTMR
@@ -115,16 +115,18 @@
  * Configuration for environment, which occupies third sector in flash.
  */
 #ifndef CONFIG_MONITOR_IS_IN_RAM
-#define CFG_ENV_ADDR           0xff820000
-#define CFG_ENV_SECT_SIZE      0x10000
-#define CFG_ENV_SIZE           0x2000
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_ADDR                0xff820000
+#define CONFIG_ENV_SECT_SIZE   0x10000
+#define CONFIG_ENV_SIZE                0x2000
+#define CONFIG_ENV_IS_IN_FLASH
 #else /* CONFIG_MONITOR_IS_IN_RAM */
-#define CFG_ENV_OFFSET         0x4000
-#define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_OFFSET              0x4000
+#define CONFIG_ENV_SECT_SIZE   0x2000
+#define CONFIG_ENV_IS_IN_FLASH
 #endif /* !CONFIG_MONITOR_IS_IN_RAM */
 
+#define        CFG_USE_PPCENV                  /* Environment embedded in sect .ppcenv */
+
 #define CFG_PROMPT             "=> "
 #define CFG_LONGHELP                           /* undef to save memory */
 
@@ -154,14 +156,15 @@
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
 #      define CONFIG_NET_MULTI         1
-#define CONFIG_MII             1
+#      define CONFIG_MII               1
+#      define CONFIG_MII_INIT          1
 #      define CFG_DISCOVER_PHY
 #      define CFG_RX_ETH_BUFFER        8
 #      define CFG_FAULT_ECHO_LINK_DOWN
 
 #      define CFG_FEC0_PINMUX          0
 #      define CFG_FEC0_MIIBASE         CFG_FEC0_IOBASE
-#      define MCFFEC_TOUT_LOOP         50000
+#      define MCFFEC_TOUT_LOOP         50000
 /* If CFG_DISCOVER_PHY is not defined - hardcoded */
 #      ifndef CFG_DISCOVER_PHY
 #              define FECDUPLEX        FULL