From 2061d658b3d199ec84976e6a573f68424369be69 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Sun, 22 Jan 2023 16:54:20 +0000
Subject: [dhcp] Simplify platform-specific client architecture definitions

Move the platform-specific DHCP client architecture definitions to
header files of the form <ipxe/$(PLATFORM)/dhcparch.h>.  This
simplifies the directory structure and allows the otherwise unused
arch/$(ARCH)/include/$(PLATFORM) to be removed from the include
directory search path, which avoids the confusing situation in which a
header file may potentially be accessed through more than one path.

For Linux userspace binaries on any architecture, use the EFI values
for that architecture by delegating to the EFI header file.  This
avoids the need to explicitly select values for Linux userspace
binaries for each architecture.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---
 src/net/udp/dhcp.c   | 2 +-
 src/net/udp/dhcpv6.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/net')

diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c
index a335a778a..b7b84e7db 100644
--- a/src/net/udp/dhcp.c
+++ b/src/net/udp/dhcp.c
@@ -46,7 +46,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/dhcp.h>
 #include <ipxe/dhcpopts.h>
 #include <ipxe/dhcppkt.h>
-#include <ipxe/dhcp_arch.h>
+#include <ipxe/dhcparch.h>
 #include <ipxe/features.h>
 #include <config/dhcp.h>
 
diff --git a/src/net/udp/dhcpv6.c b/src/net/udp/dhcpv6.c
index 28c6f7be4..9e27dec6f 100644
--- a/src/net/udp/dhcpv6.c
+++ b/src/net/udp/dhcpv6.c
@@ -40,7 +40,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/crc32.h>
 #include <ipxe/errortab.h>
 #include <ipxe/ipv6.h>
-#include <ipxe/dhcp_arch.h>
+#include <ipxe/dhcparch.h>
 #include <ipxe/dhcpv6.h>
 
 /** @file
-- 
cgit v1.2.3-55-g7522