X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fconfig_distro_defaults.h;h=41bbfb96730697d0800cd4dadac9e8b5f873b288;hb=ac20a1b21caeb779848f8f4731060dbc00f4bd7b;hp=5eea5cf900d83876cdc68c748ac870fe5a95cfa3;hpb=e536ab8849b2b4f6d68bbc8e1d1f9bc033db06bd;p=oweals%2Fu-boot.git

diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
index 5eea5cf900..41bbfb9673 100644
--- a/include/config_distro_defaults.h
+++ b/include/config_distro_defaults.h
@@ -20,47 +20,10 @@
 #define CONFIG_BOOTP_PXE
 #define CONFIG_BOOTP_SUBNETMASK
 
-#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"
-#elif defined(__aarch64__)
-#define CONFIG_BOOTP_VCI_STRING         "U-boot.armv8"
-#else
-#define CONFIG_BOOTP_VCI_STRING         "U-boot.arm"
-#endif
-#elif defined(__i386__)
-#define CONFIG_BOOTP_PXE_CLIENTARCH     0x0
-#elif defined(__x86_64__)
-#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
-#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
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_BOOTDELAY     2
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_MENU
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
 #define CONFIG_SUPPORT_RAW_INITRD
-#define CONFIG_SYS_HUSH_PARSER
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
 
 #endif	/* _CONFIG_CMD_DISTRO_DEFAULTS_H */