Re: [RFC v2 01/39] Kconfig: introduce HAS_IOPORT option and select it as necessary
On Fri, 29 Apr 2022, Niklas Schnelle wrote: > We introduce a new HAS_IOPORT Kconfig option to indicate support for > I/O Port access. In a future patch HAS_IOPORT=n will disable compilation > of the I/O accessor functions inb()/outb() and friends on architectures > which can not meaningfully support legacy I/O spaces such as s390 or > where such support is optional. The "depends on" relations on HAS_IOPORT > in drivers as well as ifdefs for HAS_IOPORT specific sections will be > added in subsequent patches on a per subsystem basis. [...] > diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig > index de3b32a507d2..4c55df08d6f1 100644 > --- a/arch/mips/Kconfig > +++ b/arch/mips/Kconfig > @@ -47,6 +47,7 @@ config MIPS > select GENERIC_SMP_IDLE_THREAD > select GENERIC_TIME_VSYSCALL > select GUP_GET_PTE_LOW_HIGH if CPU_MIPS32 && PHYS_ADDR_T_64BIT > + select HAS_IOPORT > select HAVE_ARCH_COMPILER_H > select HAVE_ARCH_JUMP_LABEL > select HAVE_ARCH_KGDB if MIPS_FP_SUPPORT NAK, not all MIPS systems have the port I/O space, and we have it already handled via the NO_IOPORT_MAP option. We'll need to have HAS_IOPORT set to !NO_IOPORT_MAP (or vice versa) for the MIPS architecture. Maciej
[PATCH] crypto: vmx - Align the short log with Makefile cleanups
I notieced the log is not properly aligned: PERL drivers/crypto/vmx/aesp8-ppc.S CC [M] fs/xfs/xfs_reflink.o PERL drivers/crypto/vmx/ghashp8-ppc.S CC [M] drivers/crypto/vmx/aes.o Add some spaces after 'PERL'. While I was here, I cleaned up the Makefile: - Merge the two similar rules - Remove redundant 'clean-files' (Having 'targets' is enough) - Move the flavour into the build command This still avoids the build failures fixed by commit 4ee812f6143d ("crypto: vmx - Avoid weird build failures"). Signed-off-by: Masahiro Yamada --- drivers/crypto/vmx/Makefile | 17 +++-- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/crypto/vmx/Makefile b/drivers/crypto/vmx/Makefile index 709670d2b553..df93ba63b1cd 100644 --- a/drivers/crypto/vmx/Makefile +++ b/drivers/crypto/vmx/Makefile @@ -2,21 +2,10 @@ obj-$(CONFIG_CRYPTO_DEV_VMX_ENCRYPT) += vmx-crypto.o vmx-crypto-objs := vmx.o aesp8-ppc.o ghashp8-ppc.o aes.o aes_cbc.o aes_ctr.o aes_xts.o ghash.o -ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y) -override flavour := linux-ppc64le -else -override flavour := linux-ppc64 -endif - -quiet_cmd_perl = PERL $@ - cmd_perl = $(PERL) $(<) $(flavour) > $(@) +quiet_cmd_perl = PERL$@ + cmd_perl = $(PERL) $< $(if $(CONFIG_LITTLE_ENDIAN), linux-ppc64le, linux-ppc64) > $@ targets += aesp8-ppc.S ghashp8-ppc.S -$(obj)/aesp8-ppc.S: $(src)/aesp8-ppc.pl FORCE - $(call if_changed,perl) - -$(obj)/ghashp8-ppc.S: $(src)/ghashp8-ppc.pl FORCE +$(obj)/aesp8-ppc.S $(obj)/ghashp8-ppc.S: $(obj)/%.S: $(src)/%.pl FORCE $(call if_changed,perl) - -clean-files := aesp8-ppc.S ghashp8-ppc.S -- 2.32.0
Re: [PATCH] kbuild: drop $(objtree)/ prefix support for clean-files
Masahiro Yamada writes: > I think this hack is a bad idea. arch/powerpc/boot/Makefile is the > only user. Let's stop doing this. > > Signed-off-by: Masahiro Yamada > --- > > arch/powerpc/boot/Makefile | 4 ++-- Acked-by: Michael Ellerman (powerpc) cheers > scripts/Makefile.clean | 8 +--- > 2 files changed, 3 insertions(+), 9 deletions(-) > > diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile > index 4b4827c475c6..008bf0bff186 100644 > --- a/arch/powerpc/boot/Makefile > +++ b/arch/powerpc/boot/Makefile > @@ -453,8 +453,8 @@ clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* > treeImage.* \ > clean-kernel-base := vmlinux.strip vmlinux.bin > clean-kernel := $(addsuffix .gz,$(clean-kernel-base)) > clean-kernel += $(addsuffix .xz,$(clean-kernel-base)) > -# If not absolute clean-files are relative to $(obj). > -clean-files += $(addprefix $(objtree)/, $(clean-kernel)) > +# clean-files are relative to $(obj). > +clean-files += $(addprefix ../../../, $(clean-kernel)) > > WRAPPER_OBJDIR := /usr/lib/kernel-wrapper > WRAPPER_DTSDIR := /usr/lib/kernel-wrapper/dts > diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean > index 74cb1c5c3658..878cec648959 100644 > --- a/scripts/Makefile.clean > +++ b/scripts/Makefile.clean > @@ -36,13 +36,7 @@ __clean-files := \ > > __clean-files := $(filter-out $(no-clean-files), $(__clean-files)) > > -# clean-files is given relative to the current directory, unless it > -# starts with $(objtree)/ (which means "./", so do not add "./" unless > -# you want to delete a file from the toplevel object directory). > - > -__clean-files := $(wildcard \ > -$(addprefix $(obj)/, $(filter-out $(objtree)/%, > $(__clean-files))) \ > -$(filter $(objtree)/%, $(__clean-files))) > +__clean-files := $(wildcard $(addprefix $(obj)/, $(__clean-files))) > > # == > > -- > 2.32.0