From fa96f37ec5835aa685f7beb0af4fef12e9001027 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 6 May 2016 21:01:04 +0200 Subject: [PATCH] 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 Reviewed-by: Tom Rini [trini: Drop the Xilinx define to 0x100 as it's not the correct value to use]. Signed-off-by: Tom Rini --- include/configs/xilinx_zynqmp.h | 1 - net/Kconfig | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index b2fa164f65..ffb6b34d57 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 64fd0f94bf..414c5497c7 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 -- 2.39.5