mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-31 00:17:44 +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>
75 lines
2.1 KiB
Makefile
75 lines
2.1 KiB
Makefile
#
|
|
# This file is subject to the terms and conditions of the GNU General Public
|
|
# License. See the file "COPYING" in the main directory of this archive
|
|
# for more details.
|
|
#
|
|
# Copyright (C) 2001 - 2005 Tensilica Inc.
|
|
# Copyright (C) 2014 Cadence Design Systems Inc.
|
|
#
|
|
# This file is included by the global makefile so that you can add your own
|
|
# architecture-specific flags and dependencies.
|
|
|
|
# Core configuration.
|
|
# (Use VAR=<xtensa_config> to use another default compiler.)
|
|
|
|
variant-y := $(CONFIG_XTENSA_VARIANT_NAME)
|
|
|
|
VARIANT = $(variant-y)
|
|
|
|
ifneq ($(VARIANT),)
|
|
ifdef cross_compiling
|
|
ifndef CROSS_COMPILE
|
|
CROSS_COMPILE = xtensa_$(VARIANT)-
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
# Platform configuration
|
|
|
|
platform-$(CONFIG_XTENSA_PLATFORM_XT2000) := xt2000
|
|
platform-$(CONFIG_XTENSA_PLATFORM_ISS) := iss
|
|
platform-$(CONFIG_XTENSA_PLATFORM_XTFPGA) := xtfpga
|
|
|
|
# temporarily until string.h is fixed
|
|
KBUILD_CFLAGS += -ffreestanding -D__linux__
|
|
KBUILD_CFLAGS += -pipe -mlongcalls -mtext-section-literals
|
|
KBUILD_CFLAGS += $(call cc-option,-mforce-no-pic,)
|
|
KBUILD_CFLAGS += $(call cc-option,-mno-serialize-volatile,)
|
|
|
|
KBUILD_AFLAGS += -mlongcalls -mtext-section-literals
|
|
|
|
ifneq ($(CONFIG_LD_NO_RELAX),)
|
|
KBUILD_LDFLAGS := --no-relax
|
|
endif
|
|
|
|
CHECKFLAGS += -D$(if $(CONFIG_CPU_BIG_ENDIAN),__XTENSA_EB__,__XTENSA_EL__)
|
|
|
|
vardirs := $(patsubst %,arch/xtensa/variants/%/,$(variant-y))
|
|
plfdirs := $(patsubst %,arch/xtensa/platforms/%/,$(platform-y))
|
|
|
|
KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(vardirs) $(plfdirs))
|
|
|
|
KBUILD_DEFCONFIG := iss_defconfig
|
|
|
|
# Find libgcc.a
|
|
|
|
LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
|
|
|
|
head-y := arch/xtensa/kernel/head.o
|
|
|
|
libs-y += arch/xtensa/lib/ $(LIBGCC)
|
|
|
|
boot := arch/xtensa/boot
|
|
|
|
all Image zImage uImage xipImage: vmlinux
|
|
$(Q)$(MAKE) $(build)=$(boot) $@
|
|
|
|
archheaders:
|
|
$(Q)$(MAKE) $(build)=arch/xtensa/kernel/syscalls all
|
|
|
|
define archhelp
|
|
@echo '* Image - Kernel ELF image with reset vector'
|
|
@echo '* zImage - Compressed kernel image (arch/xtensa/boot/images/zImage.*)'
|
|
@echo '* uImage - U-Boot wrapped image'
|
|
@echo ' xipImage - XIP image'
|
|
endef
|