From bf63fb062682256c8ec892647e22e99d9b2e507d Mon Sep 17 00:00:00 2001 From: Mikaela RJ Szekely Date: Sun, 13 May 2018 02:08:44 -0400 Subject: [PATCH] Allow for untracked config.h --- fusee/fusee-primary/Makefile | 4 ++++ fusee/fusee-primary/src/main.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/fusee/fusee-primary/Makefile b/fusee/fusee-primary/Makefile index a6ae3eb22..c6ac0ea1e 100644 --- a/fusee/fusee-primary/Makefile +++ b/fusee/fusee-primary/Makefile @@ -30,6 +30,10 @@ CFLAGS = \ -fstrict-volatile-bitfields \ -DFUSEE_STAGE1_SRC +ifneq (,$(wildcard src/config.h)) + CFLAGS += -DHAS_CONFIG_H +endif + LDFLAGS = -specs=linker.specs -g $(ARCH) objects = $(patsubst $(dir_source)/%.s, $(dir_build)/%.o, \ diff --git a/fusee/fusee-primary/src/main.c b/fusee/fusee-primary/src/main.c index 4234b1672..c72dc035f 100644 --- a/fusee/fusee-primary/src/main.c +++ b/fusee/fusee-primary/src/main.c @@ -10,6 +10,10 @@ #include "lib/printk.h" #include "display/video_fb.h" +#ifdef HAS_CONFIG_H +#include "config.h" +#endif + extern void (*__program_exit_callback)(int rc); static void *g_framebuffer;