mirror of
https://github.com/torvalds/linux
synced 2024-10-08 20:34:15 +00:00
129ab0d2d9
The previous commit fixed up all shell scripts to not include
include/config/auto.conf.
Now that include/config/auto.conf is only included by Makefiles,
we can change it into a more Make-friendly form.
Previously, Kconfig output string values enclosed with double-quotes
(both in the .config and include/config/auto.conf):
CONFIG_X="foo bar"
Unlike shell, Make handles double-quotes (and single-quotes as well)
verbatim. We must rip them off when used.
There are some patterns:
[1] $(patsubst "%",%,$(CONFIG_X))
[2] $(CONFIG_X:"%"=%)
[3] $(subst ",,$(CONFIG_X))
[4] $(shell echo $(CONFIG_X))
These are not only ugly, but also fragile.
[1] and [2] do not work if the value contains spaces, like
CONFIG_X=" foo bar "
[3] does not work correctly if the value contains double-quotes like
CONFIG_X="foo\"bar"
[4] seems to work better, but has a cost of forking a process.
Anyway, quoted strings were always PITA for our Makefiles.
This commit changes Kconfig to stop quoting in include/config/auto.conf.
These are the string type symbols referenced in Makefiles or scripts:
ACPI_CUSTOM_DSDT_FILE
ARC_BUILTIN_DTB_NAME
ARC_TUNE_MCPU
BUILTIN_DTB_SOURCE
CC_IMPLICIT_FALLTHROUGH
CC_VERSION_TEXT
CFG80211_EXTRA_REGDB_KEYDIR
EXTRA_FIRMWARE
EXTRA_FIRMWARE_DIR
EXTRA_TARGETS
H8300_BUILTIN_DTB
INITRAMFS_SOURCE
LOCALVERSION
MODULE_SIG_HASH
MODULE_SIG_KEY
NDS32_BUILTIN_DTB
NIOS2_DTB_SOURCE
OPENRISC_BUILTIN_DTB
SOC_CANAAN_K210_DTB_SOURCE
SYSTEM_BLACKLIST_HASH_LIST
SYSTEM_REVOCATION_KEYS
SYSTEM_TRUSTED_KEYS
TARGET_CPU
UNUSED_KSYMS_WHITELIST
XILINX_MICROBLAZE0_FAMILY
XILINX_MICROBLAZE0_HW_VER
XTENSA_VARIANT_NAME
I checked them one by one, and fixed up the code where necessary.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
43 lines
1.5 KiB
Makefile
43 lines
1.5 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
obj-y += main.o
|
|
|
|
# Create $(fwdir) from $(CONFIG_EXTRA_FIRMWARE_DIR) -- if it doesn't have a
|
|
# leading /, it's relative to $(srctree).
|
|
fwdir := $(CONFIG_EXTRA_FIRMWARE_DIR)
|
|
fwdir := $(addprefix $(srctree)/,$(filter-out /%,$(fwdir)))$(filter /%,$(fwdir))
|
|
|
|
firmware := $(addsuffix .gen.o, $(CONFIG_EXTRA_FIRMWARE))
|
|
obj-y += $(firmware)
|
|
|
|
FWNAME = $(patsubst $(obj)/%.gen.S,%,$@)
|
|
FWSTR = $(subst $(comma),_,$(subst /,_,$(subst .,_,$(subst -,_,$(FWNAME)))))
|
|
ASM_WORD = $(if $(CONFIG_64BIT),.quad,.long)
|
|
ASM_ALIGN = $(if $(CONFIG_64BIT),3,2)
|
|
PROGBITS = $(if $(CONFIG_ARM),%,@)progbits
|
|
|
|
filechk_fwbin = \
|
|
echo "/* Generated by $(src)/Makefile */" ;\
|
|
echo " .section .rodata" ;\
|
|
echo " .p2align 4" ;\
|
|
echo "_fw_$(FWSTR)_bin:" ;\
|
|
echo " .incbin \"$(fwdir)/$(FWNAME)\"" ;\
|
|
echo "_fw_end:" ;\
|
|
echo " .section .rodata.str,\"aMS\",$(PROGBITS),1" ;\
|
|
echo " .p2align $(ASM_ALIGN)" ;\
|
|
echo "_fw_$(FWSTR)_name:" ;\
|
|
echo " .string \"$(FWNAME)\"" ;\
|
|
echo " .section .builtin_fw,\"a\",$(PROGBITS)" ;\
|
|
echo " .p2align $(ASM_ALIGN)" ;\
|
|
echo " $(ASM_WORD) _fw_$(FWSTR)_name" ;\
|
|
echo " $(ASM_WORD) _fw_$(FWSTR)_bin" ;\
|
|
echo " $(ASM_WORD) _fw_end - _fw_$(FWSTR)_bin"
|
|
|
|
$(obj)/%.gen.S: FORCE
|
|
$(call filechk,fwbin)
|
|
|
|
# The .o files depend on the binaries directly; the .S files don't.
|
|
$(addprefix $(obj)/, $(firmware)): $(obj)/%.gen.o: $(fwdir)/%
|
|
|
|
targets := $(patsubst $(obj)/%,%, \
|
|
$(shell find $(obj) -name \*.gen.S 2>/dev/null))
|