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

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

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index b453d8f..cdc5b00 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -36,8 +36,6 @@
 
 #ifdef CONFIG_MICRO_SUPPORT_CARD
 #define CONFIG_SMC911X
-#else
-#define CONFIG_SYS_NO_FLASH
 #endif
 
 #define CONFIG_FLASH_CFI_DRIVER
@@ -59,7 +57,6 @@
 #define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1
 
 /* serial console configuration */
-#define CONFIG_BAUDRATE                        115200
 
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
 
@@ -144,7 +141,7 @@
 #if defined(CONFIG_ARM64) && !defined(CONFIG_ARMV8_MULTIENTRY)
 /* ARM Trusted Firmware */
 #define BOOT_IMAGES \
-       "second_image=bl1.bin\0" \
+       "second_image=unph_bl.bin\0" \
        "third_image=fip.bin\0"
 #else
 #define BOOT_IMAGES \