karo: cleanup after merge of v2015.10-rc2

[karo-tx-uboot.git] / include / configs / uniphier.h

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index a8bce668645027d3c7228143ebf18c6f1fa0b6b7..d59564bafd0cec521ba067e63ca56fdb57adea95 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -288,7 +288,7 @@
        "netdev=eth0\0"                                         \
        "verify=n\0"                                            \
        "nandupdate=nand erase 0 0x00100000 &&"                 \
-               "tftpboot u-boot-spl.bin &&"                    \
+               "tftpboot u-boot-spl-dtb.bin &&"                \
                "nand write $loadaddr 0 0x00010000 &&"          \
                "tftpboot u-boot-dtb.img &&"                    \
                "nand write $loadaddr 0x00010000 0x000f0000\0"  \
@@ -299,10 +299,6 @@
 /* Open Firmware flat tree */
 #define CONFIG_OF_LIBFDT
 
-#define CONFIG_LIB_RAND
-
-#define CONFIG_HAVE_ARM_SECURE
-
 /* Memory Size & Mapping */
 #define CONFIG_SYS_SDRAM_BASE          CONFIG_SDRAM0_BASE