X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=include%2Fconfig_distro_defaults.h;h=d8165cc80e3e8df95f8b4d17e040c9e1cdfa282c;hb=f3a70a92fe95ecdfb4a6ae2de4b00fc6cceccfec;hp=5d18a4b903a45e83f85690590c333aeb8012523d;hpb=e141652b9cd0cb4f899f7a0fd71c8a438300e365;p=karo-tx-uboot.git

diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
index 5d18a4b903..d8165cc80e 100644
--- a/include/config_distro_defaults.h
+++ b/include/config_distro_defaults.h
@@ -10,7 +10,7 @@
 /*
  * 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.
+ * consistent manner.
  */
 
 #define CONFIG_BOOTP_BOOTPATH
@@ -20,18 +20,34 @@
 #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
@@ -39,7 +55,6 @@
 #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