diff options
| author | Tom Rini <trini@konsulko.com> | 2020-08-05 16:05:33 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-08-05 16:05:33 -0400 |
| commit | 635dfee2cb522f5072530ca63fd4ab02890b90a2 (patch) | |
| tree | 8abedb1958a51367a9a08922eea3d33cfb6035f4 /scripts | |
| parent | f1c0b7cd4be2081ae3711cec2c4cc2910a5817e1 (diff) | |
| parent | 7b27e0fe13d8d44da6cd357a69668a726b852502 (diff) | |
Merge branch '2020-08-05-misc-fixes'
- A large number of assorted fixes and minor improvements
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.lib | 2 | ||||
| -rw-r--r-- | scripts/basic/fixdep.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 734001c952a..56e9d542429 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -311,7 +311,7 @@ cmd_dt_S_dtb= \ $(obj)/%.dtb.S: $(obj)/%.dtb $(call cmd,dt_S_dtb) -ifeq ($(CONFIG_SPL_LOAD_FIT_APPLY_OVERLAY),y) +ifeq ($(CONFIG_OF_LIBFDT_OVERLAY),y) DTC_FLAGS += -@ endif diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index 958668df554..6d59cf8c07e 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c @@ -266,7 +266,7 @@ static void parse_config_file(const char *p) (q - p == 9 && !memcmp(p, "IS_MODULE(", 10)) || (q - p == 3 && !memcmp(p, "VAL(", 4))) { p = q + 1; - q = p; + q = p; while (isalnum(*q) || *q == '_') q++; r = q; |