projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rockchip: rk3188: Add core support
[oweals/u-boot.git]
/
scripts
/
Makefile.autoconf
diff --git
a/scripts/Makefile.autoconf
b/scripts/Makefile.autoconf
index f054081c98959ccbfd0cbd3acbd660fd2b40637c..2a967ff6f33a8b2594482fbf1d04b726649a48e0 100644
(file)
--- a/
scripts/Makefile.autoconf
+++ b/
scripts/Makefile.autoconf
@@
-6,6
+6,9
@@
# When our migration to Kconfig is done
# (= When we move all CONFIGs from header files to Kconfig)
# this makefile can be deleted.
# When our migration to Kconfig is done
# (= When we move all CONFIGs from header files to Kconfig)
# this makefile can be deleted.
+#
+# SPDX-License-Identifier: GPL-2.0
+#
__all: include/autoconf.mk include/autoconf.mk.dep
__all: include/autoconf.mk include/autoconf.mk.dep
@@
-43,7
+46,7
@@
quiet_cmd_autoconf_dep = GEN $@
-MQ include/config/auto.conf $(srctree)/include/common.h > $@ || { \
rm $@; false; \
}
-MQ include/config/auto.conf $(srctree)/include/common.h > $@ || { \
rm $@; false; \
}
-include/autoconf.mk.dep: FORCE
+include/autoconf.mk.dep:
include/config.h
FORCE
$(call cmd,autoconf_dep)
# We are migrating from board headers to Kconfig little by little.
$(call cmd,autoconf_dep)
# We are migrating from board headers to Kconfig little by little.
@@
-55,31
+58,44
@@
include/autoconf.mk.dep: FORCE
# same CONFIG macros
quiet_cmd_autoconf = GEN $@
cmd_autoconf = \
# same CONFIG macros
quiet_cmd_autoconf = GEN $@
cmd_autoconf = \
- $(CPP) $(c_flags) $2 -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && { \
- sed -n -f $(srctree)/tools/scripts/define2mk.sed $@.tmp | \
+ sed -n -f $(srctree)/tools/scripts/define2mk.sed $< | \
while read line; do \
while read line; do \
- if ! grep -q "$${line%=*}=" include/config/auto.conf; then \
+ if [ -n "${KCONFIG_IGNORE_DUPLICATES}" ] || \
+ ! grep -q "$${line%=*}=" include/config/auto.conf; then \
echo "$$line"; \
fi \
echo "$$line"; \
fi \
- done > $@; \
- rm $@.tmp; \
- } || { \
- rm $@.tmp; false; \
+ done > $@
+
+quiet_cmd_u_boot_cfg = CFG $@
+ cmd_u_boot_cfg = \
+ $(CPP) $(c_flags) $2 -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && { \
+ grep 'define CONFIG_' $@.tmp > $@; \
+ rm $@.tmp; \
+ } || { \
+ rm $@.tmp; false; \
}
}
-include/autoconf.mk: FORCE
- $(call cmd,autoconf)
+u-boot.cfg: include/config.h FORCE
+ $(call cmd,u_boot_cfg)
+
+spl/u-boot.cfg: include/config.h FORCE
+ $(Q)mkdir -p $(dir $@)
+ $(call cmd,u_boot_cfg,-DCONFIG_SPL_BUILD)
-
spl/include/autoconf.mk:
FORCE
+
tpl/u-boot.cfg: include/config.h
FORCE
$(Q)mkdir -p $(dir $@)
$(Q)mkdir -p $(dir $@)
- $(call cmd,autoconf,-DCONFIG_SPL_BUILD)
+ $(call cmd,u_boot_cfg,-DCONFIG_SPL_BUILD -DCONFIG_TPL_BUILD)
+
+include/autoconf.mk: u-boot.cfg
+ $(call cmd,autoconf)
-tpl/include/autoconf.mk: FORCE
+spl/include/autoconf.mk: spl/u-boot.cfg
$(Q)mkdir -p $(dir $@)
$(Q)mkdir -p $(dir $@)
- $(call cmd,autoconf
,-DCONFIG_SPL_BUILD -DCONFIG_TPL_BUILD
)
+ $(call cmd,autoconf)
-include/autoconf.mk include/autoconf.mk.dep \
- spl/include/autoconf.mk tpl/include/autoconf.mk: include/config.h
+tpl/include/autoconf.mk: tpl/u-boot.cfg
+ $(Q)mkdir -p $(dir $@)
+ $(call cmd,autoconf)
# include/config.h
# Prior to Kconfig, it was generated by mkconfig. Now it is created here.
# include/config.h
# Prior to Kconfig, it was generated by mkconfig. Now it is created here.
@@
-94,6
+110,7
@@
define filechk_config_h
echo \#include \<config_uncmd_spl.h\>; \
echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \
echo \#include \<asm/config.h\>; \
echo \#include \<config_uncmd_spl.h\>; \
echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \
echo \#include \<asm/config.h\>; \
+ echo \#include \<linux/kconfig.h\>; \
echo \#include \<config_fallbacks.h\>;)
endef
echo \#include \<config_fallbacks.h\>;)
endef
@@
-106,6
+123,7
@@
include/config.h: scripts/Makefile.autoconf create_symlink FORCE
# Otherwise, create a symbolic link to arch/$(ARCH)/include/asm/arch-$(SOC).
PHONY += create_symlink
create_symlink:
# Otherwise, create a symbolic link to arch/$(ARCH)/include/asm/arch-$(SOC).
PHONY += create_symlink
create_symlink:
+ifdef CONFIG_CREATE_ARCH_SYMLINK
ifneq ($(KBUILD_SRC),)
$(Q)mkdir -p include/asm
$(Q)if [ -d $(KBUILD_SRC)/arch/$(ARCH)/mach-$(SOC)/include/mach ]; then \
ifneq ($(KBUILD_SRC),)
$(Q)mkdir -p include/asm
$(Q)if [ -d $(KBUILD_SRC)/arch/$(ARCH)/mach-$(SOC)/include/mach ]; then \
@@
-122,6
+140,7
@@
else
fi; \
ln -fsn $$dest arch/$(ARCH)/include/asm/arch
endif
fi; \
ln -fsn $$dest arch/$(ARCH)/include/asm/arch
endif
+endif
PHONY += FORCE
FORCE:
PHONY += FORCE
FORCE: