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 bfce4e5b1b87a9687a5df81c06cc5c10c1b20226..8aeda4eb208a41fcaaf57ca2f00a59a490c9fefb 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -28,14 +28,6 @@
 /* FLASH related */
 #define CONFIG_MTD_DEVICE
 
-#define CONFIG_SMC911X_32_BIT
-/* dummy: referenced by examples/standalone/smc911x_eeprom.c */
-#define CONFIG_SMC911X_BASE    0
-
-#ifdef CONFIG_MICRO_SUPPORT_CARD
-#define CONFIG_SMC911X
-#endif
-
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI
 
@@ -56,13 +48,7 @@
 
 /* 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 */
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS             16      /* max number of command */
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE            (CONFIG_SYS_CBSIZE)
 
@@ -82,13 +68,8 @@
 
 #define CONFIG_SYS_MAX_NAND_DEVICE                     1
 #define CONFIG_SYS_NAND_ONFI_DETECTION
-
-#define CONFIG_NAND_DENALI_ECC_SIZE                    1024
-
 #define CONFIG_SYS_NAND_REGS_BASE                      0x68100000
 #define CONFIG_SYS_NAND_DATA_BASE                      0x68000000
-
-#define CONFIG_SYS_NAND_USE_FLASH_BBT
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS                  0
 
 /* SD/MMC */
@@ -108,8 +89,7 @@
 
 #define CONFIG_LOADADDR                        0x84000000
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
-#define CONFIG_CMDLINE_EDITING         /* add command line history     */
+#define CONFIG_SYS_BOOTM_LEN           (32 << 20)
 
 #if defined(CONFIG_ARM64)
 /* ARM Trusted Firmware */
@@ -201,7 +181,6 @@
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                               \
        "netdev=eth0\0"                                         \
-       "verify=n\0"                                            \
        "initrd_high=0xffffffffffffffff\0"                      \
        "nor_base=0x42000000\0"                                 \
        "sramupdate=setexpr tmp_addr $nor_base + 0x50000 &&"    \
@@ -231,10 +210,6 @@
 
 #define CONFIG_SYS_SDRAM_BASE          0x80000000
 #define CONFIG_NR_DRAM_BANKS           3
-/* for LD20; the last 64 byte is used for dynamic DDR PHY training */
-#define CONFIG_SYS_MEM_TOP_HIDE                64
-
-#define CONFIG_PANIC_HANG
 
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_TEXT_BASE)
 
@@ -248,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) */