Merge branch 'next'

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

diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
index bd8fbca..2ba7cf4 100644 (file)
--- a/include/config_distro_defaults.h
+++ b/include/config_distro_defaults.h
@@ -23,11 +23,17 @@
 #if defined(__arm__) || defined(__aarch64__)
 #define CONFIG_BOOTP_PXE_CLIENTARCH     0x100
 #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)
-#define CONFIG_BOOTP_VCI_STRING         "U-boot.armv7"
+#if !defined(CONFIG_BOOTP_VCI_STRING)
+#define CONFIG_BOOTP_VCI_STRING         "U-Boot.armv7"
+#endif
 #elif defined(__aarch64__)
-#define CONFIG_BOOTP_VCI_STRING         "U-boot.armv8"
+#if !defined(CONFIG_BOOTP_VCI_STRING)
+#define CONFIG_BOOTP_VCI_STRING         "U-Boot.armv8"
+#endif
 #else
-#define CONFIG_BOOTP_VCI_STRING         "U-boot.arm"
+#if !defined(CONFIG_BOOTP_VCI_STRING)
+#define CONFIG_BOOTP_VCI_STRING         "U-Boot.arm"
+#endif
 #endif
 #elif defined(__i386__)
 #define CONFIG_BOOTP_PXE_CLIENTARCH     0x0
@@ -35,15 +41,12 @@
 #define CONFIG_BOOTP_PXE_CLIENTARCH     0x9
 #endif
 
-#define CONFIG_OF_LIBFDT
-
 #ifdef CONFIG_ARM64
 #define CONFIG_CMD_BOOTI
 #else
 #define CONFIG_CMD_BOOTZ
 #endif
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_EXT4
 #define CONFIG_CMD_FAT