Home Explore Help
Sign In
oss
/
openadk
4
1
Fork 3
Files Issues 1 Pull Requests 0 Wiki
Browse Source

prefix models with ADK_TARGET_MODEL

Waldemar Brodkorb 8 years ago
parent
ed130c4bcc
commit
fa83e16cb8
10 changed files with 28 additions and 29 deletions
Split View Show Diff Stats
  1. 10 10
      target/config/Config.in.subsystem
  2. 1 1
      target/config/Config.in.target
  3. 2 2
      target/linux/config/Config.in.audio
  4. 2 2
      target/linux/config/Config.in.graphics
  5. 3 3
      target/linux/config/Config.in.input
  6. 3 3
      target/linux/config/Config.in.kernel
  7. 2 3
      target/linux/config/Config.in.leds
  8. 2 3
      target/linux/config/Config.in.rtc
  9. 2 0
      target/linux/config/Config.in.serial
  10. 1 2
      target/x86/kernel/pcengines-alix

+ 10 - 10
target/config/Config.in.subsystem
View File 

@@ -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

+ 1 - 1
target/config/Config.in.target
View File 

@@ -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 ""

+ 2 - 2
target/linux/config/Config.in.audio
View File 

@@ -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

+ 2 - 2
target/linux/config/Config.in.graphics
View File 

@@ -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.

+ 3 - 3
target/linux/config/Config.in.input
View File 

@@ -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

+ 3 - 3
target/linux/config/Config.in.kernel
View File 

@@ -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.

+ 2 - 3
target/linux/config/Config.in.leds
View File 

@@ -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

+ 2 - 3
target/linux/config/Config.in.rtc
View File 

@@ -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.

+ 2 - 0
target/linux/config/Config.in.serial
View File 

@@ -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

+ 1 - 2
target/x86/kernel/pcengines-alix
View File 

@@ -1,4 +1,3 @@
 
 CONFIG_X86=y
 
 CONFIG_X86_32=y
 
-CONFIG_SERIAL_8250=y
 
-CONFIG_SERIAL_8250_CONSOLE=y
 
+CONFIG_MGEODE_LX=y