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

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

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 95d6452..bec7b68 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -94,9 +94,6 @@
 #define CONFIG_SYS_NAND_DATA_BASE                      0x68000000
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS                  0
 
-/* SD/MMC */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_START       CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_SDRAM_BASE + 0x01000000)
@@ -124,8 +121,6 @@
        "third_image=u-boot.bin\0"
 #endif
 
-#define CONFIG_PREBOOT                 "env exist ${bootdev}preboot && run ${bootdev}preboot"
-
 #define CONFIG_ROOTPATH                        "/nfs/root/path"
 #define CONFIG_NFSBOOTCOMMAND                                          \
        "setenv bootargs $bootargs root=/dev/nfs rw "                   \
@@ -231,9 +226,6 @@
 /* only for SPL */
 #if defined(CONFIG_ARCH_UNIPHIER_LD4) || \
        defined(CONFIG_ARCH_UNIPHIER_SLD8)
-#define CONFIG_SPL_TEXT_BASE           0x00040000
-#else
-#define CONFIG_SPL_TEXT_BASE           0x00100000
 #endif
 
 #define CONFIG_SPL_STACK               (0x00200000)