Signed-off-by: Masahiro Yamada <[email protected]> --- arch/arm/Kconfig | 2 -- arch/arm/Makefile | 1 - arch/arm/platforms/Kconfig | 1 + arch/arm/platforms/Makefile | 1 + arch/arm/{mach-mediatek => platforms/mediatek}/Kconfig | 0 arch/arm/{mach-mediatek => platforms/mediatek}/Makefile | 0 arch/arm/{mach-mediatek => platforms/mediatek}/mediatek.c | 0 arch/arm/{mach-mediatek => platforms/mediatek}/platsmp.c | 0 8 files changed, 2 insertions(+), 3 deletions(-) rename arch/arm/{mach-mediatek => platforms/mediatek}/Kconfig (100%) rename arch/arm/{mach-mediatek => platforms/mediatek}/Makefile (100%) rename arch/arm/{mach-mediatek => platforms/mediatek}/mediatek.c (100%) rename arch/arm/{mach-mediatek => platforms/mediatek}/platsmp.c (100%)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 51e2663..38d9cb7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -781,8 +781,6 @@ source "arch/arm/mach-mv78xx0/Kconfig" source "arch/arm/mach-imx/Kconfig" -source "arch/arm/mach-mediatek/Kconfig" - source "arch/arm/mach-mxs/Kconfig" source "arch/arm/mach-netx/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 923be10..17ccd3f 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -187,7 +187,6 @@ machine-$(CONFIG_ARCH_MOXART) += moxart machine-$(CONFIG_ARCH_MV78XX0) += mv78xx0 machine-$(CONFIG_ARCH_MVEBU) += mvebu machine-$(CONFIG_ARCH_MXC) += imx -machine-$(CONFIG_ARCH_MEDIATEK) += mediatek machine-$(CONFIG_ARCH_MXS) += mxs machine-$(CONFIG_ARCH_NETX) += netx machine-$(CONFIG_ARCH_NOMADIK) += nomadik diff --git a/arch/arm/platforms/Kconfig b/arch/arm/platforms/Kconfig index ce6ed8a..069b6a2 100644 --- a/arch/arm/platforms/Kconfig +++ b/arch/arm/platforms/Kconfig @@ -1,5 +1,6 @@ # This is sorted alphabetically by directory pathname. +source "arch/arm/platforms/mediatek/Kconfig" source "arch/arm/platforms/rockchip/Kconfig" source "arch/arm/platforms/socfpga/Kconfig" source "arch/arm/platforms/sunxi/Kconfig" diff --git a/arch/arm/platforms/Makefile b/arch/arm/platforms/Makefile index bf88c66e..3b0a4e7 100644 --- a/arch/arm/platforms/Makefile +++ b/arch/arm/platforms/Makefile @@ -1,5 +1,6 @@ # This list sorted alphanumerically by CONFIG_* macro name. +obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ obj-$(CONFIG_ARCH_SOCFPGA) += socfpga/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/ diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/platforms/mediatek/Kconfig similarity index 100% rename from arch/arm/mach-mediatek/Kconfig rename to arch/arm/platforms/mediatek/Kconfig diff --git a/arch/arm/mach-mediatek/Makefile b/arch/arm/platforms/mediatek/Makefile similarity index 100% rename from arch/arm/mach-mediatek/Makefile rename to arch/arm/platforms/mediatek/Makefile diff --git a/arch/arm/mach-mediatek/mediatek.c b/arch/arm/platforms/mediatek/mediatek.c similarity index 100% rename from arch/arm/mach-mediatek/mediatek.c rename to arch/arm/platforms/mediatek/mediatek.c diff --git a/arch/arm/mach-mediatek/platsmp.c b/arch/arm/platforms/mediatek/platsmp.c similarity index 100% rename from arch/arm/mach-mediatek/platsmp.c rename to arch/arm/platforms/mediatek/platsmp.c -- 1.9.1
