enable rtc for cubox-i

5 files changed, 74 insertions, 50 deletions

diff --git a/target/arm/kernel/cubox-i2ultra b/target/arm/kernel/cubox-i2ultra
index 442536aab..47bc235c5 100644
--- a/target/arm/kernel/cubox-i2ultra
+++ b/target/arm/kernel/cubox-i2ultra
@@ -13,8 +13,6 @@ CONFIG_AEABI=y
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_NEON=y
-CONFIG_DTC=y
-CONFIG_OF=y
 CONFIG_PCI_IMX6=y
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
diff --git a/target/arm/sys-available/cubox-i b/target/arm/sys-available/cubox-i
index cd1362ecd..0c26037de 100644
--- a/target/arm/sys-available/cubox-i
+++ b/target/arm/sys-available/cubox-i
@@ -11,6 +11,7 @@ config ADK_TARGET_SYSTEM_CUBOX_I
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_I2C
+	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_WITH_ROOT_RW
 	select ADK_PACKAGE_U_BOOT_IMX6
diff --git a/target/linux/Config.in b/target/linux/Config.in
index e44412ae8..70fc094f7 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -13,6 +13,7 @@ source target/linux/config/Config.in.audio
 source target/linux/config/Config.in.video
 source target/linux/config/Config.in.crypto
 source target/linux/config/Config.in.bluetooth
+source target/linux/config/Config.in.rtc
 source target/linux/config/Config.in.watchdog
 source target/linux/config/Config.in.leds
 source target/linux/config/Config.in.misc
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index 2a42745ea..f171f8a52 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -25,15 +25,6 @@ config ADK_KPACKAGE_KMOD_REGMAP_MMIO
 config ADK_KERNEL_KEYS
 	boolean
 
-config ADK_KERNEL_RTC_CLASS
- 	boolean
-
-config ADK_KERNEL_RTC_HCTOSYS
- 	boolean
-
-config ADK_KERNEL_RTC_INTF_DEV
- 	boolean
-
 menu "Miscellaneous devices support"
 
 config ADK_KERNEL_KEXEC
@@ -42,45 +33,6 @@ config ADK_KERNEL_KEXEC
 	help
 	  You need also kexec-tools to benefit from it.	
 
-config ADK_KERNEL_RTC_DRV_PXA
-	prompt ".................................. RTC support for Sharp Zaurus"
-	boolean
-	select ADK_KERNEL_RTC_CLASS
-	select ADK_KERNEL_RTC_HCTOSYS
-	select ADK_KERNEL_RTC_INTF_DEV
-	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default n
-	depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	help
-	  Sharp Zaurus RTC.
-
-config ADK_KERNEL_RTC_DRV_AT91SAM9
-	prompt ".................................. RTC support for AT91SAM9 (Fox G20)"
-	boolean
-	select ADK_KERNEL_RTC_CLASS
-	select ADK_KERNEL_RTC_HCTOSYS
-	select ADK_KERNEL_RTC_INTF_DEV
-	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	default n
-	depends on ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	help
- 	  Fox G20 RTC support.
-
-config ADK_KERNEL_RTC_DRV_CMOS
-	prompt ".................................. RTC support for PC CMOS"
-	boolean
-	select ADK_KERNEL_RTC_CLASS
-	select ADK_KERNEL_RTC_HCTOSYS
-	select ADK_KERNEL_RTC_INTF_DEV
-	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
-	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
-	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
- 	default n
-	depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || ADK_TARGET_SYSTEM_IBM_X40 || ADK_TARGET_SYSTEM_LEMOTE_YEELONG)
- 	help
-	 PC CMOS RTC support.
-	
 config ADK_KPACKAGE_KMOD_PARPORT
 	prompt "kmod-parport...................... generic parallel port support"
 	tristate
diff --git a/target/linux/config/Config.in.rtc b/target/linux/config/Config.in.rtc
new file mode 100644
index 000000000..a1cb54fa3
--- /dev/null
+++ b/target/linux/config/Config.in.rtc
@@ -0,0 +1,72 @@
+menu "RTC device support"
+depends on ADK_TARGET_WITH_RTC
+
+config ADK_KERNEL_RTC_CLASS
+ 	boolean
+
+config ADK_KERNEL_RTC_HCTOSYS
+ 	boolean
+
+config ADK_KERNEL_RTC_INTF_DEV
+ 	boolean
+
+config ADK_KERNEL_RTC_INTF_DEV_UIE_EMUL
+	boolean
+
+config ADK_KERNEL_RTC_DRV_PCF8563
+	boolean
+
+config ADK_KERNEL_RTC_DRV_SNVS
+	prompt "RTC support for Solidrun Cubox-i"
+	boolean
+	select ADK_KERNEL_RTC_CLASS
+	select ADK_KERNEL_RTC_HCTOSYS
+	select ADK_KERNEL_RTC_INTF_DEV
+	select ADK_KERNEL_RTC_INTF_DEV_UIE_EMUL
+	select ADK_KERNEL_RTC_DRV_PCF8563
+	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	default n
+	depends on ADK_TARGET_SYSTEM_CUBOX_I
+	help
+	  Solidrun Cubox-i RTC.
+
+config ADK_KERNEL_RTC_DRV_PXA
+	prompt "RTC support for Sharp Zaurus"
+	boolean
+	select ADK_KERNEL_RTC_CLASS
+	select ADK_KERNEL_RTC_HCTOSYS
+	select ADK_KERNEL_RTC_INTF_DEV
+	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
+	default n
+	depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS
+	help
+	  Sharp Zaurus RTC.
+
+config ADK_KERNEL_RTC_DRV_AT91SAM9
+	prompt "RTC support for AT91SAM9 (Fox G20)"
+	boolean
+	select ADK_KERNEL_RTC_CLASS
+	select ADK_KERNEL_RTC_HCTOSYS
+	select ADK_KERNEL_RTC_INTF_DEV
+	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
+	default n
+	depends on ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
+	help
+ 	  Fox G20 RTC support.
+
+config ADK_KERNEL_RTC_DRV_CMOS
+	prompt "RTC support for PC CMOS"
+	boolean
+	select ADK_KERNEL_RTC_CLASS
+	select ADK_KERNEL_RTC_HCTOSYS
+	select ADK_KERNEL_RTC_INTF_DEV
+	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
+	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
+	default y if ADK_TARGET_SYSTEM_IBM_X40
+	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+ 	default n
+	depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || ADK_TARGET_SYSTEM_IBM_X40 || ADK_TARGET_SYSTEM_LEMOTE_YEELONG)
+ 	help
+	 PC CMOS RTC support.
+
+endmenu