Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95b8f20f authored by Russell King's avatar Russell King
Browse files

ARM: fix badly placed mach/plat entries in Kconfig & Makefile 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7284ce6c

arch/arm/Kconfig

+35 −35
Original line number Diff line number Diff line
@@ -729,14 +729,26 @@ config ARCH_U8500 


endchoice



source "arch/arm/mach-aaec2000/Kconfig"



source "arch/arm/mach-at91/Kconfig"



source "arch/arm/mach-bcmring/Kconfig"



source "arch/arm/mach-clps711x/Kconfig"



source "arch/arm/mach-davinci/Kconfig"



source "arch/arm/mach-dove/Kconfig"



source "arch/arm/mach-ep93xx/Kconfig"



source "arch/arm/mach-footbridge/Kconfig"



source "arch/arm/mach-gemini/Kconfig"



source "arch/arm/mach-h720x/Kconfig"



source "arch/arm/mach-integrator/Kconfig"



source "arch/arm/mach-iop32x/Kconfig"
@@ -751,16 +763,26 @@ source "arch/arm/mach-ixp2000/Kconfig" 


source "arch/arm/mach-ixp23xx/Kconfig"



source "arch/arm/mach-kirkwood/Kconfig"



source "arch/arm/mach-ks8695/Kconfig"



source "arch/arm/mach-lh7a40x/Kconfig"



source "arch/arm/mach-loki/Kconfig"



source "arch/arm/mach-msm/Kconfig"



source "arch/arm/mach-mv78xx0/Kconfig"



source "arch/arm/mach-pxa/Kconfig"

source "arch/arm/plat-pxa/Kconfig"

source "arch/arm/plat-mxc/Kconfig"



source "arch/arm/mach-mmp/Kconfig"

source "arch/arm/mach-netx/Kconfig"



source "arch/arm/mach-sa1100/Kconfig"

source "arch/arm/mach-nomadik/Kconfig"

source "arch/arm/plat-nomadik/Kconfig"



source "arch/arm/mach-ns9xxx/Kconfig"



source "arch/arm/plat-omap/Kconfig"
@@ -770,9 +792,14 @@ source "arch/arm/mach-omap2/Kconfig" 


source "arch/arm/mach-orion5x/Kconfig"



source "arch/arm/mach-kirkwood/Kconfig"

source "arch/arm/mach-pxa/Kconfig"

source "arch/arm/plat-pxa/Kconfig"



source "arch/arm/mach-dove/Kconfig"

source "arch/arm/mach-mmp/Kconfig"



source "arch/arm/mach-realview/Kconfig"



source "arch/arm/mach-sa1100/Kconfig"



source "arch/arm/plat-samsung/Kconfig"

source "arch/arm/plat-s3c24xx/Kconfig"
@@ -800,41 +827,14 @@ if ARCH_S5PC1XX 
source "arch/arm/mach-s5pc100/Kconfig"

endif



source "arch/arm/mach-lh7a40x/Kconfig"

source "arch/arm/mach-u300/Kconfig"



source "arch/arm/mach-h720x/Kconfig"

source "arch/arm/mach-ux500/Kconfig"



source "arch/arm/mach-versatile/Kconfig"



source "arch/arm/mach-aaec2000/Kconfig"



source "arch/arm/mach-realview/Kconfig"



source "arch/arm/mach-at91/Kconfig"



source "arch/arm/plat-mxc/Kconfig"



source "arch/arm/mach-nomadik/Kconfig"

source "arch/arm/plat-nomadik/Kconfig"



source "arch/arm/mach-netx/Kconfig"



source "arch/arm/mach-ns9xxx/Kconfig"



source "arch/arm/mach-davinci/Kconfig"



source "arch/arm/mach-ks8695/Kconfig"



source "arch/arm/mach-msm/Kconfig"



source "arch/arm/mach-u300/Kconfig"



source "arch/arm/mach-w90x900/Kconfig"



source "arch/arm/mach-bcmring/Kconfig"



source "arch/arm/mach-ux500/Kconfig"



# Definitions to make life easier

config ARCH_ACORN

	bool

arch/arm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ machine-$(CONFIG_ARCH_MX1) := mx1 
machine-$(CONFIG_ARCH_MX2)		:= mx2

machine-$(CONFIG_ARCH_MX25)		:= mx25

machine-$(CONFIG_ARCH_MX3)		:= mx3

machine-$(CONFIG_ARCH_MXC91231)		:= mxc91231

machine-$(CONFIG_ARCH_NETX)		:= netx

machine-$(CONFIG_ARCH_NOMADIK)		:= nomadik

machine-$(CONFIG_ARCH_NS9XXX)		:= ns9xxx
@@ -171,12 +172,12 @@ machine-$(CONFIG_ARCH_U8500) := ux500 
machine-$(CONFIG_ARCH_VERSATILE)	:= versatile

machine-$(CONFIG_ARCH_W90X900)		:= w90x900

machine-$(CONFIG_FOOTBRIDGE)		:= footbridge

machine-$(CONFIG_ARCH_MXC91231)		:= mxc91231



# Platform directory name.  This list is sorted alphanumerically

# by CONFIG_* macro name.

plat-$(CONFIG_ARCH_MXC)		:= mxc

plat-$(CONFIG_ARCH_OMAP)	:= omap

plat-$(CONFIG_ARCH_STMP3XXX)	:= stmp3xxx

plat-$(CONFIG_PLAT_IOP)		:= iop

plat-$(CONFIG_PLAT_NOMADIK)	:= nomadik

plat-$(CONFIG_PLAT_ORION)	:= orion
@@ -184,7 +185,6 @@ plat-$(CONFIG_PLAT_PXA) := pxa 
plat-$(CONFIG_PLAT_S3C24XX)	:= s3c24xx s3c samsung

plat-$(CONFIG_PLAT_S3C64XX)	:= s3c64xx s3c samsung

plat-$(CONFIG_PLAT_S5PC1XX)	:= s5pc1xx s3c samsung

plat-$(CONFIG_ARCH_STMP3XXX)	:= stmp3xxx



ifeq ($(CONFIG_ARCH_EBSA110),y)

# This is what happens if you forget the IOCS16 line.