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

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

diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 5b3a3d1..4d0e7b4 100644 (file)
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -23,7 +23,6 @@
 
 #define CONFIG_ARCH_CPU_INIT
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
 
 #define CONFIG_CMDLINE_TAG             1       /* enable passing of ATAGs */
 #define CONFIG_SETUP_MEMORY_TAGS       1
@@ -106,10 +105,7 @@
 /* MMC */
 
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
-#define CONFIG_DOS_PARTITION
 #endif
 
 /* Ethernet - not present */
@@ -148,7 +144,7 @@
 #define CONFIG_BOOTARGS                \
                                "console=ttyS0,115200 earlyprintk "                             \
                                "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"          \
-                               "256K(env),256k(env_redundent),256k(spare),"                    \
+                               "256K(env),256k(env_redundant),256k(spare),"                    \
                                "512k(dtb),6M(kernel)ro,-(rootfs) "                             \
                                "rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"