summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2016-05-06 19:01:04 (GMT)
committerTom Rini <trini@konsulko.com>2016-05-27 19:37:16 (GMT)
commitfa96f37ec5835aa685f7beb0af4fef12e9001027 (patch)
tree275038a6d7230c9573663bd7c87394d5b6feae45
parent0dac6b4e850cdd934f9b04cecc79fc395127ab29 (diff)
downloadu-boot-fa96f37ec5835aa685f7beb0af4fef12e9001027.tar.xz
net: Fix client identifiers for ARM
There are client identifiers specifically reserved for ARM U-Boot according to http://www.ietf.org/assignments/dhcpv6-parameters/dhcpv6-parameters.xml#processor-architecture. So let's actually make use of them rather than the bogus 0x100 that we emitted so far. Signed-off-by: Alexander Graf <agraf@suse.de> Reviewed-by: Tom Rini <trini@konsulko.com> [trini: Drop the Xilinx define to 0x100 as it's not the correct value to use]. Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r--include/configs/xilinx_zynqmp.h1
-rw-r--r--net/Kconfig3
2 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index b2fa164..ffb6b34 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -80,7 +80,6 @@
#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_PXE
#define CONFIG_BOOTP_SUBNETMASK
-#define CONFIG_BOOTP_PXE_CLIENTARCH 0x100
/* Diff from config_distro_defaults.h */
#define CONFIG_SUPPORT_RAW_INITRD
diff --git a/net/Kconfig b/net/Kconfig
index 64fd0f9..414c549 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -34,7 +34,8 @@ config NET_TFTP_VARS
config BOOTP_PXE_CLIENTARCH
hex
- default 0x100 if ARM
+ default 0x16 if ARM64
+ default 0x15 if ARM
default 0 if X86
config BOOTP_VCI_STRING