MIPS: Only include the platform file needed
authorThomas Bogendoerfer <tsbogend@alpha.franken.de>
Wed, 6 May 2020 16:24:02 +0000 (18:24 +0200)
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>
Tue, 12 May 2020 22:17:18 +0000 (00:17 +0200)
Instead of including all Platform files, we simply include the
needed one and avoid clashes with makefile variables.

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
32 files changed:
arch/mips/Kbuild.platforms
arch/mips/alchemy/Platform
arch/mips/ar7/Platform
arch/mips/ath25/Platform
arch/mips/ath79/Platform
arch/mips/bcm47xx/Platform
arch/mips/bcm63xx/Platform
arch/mips/bmips/Platform
arch/mips/cavium-octeon/Platform
arch/mips/cobalt/Platform
arch/mips/dec/Platform
arch/mips/generic/Platform
arch/mips/jazz/Platform
arch/mips/jz4740/Platform
arch/mips/lantiq/Platform
arch/mips/loongson2ef/Platform
arch/mips/loongson32/Platform
arch/mips/loongson64/Platform
arch/mips/mti-malta/Platform
arch/mips/netlogic/Platform
arch/mips/paravirt/Platform
arch/mips/pic32/Platform
arch/mips/pistachio/Platform
arch/mips/pnx833x/Platform
arch/mips/rb532/Platform
arch/mips/sgi-ip22/Platform
arch/mips/sgi-ip27/Platform
arch/mips/sgi-ip30/Platform
arch/mips/sgi-ip32/Platform
arch/mips/sibyte/Platform
arch/mips/sni/Platform
arch/mips/txx9/Platform

index 292b59a..5e3f6ed 100644 (file)
@@ -1,39 +1,44 @@
 # SPDX-License-Identifier: GPL-2.0
 # All platforms listed in alphabetic order
 
-platforms += alchemy
-platforms += ar7
-platforms += ath25
-platforms += ath79
-platforms += bcm47xx
-platforms += bcm63xx
-platforms += bmips
-platforms += cavium-octeon
-platforms += cobalt
-platforms += dec
-platforms += generic
-platforms += jazz
-platforms += jz4740
-platforms += lantiq
-platforms += loongson2ef
-platforms += loongson32
-platforms += loongson64
-platforms += mti-malta
-platforms += netlogic
-platforms += paravirt
-platforms += pic32
-platforms += pistachio
-platforms += pnx833x
-platforms += ralink
-platforms += rb532
-platforms += sgi-ip22
-platforms += sgi-ip27
-platforms += sgi-ip30
-platforms += sgi-ip32
-platforms += sibyte
-platforms += sni
-platforms += txx9
-platforms += vr41xx
+platform-$(CONFIG_MIPS_ALCHEMY)                += alchemy/
+platform-$(CONFIG_AR7)                 += ar7/
+platform-$(CONFIG_ATH25)               += ath25/
+platform-$(CONFIG_ATH79)               += ath79/
+platform-$(CONFIG_BCM47XX)             += bcm47xx/
+platform-$(CONFIG_BCM63XX)             += bcm63xx/
+platform-$(CONFIG_BMIPS_GENERIC)       += bmips/
+platform-$(CONFIG_CAVIUM_OCTEON_SOC)   += cavium-octeon/
+platform-$(CONFIG_MIPS_COBALT)         += cobalt/
+platform-$(CONFIG_MACH_DECSTATION)     += dec/
+platform-$(CONFIG_MIPS_GENERIC)                += generic/
+platform-$(CONFIG_MACH_JAZZ)           += jazz/
+platform-$(CONFIG_MACH_INGENIC)                += jz4740/
+platform-$(CONFIG_LANTIQ)              += lantiq/
+platform-$(CONFIG_MACH_LOONGSON2EF)    += loongson2ef/
+platform-$(CONFIG_MACH_LOONGSON32)     += loongson32/
+platform-$(CONFIG_MACH_LOONGSON64)     += loongson64/
+platform-$(CONFIG_MIPS_MALTA)          += mti-malta/
+platform-$(CONFIG_NLM_COMMON)          += netlogic/
+platform-$(CONFIG_MIPS_PARAVIRT)       += paravirt/
+platform-$(CONFIG_PIC32MZDA)           += pic32/
+platform-$(CONFIG_MACH_PISTACHIO)      += pistachio/
+platform-$(CONFIG_SOC_PNX833X)         += pnx833x/
+platform-$(CONFIG_RALINK)              += ralink/
+platform-$(CONFIG_MIKROTIK_RB532)      += rb532/
+platform-$(CONFIG_SGI_IP22)            += sgi-ip22/
+platform-$(CONFIG_SGI_IP27)            += sgi-ip27/
+platform-$(CONFIG_SGI_IP28)            += sgi-ip22/
+platform-$(CONFIG_SGI_IP30)            += sgi-ip30/
+platform-$(CONFIG_SGI_IP32)            += sgi-ip32/
+platform-$(CONFIG_SIBYTE_BCM112X)      += sibyte/
+platform-$(CONFIG_SIBYTE_SB1250)       += sibyte/
+platform-$(CONFIG_SIBYTE_BCM1x55)      += sibyte/
+platform-$(CONFIG_SIBYTE_BCM1x80)      += sibyte/
+platform-$(CONFIG_SNI_RM)              += sni/
+platform-$(CONFIG_MACH_TX39XX)         += tx99/
+platform-$(CONFIG_MACH_TX49XX)         += tx99/
+platform-$(CONFIG_MACH_VR41XX)         += vr41xx/
 
 # include the platform specific files
-include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms))
+include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platform-y))
index 33c9da3..c8cff50 100644 (file)
@@ -15,19 +15,16 @@ load-$(CONFIG_MIPS_DB1XXX)  += 0xffffffff80100000
 #
 # 4G-Systems MTX-1 "MeshCube" wireless router
 #
-platform-$(CONFIG_MIPS_MTX1)   += alchemy/
 load-$(CONFIG_MIPS_MTX1)       += 0xffffffff80100000
 
 #
 # MyCable eval board
 #
-platform-$(CONFIG_MIPS_XXS1500) += alchemy/
 load-$(CONFIG_MIPS_XXS1500)    += 0xffffffff80100000
 
 #
 # Trapeze ITS GRP board
 #
-platform-$(CONFIG_MIPS_GPR)    += alchemy/
 load-$(CONFIG_MIPS_GPR)                += 0xffffffff80100000
 
 # boards can specify their own <gpio.h> in one of their include dirs.
index 21f9102..a9257cc 100644 (file)
@@ -1,6 +1,5 @@
 #
 # Texas Instruments AR7
 #
-platform-$(CONFIG_AR7)         += ar7/
 cflags-$(CONFIG_AR7)           += -I$(srctree)/arch/mips/include/asm/mach-ar7
 load-$(CONFIG_AR7)             += 0xffffffff94100000
index ef3f81f..aef098b 100644 (file)
@@ -1,6 +1,5 @@
 #
 # Atheros AR531X/AR231X WiSoC
 #
-platform-$(CONFIG_ATH25)       += ath25/
 cflags-$(CONFIG_ATH25)         += -I$(srctree)/arch/mips/include/asm/mach-ath25
 load-$(CONFIG_ATH25)           += 0xffffffff80041000
index 2bd6636..5774447 100644 (file)
@@ -2,6 +2,5 @@
 # Atheros AR71xx/AR724x/AR913x
 #
 
-platform-$(CONFIG_ATH79)       += ath79/
 cflags-$(CONFIG_ATH79)         += -I$(srctree)/arch/mips/include/asm/mach-ath79
 load-$(CONFIG_ATH79)           = 0xffffffff80060000
index 70783b7..833b204 100644 (file)
@@ -1,7 +1,6 @@
 #
 # Broadcom BCM47XX boards
 #
-platform-$(CONFIG_BCM47XX)     += bcm47xx/
 cflags-$(CONFIG_BCM47XX)       +=                                      \
                -I$(srctree)/arch/mips/include/asm/mach-bcm47xx
 load-$(CONFIG_BCM47XX)         := 0xffffffff80001000
index 5f86b2f..882dc40 100644 (file)
@@ -1,7 +1,6 @@
 #
 # Broadcom BCM63XX boards
 #
-platform-$(CONFIG_BCM63XX)     += bcm63xx/
 cflags-$(CONFIG_BCM63XX)       +=                                      \
                -I$(srctree)/arch/mips/include/asm/mach-bcm63xx/
 load-$(CONFIG_BCM63XX)         := 0xffffffff80010000
index 5f127fd..1434ea3 100644 (file)
@@ -1,7 +1,6 @@
 #
 # Broadcom Generic BMIPS kernel
 #
-platform-$(CONFIG_BMIPS_GENERIC)       += bmips/
 cflags-$(CONFIG_BMIPS_GENERIC)         +=                              \
                -I$(srctree)/arch/mips/include/asm/mach-bmips/
 load-$(CONFIG_BMIPS_GENERIC)           := 0xffffffff80010000
index 45be853..4adef38 100644 (file)
@@ -1,7 +1,6 @@
 #
 # Cavium Octeon
 #
-platform-$(CONFIG_CAVIUM_OCTEON_SOC)   += cavium-octeon/
 cflags-$(CONFIG_CAVIUM_OCTEON_SOC)     +=                              \
                -I$(srctree)/arch/mips/include/asm/mach-cavium-octeon
 load-$(CONFIG_CAVIUM_OCTEON_SOC)       += 0xffffffff81100000
index 34123ef..4254895 100644 (file)
@@ -1,6 +1,5 @@
 #
 # Cobalt Server
 #
-platform-$(CONFIG_MIPS_COBALT) += cobalt/
 cflags-$(CONFIG_MIPS_COBALT)   += -I$(srctree)/arch/mips/include/asm/mach-cobalt
 load-$(CONFIG_MIPS_COBALT)     += 0xffffffff80080000
index cf55a6f..c82391e 100644 (file)
@@ -1,7 +1,6 @@
 #
 # DECstation family
 #
-platform-$(CONFIG_MACH_DECSTATION)     += dec/
 cflags-$(CONFIG_MACH_DECSTATION)       += \
                        -I$(srctree)/arch/mips/include/asm/mach-dec
 libs-$(CONFIG_MACH_DECSTATION)         += arch/mips/dec/prom/
index eaa19d1..53c33cb 100644 (file)
@@ -8,7 +8,6 @@
 # option) any later version.
 #
 
-platform-$(CONFIG_MIPS_GENERIC)        += generic/
 cflags-$(CONFIG_MIPS_GENERIC)  += -I$(srctree)/arch/mips/include/asm/mach-generic
 load-$(CONFIG_MIPS_GENERIC)    += 0xffffffff80100000
 all-$(CONFIG_MIPS_GENERIC)     := vmlinux.gz.itb
index 3373788..eb0490a 100644 (file)
@@ -1,6 +1,5 @@
 #
 # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
 #
-platform-$(CONFIG_MACH_JAZZ)   += jazz/
 cflags-$(CONFIG_MACH_JAZZ)     += -I$(srctree)/arch/mips/include/asm/mach-jazz
 load-$(CONFIG_MACH_JAZZ)       += 0xffffffff80080000
index a2a5a85..bd35d06 100644 (file)
@@ -1,4 +1,3 @@
-platform-$(CONFIG_MACH_INGENIC)        += jz4740/
 cflags-$(CONFIG_MACH_INGENIC)  += -I$(srctree)/arch/mips/include/asm/mach-jz4740
 load-$(CONFIG_MACH_INGENIC)    += 0xffffffff80010000
 zload-$(CONFIG_MACH_INGENIC)   += 0xffffffff81000000
index b3ec498..0bc9c0f 100644 (file)
@@ -2,7 +2,6 @@
 # Lantiq
 #
 
-platform-$(CONFIG_LANTIQ)      += lantiq/
 cflags-$(CONFIG_LANTIQ)                += -I$(srctree)/arch/mips/include/asm/mach-lantiq
 load-$(CONFIG_LANTIQ)          = 0xffffffff80002000
 cflags-$(CONFIG_SOC_TYPE_XWAY) += -I$(srctree)/arch/mips/include/asm/mach-lantiq/xway
index 3aca429..cdad3c1 100644 (file)
@@ -26,7 +26,6 @@ endif
 # Loongson Machines' Support
 #
 
-platform-$(CONFIG_MACH_LOONGSON2EF) += loongson2ef/
 cflags-$(CONFIG_MACH_LOONGSON2EF) += -I$(srctree)/arch/mips/include/asm/mach-loongson2ef -mno-branch-likely
 load-$(CONFIG_LEMOTE_FULOONG2E) += 0xffffffff80100000
 load-$(CONFIG_LEMOTE_MACH2F) += 0xffffffff80200000
index 7f8e342..3b9673e 100644 (file)
@@ -1,4 +1,3 @@
 cflags-$(CONFIG_CPU_LOONGSON32)                += -march=mips32r2 -Wa,--trap
-platform-$(CONFIG_MACH_LOONGSON32)     += loongson32/
 cflags-$(CONFIG_MACH_LOONGSON32)       += -I$(srctree)/arch/mips/include/asm/mach-loongson32
 load-$(CONFIG_CPU_LOONGSON32)          += 0xffffffff80200000
index d5eb94c..ec42c50 100644 (file)
@@ -55,6 +55,5 @@ cflags-y += $(call cc-option,-mno-loongson-mmi)
 # Loongson Machines' Support
 #
 
-platform-$(CONFIG_MACH_LOONGSON64) += loongson64/
 cflags-$(CONFIG_MACH_LOONGSON64) += -I$(srctree)/arch/mips/include/asm/mach-loongson64 -mno-branch-likely
 load-$(CONFIG_CPU_LOONGSON64) += 0xffffffff80200000
index 2cc72c9..41e0d2a 100644 (file)
@@ -1,7 +1,6 @@
 #
 # MIPS Malta board
 #
-platform-$(CONFIG_MIPS_MALTA)  += mti-malta/
 cflags-$(CONFIG_MIPS_MALTA)    += -I$(srctree)/arch/mips/include/asm/mach-malta
 ifdef CONFIG_KVM_GUEST
     load-$(CONFIG_MIPS_MALTA)  += 0x0000000040100000
index fb8eb4c..4195a09 100644 (file)
@@ -13,5 +13,4 @@ cflags-$(CONFIG_CPU_XLP)      += $(call cc-option,-march=xlp,-march=mips64r2)
 #
 # NETLOGIC processor support
 #
-platform-$(CONFIG_NLM_COMMON)  += netlogic/
 load-$(CONFIG_NLM_COMMON)      += 0xffffffff80100000
index 7e76ef2..0b85758 100644 (file)
@@ -1,7 +1,6 @@
 #
 # Generic para-virtualized guest.
 #
-platform-$(CONFIG_MIPS_PARAVIRT)       += paravirt/
 cflags-$(CONFIG_MIPS_PARAVIRT)         +=                              \
                -I$(srctree)/arch/mips/include/asm/mach-paravirt
 
index cd2084f..1e92e52 100644 (file)
@@ -1,7 +1,6 @@
 #
 # PIC32MZDA
 #
-platform-$(CONFIG_PIC32MZDA)   += pic32/
 cflags-$(CONFIG_PIC32MZDA)     += -I$(srctree)/arch/mips/include/asm/mach-pic32
 load-$(CONFIG_PIC32MZDA)       += 0xffffffff88000000
 all-$(CONFIG_PIC32MZDA)                := $(COMPRESSION_FNAME).bin
index c3592b3..f73a1a9 100644 (file)
@@ -1,7 +1,6 @@
 #
 # IMG Pistachio SoC
 #
-platform-$(CONFIG_MACH_PISTACHIO)      += pistachio/
 cflags-$(CONFIG_MACH_PISTACHIO)                +=                              \
                -I$(srctree)/arch/mips/include/asm/mach-pistachio
 load-$(CONFIG_MACH_PISTACHIO)          += 0xffffffff80400000
index 2872606..e5286a4 100644 (file)
@@ -1,5 +1,4 @@
 # NXP STB225
-platform-$(CONFIG_SOC_PNX833X) += pnx833x/
 cflags-$(CONFIG_SOC_PNX833X)   += -I$(srctree)/arch/mips/include/asm/mach-pnx833x
 load-$(CONFIG_NXP_STB220)      += 0xffffffff80001000
 load-$(CONFIG_NXP_STB225)      += 0xffffffff80001000
index aeec45a..12eaa87 100644 (file)
@@ -1,7 +1,6 @@
 #
 # Routerboard 532
 #
-platform-$(CONFIG_MIKROTIK_RB532)      += rb532/
 cflags-$(CONFIG_MIKROTIK_RB532)                +=                              \
                -I$(srctree)/arch/mips/include/asm/mach-rc32434
 load-$(CONFIG_MIKROTIK_RB532)          += 0xffffffff80101000
index e8f6b3a..62fa30b 100644 (file)
@@ -7,7 +7,6 @@
 # current variable will break so for 64-bit kernels we have to raise the start
 # address by 8kb.
 #
-platform-$(CONFIG_SGI_IP22)            += sgi-ip22/
 cflags-$(CONFIG_SGI_IP22)      += -I$(srctree)/arch/mips/include/asm/mach-ip22
 ifdef CONFIG_32BIT
 load-$(CONFIG_SGI_IP22)                += 0xffffffff88002000
@@ -29,6 +28,5 @@ ifdef CONFIG_SGI_IP28
       $(error gcc doesn't support needed option -mr10k-cache-barrier=store)
   endif
 endif
-platform-$(CONFIG_SGI_IP28)            += sgi-ip22/
 cflags-$(CONFIG_SGI_IP28)      += -mr10k-cache-barrier=store -I$(srctree)/arch/mips/include/asm/mach-ip28
 load-$(CONFIG_SGI_IP28)                += 0xa800000020004000
index 1fb9c2e..e734ee6 100644 (file)
@@ -5,8 +5,6 @@
 # symmon, 0xc00000000001c000 for production kernels.  Note that the value must
 # be 16kb aligned or the handling of the current variable will break.
 #
-ifdef CONFIG_SGI_IP27
-platform-$(CONFIG_SGI_IP27)    += sgi-ip27/
 cflags-$(CONFIG_SGI_IP27)      += -I$(srctree)/arch/mips/include/asm/mach-ip27
 ifdef CONFIG_MAPPED_KERNEL
 load-$(CONFIG_SGI_IP27)                += 0xc00000004001c000
@@ -16,4 +14,3 @@ else
 load-$(CONFIG_SGI_IP27)                += 0xa80000000001c000
 OBJCOPYFLAGS                   := --change-addresses=0x57ffffff80000000
 endif
-endif
index 2b5695c..f6f1151 100644 (file)
@@ -1,8 +1,5 @@
 #
 # SGI-IP30 (Octane/Octane2)
 #
-ifdef CONFIG_SGI_IP30
-platform-$(CONFIG_SGI_IP30)            += sgi-ip30/
 cflags-$(CONFIG_SGI_IP30)              += -I$(srctree)/arch/mips/include/asm/mach-ip30
 load-$(CONFIG_SGI_IP30)                        += 0xa800000020004000
-endif
index 0fea556..f58a7a0 100644 (file)
@@ -6,6 +6,5 @@
 # a multiple of the kernel stack size or the handling of the current variable
 # will break.
 #
-platform-$(CONFIG_SGI_IP32)    += sgi-ip32/
 cflags-$(CONFIG_SGI_IP32)      += -I$(srctree)/arch/mips/include/asm/mach-ip32
 load-$(CONFIG_SGI_IP32)                += 0xffffffff80004000
index af11733..65b2225 100644 (file)
@@ -1,10 +1,6 @@
 #
 # These are all rather similar so we consider them a single platform
 #
-platform-$(CONFIG_SIBYTE_BCM112X)      += sibyte/
-platform-$(CONFIG_SIBYTE_SB1250)       += sibyte/
-platform-$(CONFIG_SIBYTE_BCM1x55)      += sibyte/
-platform-$(CONFIG_SIBYTE_BCM1x80)      += sibyte/
 
 #
 # Sibyte SB1250 / BCM1480 family of SOCs
index 2644a9d..b0b3dde 100644 (file)
@@ -1,7 +1,6 @@
 #
 # SNI RM
 #
-platform-$(CONFIG_SNI_RM)              += sni/
 cflags-$(CONFIG_SNI_RM)                += -I$(srctree)/arch/mips/include/asm/mach-rm
 ifdef CONFIG_CPU_LITTLE_ENDIAN
 load-$(CONFIG_SNI_RM)          += 0xffffffff80600000
index a176d1f..7f4429b 100644 (file)
@@ -1,6 +1,3 @@
-platform-$(CONFIG_MACH_TX39XX) += txx9/
-platform-$(CONFIG_MACH_TX49XX) += txx9/
-
 cflags-$(CONFIG_MACH_TX39XX)   +=                                      \
                -I$(srctree)/arch/mips/include/asm/mach-tx39xx
 cflags-$(CONFIG_MACH_TX49XX)   +=                                      \