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

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

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 5ab06f6072dd5d8bf21fb23ecd93e6d11db30499..8aeda4eb208a41fcaaf57ca2f00a59a490c9fefb 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -48,9 +48,6 @@
 
 /* serial console configuration */
 
-#define CONFIG_SYS_LONGHELP            /* undef to save memory */
-
-#define CONFIG_CMDLINE_EDITING         /* add command line history     */
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O Buffer Size */
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE            (CONFIG_SYS_CBSIZE)
@@ -94,8 +91,6 @@
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_BOOTM_LEN           (32 << 20)
 
-#define CONFIG_CMDLINE_EDITING         /* add command line history     */
-
 #if defined(CONFIG_ARM64)
 /* ARM Trusted Firmware */
 #define BOOT_IMAGES \
@@ -228,8 +223,6 @@
 
 #define CONFIG_SPL_STACK               (0x00100000)
 
-#define CONFIG_SPL_FRAMEWORK
-
 #define CONFIG_SYS_NAND_U_BOOT_OFFS            0x20000
 
 /* subtract sizeof(struct image_header) */