summaryrefslogtreecommitdiff
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2022-04-21 17:00:23 +0300
committerArnd Bergmann <arnd@arndb.de>2022-04-22 12:14:55 +0300
commit0cd47616cfbb1422e24414daa5a96637fc5aa663 (patch)
tree9a98c733a529011701ae5bae8cd5037f7203072c /arch/arm/Makefile
parentc0c237d106bd35a58b65a174bd5ec50901940040 (diff)
parent917bf5a312fdb421a65cf3e57914a34e8eccc7a1 (diff)
downloadlinux-0cd47616cfbb1422e24414daa5a96637fc5aa663.tar.xz
Merge branch 'omap1/multiplatform-prep' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc into arm/multiplatform
This is the full series for converting OMAP1 to multiplatform, rebased from my 2019 attempt to do the same thing. The soc tree contains simpler patches to do the same for iop32x, ixp4xx, ep93xx and s3c24xx, which means we are getting closer to completing this for all ARMv5 platforms (I have patches for PXA, which is the last one remaining). Janusz already tested the branch separately and did the missing work for the common-clk conversion after my previous approach was broken. Aaro found one regression during additional testing, this is fixed now. Acked-by: Tony Lindgren <tony@atomide.com> Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r--arch/arm/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 8740e3a63afb..2c5f9b74fb91 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -224,7 +224,6 @@ machine-$(CONFIG_PLAT_SPEAR) += spear
# Platform directory name. This list is sorted alphanumerically
# by CONFIG_* macro name.
-plat-$(CONFIG_ARCH_OMAP) += omap
plat-$(CONFIG_PLAT_ORION) += orion
plat-$(CONFIG_PLAT_PXA) += pxa