Browse Source

ARM: mxs: always build ocotp

With this patch ocotp support will always be build into the kernel on mxs.
Otherwise a DT-only kernel fails to link with:

arch/arm/mach-mxs/mach-mxs.c:169: undefined reference to `mxs_get_ocotp'

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Marc Kleine-Budde 13 years ago
parent
commit
6eec0152c4
2 changed files with 1 additions and 8 deletions
  1. 0 6
      arch/arm/mach-mxs/Kconfig
  2. 1 2
      arch/arm/mach-mxs/Makefile

+ 0 - 6
arch/arm/mach-mxs/Kconfig

@@ -2,9 +2,6 @@ if ARCH_MXS
 
 
 source "arch/arm/mach-mxs/devices/Kconfig"
 source "arch/arm/mach-mxs/devices/Kconfig"
 
 
-config MXS_OCOTP
-	bool
-
 config SOC_IMX23
 config SOC_IMX23
 	bool
 	bool
 	select ARM_AMBA
 	select ARM_AMBA
@@ -66,7 +63,6 @@ config MACH_MX28EVK
 	select MXS_HAVE_PLATFORM_MXS_SAIF
 	select MXS_HAVE_PLATFORM_MXS_SAIF
 	select MXS_HAVE_PLATFORM_MXS_I2C
 	select MXS_HAVE_PLATFORM_MXS_I2C
 	select MXS_HAVE_PLATFORM_RTC_STMP3XXX
 	select MXS_HAVE_PLATFORM_RTC_STMP3XXX
-	select MXS_OCOTP
 	help
 	help
 	  Include support for MX28EVK platform. This includes specific
 	  Include support for MX28EVK platform. This includes specific
 	  configurations for the board and its peripherals.
 	  configurations for the board and its peripherals.
@@ -94,7 +90,6 @@ config MODULE_M28
 	select MXS_HAVE_PLATFORM_MXS_I2C
 	select MXS_HAVE_PLATFORM_MXS_I2C
 	select MXS_HAVE_PLATFORM_MXS_MMC
 	select MXS_HAVE_PLATFORM_MXS_MMC
 	select MXS_HAVE_PLATFORM_MXSFB
 	select MXS_HAVE_PLATFORM_MXSFB
-	select MXS_OCOTP
 
 
 config MODULE_APX4
 config MODULE_APX4
 	bool
 	bool
@@ -106,7 +101,6 @@ config MODULE_APX4
 	select MXS_HAVE_PLATFORM_MXS_I2C
 	select MXS_HAVE_PLATFORM_MXS_I2C
 	select MXS_HAVE_PLATFORM_MXS_MMC
 	select MXS_HAVE_PLATFORM_MXS_MMC
 	select MXS_HAVE_PLATFORM_MXS_SAIF
 	select MXS_HAVE_PLATFORM_MXS_SAIF
-	select MXS_OCOTP
 
 
 config MACH_TX28
 config MACH_TX28
 	bool "Ka-Ro TX28 module"
 	bool "Ka-Ro TX28 module"

+ 1 - 2
arch/arm/mach-mxs/Makefile

@@ -1,7 +1,6 @@
 # Common support
 # Common support
-obj-y := devices.o icoll.o iomux.o system.o timer.o mm.o
+obj-y := devices.o icoll.o iomux.o ocotp.o system.o timer.o mm.o
 
 
-obj-$(CONFIG_MXS_OCOTP) += ocotp.o
 obj-$(CONFIG_PM) += pm.o
 obj-$(CONFIG_PM) += pm.o
 
 
 obj-$(CONFIG_MACH_MXS_DT) += mach-mxs.o
 obj-$(CONFIG_MACH_MXS_DT) += mach-mxs.o