summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-06-11 11:33:34 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-06-11 11:33:34 +0200
commit06b8bc4d708b8ff4eba1dd9b48ec110a8019d2c8 (patch)
tree3c7c238c81aa91405159959906f31f6195aa6217 /scripts
parentb697fba4a5c5395a9db271efa286870191418040 (diff)
parentb917f7864115a35fbb9e69af2c1d553a110a37fc (diff)
downloadbarebox-06b8bc4d708b8ff4eba1dd9b48ec110a8019d2c8.tar.gz
barebox-06b8bc4d708b8ff4eba1dd9b48ec110a8019d2c8.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Kbuild.include5
-rw-r--r--scripts/kwboot.c6
2 files changed, 3 insertions, 8 deletions
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 5fa7f16e12..5e7255db3a 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -129,11 +129,6 @@ cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))
# Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
cc-ifversion = $(shell [ $(call cc-version, $(CC)) $(1) $(2) ] && echo $(3))
-# cc-ldoption
-# Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)
-cc-ldoption = $(call try-run,\
- $(CC) $(1) -nostdlib -xc /dev/null -o "$$TMP",$(1),$(2))
-
# ld-option
# Usage: LDFLAGS += $(call ld-option, -X)
ld-option = $(call try-run,\
diff --git a/scripts/kwboot.c b/scripts/kwboot.c
index df52144e45..43b8b8cbcd 100644
--- a/scripts/kwboot.c
+++ b/scripts/kwboot.c
@@ -378,10 +378,10 @@ kwboot_xm_resync(int fd)
* there is another problem.
*/
int rc;
- char buf[sizeof(struct kwboot_block)];
+ uint8_t buf[sizeof(struct kwboot_block)];
unsigned interval = 1;
unsigned len;
- char *p = buf;
+ uint8_t *p = buf;
memset(buf, 0xff, sizeof(buf));
@@ -407,7 +407,7 @@ static int
kwboot_xm_sendblock(int fd, struct kwboot_block *block)
{
int rc, retries;
- char c;
+ uint8_t c;
retries = 16;
do {