rename CFG_ENV macros to CONFIG_ENV

[platform/kernel/u-boot.git] / include / configs / MVBC_P.h

diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h
index ff6f6cc..21475fb 100644 (file)
--- a/include/configs/MVBC_P.h
+++ b/include/configs/MVBC_P.h
@@ -40,7 +40,7 @@
 #define CONFIG_MISC_INIT_R     1
 
 #define CFG_CACHELINE_SIZE     32
-#if (CONFIG_CMD_KGDB)
+#ifdef CONFIG_CMD_KGDB
 #define CFG_CACHELINE_SHIFT    5
 #endif
 
@@ -198,7 +198,7 @@
  */
 #undef         CONFIG_FLASH_16BIT
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI_AMD_RESET 1
 #define CFG_FLASH_EMPTY_INFO
 
@@ -215,14 +215,14 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
 #undef CFG_FLASH_PROTECTION
 
-#define CFG_ENV_ADDR           0xFFFE0000
-#define CFG_ENV_SIZE           0x10000
-#define CFG_ENV_SECT_SIZE      0x10000
-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    CFG_ENV_SIZE
+#define CONFIG_ENV_ADDR                0xFFFE0000
+#define CONFIG_ENV_SIZE                0x10000
+#define CONFIG_ENV_SECT_SIZE   0x10000
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 
 /*
  * Memory map
@@ -243,7 +243,7 @@
 #define CFG_RAMBOOT            1
 #endif
 
-/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */
 #define CFG_MONITOR_LEN                (512 << 10)
 #define CFG_MALLOC_LEN         (512 << 10)
 #define CFG_BOOTMAPSZ          (8 << 20)
@@ -255,7 +255,7 @@
 #define CONFIG_NET_RETRY_COUNT 5
 
 #define CONFIG_E1000
-#define CONFIG_E1000_FALLBACK_MAC      0xb6b445ebfbc0
+#define CONFIG_E1000_FALLBACK_MAC      { 0xb6, 0xb4, 0x45, 0xeb, 0xfb, 0xc0 }
 #undef CONFIG_MPC5xxx_FEC
 #undef CONFIG_PHY_ADDR
 #define CONFIG_NETDEV          eth0
@@ -268,7 +268,7 @@
 #define CFG_PROMPT_HUSH_PS2    "> "
 #undef         CFG_LONGHELP
 #define CFG_PROMPT             "=> "
-#if (CONFIG_CMD_KGDB)
+#ifdef CONFIG_CMD_KGDB
 #define CFG_CBSIZE             1024
 #else
 #define CFG_CBSIZE             256