X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfig_distro_defaults.h;h=9d1de5508ff9b93007faf2df115b78edcbb5ddd6;hb=6168dc6a7a28da3e865314bf1ba5a53eaebe63ac;hp=11b5b793046f0046579806eda4dc6bc30ff799fa;hpb=13a49c3a739bec2414c2833e0393469aab93e870;p=u-boot

diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
index 11b5b79304..9d1de5508f 100644
--- a/include/config_distro_defaults.h
+++ b/include/config_distro_defaults.h
@@ -8,8 +8,9 @@
 #define _CONFIG_CMD_DISTRO_DEFAULTS_H
 
 /*
- * List of all commands and options that when defined enables support for features
- * required by distros to support boards in a standardised and consitant manner.
+ * List of all commands and options that when defined enables support for
+ * features required by distros to support boards in a standardised and
+ * consistent manner.
  */
 
 #define CONFIG_BOOTP_BOOTPATH
@@ -19,26 +20,40 @@
 #define CONFIG_BOOTP_PXE
 #define CONFIG_BOOTP_SUBNETMASK
 
-#if defined(__arm__)
+#if defined(__arm__) || defined(__aarch64__)
 #define CONFIG_BOOTP_PXE_CLIENTARCH     0x100
 #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)
+#if !defined(CONFIG_BOOTP_VCI_STRING)
 #define CONFIG_BOOTP_VCI_STRING         "U-boot.armv7"
+#endif
+#elif defined(__aarch64__)
+#if !defined(CONFIG_BOOTP_VCI_STRING)
+#define CONFIG_BOOTP_VCI_STRING         "U-boot.armv8"
+#endif
 #else
+#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
+#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