Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
index 532f47ea4f3ab8988fe48e59be2e46d8760bda86..6ab8db36a85ebd8fc69983d56bd36e4beb563311 100644 (file)
--- a/include/configs/mx7ulp_evk.h
+++ b/include/configs/mx7ulp_evk.h
@@ -68,7 +68,6 @@
 #define CONFIG_CONS_INDEX              1
 #define CONFIG_BAUDRATE                        115200
 
-#undef CONFIG_CMD_IMLS
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_AUTO_COMPLETE
 
@@ -78,10 +77,7 @@
 #define CONFIG_SYS_PROMPT              "=> "
 #define CONFIG_SYS_CBSIZE              512
 
-/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS             256
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 
 #define CONFIG_CMDLINE_EDITING
 
@@ -93,7 +89,6 @@
 #define PHYS_SDRAM_SIZE                        SZ_1G
 #define CONFIG_SYS_MEMTEST_START       PHYS_SDRAM
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
-#define CONFIG_CMD_BOOTZ
 
 #define CONFIG_LOADADDR             0x60800000