rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/OXC.h b/include/configs/OXC.h
index 586b19f..2ccaf47 100644 (file)
--- a/include/configs/OXC.h
+++ b/include/configs/OXC.h
@@ -51,10 +51,23 @@
 #define CONFIG_BAUDRATE                9600
 #define CFG_BAUDRATE_TABLE     { 9600, 19200, 38400, 57600, 115200 }
 
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL | CFG_CMD_ELF)
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any)      */
-#include <cmd_confdefs.h>
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ELF
+
 
 /*
  * Miscellaneous configurable options
@@ -180,9 +193,10 @@
  * Environment
  */
 
-#define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_ADDR           0xFFF30000      /* Offset of Environment Sector */
-#define CFG_ENV_SIZE           0x00010000      /* Total Size of Environment Sector */
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_ADDR                0xFFF30000      /* Offset of Environment Sector */
+#define CONFIG_ENV_SIZE                0x00010000      /* Total Size of Environment Sector */
+#define        CONFIG_ENV_IS_EMBEDDED  1               /* short-cut compile-time test  */
 #define CONFIG_ENV_OVERWRITE    1              /* Allow modifying the environment */
 
 /*
@@ -298,7 +312,7 @@
  * Cache Configuration
  */
 #define CFG_CACHELINE_SIZE     32      /* For MPC8240 CPU                      */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #  define CFG_CACHELINE_SHIFT  5       /* log base 2 of the above value */
 #endif