]> git.ipfire.org Git - thirdparty/ipxe.git/commit
[dhcp] Simplify platform-specific client architecture definitions
authorMichael Brown <mcb30@ipxe.org>
Sun, 22 Jan 2023 16:54:20 +0000 (16:54 +0000)
committerMichael Brown <mcb30@ipxe.org>
Sun, 22 Jan 2023 17:45:34 +0000 (17:45 +0000)
commit2061d658b3d199ec84976e6a573f68424369be69
tree0645e9e632cade65e7c9bddd5a4dce313c35b8ef
parent2ef5f5e05efa3ab29a207b6641b0ac6afefd3f0b
[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>
18 files changed:
src/Makefile.housekeeping
src/arch/arm32/include/efi/ipxe/dhcp_arch.h [deleted file]
src/arch/arm32/include/ipxe/efi/dhcparch.h [new file with mode: 0644]
src/arch/arm64/include/efi/ipxe/dhcp_arch.h [deleted file]
src/arch/arm64/include/ipxe/efi/dhcparch.h [new file with mode: 0644]
src/arch/i386/include/efi/ipxe/dhcp_arch.h [deleted file]
src/arch/i386/include/ipxe/efi/dhcparch.h [new file with mode: 0644]
src/arch/i386/include/pcbios/ipxe/dhcp_arch.h [deleted file]
src/arch/x86/Makefile.linux
src/arch/x86/include/ipxe/pcbios/dhcparch.h [new file with mode: 0644]
src/arch/x86/include/linux/ipxe/dhcp_arch.h [deleted file]
src/arch/x86_64/include/efi/ipxe/dhcp_arch.h [deleted file]
src/arch/x86_64/include/ipxe/efi/dhcparch.h [new file with mode: 0644]
src/arch/x86_64/include/pcbios/ipxe/dhcp_arch.h [deleted file]
src/include/ipxe/dhcparch.h [new file with mode: 0644]
src/include/ipxe/linux/dhcparch.h [new file with mode: 0644]
src/net/udp/dhcp.c
src/net/udp/dhcpv6.c