tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

powerpc/Makefiles: Convert ifeq to ifdef where possible

In Makefiles if we're testing a CONFIG_FOO symbol for equality with 'y'
we can instead just use ifdef. The latter reads easily, so convert to
it where possible.

Signed-off-by: Rodrigo R. Galvao <rosattig@linux.vnet.ibm.com>
Reviewed-by: Mauro S. M. Rodrigues <maurosr@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

authored by

Rodrigo R. Galvao and committed by
Michael Ellerman badf436f f8db2007

+29 -27
+13 -13
arch/powerpc/Makefile
··· 36 36 KBUILD_DEFCONFIG := ppc64_defconfig 37 37 endif 38 38 39 - ifeq ($(CONFIG_PPC64),y) 39 + ifdef CONFIG_PPC64 40 40 new_nm := $(shell if $(NM) --help 2>&1 | grep -- '--synthetic' > /dev/null; then echo y; else echo n; fi) 41 41 42 42 ifeq ($(new_nm),y) ··· 74 74 endif 75 75 endif 76 76 77 - ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y) 77 + ifdef CONFIG_CPU_LITTLE_ENDIAN 78 78 KBUILD_CFLAGS += -mlittle-endian 79 79 LDFLAGS += -EL 80 80 LDEMULATION := lppc ··· 117 117 LDFLAGS_vmlinux := $(LDFLAGS_vmlinux-y) 118 118 LDFLAGS_vmlinux += $(call ld-option,--orphan-handling=warn) 119 119 120 - ifeq ($(CONFIG_PPC64),y) 120 + ifdef CONFIG_PPC64 121 121 ifeq ($(call cc-option-yn,-mcmodel=medium),y) 122 122 # -mcmodel=medium breaks modules because it uses 32bit offsets from 123 123 # the TOC pointer to create pointers where possible. Pointers into the ··· 134 134 endif 135 135 136 136 CFLAGS-$(CONFIG_PPC64) := $(call cc-option,-mtraceback=no) 137 - ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y) 137 + ifdef CONFIG_CPU_LITTLE_ENDIAN 138 138 CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv2,$(call cc-option,-mcall-aixdesc)) 139 139 AFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv2) 140 140 else ··· 148 148 CFLAGS-$(CONFIG_PPC32) := -ffixed-r2 $(MULTIPLEWORD) 149 149 CFLAGS-$(CONFIG_PPC32) += $(call cc-option,-mno-readonly-in-sdata) 150 150 151 - ifeq ($(CONFIG_PPC_BOOK3S_64),y) 152 - ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y) 151 + ifdef CONFIG_PPC_BOOK3S_64 152 + ifdef CONFIG_CPU_LITTLE_ENDIAN 153 153 CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power8 154 154 CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=power9,-mtune=power8) 155 155 else ··· 173 173 CFLAGS-$(CONFIG_PPC_8xx) += $(call cc-option,-mcpu=860) 174 174 175 175 # Altivec option not allowed with e500mc64 in GCC. 176 - ifeq ($(CONFIG_ALTIVEC),y) 176 + ifdef CONFIG_ALTIVEC 177 177 E5500_CPU := -mcpu=powerpc64 178 178 else 179 179 E5500_CPU := $(call cc-option,-mcpu=e500mc64,-mcpu=powerpc64) ··· 181 181 CFLAGS-$(CONFIG_E5500_CPU) += $(E5500_CPU) 182 182 CFLAGS-$(CONFIG_E6500_CPU) += $(call cc-option,-mcpu=e6500,$(E5500_CPU)) 183 183 184 - ifeq ($(CONFIG_PPC32),y) 185 - ifeq ($(CONFIG_PPC_E500MC),y) 184 + ifdef CONFIG_PPC32 185 + ifdef CONFIG_PPC_E500MC 186 186 CFLAGS-y += $(call cc-option,-mcpu=e500mc,-mcpu=powerpc) 187 187 else 188 188 CFLAGS-$(CONFIG_E500) += $(call cc-option,-mcpu=8540 -msoft-float,-mcpu=powerpc) ··· 204 204 CHECKFLAGS += -D__LITTLE_ENDIAN__ 205 205 endif 206 206 207 - ifeq ($(CONFIG_476FPE_ERR46),y) 207 + ifdef CONFIG_476FPE_ERR46 208 208 KBUILD_LDFLAGS_MODULE += --ppc476-workaround \ 209 209 -T $(srctree)/arch/powerpc/platforms/44x/ppc476_modules.lds 210 210 endif ··· 231 231 # often slow when they are implemented at all 232 232 KBUILD_CFLAGS += $(call cc-option,-mno-string) 233 233 234 - ifeq ($(CONFIG_6xx),y) 234 + ifdef CONFIG_6xx 235 235 KBUILD_CFLAGS += -mcpu=powerpc 236 236 endif 237 237 238 238 # Work around a gcc code-gen bug with -fno-omit-frame-pointer. 239 - ifeq ($(CONFIG_FUNCTION_TRACER),y) 239 + ifdef CONFIG_FUNCTION_TRACER 240 240 KBUILD_CFLAGS += -mno-sched-epilog 241 241 endif 242 242 ··· 395 395 $(Q)$(MAKE) $(build)=$(boot) install 396 396 397 397 vdso_install: 398 - ifeq ($(CONFIG_PPC64),y) 398 + ifdef CONFIG_PPC64 399 399 $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 $@ 400 400 endif 401 401 $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso32 $@
+1 -1
arch/powerpc/boot/Makefile
··· 354 354 355 355 # For 32-bit powermacs, build the COFF and miboot images 356 356 # as well as the ELF images. 357 - ifeq ($(CONFIG_PPC32),y) 357 + ifdef CONFIG_PPC32 358 358 image-$(CONFIG_PPC_PMAC) += zImage.coff zImage.miboot 359 359 endif 360 360
+8 -6
arch/powerpc/kernel/Makefile
··· 7 7 8 8 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror 9 9 10 - ifeq ($(CONFIG_PPC64),y) 10 + ifdef CONFIG_PPC64 11 11 CFLAGS_prom_init.o += $(NO_MINIMAL_TOC) 12 12 endif 13 - ifeq ($(CONFIG_PPC32),y) 13 + ifdef CONFIG_PPC32 14 14 CFLAGS_prom_init.o += -fPIC 15 15 CFLAGS_btext.o += -fPIC 16 16 endif ··· 63 63 obj-$(CONFIG_GENERIC_TBSYNC) += smp-tbsync.o 64 64 obj-$(CONFIG_CRASH_DUMP) += crash_dump.o 65 65 obj-$(CONFIG_FA_DUMP) += fadump.o 66 - ifeq ($(CONFIG_PPC32),y) 66 + ifdef CONFIG_PPC32 67 67 obj-$(CONFIG_E500) += idle_e500.o 68 68 endif 69 69 obj-$(CONFIG_6xx) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o 70 70 obj-$(CONFIG_TAU) += tau_6xx.o 71 71 obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o 72 - ifeq ($(CONFIG_FSL_BOOKE),y) 72 + ifdef CONFIG_FSL_BOOKE 73 73 obj-$(CONFIG_HIBERNATION) += swsusp_booke.o 74 74 else 75 75 obj-$(CONFIG_HIBERNATION) += swsusp_$(BITS).o ··· 110 110 obj-$(CONFIG_KEXEC_CORE) += machine_kexec.o crash.o \ 111 111 machine_kexec_$(BITS).o 112 112 obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file_$(BITS).o kexec_elf_$(BITS).o 113 - ifeq ($(CONFIG_HAVE_IMA_KEXEC)$(CONFIG_IMA),yy) 113 + ifdef CONFIG_HAVE_IMA_KEXEC 114 + ifdef CONFIG_IMA 114 115 obj-y += ima_kexec.o 116 + endif 115 117 endif 116 118 117 119 obj-$(CONFIG_AUDIT) += audit.o ··· 167 165 systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i 168 166 $(call cmd,systbl_chk) 169 167 170 - ifeq ($(CONFIG_PPC_OF_BOOT_TRAMPOLINE),y) 168 + ifdef CONFIG_PPC_OF_BOOT_TRAMPOLINE 171 169 $(obj)/built-in.a: prom_init_check 172 170 173 171 quiet_cmd_prom_init_check = CALL $<
+2 -2
arch/powerpc/mm/Makefile
··· 19 19 obj-$(CONFIG_PPC_RADIX_MMU) += pgtable-radix.o tlb-radix.o 20 20 obj-$(CONFIG_PPC_STD_MMU_32) += ppc_mmu_32.o hash_low_32.o mmu_context_hash32.o 21 21 obj-$(CONFIG_PPC_STD_MMU) += tlb_hash$(BITS).o 22 - ifeq ($(CONFIG_PPC_BOOK3S_64),y) 22 + ifdef CONFIG_PPC_BOOK3S_64 23 23 obj-$(CONFIG_PPC_4K_PAGES) += hash64_4k.o 24 24 obj-$(CONFIG_PPC_64K_PAGES) += hash64_64k.o 25 25 endif ··· 31 31 obj-$(CONFIG_PPC_SPLPAR) += vphn.o 32 32 obj-$(CONFIG_PPC_MM_SLICES) += slice.o 33 33 obj-y += hugetlbpage.o 34 - ifeq ($(CONFIG_HUGETLB_PAGE),y) 34 + ifdef CONFIG_HUGETLB_PAGE 35 35 obj-$(CONFIG_PPC_BOOK3S_64) += hugetlbpage-hash64.o 36 36 obj-$(CONFIG_PPC_RADIX_MMU) += hugetlbpage-radix.o 37 37 obj-$(CONFIG_PPC_BOOK3E_MMU) += hugetlbpage-book3e.o
+1 -1
arch/powerpc/net/Makefile
··· 2 2 # 3 3 # Arch-specific network modules 4 4 # 5 - ifeq ($(CONFIG_PPC64),y) 5 + ifdef CONFIG_PPC64 6 6 obj-$(CONFIG_BPF_JIT) += bpf_jit_comp64.o 7 7 else 8 8 obj-$(CONFIG_BPF_JIT) += bpf_jit_asm.o bpf_jit_comp.o
+1 -1
arch/powerpc/platforms/52xx/Makefile
··· 11 11 obj-$(CONFIG_PPC_MEDIA5200) += media5200.o 12 12 13 13 obj-$(CONFIG_PM) += mpc52xx_sleep.o mpc52xx_pm.o 14 - ifeq ($(CONFIG_PPC_LITE5200),y) 14 + ifdef CONFIG_PPC_LITE5200 15 15 obj-$(CONFIG_PM) += lite5200_sleep.o lite5200_pm.o 16 16 endif 17 17
+1 -1
arch/powerpc/platforms/cell/Makefile
··· 10 10 11 11 obj-$(CONFIG_PPC_IBM_CELL_POWERBUTTON) += cbe_powerbutton.o 12 12 13 - ifeq ($(CONFIG_SMP),y) 13 + ifdef CONFIG_SMP 14 14 obj-$(CONFIG_PPC_CELL_NATIVE) += smp.o 15 15 endif 16 16
+1 -1
arch/powerpc/platforms/pseries/Makefile
··· 25 25 obj-$(CONFIG_IBMVIO) += vio.o 26 26 obj-$(CONFIG_IBMEBUS) += ibmebus.o 27 27 28 - ifeq ($(CONFIG_PPC_PSERIES),y) 28 + ifdef CONFIG_PPC_PSERIES 29 29 obj-$(CONFIG_SUSPEND) += suspend.o 30 30 endif
+1 -1
arch/powerpc/sysdev/Makefile
··· 48 48 obj-$(CONFIG_PPC_MPC512x) += mpc5xxx_clocks.o 49 49 obj-$(CONFIG_PPC_MPC52xx) += mpc5xxx_clocks.o 50 50 51 - ifeq ($(CONFIG_SUSPEND),y) 51 + ifdef CONFIG_SUSPEND 52 52 obj-$(CONFIG_6xx) += 6xx-suspend.o 53 53 endif 54 54