From 7ee47e607ec8eb2ac137cc3acf2cc542e74bd237 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 14 May 2013 10:16:26 +0200 Subject: [PATCH] meta-digi-arm: rework variants support Mostly cosmetic changes to clear it a bit so customers can use it as documentation for what variant they need to configure in their projects. Also a couple of minor fixes: 'ext-eth' typo and duplicated 'e' variant for ccimx53js. https://jira.digi.com/browse/DEL-460 Signed-off-by: Javier Viguera --- .../conf/machine/include/ccardimx28.inc | 33 ++++++----- .../conf/machine/include/ccimx51.inc | 59 ++++++++++--------- .../conf/machine/include/ccimx53.inc | 52 ++++++++-------- 3 files changed, 77 insertions(+), 67 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/ccardimx28.inc b/meta-digi-arm/conf/machine/include/ccardimx28.inc index f2ab4d4c9..9ea508630 100644 --- a/meta-digi-arm/conf/machine/include/ccardimx28.inc +++ b/meta-digi-arm/conf/machine/include/ccardimx28.inc @@ -27,24 +27,27 @@ MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" MACHINE_FEATURES += "alsa touchscreen" +# # Supported variants +# +# To build any of these variants configure MACHINE_VARIANT on the project's +# local.conf to the variant name. +# +# Name WiFi Eth2 BT 1wire +# ------------------------------------------- +# - N N N N (empty MACHINE_VARIANT="") +# e N Y N N +# w Y N N N +# wb Y N Y N +# web Y Y Y N +# web1 Y Y Y Y -# 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_append_web1 = " wifi ext-eth bluetooth 1-wire" -MACHINE_FEATURES_append_web = " wifi ext-eth bluetooth" -MACHINE_FEATURES_append_wb = " wifi bluetooth" -MACHINE_FEATURES_append_w = " wifi" +# Per-variant machine features MACHINE_FEATURES_append_e = " ext-eth" +MACHINE_FEATURES_append_w = " wifi" +MACHINE_FEATURES_append_wb = " wifi bluetooth" +MACHINE_FEATURES_append_web = " wifi ext-eth bluetooth" +MACHINE_FEATURES_append_web1 = " wifi ext-eth bluetooth 1-wire" # Variants for different CPU speed #UBOOT_CONFIG_VARIANT = "261MHz" diff --git a/meta-digi-arm/conf/machine/include/ccimx51.inc b/meta-digi-arm/conf/machine/include/ccimx51.inc index 14b4f9da5..45251a7ca 100644 --- a/meta-digi-arm/conf/machine/include/ccimx51.inc +++ b/meta-digi-arm/conf/machine/include/ccimx51.inc @@ -27,35 +27,40 @@ module_autoload_sahara = "sahara" module_autoload_mt9v111_camera = "mt9v111_camera" module_autoload_pmic_battery = "pmic_battery" +# # Supported variants +# +# To build any of these variants configure MACHINE_VARIANT on the project's +# local.conf to the variant name. +# +# Name WiFi Eth2 RAM Accel GPU VPU +# --------------------------------------------------------- +# 128 N N 128 N N N +# 128a N N 128 Y N N +# 128agv N N 128 Y Y Y +# agv N N 256 Y Y Y +# eagv N Y 512 Y Y Y +# w Y N 512 N N N +# w128a Y N 128 Y N N +# w128agv Y N 128 Y Y Y +# wagv Y N 256 Y Y Y +# weagv Y Y 512 Y Y Y -# 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 -# eagv 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 -# 128agv N N 128 Y Y Y -# 128a N N 128 Y N N -# w128a Y N 128 Y N N - - +# Per-variant machine features +MACHINE_FEATURES_append_128a = " accelerometer" +MACHINE_FEATURES_append_128agv = " accelerometer accel-video accel-graphics" +MACHINE_FEATURES_append_agv = " accelerometer accel-video accel-graphics" +MACHINE_FEATURES_append_eagv = " ext-eth accelerometer accel-video accel-graphics" +MACHINE_FEATURES_append_w = " wifi" +MACHINE_FEATURES_append_w128a = " wifi accelerometer" +MACHINE_FEATURES_append_w128agv = " wifi accelerometer accel-video accel-graphics" MACHINE_FEATURES_append_wagv = " wifi accelerometer accel-video accel-graphics" MACHINE_FEATURES_append_weagv = " wifi ext-eth accelerometer accel-video accel-graphics" -UBOOT_CONFIG_VARIANT_weagv = "ext_eth" -MACHINE_FEATURES_append_w128agv = " wifi accelerometer accel-video accel-graphics" -UBOOT_CONFIG_VARIANT_w128agv = "128sdram" -MACHINE_FEATURES_append_eagv = " ext-eth accelerometer accel-video accel-graphics" -MACHINE_FEATURES_append_agv = " accelerometer accel-video accel-graphics" -MACHINE_FEATURES_append_w = " wifi" -UBOOT_CONFIG_VARIANT_128 = "128sdram" -MACHINE_FEATURES_append_128agv = " accelerometer accel-video accel-graphics" -UBOOT_CONFIG_VARIANT_128agv = "128sdram" -MACHINE_FEATURES_append_128a = " accelerometer" -UBOOT_CONFIG_VARIANT_128a = "128sdram" -MACHINE_FEATURES_append_w128a = " wifi accelerometer" -UBOOT_CONFIG_VARIANT_w128a = "128sdram" +# Per-variant u-boot configuration +UBOOT_CONFIG_VARIANT_128 = "128sdram" +UBOOT_CONFIG_VARIANT_128a = "128sdram" +UBOOT_CONFIG_VARIANT_128agv = "128sdram" +UBOOT_CONFIG_VARIANT_w128a = "128sdram" +UBOOT_CONFIG_VARIANT_w128agv = "128sdram" +UBOOT_CONFIG_VARIANT_weagv = "ext_eth" diff --git a/meta-digi-arm/conf/machine/include/ccimx53.inc b/meta-digi-arm/conf/machine/include/ccimx53.inc index 5a5652e9b..c62abd18a 100644 --- a/meta-digi-arm/conf/machine/include/ccimx53.inc +++ b/meta-digi-arm/conf/machine/include/ccimx53.inc @@ -24,35 +24,37 @@ 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 +# +# To build any of these variants configure MACHINE_VARIANT on the project's +# local.conf to the variant name. +# +# Name WiFi Eth2 RAM NAND +# ------------------------------------------ +# - N N 512 512 (empty MACHINE_VARIANT="") +# 128 N N 128 128 +# 4k N N 512 1024 +# e N Y 1024 512 +# e4k N Y 512 1024 +# w Y N 512 512 +# w128 Y N 128 128 +# we Y Y 512 512 # All variants support -MACHINE_FEATURES += "accel-video" -MACHINE_FEATURES += "accel-graphics" -MACHINE_FEATURES += "accelerometer" +MACHINE_FEATURES += "accelerometer accel-graphics accel-video" -# Variant configuration - -MACHINE_FEATURES_append_we = " wifi ext-eth" -UBOOT_CONFIG_VARIANT_we = "ext_eth" +# Per-variant machine features +MACHINE_FEATURES_append_e = " ext-eth" +MACHINE_FEATURES_append_e4k = " ext-eth" MACHINE_FEATURES_append_w = " wifi" MACHINE_FEATURES_append_w128 = " wifi" -UBOOT_CONFIG_VARIANT_w128 = "128sdram" -MACHINE_FEATURES_append_e = " ext-ext" -UBOOT_CONFIG_VARIANT_e = "ext_eth" -UBOOT_CONFIG_VARIANT_4k = "4Kpage" -MACHINE_FEATURES_append_e = " ext-eth" -UBOOT_CONFIG_VARIANT_e = "ext_eth" -UBOOT_CONFIG_VARIANT_128 = "128sdram" +MACHINE_FEATURES_append_we = " wifi ext-eth" +# Per-variant u-boot configuration +UBOOT_CONFIG_VARIANT_128 = "128sdram" +UBOOT_CONFIG_VARIANT_4k = "4Kpage" +UBOOT_CONFIG_VARIANT_e = "ext_eth" +UBOOT_CONFIG_VARIANT_e4k = "4Kpage" +UBOOT_CONFIG_VARIANT_w128 = "128sdram" +UBOOT_CONFIG_VARIANT_we = "ext_eth"