From c3c816ec528378408000087e65cf121dcb179ccb Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Mon, 25 Mar 2013 16:26:14 +0100 Subject: [PATCH] Add support for variants I have split the machine configuration in two: -The module machine configuration include, for example ccimx53.inc -The machine configuration (for example cimx53js.conf) which includes the variant configuration. This will allow for customers to create their own machine keeping the module include file. The variant can be configured in the local.conf file with a MACHINE_VARIANT variable. The variant names are made up of the interface initials as follows: w: wifi e: externel ethernel b: bluetooth 1: 1-wire a: accelerometer g: GPU v: VPU 128: 128MB RAM 4k: 1024MB NAND (only for MX51 JTAG flash) For details regarding the supported variants, each machine configuration file contains a comment with a variants table. https://jira.digi.com/browse/DEL-330 Signed-off-by: Alex Gonzalez --- meta-digi-arm/conf/machine/ccardimx28js.conf | 23 +------ meta-digi-arm/conf/machine/ccimx51js.conf | 26 +------- meta-digi-arm/conf/machine/ccimx53js.conf | 25 +------- .../conf/machine/include/ccardimx28.inc | 51 ++++++++++++++++ .../conf/machine/include/ccimx51.inc | 60 +++++++++++++++++++ .../conf/machine/include/ccimx53.inc | 57 ++++++++++++++++++ .../conf/machine/include/digi-defaults.inc | 4 ++ .../conf/machine/include/mxs-digi-base.inc | 2 +- .../ccardimx28js/config-1-wire.cfg | 1 + .../ccardimx28js/config-ext-eth.cfg | 1 + .../ccardimx28js/defconfig | 2 - .../ccimx51js/config-ext-eth-module.cfg | 1 + .../ccimx53js/config-ext-eth-module.cfg | 1 + .../linux/linux-del_2.6.35.14.bb | 6 +- .../packagegroups/packagegroup-del-network.bb | 2 + .../packagegroup-del-wireless.bb | 5 ++ .../recipes-core/netbase/netbase_5.0.bbappend | 26 ++++++-- .../packagegroup-del-examples.bb | 2 +- 18 files changed, 215 insertions(+), 80 deletions(-) create mode 100644 meta-digi-arm/conf/machine/include/ccardimx28.inc create mode 100644 meta-digi-arm/conf/machine/include/ccimx51.inc create mode 100644 meta-digi-arm/conf/machine/include/ccimx53.inc create mode 100644 meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-1-wire.cfg create mode 100644 meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-ext-eth.cfg create mode 100644 meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/config-ext-eth-module.cfg create mode 100644 meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx53js/config-ext-eth-module.cfg diff --git a/meta-digi-arm/conf/machine/ccardimx28js.conf b/meta-digi-arm/conf/machine/ccardimx28js.conf index 29cf26535..d791bfdf2 100644 --- a/meta-digi-arm/conf/machine/ccardimx28js.conf +++ b/meta-digi-arm/conf/machine/ccardimx28js.conf @@ -2,28 +2,7 @@ #@NAME: ConnectCore for MX28 JumpStart Kit. #@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX28 JSK. -include conf/machine/include/mxs-digi-base.inc - -SOC_FAMILY = "mxs" - -UBOOT_ENTRYPOINT = "0x41008000" -UBOOT_LOADADDRESS = "0x41008000" - -# Set UBOOT_CONFIG_VARIANT in local.conf accordingly, default is empty: 261MHz,360MHz,test,dbg -UBOOT_CONFIG_VARIANT ?= "" -UBOOT_MACHINE = '${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "_", "_${UBOOT_CONFIG_VARIANT}_", d )}config' -UBOOT_MAKE_TARGET = "u-boot-ivt.sb" -UBOOT_SUFFIX = "sb" -UBOOT_IMAGE = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}ivt-${PV}-${PR}.${UBOOT_SUFFIX}' -UBOOT_BINARY = "u-boot-ivt.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}ivt.${UBOOT_SUFFIX}' +include conf/machine/include/ccardimx28.inc SERIAL_CONSOLE = "115200 ttyAM0" -# wpa_supplicant driver to use in '/etc/network/interfaces' -WPA_DRIVER = "nl80211" - -# Firmware -MACHINE_FIRMWARE = "firmware-mxs-ar3k" -MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" -MACHINE_FEATURES += "alsa touchscreen" diff --git a/meta-digi-arm/conf/machine/ccimx51js.conf b/meta-digi-arm/conf/machine/ccimx51js.conf index 0f47241a0..cad66d256 100644 --- a/meta-digi-arm/conf/machine/ccimx51js.conf +++ b/meta-digi-arm/conf/machine/ccimx51js.conf @@ -2,31 +2,7 @@ #@NAME: ConnectCore for MX51 JumpStart Kit. #@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX51 JSK -include conf/machine/include/imx-digi-base.inc - -SOC_FAMILY = "mx51:mx5" - -MACHINE_FEATURES += "accel-graphics accel-video wifi" - -UBOOT_ENTRYPOINT = "0x94000000" -UBOOT_LOADADDRESS = "0x94000000" +include conf/machine/include/ccimx51.inc SERIAL_CONSOLE = "38400 ttymxc1" -# Firmware -MACHINE_FIRMWARE = "firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" - -MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" -MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mma7455l \" -MACHINE_EXTRA_RRECOMMENDS += "kernel-module-scc2-driver \" -MACHINE_EXTRA_RRECOMMENDS += "kernel-module-sahara \" -MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mt9v111-camera \" -MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pmic-battery \" -MACHINE_EXTRA_RRECOMMENDS += "kernel-module-redpine \" - -module_autoload_mma7455l = "mma7455l" -module_autoload_scc2_driver = "scc2_driver" -module_autoload_sahara = "sahara" -module_autoload_mt9v111_camera = "mt9v111_camera" -module_autoload_pmic_battery = "pmic_battery" - diff --git a/meta-digi-arm/conf/machine/ccimx53js.conf b/meta-digi-arm/conf/machine/ccimx53js.conf index 559708831..04539e863 100644 --- a/meta-digi-arm/conf/machine/ccimx53js.conf +++ b/meta-digi-arm/conf/machine/ccimx53js.conf @@ -2,28 +2,7 @@ #@NAME: ConnectCore for MX53 JumpStart Kit. #@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX53 JSK. -include conf/machine/include/imx-digi-base.inc - -SOC_FAMILY = "mx53:mx5" - -MACHINE_FEATURES += "accel-graphics accel-video wifi" - -UBOOT_ENTRYPOINT = "0x70800000" -UBOOT_LOADADDRESS = "0x70800000" +# Contains the ConnectCore for MX53 module. +include conf/machine/include/ccimx53.inc SERIAL_CONSOLE = "115200 ttymxc0" - -# Firmware -MACHINE_FIRMWARE = "firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" -MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" -MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mma7455l \" -MACHINE_EXTRA_RRECOMMENDS += "kernel-module-scc2-driver \" -MACHINE_EXTRA_RRECOMMENDS += "kernel-module-sahara \" -MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mt9v111-camera \" -MACHINE_EXTRA_RRECOMMENDS += "kernel-module-redpine \" - -module_autoload_mma7455l = "mma7455l" -module_autoload_scc2_driver = "scc2_driver" -module_autoload_sahara = "sahara" -module_autoload_mt9v111_camera = "mt9v111_camera" - diff --git a/meta-digi-arm/conf/machine/include/ccardimx28.inc b/meta-digi-arm/conf/machine/include/ccardimx28.inc new file mode 100644 index 000000000..a35f1943c --- /dev/null +++ b/meta-digi-arm/conf/machine/include/ccardimx28.inc @@ -0,0 +1,51 @@ +#@TYPE: Machine +#@NAME: ConnectCore for MX28 module. +#@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX28 module. + +include conf/machine/include/mxs-digi-base.inc + +SOC_FAMILY = "mxs" + +UBOOT_ENTRYPOINT = "0x41008000" +UBOOT_LOADADDRESS = "0x41008000" + +# Set UBOOT_CONFIG_VARIANT in local.conf accordingly, default is empty: 261MHz,360MHz,test,dbg +UBOOT_CONFIG_VARIANT ?= "" +UBOOT_MACHINE = '${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "_", "_${UBOOT_CONFIG_VARIANT}_", d )}config' +UBOOT_MAKE_TARGET = "u-boot-ivt.sb" +UBOOT_SUFFIX = "sb" +UBOOT_IMAGE = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}ivt-${PV}-${PR}.${UBOOT_SUFFIX}' +UBOOT_BINARY = "u-boot-ivt.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}ivt.${UBOOT_SUFFIX}' + +# wpa_supplicant driver to use in '/etc/network/interfaces' +WPA_DRIVER = "nl80211" + +# Firmware +MACHINE_FIRMWARE = "firmware-mxs-ar3k" +MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" + +MACHINE_FEATURES += "alsa touchscreen" + +# Supported variants + +# Name WiFi Eth2 BT 1wire +# ---- --- --- --- ----- +# web1 Y Y Y Y +# web Y Y Y N +# wb Y N Y N +# w Y N N N +# - N N N N +# e N Y N N + +# Variant configuration + +MACHINE_FEATURES_web1 += "wifi ext-eth bluetooth 1-wire" +MACHINE_FEATURES_web += "wifi ext-eth bluetooth" +MACHINE_FEATURES_wb += "wifi bluetooth" +MACHINE_FEATURES_w += "wifi" +MACHINE_FEATURES_e += "ext-eth" + +# Variants for different CPU speed +#UBOOT_CONFIG_VARIANT = "261MHz" +#UBOOT_CONFIG_VARIANT = "360MHz" diff --git a/meta-digi-arm/conf/machine/include/ccimx51.inc b/meta-digi-arm/conf/machine/include/ccimx51.inc new file mode 100644 index 000000000..636a7e195 --- /dev/null +++ b/meta-digi-arm/conf/machine/include/ccimx51.inc @@ -0,0 +1,60 @@ +#@TYPE: Machine +#@NAME: ConnectCore for MX51 module. +#@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX51 module. + +include conf/machine/include/imx-digi-base.inc + +SOC_FAMILY = "mx51:mx5" + +UBOOT_ENTRYPOINT = "0x94000000" +UBOOT_LOADADDRESS = "0x94000000" + +# Firmware +MACHINE_FIRMWARE = "firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" + +MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mma7455l \" +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-smsc911x \" +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-scc2-driver \" +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-sahara \" +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mt9v111-camera \" +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pmic-battery \" + +module_autoload_mma7455l = "mma7455l" +module_autoload_smsc911x = "smsc911x" +module_autoload_scc2_driver = "scc2_driver" +module_autoload_sahara = "sahara" +module_autoload_mt9v111_camera = "mt9v111_camera" +module_autoload_pmic_battery = "pmic_battery" + +# Supported variants + +# Name WiFi Eth2 RAM Accel GPU VPU +# ---- --- --- --- ---- --- --- +# wagv Y N 256 Y Y Y +# weagv Y Y 512 Y Y Y +# w128agv Y N 128 Y Y Y +# eavg N Y 512 Y Y Y +# agv N N 256 Y Y Y +# w Y N 512 N N N +# 128 N N 128 N N N +# 128avg N N 128 Y Y Y +# 128a N N 128 Y N N +# w128a Y N 128 Y N N + + +MACHINE_FEATURES_wagv += "wifi accelerometer accel-video accel-graphics" +MACHINE_FEATURES_weagv += "wifi ext-eth accelerometer accel-video accel-graphics" +UBOOT_CONFIG_VARIANT_weagv = "ext_eth" +MACHINE_FEATURES_w128agv += "wifi accelerometer accel-video accel-graphics" +UBOOT_CONFIG_VARIANT_w128agv = "128sdram" +MACHINE_FEATURES_eavg += "ext-eth accelerometer accel-video accel-graphics" +MACHINE_FEATURES_agv += "accelerometer accel-video accel-graphics" +MACHINE_FEATURES_w += "wifi" +UBOOT_CONFIG_VARIANT_128 = "128sdram" +MACHINE_FEATURES_128avg += "accelerometer accel-video accel-graphics" +UBOOT_CONFIG_VARIANT_128avg = "128sdram" +MACHINE_FEATURES_128a += "accelerometer" +UBOOT_CONFIG_VARIANT_128a = "128sdram" +MACHINE_FEATURES_w128a += "wifi accelerometer" +UBOOT_CONFIG_VARIANT_w128a = "128sdram" diff --git a/meta-digi-arm/conf/machine/include/ccimx53.inc b/meta-digi-arm/conf/machine/include/ccimx53.inc new file mode 100644 index 000000000..cc8ed72a7 --- /dev/null +++ b/meta-digi-arm/conf/machine/include/ccimx53.inc @@ -0,0 +1,57 @@ +#@TYPE: Machine +#@NAME: ConnectCore for MX53 module. +#@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX53 module. + +include conf/machine/include/imx-digi-base.inc + +SOC_FAMILY = "mx53:mx5" + +UBOOT_ENTRYPOINT = "0x70800000" +UBOOT_LOADADDRESS = "0x70800000" + +# Firmware +MACHINE_FIRMWARE = "firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" +MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mma7455l \" +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-smsc911x \" +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-scc2-driver \" +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-sahara \" +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mt9v111-camera \" + +module_autoload_mma7455l = "mma7455l" +module_autoload_smsc911x = "smsc911x" +module_autoload_scc2_driver = "scc2_driver" +module_autoload_sahara = "sahara" +module_autoload_mt9v111_camera = "mt9v111_camera" + +# Supported variants + +# Name WiFi Eth2 RAM NAND +# ---- --- --- --- ---- +# we Y Y 512 512 +# w Y N 512 512 +# w128 Y N 128 128 +# - N N 512 512 +# e N Y 1024 512 +# 4k N N 512 1024 +# e N Y 512 1024 +# 128 N N 128 128 + +# All variants support +MACHINE_FEATURES += "accel-video" +MACHINE_FEATURES += "accel-graphics" +MACHINE_FEATURES += "accelerometer" + +# Variant configuration + +MACHINE_FEATURES_we += "wifi ext-eth" +UBOOT_CONFIG_VARIANT_we = "ext_eth" +MACHINE_FEATURES_w += "wifi" +MACHINE_FEATURES_w128 += "wifi" +UBOOT_CONFIG_VARIANT_w128 = "128sdram" +MACHINE_FEATURES_e += "ext-ext" +UBOOT_CONFIG_VARIANT_e = "ext_eth" +UBOOT_CONFIG_VARIANT_4k = "4Kpage" +MACHINE_FEATURES_e += "ext-eth" +UBOOT_CONFIG_VARIANT_e = "ext_eth" +UBOOT_CONFIG_VARIANT_128 = "128sdram" diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index ef5510c4c..f9cb50c73 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -14,3 +14,7 @@ IMAGE_CLASSES = "image_types_digi" # Do not enable console on VT (see sysvinit-inittab recipe) USE_VT = "0" + +# Add the machine variant to the valid machine override +MACHINEOVERRIDES =. "${@['', '${MACHINE_VARIANT}:']['${MACHINE_VARIANT}' != '']}" +MACHINE_VARIANT ?= "" diff --git a/meta-digi-arm/conf/machine/include/mxs-digi-base.inc b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc index 05fc4b40d..a557403d8 100644 --- a/meta-digi-arm/conf/machine/include/mxs-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc @@ -24,4 +24,4 @@ IMAGE_FSTYPES ?= "sum.jffs2 tar.bz2 ubifs" KERNEL_IMAGETYPE = "uImage" -MACHINE_FEATURES = "apm usbgadget usbhost vfat bluetooth wifi" +MACHINE_FEATURES = "apm usbgadget usbhost vfat" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-1-wire.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-1-wire.cfg new file mode 100644 index 000000000..26ffa65fc --- /dev/null +++ b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-1-wire.cfg @@ -0,0 +1 @@ +CONFIG_W1_MASTER_DS2482=y diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-ext-eth.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-ext-eth.cfg new file mode 100644 index 000000000..f15756dac --- /dev/null +++ b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/config-ext-eth.cfg @@ -0,0 +1 @@ +CONFIG_CCARDIMX28_ENET1=y diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/defconfig index eebccd611..f526a9440 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/defconfig +++ b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccardimx28js/defconfig @@ -269,7 +269,6 @@ CONFIG_CCMX28_CAN1=y # Ethernet Options # # CONFIG_CCARDIMX28_ENET0_LEDS is not set -CONFIG_CCARDIMX28_ENET1=y # CONFIG_CCARDIMX28_ENET1_LEDS is not set # @@ -1058,7 +1057,6 @@ CONFIG_W1=y # 1-wire Bus Masters # # CONFIG_W1_MASTER_DS2490 is not set -CONFIG_W1_MASTER_DS2482=y # CONFIG_W1_MASTER_DS1WM is not set # CONFIG_W1_MASTER_GPIO is not set diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/config-ext-eth-module.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/config-ext-eth-module.cfg new file mode 100644 index 000000000..bc77c896a --- /dev/null +++ b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx51js/config-ext-eth-module.cfg @@ -0,0 +1 @@ +CONFIG_SMSC911X=m diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx53js/config-ext-eth-module.cfg b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx53js/config-ext-eth-module.cfg new file mode 100644 index 000000000..bc77c896a --- /dev/null +++ b/meta-digi-arm/recipes-kernel/linux/linux-del-2.6.35.14/ccimx53js/config-ext-eth-module.cfg @@ -0,0 +1 @@ +CONFIG_SMSC911X=m diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb index a60e1d42a..1086d9439 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb @@ -20,8 +20,12 @@ LOCALVERSION_mxs = "mxs+${SRCREV_SHORT}" LOCALVERSION_cpx2_mxs = "mxs+gateways+${SRCREV_SHORT}" KERNEL_CFG_FRAGS ?= "" -KERNEL_CFG_FRAGS_append_mx5 = " file://config-accel-module.cfg file://config-sahara-module.cfg file://config-camera-module.cfg" +KERNEL_CFG_FRAGS_append_mx5 = "file://config-sahara-module.cfg file://config-camera-module.cfg" +KERNEL_CFG_FRAGS_append_mx5 = " ${@base_contains('MACHINE_FEATURES', 'accelerometer', 'file://config-accel-module.cfg', '', d)}" +KERNEL_CFG_FRAGS_append_mx5 = " ${@base_contains('MACHINE_FEATURES', 'ext-eth', 'file://config-ext-eth-module.cfg', '', d)}" KERNEL_CFG_FRAGS_append_ccimx51js = " file://config-battery-module.cfg" +KERNEL_CFG_FRAGS_append_ccardimx28js = " ${@base_contains('MACHINE_FEATURES', '1-wire', 'file://config-1-wire.cfg', '', d)}" +KERNEL_CFG_FRAGS_append_ccardimx28js = " ${@base_contains('MACHINE_FEATURES', 'ext-eth', 'file://config-ext-eth.cfg', '', d)}" KERNEL_CFG_FRAGS_append_ccardimx28js = " ${@base_contains('DISTRO_FEATURES', 'x11', 'file://config-fb.cfg file://config-touch.cfg', '', d)}" KERNEL_CFG_FRAGS_append_ccardimx28js = " ${@base_contains('MACHINE_FEATURES', 'alsa', 'file://config-sound.cfg', '', d)}" diff --git a/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-network.bb b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-network.bb index 68b9694c8..826aac188 100644 --- a/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-network.bb +++ b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-network.bb @@ -41,5 +41,7 @@ RDEPENDS_${PN} = "\ ${VIRTUAL-RUNTIME_ntp-client} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" +RDEPENDS_${PN}_append_mx5 = " ${@base_contains('MACHINE_FEATURES', 'ext-eth', 'kernel-module-smsc911x', '', d)}" + RRECOMMENDS_${PN} = "\ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" diff --git a/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-wireless.bb b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-wireless.bb index 140576603..bc0cf258e 100644 --- a/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-wireless.bb +++ b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-wireless.bb @@ -16,11 +16,16 @@ inherit packagegroup MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" +WIRELESS_MODULE ?= "" +WIRELESS_MODULE_append_mx5 = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-redpine', '', d)}" +WIRELESS_MODULE_append_mxs = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-atheros', '', d)}" + RDEPENDS_${PN} = "\ wpa-supplicant \ wireless-tools \ crda \ iw \ + ${WIRELESS_MODULE} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" RDEPENDS_${PN}_append_ccimx51js = "kernel-module-redpine" diff --git a/meta-digi-del/recipes-core/netbase/netbase_5.0.bbappend b/meta-digi-del/recipes-core/netbase/netbase_5.0.bbappend index ef3912058..340e2c587 100644 --- a/meta-digi-del/recipes-core/netbase/netbase_5.0.bbappend +++ b/meta-digi-del/recipes-core/netbase/netbase_5.0.bbappend @@ -20,7 +20,7 @@ pkg_postinst_${PN} () { cat << EOF > $D${sysconfdir}/network/interfaces EOF -cat $D/boot/config* | /bin/grep CONFIG_BLK_DEV_LOOP=y +cat $D/boot/config* | /bin/grep CONFIG_BLK_DEV_LOOP= if [ $? -eq 0 ]; then cat << EOF >> $D${sysconfdir}/network/interfaces # The loopback interface @@ -29,7 +29,7 @@ iface lo inet loopback EOF fi -cat $D/boot/config* | /bin/grep CONFIG_FEC=y +cat $D/boot/config* | /bin/grep CONFIG_FEC= if [ $? -eq 0 ]; then # Primary wired interface cat << EOF >> $D${sysconfdir}/network/interfaces @@ -45,8 +45,24 @@ iface eth0 inet static EOF fi -# Secondary wired interface -cat $D/boot/config* | /bin/grep CONFIG_SMSC911X=y +# Secondary wired interface on MXC platforms +cat $D/boot/config* | /bin/grep CONFIG_SMSC911X= +if [ $? -eq 0 ]; then +cat << EOF >> $D${sysconfdir}/network/interfaces +auto eth1 +# Use for dhcp +# iface eth1 inet dhcp +iface eth1 inet static + address 192.168.44.30 + netmask 255.255.255.0 + network 192.168.44.0 + gateway 192.168.44.1 + +EOF +fi + +# Secondary wired interface on MXS platforms +cat $D/boot/config* | /bin/grep CONFIG_CCARDIMX28_ENET1= if [ $? -eq 0 ]; then cat << EOF >> $D${sysconfdir}/network/interfaces auto eth1 @@ -62,7 +78,7 @@ EOF fi # Wireless interface -cat $D/boot/config* | /bin/grep CONFIG_WIRELESS=y +cat $D/boot/config* | /bin/grep CONFIG_WIRELESS= if [ $? -eq 0 ]; then cat << EOF >> $D${sysconfdir}/network/interfaces auto wlan0 diff --git a/meta-digi-del/recipes-digi/packagegroups/packagegroup-del-examples.bb b/meta-digi-del/recipes-digi/packagegroups/packagegroup-del-examples.bb index de626d755..eed46567e 100644 --- a/meta-digi-del/recipes-digi/packagegroups/packagegroup-del-examples.bb +++ b/meta-digi-del/recipes-digi/packagegroups/packagegroup-del-examples.bb @@ -28,7 +28,7 @@ RDEPENDS_${PN}_append_mxs = "\ " RDEPENDS_${PN}_append_mx5 = "\ - del-examples-accelerometer \ + ${@base_contains("MACHINE_FEATURES", "accelerometer", "del-examples-accelerometer", "", d)} \ ${@base_contains("MACHINE_FEATURES", "accel-graphics", "del-examples-opengles", "", d)} \ del-examples-sahara \ del-examples-v4l2 \