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

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

diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index 61c30c9..a3a393e 100644 (file)
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -33,17 +33,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_FSL_OCRAM_BASE + 0xfff0)
 
 /* Link Definitions */
-#ifdef CONFIG_SPL
-#define CONFIG_SYS_TEXT_BASE           0x80400000
-#else
-#ifdef CONFIG_QSPI_BOOT
-#define CONFIG_SYS_TEXT_BASE            0x20100000
-#else
-#define CONFIG_SYS_TEXT_BASE           0x30100000
-#endif
-#endif
-
-#define CONFIG_SUPPORT_RAW_INITRD
 
 #ifdef CONFIG_QSPI_BOOT
 #define CONFIG_SYS_FSL_QSPI_BASE       0x20000000
@@ -241,17 +230,11 @@ unsigned long long get_qixis_addr(void);
                                        sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE /* Boot args buffer */
-#define CONFIG_SYS_LONGHELP
-#ifndef SPL_NO_ENV
-#define CONFIG_CMDLINE_EDITING         1
-#endif
-#define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_MAXARGS             64      /* max command args */
 
 #ifdef CONFIG_SPL
 #define CONFIG_SPL_BSS_START_ADDR      0x80100000
 #define CONFIG_SPL_BSS_MAX_SIZE                0x00100000
-#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds"
 #define CONFIG_SPL_MAX_SIZE            0x16000
 #define CONFIG_SPL_STACK               (CONFIG_SYS_FSL_OCRAM_BASE + 0x9ff0)