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

[oweals/u-boot.git] / include / configs / m28evk.h

diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index c4717238bb5c90aa5993d6b01a8d2d76ec332744..ad6995d1a033abd5a808bc70bace7c35ea3f13d2 100644 (file)
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -13,12 +13,6 @@
 
 #define CONFIG_TIMESTAMP               /* Print image info with timestamp */
 
-/* U-Boot Commands */
-#define CONFIG_FAT_WRITE
-
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_NAND_TRIMFFS
-
 /* Memory configuration */
 #define CONFIG_NR_DRAM_BANKS           1               /* 1 bank of DRAM */
 #define PHYS_SDRAM_1                   0x40000000      /* Base address */
@@ -27,7 +21,6 @@
 
 /* Environment */
 #define CONFIG_ENV_SIZE                        (16 * 1024)
-#define CONFIG_ENV_IS_IN_NAND
 
 /* Environment is in NAND */
 #if defined(CONFIG_CMD_NAND) && defined(CONFIG_ENV_IS_IN_NAND)
@@ -38,23 +31,8 @@
 #define CONFIG_ENV_OFFSET_REDUND       \
                (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
 
-#define CONFIG_CMD_UBIFS
-#define CONFIG_CMD_MTDPARTS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define MTDIDS_DEFAULT                 "nand0=gpmi-nand"
-#define MTDPARTS_DEFAULT                       \
-       "mtdparts=gpmi-nand:"                   \
-               "3m(u-boot),"                   \
-               "512k(env1),"                   \
-               "512k(env2),"                   \
-               "14m(boot),"                    \
-               "238m(data),"                   \
-               "-@4096k(UBI)"
-#else
-#define CONFIG_ENV_IS_NOWHERE
 #endif
 
 /* FEC Ethernet on SoC */
@@ -85,7 +63,6 @@
 /* SPI */
 #ifdef CONFIG_CMD_SPI
 #define CONFIG_DEFAULT_SPI_BUS         2
-#define CONFIG_DEFAULT_SPI_CS          0
 #define CONFIG_DEFAULT_SPI_MODE                SPI_MODE_0
 
 /* SPI FLASH */
@@ -115,7 +92,6 @@
 
 /* Booting Linux */
 #define CONFIG_BOOTFILE                "fitImage"
-#define CONFIG_BOOTARGS                "console=ttyAMA0,115200n8 "
 #define CONFIG_BOOTCOMMAND     "run mmc_mmc"
 #define CONFIG_LOADADDR                0x42000000
 #define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR