forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c 
 kernel/scripts/kconfig/Makefile
....@@ -20,19 +20,19 @@
2020 unexport CONFIG_
2121 
2222 xconfig: $(obj)/qconf
23
-	$< $(silent) $(Kconfig)
23
+	$(Q)$< $(silent) $(Kconfig)
2424 
2525 gconfig: $(obj)/gconf
26
-	$< $(silent) $(Kconfig)
26
+	$(Q)$< $(silent) $(Kconfig)
2727 
2828 menuconfig: $(obj)/mconf
29
-	$< $(silent) $(Kconfig)
29
+	$(Q)$< $(silent) $(Kconfig)
3030 
3131 config: $(obj)/conf
32
-	$< $(silent) --oldaskconfig $(Kconfig)
32
+	$(Q)$< $(silent) --oldaskconfig $(Kconfig)
3333 
3434 nconfig: $(obj)/nconf
35
-	$< $(silent) $(Kconfig)
35
+	$(Q)$< $(silent) $(Kconfig)
3636 
3737 build_menuconfig: $(obj)/mconf
3838 
....@@ -43,16 +43,16 @@
4343 build_xconfig: $(obj)/qconf
4444 
4545 localyesconfig localmodconfig: $(obj)/conf
46
-	$(Q)perl $(srctree)/$(src)/streamline_config.pl --$@ $(srctree) $(Kconfig) > .tmp.config
47
-	$(Q)if [ -f .config ]; then 					\
48
-			cmp -s .tmp.config .config ||			\
49
-			(mv -f .config .config.old.1;			\
50
-			 mv -f .tmp.config .config;			\
51
-			 $< $(silent) --oldconfig $(Kconfig);		\
52
-			 mv -f .config.old.1 .config.old)		\
53
-	else								\
54
-			mv -f .tmp.config .config;			\
55
-			$< $(silent) --oldconfig $(Kconfig);		\
46
+	$(Q)$(PERL) $(srctree)/$(src)/streamline_config.pl --$@ $(srctree) $(Kconfig) > .tmp.config
47
+	$(Q)if [ -f .config ]; then 				\
48
+		cmp -s .tmp.config .config ||			\
49
+		(mv -f .config .config.old.1;			\
50
+		 mv -f .tmp.config .config;			\
51
+		 $< $(silent) --oldconfig $(Kconfig);		\
52
+		 mv -f .config.old.1 .config.old)		\
53
+	else							\
54
+		mv -f .tmp.config .config;			\
55
+		$< $(silent) --oldconfig $(Kconfig);		\
5656 	fi
5757 	$(Q)rm -f .tmp.config
5858 
....@@ -62,42 +62,26 @@
6262 #  syncconfig has become an internal implementation detail and is now
6363 #  deprecated for external use
6464 simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
65
-	alldefconfig randconfig listnewconfig olddefconfig syncconfig
65
+	alldefconfig randconfig listnewconfig olddefconfig syncconfig \
66
+	helpnewconfig yes2modconfig mod2yesconfig
67
+
6668 PHONY += $(simple-targets)
6769 
6870 $(simple-targets): $(obj)/conf
69
-	$< $(silent) --$@ $(Kconfig)
71
+	$(Q)$< $(silent) --$@ $(Kconfig)
7072 
71
-PHONY += oldnoconfig silentoldconfig savedefconfig defconfig
72
-
73
-# oldnoconfig is an alias of olddefconfig, because people already are dependent
74
-# on its behavior (sets new symbols to their default value but not 'n') with the
75
-# counter-intuitive name.
76
-oldnoconfig: olddefconfig
77
-	@echo "  WARNING: \"oldnoconfig\" target will be removed after Linux 4.19"
78
-	@echo "            Please use \"olddefconfig\" instead, which is an alias."
79
-
80
-# We do not expect manual invokcation of "silentoldcofig" (or "syncconfig").
81
-silentoldconfig: syncconfig
82
-	@echo "  WARNING: \"silentoldconfig\" has been renamed to \"syncconfig\""
83
-	@echo "            and is now an internal implementation detail."
84
-	@echo "            What you want is probably \"oldconfig\"."
85
-	@echo "            \"silentoldconfig\" will be removed after Linux 4.19"
73
+PHONY += savedefconfig defconfig
8674 
8775 savedefconfig: $(obj)/conf
88
-	$< $(silent) --$@=defconfig $(Kconfig)
76
+	$(Q)$< $(silent) --$@=defconfig $(Kconfig)
8977 
9078 defconfig: $(obj)/conf
91
-ifeq ($(KBUILD_DEFCONFIG),)
92
-	$< $(silent) --defconfig $(Kconfig)
93
-else
9479 ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)
9580 	@$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
9681 	$(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
9782 else
9883 	@$(kecho) "*** Default configuration is based on target '$(KBUILD_DEFCONFIG)'"
9984 	$(Q)$(MAKE) -f $(srctree)/Makefile $(KBUILD_DEFCONFIG)
100
-endif
10185 endif
10286 
10387 %_defconfig: $(obj)/conf
....@@ -108,15 +92,17 @@
10892 %.config: $(obj)/conf
10993 	$(if $(call configfiles),, $(error No configuration exists for this target on this architecture))
11094 	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(configfiles)
111
-	+$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig
95
+	$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
11296 
11397 PHONY += kvmconfig
11498 kvmconfig: kvm_guest.config
115
-	@:
99
+	@echo >&2 "WARNING: 'make $@' will be removed after Linux 5.10"
100
+	@echo >&2 "         Please use 'make $<' instead."
116101 
117102 PHONY += xenconfig
118103 xenconfig: xen.config
119
-	@:
104
+	@echo >&2 "WARNING: 'make $@' will be removed after Linux 5.10"
105
+	@echo >&2 "         Please use 'make $<' instead."
120106 
121107 PHONY += tinyconfig
122108 tinyconfig:
....@@ -125,10 +111,10 @@
125111 # CHECK: -o cache_dir=<path> working?
126112 PHONY += testconfig
127113 testconfig: $(obj)/conf
128
-	$(PYTHON3) -B -m pytest $(srctree)/$(src)/tests \
114
+	$(Q)$(PYTHON3) -B -m pytest $(srctree)/$(src)/tests \
129115 	-o cache_dir=$(abspath $(obj)/tests/.cache) \
130116 	$(if $(findstring 1,$(KBUILD_VERBOSE)),--capture=no)
131
-clean-dirs += tests/.cache
117
+clean-files += tests/.cache
132118 
133119 # Help text used by make help
134120 help:
....@@ -139,7 +125,9 @@
139125 	@echo  '  gconfig	  - Update current config utilising a GTK+ based front-end'
140126 	@echo  '  oldconfig	  - Update current config utilising a provided .config as base'
141127 	@echo  '  localmodconfig  - Update current config disabling modules not loaded'
128
+	@echo  '                    except those preserved by LMC_KEEP environment variable'
142129 	@echo  '  localyesconfig  - Update current config converting local mods to core'
130
+	@echo  '                    except those preserved by LMC_KEEP environment variable'
143131 	@echo  '  defconfig	  - New config with default from ARCH supplied defconfig'
144132 	@echo  '  savedefconfig   - Save current config as ./defconfig (minimal config)'
145133 	@echo  '  allnoconfig	  - New config where all options are answered with no'
....@@ -147,84 +135,82 @@
147135 	@echo  '  allmodconfig	  - New config selecting modules when possible'
148136 	@echo  '  alldefconfig    - New config with all symbols set to default'
149137 	@echo  '  randconfig	  - New config with random answer to all options'
138
+	@echo  '  yes2modconfig	  - Change answers from yes to mod if possible'
139
+	@echo  '  mod2yesconfig	  - Change answers from mod to yes if possible'
150140 	@echo  '  listnewconfig   - List new options'
141
+	@echo  '  helpnewconfig   - List new options and help text'
151142 	@echo  '  olddefconfig	  - Same as oldconfig but sets new symbols to their'
152143 	@echo  '                    default value without prompting'
153
-	@echo  '  kvmconfig	  - Enable additional options for kvm guest kernel support'
154
-	@echo  '  xenconfig       - Enable additional options for xen dom0 and guest kernel support'
155144 	@echo  '  tinyconfig	  - Configure the tiniest possible kernel'
156145 	@echo  '  testconfig	  - Run Kconfig unit tests (requires python3 and pytest)'
157146 
158147 # ===========================================================================
159
-# Shared Makefile for the various kconfig executables:
160
-# conf:	  Used for defconfig, oldconfig and related targets
161148 # object files used by all kconfig flavours
149
+common-objs	:= confdata.o expr.o lexer.lex.o parser.tab.o preprocess.o \
150
+		   symbol.o util.o
162151 
163
-conf-objs	:= conf.o  zconf.tab.o
152
+$(obj)/lexer.lex.o: $(obj)/parser.tab.h
153
+HOSTCFLAGS_lexer.lex.o	:= -I $(srctree)/$(src)
154
+HOSTCFLAGS_parser.tab.o	:= -I $(srctree)/$(src)
164155 
165
-hostprogs-y := conf
166
-
167
-targets		+= zconf.lex.c
168
-
169
-# generated files seem to need this to find local include files
170
-HOSTCFLAGS_zconf.lex.o	:= -I$(src)
171
-HOSTCFLAGS_zconf.tab.o	:= -I$(src)
156
+# conf: Used for defconfig, oldconfig and related targets
157
+hostprogs	+= conf
158
+conf-objs	:= conf.o $(common-objs)
172159 
173160 # nconf: Used for the nconfig target based on ncurses
174
-hostprogs-y	+= nconf
175
-nconf-objs	:= nconf.o zconf.tab.o nconf.gui.o
161
+hostprogs	+= nconf
162
+nconf-objs	:= nconf.o nconf.gui.o $(common-objs)
176163 
177
-HOSTLDLIBS_nconf	= $(shell . $(obj)/.nconf-cfg && echo $$libs)
178
-HOSTCFLAGS_nconf.o	= $(shell . $(obj)/.nconf-cfg && echo $$cflags)
179
-HOSTCFLAGS_nconf.gui.o	= $(shell . $(obj)/.nconf-cfg && echo $$cflags)
164
+HOSTLDLIBS_nconf	= $(shell . $(obj)/nconf-cfg && echo $$libs)
165
+HOSTCFLAGS_nconf.o	= $(shell . $(obj)/nconf-cfg && echo $$cflags)
166
+HOSTCFLAGS_nconf.gui.o	= $(shell . $(obj)/nconf-cfg && echo $$cflags)
180167 
181
-$(obj)/nconf.o $(obj)/nconf.gui.o: $(obj)/.nconf-cfg
168
+$(obj)/nconf.o $(obj)/nconf.gui.o: $(obj)/nconf-cfg
182169 
183170 # mconf: Used for the menuconfig target based on lxdialog
184
-hostprogs-y	+= mconf
185
-lxdialog	:= checklist.o inputbox.o menubox.o textbox.o util.o yesno.o
186
-mconf-objs	:= mconf.o zconf.tab.o $(addprefix lxdialog/, $(lxdialog))
171
+hostprogs	+= mconf
172
+lxdialog	:= $(addprefix lxdialog/, \
173
+		     checklist.o inputbox.o menubox.o textbox.o util.o yesno.o)
174
+mconf-objs	:= mconf.o $(lxdialog) $(common-objs)
187175 
188
-HOSTLDLIBS_mconf = $(shell . $(obj)/.mconf-cfg && echo $$libs)
176
+HOSTLDLIBS_mconf = $(shell . $(obj)/mconf-cfg && echo $$libs)
189177 $(foreach f, mconf.o $(lxdialog), \
190
-  $(eval HOSTCFLAGS_$f = $$(shell . $(obj)/.mconf-cfg && echo $$$$cflags)))
178
+  $(eval HOSTCFLAGS_$f = $$(shell . $(obj)/mconf-cfg && echo $$$$cflags)))
191179 
192
-$(obj)/mconf.o: $(obj)/.mconf-cfg
193
-$(addprefix $(obj)/lxdialog/, $(lxdialog)): $(obj)/.mconf-cfg
180
+$(addprefix $(obj)/, mconf.o $(lxdialog)): $(obj)/mconf-cfg
194181 
195182 # qconf: Used for the xconfig target based on Qt
196
-hostprogs-y	+= qconf
197
-qconf-cxxobjs	:= qconf.o
198
-qconf-objs	:= zconf.tab.o
183
+hostprogs	+= qconf
184
+qconf-cxxobjs	:= qconf.o qconf-moc.o
185
+qconf-objs	:= images.o $(common-objs)
199186 
200
-HOSTLDLIBS_qconf	= $(shell . $(obj)/.qconf-cfg && echo $$libs)
201
-HOSTCXXFLAGS_qconf.o	= $(shell . $(obj)/.qconf-cfg && echo $$cflags)
187
+HOSTLDLIBS_qconf	= $(shell . $(obj)/qconf-cfg && echo $$libs)
188
+HOSTCXXFLAGS_qconf.o	= $(shell . $(obj)/qconf-cfg && echo $$cflags)
189
+HOSTCXXFLAGS_qconf-moc.o = $(shell . $(obj)/qconf-cfg && echo $$cflags)
202190 
203
-$(obj)/qconf.o: $(obj)/.qconf-cfg $(obj)/qconf.moc
191
+$(obj)/qconf.o: $(obj)/qconf-cfg
204192 
205193 quiet_cmd_moc = MOC     $@
206
-      cmd_moc = $(shell . $(obj)/.qconf-cfg && echo $$moc) -i $< -o $@
194
+      cmd_moc = $(shell . $(obj)/qconf-cfg && echo $$moc) $< -o $@
207195 
208
-$(obj)/%.moc: $(src)/%.h $(obj)/.qconf-cfg
209
-	$(call cmd,moc)
196
+$(obj)/qconf-moc.cc: $(src)/qconf.h $(obj)/qconf-cfg FORCE
197
+	$(call if_changed,moc)
198
+
199
+targets += qconf-moc.cc
210200 
211201 # gconf: Used for the gconfig target based on GTK+
212
-hostprogs-y	+= gconf
213
-gconf-objs	:= gconf.o zconf.tab.o
202
+hostprogs	+= gconf
203
+gconf-objs	:= gconf.o images.o $(common-objs)
214204 
215
-HOSTLDLIBS_gconf    = $(shell . $(obj)/.gconf-cfg && echo $$libs)
216
-HOSTCFLAGS_gconf.o  = $(shell . $(obj)/.gconf-cfg && echo $$cflags)
205
+HOSTLDLIBS_gconf    = $(shell . $(obj)/gconf-cfg && echo $$libs)
206
+HOSTCFLAGS_gconf.o  = $(shell . $(obj)/gconf-cfg && echo $$cflags)
217207 
218
-$(obj)/gconf.o: $(obj)/.gconf-cfg
219
-
220
-$(obj)/zconf.tab.o: $(obj)/zconf.lex.c
208
+$(obj)/gconf.o: $(obj)/gconf-cfg
221209 
222210 # check if necessary packages are available, and configure build flags
223
-define filechk_conf_cfg
224
-	$(CONFIG_SHELL) $<
225
-endef
211
+filechk_conf_cfg = $(CONFIG_SHELL) $<
226212 
227
-$(obj)/.%conf-cfg: $(src)/%conf-cfg.sh FORCE
213
+$(obj)/%conf-cfg: $(src)/%conf-cfg.sh FORCE
228214 	$(call filechk,conf_cfg)
229215 
230
-clean-files += .*conf-cfg
216
+clean-files += *conf-cfg