drivers/mtd: Move conditional compilation to Makefile

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

diff --git a/include/configs/pdnb3.h b/include/configs/pdnb3.h
index 06c6652..889207a 100644 (file)
--- a/include/configs/pdnb3.h
+++ b/include/configs/pdnb3.h
@@ -71,25 +71,33 @@
 #define CONFIG_BAUDRATE         115200
 #define CFG_IXP425_CONSOLE     IXP425_UART1   /* we use UART1 for console */
 
-#if defined(CONFIG_SCPU)
-#define CMD_NAND_ADD           0
-#else
-#define CMD_NAND_ADD           CFG_CMD_NAND
-#endif
 
-#define CONFIG_COMMANDS               (CONFIG_CMD_DFL  | \
-                               CFG_CMD_DHCP    | \
-                               CFG_CMD_DATE    | \
-                               CFG_CMD_NET     | \
-                               CFG_CMD_MII     | \
-                               CMD_NAND_ADD    | \
-                               CFG_CMD_I2C     | \
-                               CFG_CMD_ELF     | \
-                               CFG_CMD_PING)
+/*
+ * 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_DHCP
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_PING
+
+#if !defined(CONFIG_SCPU)
+#define CONFIG_CMD_NAND
+#endif
 
-/* This must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-/* These are u-boot generic parameters */
-#include <cmd_confdefs.h>
 
 #define CONFIG_ZERO_BOOTDELAY_CHECK    /* check for keypress on bootdelay==0 */
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
@@ -132,7 +140,7 @@
  * Default configuration (environment varibles...)
  *----------------------------------------------------------------------*/
 #define CONFIG_PREBOOT "echo;" \
-       "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+       "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
        "echo"
 
 #undef CONFIG_BOOTARGS
@@ -162,10 +170,10 @@
        "update=protect off 50000000 5007dfff;era 50000000 5007dfff;"   \
                "cp.b 100000 50000000 ${filesize};"                     \
                "setenv filesize;saveenv\0"                             \
-       "upd=run load;run update\0"                                     \
+       "upd=run load update\0"                                         \
        "ipaddr=10.0.0.233\0"                                           \
        "serverip=10.0.0.152\0"                                         \
-       "netmask=255.255.0.0\0"                                 \
+       "netmask=255.255.0.0\0"                                         \
        "ethaddr=c6:6f:13:36:f3:81\0"                                   \
        "eth1addr=c6:6f:13:36:f3:82\0"                                  \
        "mtdparts=IXP4XX-Flash.0:504k@0(uboot),4k@504k(env),"           \
@@ -203,14 +211,14 @@
  */
 #define CFG_SDR_CONFIG         0x18
 #define CFG_SDR_MODE_CONFIG    0x1
-#define CFG_SDRAM_REFRESH_CNT  0x81a
+#define CFG_SDRAM_REFRESH_CNT  0x81a
 
 /*
  * FLASH and environment organization
  */
 #if defined(CONFIG_SCPU)
 #define CFG_FLASH_CFI                          /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER                   /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver        */
 #define CFG_FLASH_CFI_WIDTH    FLASH_CFI_16BIT /* no byte writes on IXP4xx     */
 #endif
 
@@ -243,7 +251,7 @@
 #define CFG_ENV_SECT_SIZE      0x20000 /* size of one complete sector          */
 #define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
 #else
-#define CFG_ENV_SECT_SIZE      0x1000  /* size of one complete sector          */
+#define CFG_ENV_SECT_SIZE      0x1000  /* size of one complete sector          */
 #define        CFG_ENV_SIZE            0x1000  /* Total Size of Environment Sector     */
 
 /* Address and size of Redundant Environment Sector    */