prefix models with ADK_TARGET_MODEL

10 files changed, 28 insertions, 29 deletions

diff --git a/target/config/Config.in.subsystem b/target/config/Config.in.subsystem
index 39bb1394c..322612ae5 100644
--- a/target/config/Config.in.subsystem
+++ b/target/config/Config.in.subsystem
@@ -5,10 +5,10 @@ choice
 prompt "PCengines ALIX model"
 depends on ADK_TARGET_SYSTEM_PCENGINES_ALIX
 
-config ADK_TARGET_SYSTEM_PCENGINES_ALIX2D
+config ADK_TARGET_MODEL_PCENGINES_ALIX2D
 	bool "PCengines Alix 2D"
 
-config ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
+config ADK_TARGET_MODEL_PCENGINES_ALIX1C
 	bool "PCengines Alix 1C"
 	select ADK_TARGET_WITH_SOUND
 	select ADK_TARGET_WITH_VGA
@@ -19,7 +19,7 @@ choice
 prompt "Solidrun IMX6 model"
 depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 
-config ADK_TARGET_CUBOX_I4PRO
+config ADK_TARGET_MODEL_CUBOX_I4PRO
 	bool "Solidrun Cubox-i4Pro"
 	select ADK_TARGET_WITH_SMP
 	select ADK_TARGET_WITH_WIFI
@@ -27,7 +27,7 @@ config ADK_TARGET_CUBOX_I4PRO
 	select ADK_TARGET_WITH_SDIO
 	select ADK_TARGET_WITH_SATA
 
-config ADK_TARGET_CUBOX_I2ULTRA
+config ADK_TARGET_MODEL_CUBOX_I2ULTRA
 	bool "Solidrun Cubox-i2Ultra"
 	select ADK_TARGET_WITH_SMP
 	select ADK_TARGET_WITH_WIFI
@@ -35,7 +35,7 @@ config ADK_TARGET_CUBOX_I2ULTRA
 	select ADK_TARGET_WITH_SDIO
 	select ADK_TARGET_WITH_SATA
 
-config ADK_TARGET_CUBOX_I2EX
+config ADK_TARGET_MODEL_CUBOX_I2EX
 	bool "Solidrun Cubox-i2eX"
 	select ADK_TARGET_WITH_SMP
 	select ADK_TARGET_WITH_WIFI
@@ -43,26 +43,26 @@ config ADK_TARGET_CUBOX_I2EX
 	select ADK_TARGET_WITH_SDIO
 	select ADK_TARGET_WITH_SATA
 
-config ADK_TARGET_CUBOX_I2
+config ADK_TARGET_MODEL_CUBOX_I2
 	bool "Solidrun Cubox-i2"
 	select ADK_TARGET_WITH_SMP
 	select ADK_TARGET_WITH_WIFI
 	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_WITH_SDIO
 
-config ADK_TARGET_CUBOX_I1
+config ADK_TARGET_MODEL_CUBOX_I1
 	bool "Solidrun Cubox-i1"
 	select ADK_TARGET_WITH_WIFI
 	select ADK_TARGET_WITH_SDIO
 
-config ADK_TARGET_HUMMINGBOARD_I1
+config ADK_TARGET_MODEL_HUMMINGBOARD_I1
 	bool "Solidrun Hummingboard-i1"
 
-config ADK_TARGET_HUMMINGBOARD_I2
+config ADK_TARGET_MODEL_HUMMINGBOARD_I2
 	bool "Solidrun Hummingboard-i2"
 	select ADK_TARGET_WITH_SMP
 
-config ADK_TARGET_HUMMINGBOARD_I2EX
+config ADK_TARGET_MODEL_HUMMINGBOARD_I2EX
 	bool "Solidrun Hummingboard-i2eX"
 	select ADK_TARGET_WITH_SMP
 	select ADK_TARGET_WITH_SATA
diff --git a/target/config/Config.in.target b/target/config/Config.in.target
index ce74c4bba..dfd61d779 100644
--- a/target/config/Config.in.target
+++ b/target/config/Config.in.target
@@ -4,7 +4,7 @@
 config ADK_TARGET_CMDLINE
 	string
 	default "fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default "geodewdt.nowayout=1" if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
+	default "geodewdt.nowayout=1" if ADK_TARGET_MODEL_PCENGINES_ALIX1C
 	default "kinetis_platform=k70-som" if ADK_TARGET_SYSTEM_KINETIS_K70
 	default ""
 
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index f47a490ea..780ae628e 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -131,7 +131,7 @@ config ADK_KERNEL_SND_CS5535AUDIO
 	select ADK_KERNEL_SND_AC97_CODEC
 	select ADK_KERNEL_SND
 	default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
+	default m if ADK_TARGET_MODEL_PCENGINES_ALIX1C
 	depends on ADK_TARGET_WITH_PCI
 	help
 	 ALSA AMD CS5535 driver
@@ -211,7 +211,7 @@ config ADK_KERNEL_SND_IMX_SOC
 	select ADK_KERNEL_SND_SOC_IMX_HDMI_DMA
 	select ADK_KERNEL_SND_SOC_IMX_HDMI
 	select ADK_KERNEL_SND_SOC_IMX_SPDIF
-	select ADK_KERNEL_SND_SOC_IMX_SGTL5000 if ADK_TARGET_HUMMINGBOARD_I2EX
+	select ADK_KERNEL_SND_SOC_IMX_SGTL5000 if ADK_TARGET_MODEL_HUMMINGBOARD_I2EX
 	select ADK_KERNEL_SND_SOC_FSL_ASRC
 	select ADK_KERNEL_SND_SOC_FSL_SPDIF
 	select ADK_KERNEL_REGMAP
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 91ab6fcd1..6da2f20cd 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -264,8 +264,8 @@ config ADK_KERNEL_FB_GEODE_LX
 	select ADK_KERNEL_FB
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
 	select ADK_KERNEL_FB_GEODE
-	depends on ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
-	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
+	depends on ADK_TARGET_MODEL_PCENGINES_ALIX1C
+	default y if ADK_TARGET_MODEL_PCENGINES_ALIX1C
  	default n
  	help
 	 Framebuffer support for ALIX boards with VGA.
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 5584ad068..a930a07a3 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -9,12 +9,12 @@ config ADK_KERNEL_INPUT
 	bool
 	default y if ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
-	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
 	default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
+	default y if ADK_TARGET_MODEL_PCENGINES_ALIX1C
 	default n
 
 config ADK_KERNEL_HID_LOGITECH
@@ -60,24 +60,24 @@ config ADK_KERNEL_INPUT_KEYBOARD
 	bool
 	default y if ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
-	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
 	default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
+	default y if ADK_TARGET_MODEL_PCENGINES_ALIX1C
 	default n
 
 config ADK_KERNEL_INPUT_MOUSE
 	bool
 	default y if ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
-	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
 	default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
+	default y if ADK_TARGET_MODEL_PCENGINES_ALIX1C
 	default n
 
 config ADK_KERNEL_INPUT_MOUSEDEV
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index aa6b3ea01..7daecb79f 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -240,11 +240,11 @@ config ADK_KERNEL_SMP
 
 config ADK_KERNEL_HIGHMEM
 	bool "Enable high memory"
-	default y if ADK_TARGET_CUBOX_I4PRO
-	default y if ADK_TARGET_CUBOX_I2ULTRA
-	default y if ADK_TARGET_CUBOX_I2EX
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI2
+	default y if ADK_TARGET_MODEL_CUBOX_I4PRO
+	default y if ADK_TARGET_MODEL_CUBOX_I2ULTRA
+	default y if ADK_TARGET_MODEL_CUBOX_I2EX
 	default n
 	help
 	  Enable high memory support.
diff --git a/target/linux/config/Config.in.leds b/target/linux/config/Config.in.leds
index db855dccf..225cfed4e 100644
--- a/target/linux/config/Config.in.leds
+++ b/target/linux/config/Config.in.leds
@@ -35,9 +35,8 @@ config ADK_KERNEL_LEDS_ALIX2
 	prompt "LED suppport for ALIX2/ALIX3"
 	tristate
 	select ADK_KERNEL_LEDS_CLASS
-	depends on ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
-	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
-	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
+	depends on ADK_TARGET_MODEL_PCENGINES_ALIX2D
+	default y if ADK_TARGET_MODEL_PCENGINES_ALIX2D
 	default n
 
 config ADK_KERNEL_LEDS_TRIGGER_TIMER
diff --git a/target/linux/config/Config.in.rtc b/target/linux/config/Config.in.rtc
index ad5d3d5e1..acf9b8512 100644
--- a/target/linux/config/Config.in.rtc
+++ b/target/linux/config/Config.in.rtc
@@ -56,12 +56,11 @@ config ADK_KERNEL_RTC_DRV_CMOS
 	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 y if ADK_TARGET_MODEL_PCENGINES_ALIX1C
  	default n
-	depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || ADK_TARGET_SYSTEM_IBM_X40 || ADK_TARGET_SYSTEM_LEMOTE_YEELONG)
+	depends on (ADK_TARGET_MODEL_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_IBM_X40 || ADK_TARGET_SYSTEM_LEMOTE_YEELONG)
  	help
 	 PC CMOS RTC support.
 
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
index 5579336fb..d5f397e01 100644
--- a/target/linux/config/Config.in.serial
+++ b/target/linux/config/Config.in.serial
@@ -39,10 +39,12 @@ config ADK_KERNEL_SERIAL_8250
 	select ADK_KERNEL_SERIAL_8250_CONSOLE
 	depends on ADK_TARGET_SYSTEM_XILINX_KINTEX7 \
 		|| ADK_TARGET_SYSTEM_PCENGINES_APU \
+		|| ADK_TARGET_SYSTEM_PCENGINES_ALIX \
 		|| ADK_TARGET_SYSTEM_QEMU_OR1K \
 		|| ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	default y if ADK_TARGET_SYSTEM_XILINX_KINTEX7
 	default y if ADK_TARGET_SYSTEM_PCENGINES_APU
+	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX
 	default y if ADK_TARGET_SYSTEM_QEMU_OR1K
 	default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	default n
diff --git a/target/x86/kernel/pcengines-alix b/target/x86/kernel/pcengines-alix
index 849852a65..10a430f69 100644
--- a/target/x86/kernel/pcengines-alix
+++ b/target/x86/kernel/pcengines-alix
@@ -1,4 +1,3 @@
 CONFIG_X86=y
 CONFIG_X86_32=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_MGEODE_LX=y