15 files changed, 0 insertions, 689 deletions
diff --git a/gpxe/src/config/.gitignore b/gpxe/src/config/.gitignore
deleted file mode 100644
index 8e94f32f..00000000
--- a/gpxe/src/config/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.buildserial.*
diff --git a/gpxe/src/config/config.c b/gpxe/src/config/config.c
deleted file mode 100644
index a6e76220..00000000
--- a/gpxe/src/config/config.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2, or (at
- * your option) any later version.
- */
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#include <config/general.h>
-#include <config/console.h>
-
-/** @file
- *
- * Configuration options
- *
- * This file contains macros that pull various objects into the link
- * based on definitions in configuration header files. Ideally it
- * should be the only place in gPXE where one might need to use #ifdef
- * for compile-time options.
- *
- * In the fairly common case where an object should only be considered
- * for inclusion if the subsystem it depends on is present, its
- * configuration macros should be placed in a file named
- * <tt>config_<i>subsystem</i>.c</tt>, where @e subsystem is the
- * object basename of the main source file for that subsystem. The
- * build system will pull in that file if @c subsystem.c is included
- * in the final gPXE executable built.
- */
-
-/*
- * Build ID string calculations
- *
- */
-#undef XSTR
-#undef STR
-#define XSTR(s) STR(s)
-#define STR(s) #s
-
-#ifdef BUILD_SERIAL
-#include "config/.buildserial.h"
-#define BUILD_SERIAL_STR " #" XSTR(BUILD_SERIAL_NUM)
-#else
-#define BUILD_SERIAL_STR ""
-#endif
-
-#ifdef BUILD_ID
-#define BUILD_ID_STR " " BUILD_ID
-#else
-#define BUILD_ID_STR ""
-#endif
-
-#if defined(BUILD_ID) || defined(BUILD_SERIAL)
-#define BUILD_STRING " [build" BUILD_ID_STR BUILD_SERIAL_STR "]"
-#else
-#define BUILD_STRING ""
-#endif
-
-/*
- * Drag in all requested console types
- *
- */
-
-#ifdef CONSOLE_PCBIOS
-REQUIRE_OBJECT ( bios_console );
-#endif
-#ifdef CONSOLE_SERIAL
-REQUIRE_OBJECT ( serial_console );
-#endif
-#ifdef CONSOLE_DIRECT_VGA
-REQUIRE_OBJECT ( video_subr );
-#endif
-#ifdef CONSOLE_BTEXT
-REQUIRE_OBJECT ( btext );
-#endif
-#ifdef CONSOLE_PC_KBD
-REQUIRE_OBJECT ( pc_kbd );
-#endif
-#ifdef CONSOLE_SYSLOG
-REQUIRE_OBJECT ( syslog );
-#endif
-#ifdef CONSOLE_EFI
-REQUIRE_OBJECT ( efi_console );
-#endif
-
-/*
- * Drag in all requested network protocols
- *
- */
-#ifdef NET_PROTO_IPV4
-REQUIRE_OBJECT ( ipv4 );
-#endif
-
-/*
- * Drag in all requested PXE support
- *
- */
-#ifdef PXE_MENU
-REQUIRE_OBJECT ( pxemenu );
-#endif
-#ifdef PXE_STACK
-REQUIRE_OBJECT ( pxe_call );
-#endif
-
-/*
- * Drag in all requested download protocols
- *
- */
-#ifdef DOWNLOAD_PROTO_TFTP
-REQUIRE_OBJECT ( tftp );
-#endif
-#ifdef DOWNLOAD_PROTO_HTTP
-REQUIRE_OBJECT ( http );
-#endif
-#ifdef DOWNLOAD_PROTO_HTTPS
-REQUIRE_OBJECT ( https );
-#endif
-#ifdef DOWNLOAD_PROTO_FTP
-REQUIRE_OBJECT ( ftp );
-#endif
-#ifdef DOWNLOAD_PROTO_TFTM
-REQUIRE_OBJECT ( tftm );
-#endif
-#ifdef DOWNLOAD_PROTO_SLAM
-REQUIRE_OBJECT ( slam );
-#endif
-
-/*
- * Drag in all requested SAN boot protocols
- *
- */
-#ifdef SANBOOT_PROTO_ISCSI
-REQUIRE_OBJECT ( iscsiboot );
-#endif
-#ifdef SANBOOT_PROTO_AOE
-REQUIRE_OBJECT ( aoeboot );
-#endif
-#ifdef SANBOOT_PROTO_IB_SRP
-REQUIRE_OBJECT ( ib_srpboot );
-#endif
-
-/*
- * Drag in all requested resolvers
- *
- */
-#ifdef DNS_RESOLVER
-REQUIRE_OBJECT ( dns );
-#endif
-
-/*
- * Drag in all requested image formats
- *
- */
-#ifdef IMAGE_NBI
-REQUIRE_OBJECT ( nbi );
-#endif
-#ifdef IMAGE_ELF
-REQUIRE_OBJECT ( elfboot );
-#endif
-#ifdef IMAGE_FREEBSD
-REQUIRE_OBJECT ( freebsd );
-#endif
-#ifdef IMAGE_MULTIBOOT
-REQUIRE_OBJECT ( multiboot );
-#endif
-#ifdef IMAGE_AOUT
-REQUIRE_OBJECT ( aout );
-#endif
-#ifdef IMAGE_WINCE
-REQUIRE_OBJECT ( wince );
-#endif
-#ifdef IMAGE_PXE
-REQUIRE_OBJECT ( pxe_image );
-#endif
-#ifdef IMAGE_SCRIPT
-REQUIRE_OBJECT ( script );
-#endif
-#ifdef IMAGE_BZIMAGE
-REQUIRE_OBJECT ( bzimage );
-#endif
-#ifdef IMAGE_ELTORITO
-REQUIRE_OBJECT ( eltorito );
-#endif
-#ifdef IMAGE_COMBOOT
-REQUIRE_OBJECT ( comboot );
-REQUIRE_OBJECT ( com32 );
-REQUIRE_OBJECT ( comboot_call );
-REQUIRE_OBJECT ( com32_call );
-REQUIRE_OBJECT ( com32_wrapper );
-REQUIRE_OBJECT ( comboot_resolv );
-#endif
-#ifdef IMAGE_EFI
-REQUIRE_OBJECT ( efi_image );
-#endif
-
-/*
- * Drag in all requested commands
- *
- */
-#ifdef AUTOBOOT_CMD
-REQUIRE_OBJECT ( autoboot_cmd );
-#endif
-#ifdef NVO_CMD
-REQUIRE_OBJECT ( nvo_cmd );
-#endif
-#ifdef CONFIG_CMD
-REQUIRE_OBJECT ( config_cmd );
-#endif
-#ifdef IFMGMT_CMD
-REQUIRE_OBJECT ( ifmgmt_cmd );
-#endif
-/* IWMGMT_CMD is brought in by net80211.c if requested */
-#ifdef ROUTE_CMD
-REQUIRE_OBJECT ( route_cmd );
-#endif
-#ifdef IMAGE_CMD
-REQUIRE_OBJECT ( image_cmd );
-#endif
-#ifdef DHCP_CMD
-REQUIRE_OBJECT ( dhcp_cmd );
-#endif
-#ifdef SANBOOT_CMD
-REQUIRE_OBJECT ( sanboot_cmd );
-#endif
-#ifdef LOGIN_CMD
-REQUIRE_OBJECT ( login_cmd );
-#endif
-#ifdef TIME_CMD
-REQUIRE_OBJECT ( time_cmd );
-#endif
-#ifdef DIGEST_CMD
-REQUIRE_OBJECT ( digest_cmd );
-#endif
-#ifdef PXE_CMD
-REQUIRE_OBJECT ( pxe_cmd );
-#endif
-
-/*
- * Drag in miscellaneous objects
- *
- */
-#ifdef NULL_TRAP
-REQUIRE_OBJECT ( nulltrap );
-#endif
-#ifdef GDBSERIAL
-REQUIRE_OBJECT ( gdbidt );
-REQUIRE_OBJECT ( gdbserial );
-REQUIRE_OBJECT ( gdbstub_cmd );
-#endif
-#ifdef GDBUDP
-REQUIRE_OBJECT ( gdbidt );
-REQUIRE_OBJECT ( gdbudp );
-REQUIRE_OBJECT ( gdbstub_cmd );
-#endif
-
-/*
- * Drag in objects that are always required, but not dragged in via
- * symbol dependencies.
- *
- */
-REQUIRE_OBJECT ( device );
-REQUIRE_OBJECT ( embedded );
diff --git a/gpxe/src/config/config_net80211.c b/gpxe/src/config/config_net80211.c
deleted file mode 100644
index b33c363b..00000000
--- a/gpxe/src/config/config_net80211.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2, or (at
- * your option) any later version.
- */
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#include <config/general.h>
-
-/** @file
- *
- * 802.11 configuration options
- *
- */
-
-/*
- * Drag in 802.11-specific commands
- *
- */
-#ifdef IWMGMT_CMD
-REQUIRE_OBJECT ( iwmgmt_cmd );
-#endif
-
-/*
- * Drag in 802.11 error message tables
- *
- */
-#ifdef ERRMSG_80211
-REQUIRE_OBJECT ( wireless_errors );
-#endif
-
-/*
- * Drag in 802.11 cryptosystems and handshaking protocols
- *
- */
-#ifdef CRYPTO_80211_WEP
-REQUIRE_OBJECT ( wep );
-#endif
-
-#ifdef CRYPTO_80211_WPA2
-#define CRYPTO_80211_WPA
-REQUIRE_OBJECT ( wpa_ccmp );
-#endif
-
-#ifdef CRYPTO_80211_WPA
-REQUIRE_OBJECT ( wpa_psk );
-REQUIRE_OBJECT ( wpa_tkip );
-#endif
diff --git a/gpxe/src/config/config_romprefix.c b/gpxe/src/config/config_romprefix.c
deleted file mode 100644
index 85f1e78a..00000000
--- a/gpxe/src/config/config_romprefix.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2, or (at
- * your option) any later version.
- */
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#include <config/general.h>
-
-/** @file
- *
- * ROM prefix configuration options
- *
- */
-
-/*
- * Provide UNDI loader if PXE stack is requested
- *
- */
-#ifdef PXE_STACK
-REQUIRE_OBJECT ( undiloader );
-#endif
diff --git a/gpxe/src/config/console.h b/gpxe/src/config/console.h
deleted file mode 100644
index be3242dd..00000000
--- a/gpxe/src/config/console.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef CONFIG_CONSOLE_H
-#define CONFIG_CONSOLE_H
-
-/** @file
- *
- * Console configuration
- *
- * These options specify the console types that Etherboot will use for
- * interaction with the user.
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#include <config/defaults.h>
-
-//#define	CONSOLE_PCBIOS		/* Default BIOS console */
-//#define	CONSOLE_SERIAL		/* Serial port */
-//#define	CONSOLE_DIRECT_VGA	/* Direct access to VGA card */
-//#define	CONSOLE_BTEXT		/* Who knows what this does? */
-//#define	CONSOLE_PC_KBD		/* Direct access to PC keyboard */
-
-#endif /* CONFIG_CONSOLE_H */
diff --git a/gpxe/src/config/defaults.h b/gpxe/src/config/defaults.h
deleted file mode 100644
index 389c0b07..00000000
--- a/gpxe/src/config/defaults.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef CONFIG_DEFAULTS_H
-#define CONFIG_DEFAULTS_H
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#define CONFIG_DEFAULTS(_platform) <config/defaults/_platform.h>
-
-#include CONFIG_DEFAULTS(PLATFORM)
-
-#endif /* CONFIG_DEFAULTS_H */
diff --git a/gpxe/src/config/defaults/efi.h b/gpxe/src/config/defaults/efi.h
deleted file mode 100644
index fe38fd03..00000000
--- a/gpxe/src/config/defaults/efi.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef CONFIG_DEFAULTS_EFI_H
-#define CONFIG_DEFAULTS_EFI_H
-
-/** @file
- *
- * Configuration defaults for EFI
- *
- */
-
-#define UACCESS_EFI
-#define IOAPI_EFI
-#define PCIAPI_EFI
-#define CONSOLE_EFI
-#define TIMER_EFI
-#define NAP_EFIX86
-#define UMALLOC_EFI
-#define SMBIOS_EFI
-
-#define	IMAGE_EFI		/* EFI image support */
-
-#endif /* CONFIG_DEFAULTS_EFI_H */
diff --git a/gpxe/src/config/defaults/pcbios.h b/gpxe/src/config/defaults/pcbios.h
deleted file mode 100644
index c09105cc..00000000
--- a/gpxe/src/config/defaults/pcbios.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef CONFIG_DEFAULTS_PCBIOS_H
-#define CONFIG_DEFAULTS_PCBIOS_H
-
-/** @file
- *
- * Configuration defaults for PCBIOS
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#define UACCESS_LIBRM
-#define IOAPI_X86
-#define PCIAPI_PCBIOS
-#define TIMER_PCBIOS
-#define CONSOLE_PCBIOS
-#define NAP_PCBIOS
-#define UMALLOC_MEMTOP
-#define SMBIOS_PCBIOS
-
-#define	IMAGE_ELF		/* ELF image support */
-#define	IMAGE_MULTIBOOT		/* MultiBoot image support */
-#define	IMAGE_PXE		/* PXE image support */
-#define IMAGE_SCRIPT		/* gPXE script image support */
-#define IMAGE_BZIMAGE		/* Linux bzImage image support */
-#define IMAGE_COMBOOT		/* SYSLINUX COMBOOT image support */
-
-#define PXE_STACK		/* PXE stack in gPXE - required for PXELINUX */
-#define PXE_MENU		/* PXE menu booting */
-#define	PXE_CMD			/* PXE commands */
-
-#define	SANBOOT_PROTO_ISCSI	/* iSCSI protocol */
-#define	SANBOOT_PROTO_AOE	/* AoE protocol */
-
-#endif /* CONFIG_DEFAULTS_PCBIOS_H */
diff --git a/gpxe/src/config/general.h b/gpxe/src/config/general.h
deleted file mode 100644
index 2f5a9387..00000000
--- a/gpxe/src/config/general.h
+++ /dev/null
@@ -1,148 +0,0 @@
-#ifndef CONFIG_GENERAL_H
-#define CONFIG_GENERAL_H
-
-/** @file
- *
- * General configuration
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#include <config/defaults.h>
-
-/*
- * Branding
- *
- * Vendors may use these strings to add their own branding to gPXE.
- * PRODUCT_NAME is displayed prior to any gPXE branding in startup
- * messages, and PRODUCT_SHORT_NAME is used where a brief product
- * label is required (e.g. in BIOS boot selection menus).
- *
- * To minimise end-user confusion, it's probably a good idea to either
- * make PRODUCT_SHORT_NAME a substring of PRODUCT_NAME or leave it as
- * "gPXE".
- *
- */
-#define PRODUCT_NAME ""
-#define PRODUCT_SHORT_NAME "gPXE"
-
-/*
- * Timer configuration
- *
- */
-#define BANNER_TIMEOUT	0	/* Tenths of a second for which the shell
-				   banner should appear */
-
-/*
- * Network protocols
- *
- */
-
-#define	NET_PROTO_IPV4		/* IPv4 protocol */
-
-/*
- * PXE support
- *
- */
-//#undef	PXE_STACK		/* PXE stack in gPXE - you want this! */
-//#undef	PXE_MENU		/* PXE menu booting */
-
-/*
- * Download protocols
- *
- */
-
-#define	DOWNLOAD_PROTO_TFTP	/* Trivial File Transfer Protocol */
-#define	DOWNLOAD_PROTO_HTTP	/* Hypertext Transfer Protocol */
-#define	DOWNLOAD_PROTO_HTTPS	/* Secure Hypertext Transfer Protocol */
-#define	DOWNLOAD_PROTO_FTP	/* File Transfer Protocol */
-#undef	DOWNLOAD_PROTO_TFTM	/* Multicast Trivial File Transfer Protocol */
-#undef	DOWNLOAD_PROTO_SLAM	/* Scalable Local Area Multicast */
-
-/*
- * SAN boot protocols
- *
- */
-
-//#undef	SANBOOT_PROTO_ISCSI	/* iSCSI protocol */
-//#undef	SANBOOT_PROTO_AOE	/* AoE protocol */
-//#undef	SANBOOT_PROTO_IB_SRP	/* Infiniband SCSI RDMA protocol */
-
-/*
- * 802.11 cryptosystems and handshaking protocols
- *
- */
-#define	CRYPTO_80211_WEP	/* WEP encryption (deprecated and insecure!) */
-#define	CRYPTO_80211_WPA	/* WPA Personal, authenticating with passphrase */
-#define	CRYPTO_80211_WPA2	/* Add support for stronger WPA cryptography */
-
-/*
- * Name resolution modules
- *
- */
-
-#define	DNS_RESOLVER		/* DNS resolver */
-
-/*
- * Image types
- *
- * Etherboot supports various image formats.  Select whichever ones
- * you want to use.
- *
- */
-//#define	IMAGE_NBI		/* NBI image support */
-//#define	IMAGE_ELF		/* ELF image support */
-//#define	IMAGE_FREEBSD		/* FreeBSD kernel image support */
-//#define	IMAGE_MULTIBOOT		/* MultiBoot image support */
-//#define	IMAGE_AOUT		/* a.out image support */
-//#define	IMAGE_WINCE		/* WinCE image support */
-//#define	IMAGE_PXE		/* PXE image support */
-//#define	IMAGE_SCRIPT		/* gPXE script image support */
-//#define	IMAGE_BZIMAGE		/* Linux bzImage image support */
-//#define	IMAGE_COMBOOT		/* SYSLINUX COMBOOT image support */
-//#define	IMAGE_EFI		/* EFI image support */
-
-/*
- * Command-line commands to include
- *
- */
-#define	AUTOBOOT_CMD		/* Automatic booting */
-#define	NVO_CMD			/* Non-volatile option storage commands */
-#define	CONFIG_CMD		/* Option configuration console */
-#define	IFMGMT_CMD		/* Interface management commands */
-#define	IWMGMT_CMD		/* Wireless interface management commands */
-#define	ROUTE_CMD		/* Routing table management commands */
-#define IMAGE_CMD		/* Image management commands */
-#define DHCP_CMD		/* DHCP management commands */
-#define SANBOOT_CMD		/* SAN boot commands */
-#define LOGIN_CMD		/* Login command */
-#undef	TIME_CMD		/* Time commands */
-#undef	DIGEST_CMD		/* Image crypto digest commands */
-//#undef	PXE_CMD			/* PXE commands */
-
-/*
- * Error message tables to include
- *
- */
-#undef	ERRMSG_80211		/* All 802.11 error descriptions (~3.3kb) */
-
-/*
- * Obscure configuration options
- *
- * You probably don't need to touch these.
- *
- */
-
-#undef	BUILD_SERIAL		/* Include an automatic build serial
-				 * number.  Add "bs" to the list of
-				 * make targets.  For example:
-				 * "make bin/rtl8139.dsk bs" */
-#undef	BUILD_ID		/* Include a custom build ID string,
-				 * e.g "test-foo" */
-#undef	NULL_TRAP		/* Attempt to catch NULL function calls */
-#undef	GDBSERIAL		/* Remote GDB debugging over serial */
-#undef	GDBUDP			/* Remote GDB debugging over UDP
-				 * (both may be set) */
-
-#endif /* CONFIG_GENERAL_H */
diff --git a/gpxe/src/config/ioapi.h b/gpxe/src/config/ioapi.h
deleted file mode 100644
index 8ddd557b..00000000
--- a/gpxe/src/config/ioapi.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef CONFIG_IOAPI_H
-#define CONFIG_IOAPI_H
-
-/** @file
- *
- * I/O API configuration
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#include <config/defaults.h>
-
-//#undef	PCIAPI_PCBIOS		/* Access via PCI BIOS */
-//#define	PCIAPI_DIRECT		/* Direct access via Type 1 accesses */
-
-#endif /* CONFIG_IOAPI_H */
diff --git a/gpxe/src/config/isa.h b/gpxe/src/config/isa.h
deleted file mode 100644
index 523be1c0..00000000
--- a/gpxe/src/config/isa.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef CONFIG_ISA_H
-#define CONFIG_ISA_H
-
-/** @file
- *
- * ISA probe address configuration
- *
- * You can override the list of addresses that will be probed by any
- * ISA drivers.
- *
- */
-#undef	ISA_PROBE_ADDRS		/* e.g. 0x200, 0x300 */
-#undef	ISA_PROBE_ONLY		/* Do not probe any other addresses */
-
-#endif /* CONFIG_ISA_H */
diff --git a/gpxe/src/config/nap.h b/gpxe/src/config/nap.h
deleted file mode 100644
index 1b981355..00000000
--- a/gpxe/src/config/nap.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef CONFIG_NAP_H
-#define CONFIG_NAP_H
-
-/** @file
- *
- * CPU sleeping
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#include <config/defaults.h>
-
-//#undef		NAP_PCBIOS
-//#define		NAP_NULL
-
-#endif /* CONFIG_NAP_H */
diff --git a/gpxe/src/config/serial.h b/gpxe/src/config/serial.h
deleted file mode 100644
index 44272d1f..00000000
--- a/gpxe/src/config/serial.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef CONFIG_SERIAL_H
-#define CONFIG_SERIAL_H
-
-/** @file
- *
- * Serial port configuration
- *
- * These options affect the operation of the serial console.  They
- * take effect only if the serial console is included using the
- * CONSOLE_SERIAL option.
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#define	COM1		0x3f8
-#define	COM2		0x2f8
-#define	COM3		0x3e8
-#define	COM4		0x2e8
-
-#define	COMCONSOLE	COM1		/* I/O port address */
-
-/* Keep settings from a previous user of the serial port (e.g. lilo or
- * LinuxBIOS), ignoring COMSPEED, COMDATA, COMPARITY and COMSTOP.
- */
-#undef	COMPRESERVE
-
-#ifndef COMPRESERVE
-#define	COMSPEED	115200		/* Baud rate */
-#define	COMDATA		8		/* Data bits */
-#define	COMPARITY	0		/* Parity: 0=None, 1=Odd, 2=Even */
-#define	COMSTOP		1		/* Stop bits */
-#endif
-
-#endif /* CONFIG_SERIAL_H */
diff --git a/gpxe/src/config/timer.h b/gpxe/src/config/timer.h
deleted file mode 100644
index cc6a93d1..00000000
--- a/gpxe/src/config/timer.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef CONFIG_TIMER_H
-#define CONFIG_TIMER_H
-
-/** @file
- *
- * Timer configuration.
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#include <config/defaults.h>
-
-//#undef		TIMER_PCBIOS
-//#define		TIMER_RDTSC
-
-#endif /* CONFIG_TIMER_H */
diff --git a/gpxe/src/config/umalloc.h b/gpxe/src/config/umalloc.h
deleted file mode 100644
index 65febf1f..00000000
--- a/gpxe/src/config/umalloc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef CONFIG_UMALLOC_H
-#define CONFIG_UMALLOC_H
-
-/** @file
- *
- * User memory allocation API configuration
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#include <config/defaults.h>
-
-#endif /* CONFIG_UMALLOC_H */