diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-13 07:48:07 -0400 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-10-14 22:02:19 -0400 |
| commit | 3995eb82050a81e11217a0b88b2a5eddd53eb4d6 (patch) | |
| tree | b1c04b25317c9dade08d911e8077c8745df8a954 /arch/arm/Makefile | |
| parent | e0557c0d1a3a9c38af6777d308f98da12c94e137 (diff) | |
ARM: imx: merge plat-mxc into mach-imx
It's really unnecessary to have plat-mxc, and let's merge it into
mach-imx. It's pretty much just a bunch of file renaming and
Kconfig/Makefile merge.
To make the change less invasive, we keep using Kconfig symbol
CONFIG_ARCH_MXC for mach-imx sub-architecture.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index f023e3acdfbd..451757d85ee3 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -195,7 +195,6 @@ machine-$(CONFIG_ARCH_ZYNQ) += zynq | |||
| 195 | 195 | ||
| 196 | # Platform directory name. This list is sorted alphanumerically | 196 | # Platform directory name. This list is sorted alphanumerically |
| 197 | # by CONFIG_* macro name. | 197 | # by CONFIG_* macro name. |
| 198 | plat-$(CONFIG_ARCH_MXC) += mxc | ||
| 199 | plat-$(CONFIG_ARCH_OMAP) += omap | 198 | plat-$(CONFIG_ARCH_OMAP) += omap |
| 200 | plat-$(CONFIG_ARCH_S3C64XX) += samsung | 199 | plat-$(CONFIG_ARCH_S3C64XX) += samsung |
| 201 | plat-$(CONFIG_ARCH_ZYNQ) += versatile | 200 | plat-$(CONFIG_ARCH_ZYNQ) += versatile |