configs: Re-sync with CONFIG_DISTRO_DEFAULTS

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

diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index c69e8994bd8a94b0c55cdaa1ce83b3ad25177026..dcb2a698f8703f316912a997196a340f818170bb 100644 (file)
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -14,7 +14,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_SHEEVA_88SV131  1       /* CPU Core subversion */
-#define CONFIG_MACH_GURUPLUG   /* Machine type */
 
 /*
  * Standard filesystems
@@ -53,24 +52,14 @@
        "fdt addr 0x700000; fdt resize; fdt chosen; "                   \
        "bootz 0x800000 - 0x700000"
 
-#define CONFIG_MTDPARTS        \
-       "mtdparts=orion_nand:"                                          \
-       "896K(uboot),128K(uboot_env),"                                  \
-       "-@1M(root)\0"
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0"                                \
        "mtdids=nand0=orion_nand\0"                                     \
-       "mtdparts="CONFIG_MTDPARTS                                      \
+       "mtdparts="CONFIG_MTDPARTS_DEFAULT                      \
        "kernel=/boot/zImage\0"                                         \
        "fdt=/boot/guruplug-server-plus.dtb\0"                          \
        "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
 
-#define MTDIDS_DEFAULT "nand0=orion_nand"
-
-#define MTDPARTS_DEFAULT       \
-       "mtdparts="CONFIG_MTDPARTS
-
 /*
  * Ethernet Driver configuration
  */