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

diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
index 5eea5cf900..d8165cc80e 100644
--- a/include/config_distro_defaults.h
+++ b/include/config_distro_defaults.h
@@ -23,12 +23,18 @@
 #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__)
@@ -49,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