Merge branch 'master' of git://git.denx.de/u-boot-net

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

diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index dedb785..2bded45 100644 (file)
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -48,13 +48,8 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_LOADS
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_SETEXPR
 
 #ifdef CONFIG_SYS_USE_MMC
 #define CONFIG_BOOTARGS                                                        \
@@ -64,14 +59,13 @@
 #define CONFIG_BOOTARGS                                                        \
        "console=ttyS0,115200 earlyprintk "                             \
        "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"          \
-       "256K(env),256k(evn_redundent),256k(spare),"                    \
+       "256K(env),256k(env_redundent),256k(spare),"                    \
        "512k(dtb),6M(kernel)ro,-(rootfs) "                             \
        "rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
 #endif
 
 #define CONFIG_BAUDRATE                        115200
 
-#define CONFIG_SYS_PROMPT              "U-Boot> "
 #define CONFIG_SYS_CBSIZE              256
 #define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \