diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-14 12:46:41 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-14 12:46:41 +0200 |
| commit | d2bb6342d6a812f3ff0dcf17180c0b01b85cacfb (patch) | |
| tree | 662664ac398af8749af7f3c69bb298394a0fc057 /scripts | |
| parent | e9299c644a17b7ae6a91d3a4b6ccdd9acba443fe (diff) | |
| parent | 8fc0a99f32ea083b2e0eee217c813cf36aa8c521 (diff) | |
| download | barebox-d2bb6342d6a812f3ff0dcf17180c0b01b85cacfb.tar.gz barebox-d2bb6342d6a812f3ff0dcf17180c0b01b85cacfb.tar.xz | |
Merge branch 'for-next/misc' into master
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/dtc/Makefile | 2 | ||||
| -rw-r--r-- | scripts/kwboot.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile index 06a265cf7b..721e8e2b8c 100644 --- a/scripts/dtc/Makefile +++ b/scripts/dtc/Makefile @@ -14,7 +14,7 @@ libfdt-objs := $(libfdt-objs:%.o=libfdt/%.o) fdtget-objs += fdtget.o $(libfdt-objs) util.o # Source files need to get at the userspace version of libfdt_env.h to compile -HOST_EXTRACFLAGS := -I$(src)/libfdt +HOST_EXTRACFLAGS += -I$(src)/libfdt ifeq ($(wildcard /usr/include/yaml.h),) ifneq ($(CHECK_DTBS),) diff --git a/scripts/kwboot.c b/scripts/kwboot.c index 43b8b8cbcd..60e8a69d18 100644 --- a/scripts/kwboot.c +++ b/scripts/kwboot.c @@ -504,7 +504,7 @@ kwboot_term_pipe(int in, int out, char *quit, int *s) ssize_t nin, nout; char _buf[128], *buf = _buf; - nin = read(in, buf, sizeof(buf)); + nin = read(in, _buf, sizeof(_buf)); if (nin < 0) return -1; |