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/include/ipxe/dhcparch.h       | 16 ++++++++++++++++
 src/include/ipxe/linux/dhcparch.h | 20 ++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 src/include/ipxe/dhcparch.h
 create mode 100644 src/include/ipxe/linux/dhcparch.h

(limited to 'src/include')

diff --git a/src/include/ipxe/dhcparch.h b/src/include/ipxe/dhcparch.h
new file mode 100644
index 000000000..89ecfb31e
--- /dev/null
+++ b/src/include/ipxe/dhcparch.h
@@ -0,0 +1,16 @@
+#ifndef _IPXE_DHCPARCH_H
+#define _IPXE_DHCPARCH_H
+
+/** @file
+ *
+ * DHCP client architecture definitions
+ *
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+/* Include platform-specific client architecture definitions */
+#define PLATFORM_DHCPARCH(_platform) <ipxe/_platform/dhcparch.h>
+#include PLATFORM_DHCPARCH(PLATFORM)
+
+#endif /* _IPXE_DHCPARCH_H */
diff --git a/src/include/ipxe/linux/dhcparch.h b/src/include/ipxe/linux/dhcparch.h
new file mode 100644
index 000000000..464aa5168
--- /dev/null
+++ b/src/include/ipxe/linux/dhcparch.h
@@ -0,0 +1,20 @@
+#ifndef _IPXE_LINUX_DHCPARCH_H
+#define _IPXE_LINUX_DHCPARCH_H
+
+/** @file
+ *
+ * DHCP client architecture definitions
+ *
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+/*
+ * There are no specification-defined values for DHCP architecture for
+ * PXE clients running as Linux userspace applications.  Pretend to be
+ * the equivalent EFI client.
+ *
+ */
+#include <ipxe/efi/dhcparch.h>
+
+#endif /* _IPXE_LINUX_DHCPARCH_H */
-- 
cgit v1.2.3-55-g7522