configs: Re-sync with cmd/Kconfig

[people/ms/u-boot.git] / include / config_distro_defaults.h

diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
index 8237239c0021d32f53e53ff8e4cf0109c0539277..766a212b9705f941e5f0c0ee80579cb8b444da1f 100644 (file)
--- a/include/config_distro_defaults.h
+++ b/include/config_distro_defaults.h
@@ -23,30 +23,27 @@
 #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
-
-#define CONFIG_OF_LIBFDT
+#elif defined(__i386__)
+#define CONFIG_BOOTP_PXE_CLIENTARCH     0x0
+#elif defined(__x86_64__)
+#define CONFIG_BOOTP_PXE_CLIENTARCH     0x9
+#endif
 
 #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
-#define CONFIG_CMD_FS_GENERIC
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_PING
 #define CONFIG_CMD_PXE
 
 #define CONFIG_CMDLINE_EDITING
@@ -56,7 +53,8 @@
 #define CONFIG_MENU
 #define CONFIG_DOS_PARTITION
 #define CONFIG_EFI_PARTITION
+#define CONFIG_ISO_PARTITION
 #define CONFIG_SUPPORT_RAW_INITRD
-#define CONFIG_SYS_HUSH_PARSER
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
 
 #endif /* _CONFIG_CMD_DISTRO_DEFAULTS_H */