diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-04-08 13:37:28 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-04-08 13:37:28 +0200 |
| commit | ca275c3ef10906d1cd5c7d40ab78b2fad0a0c181 (patch) | |
| tree | defb48af7383a59f3842eb4aab87d23cb3ce94f8 /scripts | |
| parent | 78c371d3e76266747ed7335adaf1d04945e53776 (diff) | |
| parent | b3d5c43cb8a2d492355afba6c7139ba824b7f128 (diff) | |
| download | barebox-ca275c3ef10906d1cd5c7d40ab78b2fad0a0c181.tar.gz barebox-ca275c3ef10906d1cd5c7d40ab78b2fad0a0c181.tar.xz | |
Merge branch 'for-next/imd'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile | 3 | ||||
| -rw-r--r-- | scripts/bareboximd.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scripts/Makefile b/scripts/Makefile index aeedcac58b..a5c16b2f31 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -45,12 +45,13 @@ targetprogs-$(CONFIG_IMD_TARGET) += bareboximd-target subdir- += basic kconfig setupmbr quiet_cmd_csingle = CC $@ - cmd_csingle = $(CC) -Wp,-MD,$(depfile) $(CFLAGS) -o $@ $< + cmd_csingle = $(CC) -Wp,-MD,$(depfile) $(TARGETCFLAGS) $(CFLAGS) -o $@ $< __targetprogs := $(sort $(targetprogs-y) $(targetprogs-m)) target-csingle := $(foreach m,$(__targetprogs),$(if $($(m)-objs),,$(m))) __targetprogs := $(addprefix $(obj)/,$(__targetprogs)) target-csingle := $(addprefix $(obj)/,$(target-csingle)) +TARGETCFLAGS += -I$(srctree)/scripts/include/ always := $(hostprogs-y) $(hostprogs-m) $(targetprogs-y) diff --git a/scripts/bareboximd.c b/scripts/bareboximd.c index a3622af821..d4da681eca 100644 --- a/scripts/bareboximd.c +++ b/scripts/bareboximd.c @@ -33,6 +33,7 @@ #include <string.h> #include <errno.h> #include <stdarg.h> +#include <linux/err.h> #include "../include/image-metadata.h" |