summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2024-01-12 08:34:50 -0500
committerTom Rini <[email protected]>2024-01-12 08:34:50 -0500
commit547d3dd28a46a18d59e00a153c8becca8d4e8cf9 (patch)
tree79a09ba118b2b4d3001bfd478206734d2727f4f7 /scripts
parent2ee7a8ec6f1711abe9619fd8765edc16742be9de (diff)
parent2027e99e61aab6fd8b06e2d752e0e538cff26eb6 (diff)
Merge branch '2024-01-12-assorted-fixes'
- Allow defconfigs to #include files (so we can construct a defconfig from fragments), update phy-mtk-tphy binding, assorted test fixes, allow building host tools without cryptographic libraries again, android_ab bugfix, and make some SPL debugging cases easier.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 2d97aab8d21..5ce5845e824 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -93,7 +93,8 @@ endif
endif
%_defconfig: $(obj)/conf
- $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
+ $(Q)$(CPP) -nostdinc -I $(srctree) -undef -x assembler-with-cpp $(srctree)/arch/$(SRCARCH)/configs/$@ -o generated_defconfig
+ $(Q)$< $(silent) --defconfig=generated_defconfig $(Kconfig)
# Added for U-Boot (backward compatibility)
%_config: %_defconfig