summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPeng Fan <peng.fan@nxp.com>2017-06-23 10:37:46 +0800
committerJason Liu <jason.hui.liu@nxp.com>2017-11-03 02:36:56 +0800
commit874c2a44a01fcf064b43dbb81dfeab45f478052a (patch)
treea9e1ed344d46be666974a86a1f77123743d00c23 /arch
parent5501206a73962107ad134205f31301e2ac4eab2c (diff)
MLK-15142-6: imx-common: include imx8m support
Build iomux/i2c/bootaux for i.MX8M. Signed-off-by: Peng Fan <peng.fan@nxp.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Makefile4
-rw-r--r--arch/arm/imx-common/Makefile8
2 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index f1406b7a349..fefadd8b64e 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -95,11 +95,11 @@ libs-y += arch/arm/cpu/
libs-y += arch/arm/lib/
ifeq ($(CONFIG_SPL_BUILD),y)
-ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx5 mx6 mx7 mx35))
+ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx5 mx6 mx7 mx35 imx8m))
libs-y += arch/arm/imx-common/
endif
else
-ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx7 mx7ulp mx31 mx35 mxs vf610 imx8))
+ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx7 mx7ulp mx31 mx35 mxs vf610 imx8 imx8m))
libs-y += arch/arm/imx-common/
endif
endif
diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile
index f7f978a18a0..43ce117f83e 100644
--- a/arch/arm/imx-common/Makefile
+++ b/arch/arm/imx-common/Makefile
@@ -7,9 +7,13 @@
# SPDX-License-Identifier: GPL-2.0+
#
-ifeq ($(SOC),$(filter $(SOC),mx25 mx35 mx5 mx6 mx7 vf610))
+ifeq ($(SOC),$(filter $(SOC),mx25 mx35 mx5 mx6 mx7 vf610 imx8m))
obj-y = iomux-v3.o
endif
+ifeq ($(SOC),$(filter $(SOC),imx8m))
+obj-$(CONFIG_IMX_BOOTAUX) += imx_bootaux.o
+obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o
+endif
ifeq ($(SOC),$(filter $(SOC),mx5 mx6))
obj-y += cpu.o speed.o
obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o
@@ -17,7 +21,7 @@ endif
ifeq ($(SOC),$(filter $(SOC),mx5))
obj-y += timer.o
endif
-ifeq ($(SOC),$(filter $(SOC),mx7 mx6 mxs mx7ulp))
+ifeq ($(SOC),$(filter $(SOC),mx7 mx6 mxs mx7ulp imx8m))
obj-y += misc.o
obj-$(CONFIG_SPL_BUILD) += spl.o
endif