rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/SMN42.h b/include/configs/SMN42.h
old mode 100755 (executable)
new mode 100644 (file)
index 1d2f28d..45fe14b
--- a/include/configs/SMN42.h
+++ b/include/configs/SMN42.h
@@ -42,14 +42,14 @@
 #define CONFIG_ARM7            1       /* This is a ARM7 CPU   */
 #define CONFIG_ARM_THUMB       1       /* this is an ARM720TDMI */
 #define CONFIG_LPC2292
-#undef  CONFIG_ARM7_REVD               /* disable ARM720 REV.D Workarounds */
+#undef CONFIG_ARM7_REVD                /* disable ARM720 REV.D Workarounds */
 
 #undef CONFIG_USE_IRQ                  /* don't need them anymore */
 
 /*
  * Size of malloc() pool
  */
-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
@@ -66,10 +66,18 @@
 
 #define CONFIG_BAUDRATE                115200
 
-#define CONFIG_BOOTP_MASK       (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE)
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
+
 
 /* enable I2C and select the hardware/software driver */
-#undef  CONFIG_HARD_I2C                        /* I2C with hardware support    */
+#undef CONFIG_HARD_I2C                 /* I2C with hardware support    */
 #define CONFIG_SOFT_I2C                1       /* I2C bit-banged               */
 /* this would be 0xAE if E0, E1 and E2 were pulled high */
 #define CFG_I2C_SLAVE          0xA0
@@ -92,30 +100,29 @@
 #define        I2C_SCL(x)      { if (x) PUT32(IO0SET, SCL); else PUT32(IO0CLR, SCL); }
 #define        I2C_DELAY       { udelay(100); }
 #define        I2C_ACTIVE      { unsigned int i2ctmp; \
-                                         i2ctmp = GET32(IO0DIR); \
+                                         i2ctmp = GET32(IO0DIR); \
                                          i2ctmp |= SDA; \
                                          PUT32(IO0DIR, i2ctmp); }
 #define        I2C_TRISTATE    { unsigned int i2ctmp; \
-                                             i2ctmp = GET32(IO0DIR); \
+                                             i2ctmp = GET32(IO0DIR); \
                                              i2ctmp &= ~SDA; \
                                                  PUT32(IO0DIR, i2ctmp); }
 #endif /* CONFIG_SOFT_I2C */
 
+
 /*
- * Supported commands
+ * Command line configuration.
  */
-#define CONFIG_COMMANDS               (CONFIG_CMD_DFL  | \
-                               CFG_CMD_DHCP    | \
-                               CFG_CMD_FAT             | \
-                               CFG_CMD_MMC             | \
-                               CFG_CMD_NET             | \
-                               CFG_CMD_EEPROM  | \
-                               CFG_CMD_PING)
+#include <config_cmd_default.h>
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_MMC
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_PING
 
-#define CONFIG_DOS_PARTITION
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+#define CONFIG_DOS_PARTITION
 
 #define CONFIG_BOOTDELAY       5
 
@@ -132,12 +139,12 @@
 #define CFG_MEMTEST_START      0x81800000      /* memtest works on     */
 #define CFG_MEMTEST_END                0x83000000      /* 24 MB in SRAM        */
 
-#undef  CFG_CLKS_IN_HZ         /* everything, incl board info, in Hz */
+#undef CFG_CLKS_IN_HZ          /* everything, incl board info, in Hz */
 
-#define        CFG_LOAD_ADDR           0x81000000      /* default load address 
-                                                 * for uClinux img is here*/
+#define        CFG_LOAD_ADDR           0x81000000      /* default load address */
+                                               /* for uClinux img is here*/
 
-#define CFG_SYS_CLK_FREQ        58982400        /* Hz */
+#define CFG_SYS_CLK_FREQ       58982400        /* Hz */
 #define        CFG_HZ                  2048            /* decrementer freq in Hz */
 
                                                /* valid baudrates */
@@ -182,12 +189,12 @@
 
 #define CFG_MAX_FLASH_BANKS    2       /* max number of memory banks           */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 /* The Environment Sector is in the CPU-internal flash */
 #define CFG_FLASH_BASE         0
-#define CFG_ENV_OFFSET         0x3C000
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + CFG_ENV_OFFSET)
-#define CFG_ENV_SIZE           0x2000 /* Total Size of Environment Sector      */
+#define CONFIG_ENV_OFFSET              0x3C000
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE                0x2000 /* Total Size of Environment Sector      */
 
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS