ARM inmates are now platform independant. This means that config.h is no strict requirement any longer.
Linker scripts for inmates include config.h to get the CONFIG_INMATE_BASE parameter, if defined. Rather than include config.h in the linker file, let the compiler include the file if it exists. Signed-off-by: Ralf Ramsauer <[email protected]> --- inmates/Makefile | 7 ++++--- inmates/lib/arm/inmate.lds.S | 2 -- inmates/lib/arm64/inmate.lds.S | 2 -- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/inmates/Makefile b/inmates/Makefile index a8bcf7aa..96914d52 100644 --- a/inmates/Makefile +++ b/inmates/Makefile @@ -26,15 +26,16 @@ else LDFLAGS += --gc-sections endif +ifneq ($(wildcard $(INC_CONFIG_H)),) +INCLUDES += -include $(INC_CONFIG_H) +endif + LINUXINCLUDE := $(INCLUDES) KBUILD_CFLAGS := -g -Os -Wall -Wstrict-prototypes -Wtype-limits \ -Wmissing-declarations -Wmissing-prototypes \ -fno-strict-aliasing -fomit-frame-pointer -fno-pic \ -fno-common -fno-stack-protector -ffreestanding \ -D__LINUX_COMPILER_TYPES_H -ifneq ($(wildcard $(INC_CONFIG_H)),) -KBUILD_CFLAGS += -include $(INC_CONFIG_H) -endif OBJCOPYFLAGS := -O binary LDFLAGS += -T diff --git a/inmates/lib/arm/inmate.lds.S b/inmates/lib/arm/inmate.lds.S index bfb570d8..b516abb9 100644 --- a/inmates/lib/arm/inmate.lds.S +++ b/inmates/lib/arm/inmate.lds.S @@ -38,8 +38,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include <jailhouse/config.h> - #ifndef CONFIG_INMATE_BASE #define CONFIG_INMATE_BASE 0x0 #endif diff --git a/inmates/lib/arm64/inmate.lds.S b/inmates/lib/arm64/inmate.lds.S index dad64bc5..4ac4bdc2 100644 --- a/inmates/lib/arm64/inmate.lds.S +++ b/inmates/lib/arm64/inmate.lds.S @@ -36,8 +36,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include <jailhouse/config.h> - #ifndef CONFIG_INMATE_BASE #define CONFIG_INMATE_BASE 0x0 #endif -- 2.17.0 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
