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 <javier.viguera@digi.com>

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
+# Per-variant machine features
-# ----		---	---	---	-----
-# 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"
 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"

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
+# Per-variant machine features
-# ----		---	---	---	----	---	---
+MACHINE_FEATURES_append_128a = " accelerometer"
-# wagv		Y	N	256	Y	Y	Y
+MACHINE_FEATURES_append_128agv = " accelerometer accel-video accel-graphics"
-# weagv		Y	Y	512	Y	Y	Y
+MACHINE_FEATURES_append_agv = " accelerometer accel-video accel-graphics"
-# w128agv	Y	N	128	Y	Y	Y
+MACHINE_FEATURES_append_eagv = " ext-eth accelerometer accel-video accel-graphics"
-# eagv		N	Y	512	Y	Y	Y
+MACHINE_FEATURES_append_w = " wifi"
-# agv		N	N	256	Y	Y	Y
+MACHINE_FEATURES_append_w128a = " wifi accelerometer"
-# w		Y	N	512	N	N	N
+MACHINE_FEATURES_append_w128agv = " wifi accelerometer accel-video accel-graphics"
-# 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
-
-
 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"

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
+# To build any of these variants configure MACHINE_VARIANT on the project's
-# ----		---	---	---	----
+# local.conf to the variant name.
-# we		Y	Y	512	512
+#
-# w		Y	N	512	512
+# Name          WiFi    Eth2    RAM     NAND
-# w128		Y	N	128	128
+# ------------------------------------------
-# -		N	N	512	512
+# -             N       N       512     512     (empty MACHINE_VARIANT="")
-# e		N	Y	1024	512
+# 128           N       N       128     128
-# 4k		N	N	512	1024
+# 4k            N       N       512     1024
-# e		N	Y	512	1024
+# e             N       Y       1024    512
-# 128		N	N	128	128
+# 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 += "accelerometer accel-graphics accel-video"
-MACHINE_FEATURES += "accel-graphics"
-MACHINE_FEATURES += "accelerometer"
 
-# Variant configuration
+# Per-variant machine features
-
+MACHINE_FEATURES_append_e = " ext-eth"
-MACHINE_FEATURES_append_we = " wifi ext-eth"
+MACHINE_FEATURES_append_e4k = " ext-eth"
-UBOOT_CONFIG_VARIANT_we = "ext_eth"
 MACHINE_FEATURES_append_w = " wifi"
 MACHINE_FEATURES_append_w128 = " wifi"
-UBOOT_CONFIG_VARIANT_w128 = "128sdram"
+MACHINE_FEATURES_append_we = " wifi ext-eth"
-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"
 
+# 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"