Pārlūkot izejas kodu

implement submodel for foxboard lx. resolves duplicate full build for this systems

Waldemar Brodkorb 13 gadi atpakaļ
vecāks
revīzija
ce867d683d

+ 1 - 3
mk/modules.mk

@@ -1180,13 +1180,11 @@ $(eval $(call KMOD_template,INPUT_EVDEV,input-evdev,\
 # USB
 #
 
-ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX832),)
-ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX416),)
+ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX),)
 $(eval $(call KMOD_template,USB,usb,\
 	$(MODULES_DIR)/kernel/drivers/usb/core/usbcore \
 ,50))
 endif
-endif
 
 $(eval $(call KMOD_template,USB_EHCI_HCD,usb-ehci-hcd,\
 	$(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd \

+ 14 - 0
target/config/Config.in

@@ -73,6 +73,19 @@ config ADK_TARGET_ABI_N64
 
 endchoice
 
+# submodel support
+choice
+prompt "Foxboard LX Model"
+depends on ADK_TARGET_SYSTEM_FOXBOARD_LX
+
+config ADK_TARGET_FOXBOARD_MODEL_LX416
+	boolean "Foxboard LX 4x16"
+
+config ADK_TARGET_FOXBOARD_MODEL_LX832
+	boolean "Foxboard LX 8x32"
+
+endchoice
+
 choice 
 prompt "Broadcom BCM47xx Model"
 depends on ADK_TARGET_SYSTEM_BROADCOM_BCM47XX
@@ -302,6 +315,7 @@ config ADK_TARGET_CMDLINE
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40
 	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
+	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_FOXBOARD_LX
 	default ""
 
 # c library

+ 0 - 9
target/cris/sys-available/foxboard-lx416

@@ -1,9 +0,0 @@
-config ADK_TARGET_SYSTEM_FOXBOARD_LX416
-	bool "FOX Board LX416"
-	select ADK_cris
-	select ADK_foxboard_lx416
-	select ADK_TARGET_WITH_MTD
-	select ADK_TARGET_WITH_USB
-	help
-	  Build a system for FOX Board LX416.
-

+ 0 - 9
target/cris/sys-available/foxboard-lx832

@@ -1,9 +0,0 @@
-config ADK_TARGET_SYSTEM_FOXBOARD_LX832
-	bool "FOX Board LX832"
-	select ADK_cris
-	select ADK_foxboard_lx832
-	select ADK_TARGET_WITH_MTD
-	select ADK_TARGET_WITH_USB
-	help
-	  Build a system for FOX Board LX832.
-

+ 3 - 6
target/linux/config/Config.in.block

@@ -274,8 +274,7 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_MD
 	tristate
 	depends on !ADK_KERNEL_BLK_DEV_MD
 	select ADK_KERNEL_MD
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
+	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	help
 
 config ADK_KERNEL_MD_RAID0
@@ -310,8 +309,7 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DM
 	prompt "kmod-blk-dev-dm................... Device Mapper support"
 	select ADK_KERNEL_MD
 	depends on !ADK_KERNEL_BLK_DEV_DM
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
+	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	tristate
 	help
 	  Device-mapper is a low level volume manager.  It works by allowing
@@ -359,8 +357,7 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DRBD
 	tristate
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_CONNECTOR
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
+	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	help
           DRBD - http://www.drbd.org
 

+ 1 - 2
target/linux/config/Config.in.debug

@@ -60,8 +60,7 @@ config ADK_KPACKAGE_KMOD_OPROFILE
 	prompt "kernel support for oprofile"
 	tristate
 	select ADK_KERNEL_PROFILING
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
+	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	default n
 	help
 	 use oprofile package to make use of the kernel support.

+ 1 - 2
target/linux/config/Config.in.fs

@@ -190,8 +190,7 @@ config ADK_KPACKAGE_KMOD_XFS_FS
 	tristate
 	select ADK_KERNEL_EXPORTFS
 	depends on !ADK_KERNEL_XFS_FS
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
+	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	default n
 	help
 	  XFS is a high performance journaling filesystem which originated

+ 1 - 2
target/linux/config/Config.in.input

@@ -61,8 +61,7 @@ config ADK_KPACKAGE_KMOD_USB_HID
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_HID
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
-        depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
+        depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on ADK_TARGET_WITH_USB
 	default n
 

+ 9 - 9
target/linux/config/Config.in.kernel

@@ -3,21 +3,21 @@ config ADK_KERNEL_EXPERIMENTAL
 
 config ADK_KERNEL_ETRAX_MTD_SIZE
         hex
-        depends on ADK_TARGET_SYSTEM_FOXBOARD_LX416 || ADK_TARGET_SYSTEM_FOXBOARD_LX832
-        default "0x00400000" if ADK_TARGET_SYSTEM_FOXBOARD_LX416
-        default "0x00800000" if ADK_TARGET_SYSTEM_FOXBOARD_LX832
+        depends on ADK_TARGET_SYSTEM_FOXBOARD_LX
+        default "0x00400000" if ADK_TARGET_FOXBOARD_MODEL_LX416
+        default "0x00800000" if ADK_TARGET_FOXBOARD_MODEL_LX832
 
 config ADK_KERNEL_ETRAX_DRAM_SIZE
         int
-        depends on ADK_TARGET_SYSTEM_FOXBOARD_LX416 || ADK_TARGET_SYSTEM_FOXBOARD_LX832
-        default "16" if ADK_TARGET_SYSTEM_FOXBOARD_LX416
-        default "32" if ADK_TARGET_SYSTEM_FOXBOARD_LX832
+        depends on ADK_TARGET_SYSTEM_FOXBOARD_LX
+        default "16" if ADK_TARGET_FOXBOARD_MODEL_LX416
+        default "32" if ADK_TARGET_FOXBOARD_MODEL_LX832
 
 config ADK_KERNEL_ETRAX_DEF_R_SDRAM_TIMING
         hex
-        depends on ADK_TARGET_SYSTEM_FOXBOARD_LX416 || ADK_TARGET_SYSTEM_FOXBOARD_LX832
-        default "0x80608002" if ADK_TARGET_SYSTEM_FOXBOARD_LX416
-        default "0x80008002" if ADK_TARGET_SYSTEM_FOXBOARD_LX832
+        depends on ADK_TARGET_SYSTEM_FOXBOARD_LX
+        default "0x80608002" if ADK_TARGET_FOXBOARD_MODEL_LX416
+        default "0x80008002" if ADK_TARGET_FOXBOARD_MODEL_LX832
 
 config ADK_KERNEL_BLK_DEV_INITRD
 	boolean

+ 2 - 4
target/linux/config/Config.in.netdevice

@@ -373,8 +373,7 @@ config ADK_KPACKAGE_KMOD_RTL8187
 	prompt "kmod-rtl8187................. Realtek RTL8187/RTL8187B wireless cards"
 	tristate
 	depends on ADK_TARGET_WITH_USB
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
+	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	default n
 	help
 	  Driver for Realtek RTL8187/RTL8187B wireless chips.
@@ -389,8 +388,7 @@ config ADK_KPACKAGE_KMOD_P54_USB
 	select ADK_KPACKAGE_KMOD_MAC80211
 	select ADK_KPACKAGE_KMOD_CRC_CCITT
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
+	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	default n
 	help
 	  Driver for Prism54 USB adaptors.

+ 5 - 10
target/linux/config/Config.in.usb

@@ -75,8 +75,7 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD
 	depends on ADK_KPACKAGE_KMOD_USB
 	depends on !ADK_KERNEL_USB_UHCI_HCD
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
+	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
@@ -97,8 +96,7 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on ADK_KPACKAGE_KMOD_USB
 	#depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
+	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
@@ -120,8 +118,7 @@ config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on ADK_KPACKAGE_KMOD_USB
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
+	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	default n
 	help
 	  The ISP1160 and ISP1161 chips are USB host controllers. Enable this
@@ -135,8 +132,7 @@ config ADK_KPACKAGE_KMOD_USB_SL811_HCD
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on ADK_KPACKAGE_KMOD_USB
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
+	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	default n
 	help
 	  The SL811HS is a single-port USB controller that supports either
@@ -151,8 +147,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on !ADK_KERNEL_USB_EHCI_HCD
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX832
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX416
+	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on ADK_KPACKAGE_KMOD_USB
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2