Merge git://git.denx.de/u-boot-mmc

[people/ms/u-boot.git] / include / configs / dns325.h

diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index 9b192bccfc2e9bb5e29b85e873a4d670a73dd180..cb0d2413f931c3d07721b9a9c0c2e38fa3660ef7 100644 (file)
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -16,7 +16,6 @@
 /*
  * Machine number definition
  */
-#define MACH_TYPE_DNS325               3800
 #define CONFIG_MACH_TYPE               MACH_TYPE_DNS325
 
 /*
@@ -29,11 +28,6 @@
 /*
  * Commands configuration
  */
-#define CONFIG_SYS_NO_FLASH            /* Declare no flash (NOR/SPI) */
-#define CONFIG_CMD_ENV
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_IDE
-#define CONFIG_CMD_DATE
 #define CONFIG_SYS_MVFS
 
 #define CONFIG_NR_DRAM_BANKS           1
@@ -74,20 +68,11 @@
  */
 #define CONFIG_KIRKWOOD_GPIO
 
-/*
- * Console configuration
- */
-#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-
 /*
  * Environment variables configurations
  */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_SECT_SIZE           0x20000 /* 128KB */
-#else
-#define CONFIG_ENV_IS_NOWHERE
 #endif
 
 #define CONFIG_ENV_SIZE                        0x20000 /* 128KB */
@@ -97,10 +82,6 @@
 /*
  * Default environment variables
  */
-#define MTDIDS_DEFAULT                 "nand0=orion_nand"
-
-#define MTDPARTS_DEFAULT               "mtdparts=orion_nand:" \
-       "896k(u-boot),128k(u-boot-env),5m(kernel),-(rootfs)\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "stdin=serial\0" \
@@ -109,7 +90,7 @@
        "loadaddr=0x800000\0" \
        "autoload=no\0" \
        "console=ttyS0,115200\0" \
-       "mtdparts="MTDPARTS_DEFAULT \
+       "mtdparts="CONFIG_MTDPARTS_DEFAULT \
        "optargs=\0" \
        "bootenv=uEnv.txt\0" \
        "importbootenv=echo Importing environment ...; " \