From e0fed036fad18b4f1865a7077f1d37275f729a5b Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Tue, 7 May 2013 16:18:07 +0200
Subject: [PATCH] config templates: set default platform variants

https://jira.digi.com/browse/DEL-438

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-arm/conf/machine/include/ccimx51.inc | 6 +++---
 sdk/config/ccardimx28js/local.conf.sample      | 5 ++++-
 sdk/config/ccimx51js/local.conf.sample         | 5 ++++-
 sdk/config/ccimx53js/local.conf.sample         | 5 ++++-
 sdk/config/cpx2/local.conf.sample              | 5 ++++-
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/meta-digi-arm/conf/machine/include/ccimx51.inc b/meta-digi-arm/conf/machine/include/ccimx51.inc
index efe9c65c8..94df20902 100644
--- a/meta-digi-arm/conf/machine/include/ccimx51.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx51.inc
@@ -48,12 +48,12 @@ MACHINE_FEATURES_append_weagv = " wifi ext-eth accelerometer accel-video accel-g
 UBOOT_CONFIG_VARIANT_weagv = "ext_eth"
 MACHINE_FEATURES_append_w128agv = " wifi accelerometer accel-video accel-graphics"
 UBOOT_CONFIG_VARIANT_w128agv = "128sdram"
-MACHINE_FEATURES_append_eavg = " ext-eth accelerometer accel-video accel-graphics"
+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_128avg = " accelerometer accel-video accel-graphics"
-UBOOT_CONFIG_VARIANT_128avg = "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"
diff --git a/sdk/config/ccardimx28js/local.conf.sample b/sdk/config/ccardimx28js/local.conf.sample
index e375b4f53..e600b1995 100644
--- a/sdk/config/ccardimx28js/local.conf.sample
+++ b/sdk/config/ccardimx28js/local.conf.sample
@@ -48,7 +48,10 @@
 #MACHINE ?= "routerstationpro"
 #
 # This sets the default machine to be qemux86 if no other machine is selected:
-MACHINE ??= "ccardimx28js"
+#MACHINE ??= "qemux86"
+
+MACHINE = "ccardimx28js"
+MACHINE_VARIANT = "wb"
 
 #
 # Where to place downloads
diff --git a/sdk/config/ccimx51js/local.conf.sample b/sdk/config/ccimx51js/local.conf.sample
index de45ebc19..0882bb08d 100644
--- a/sdk/config/ccimx51js/local.conf.sample
+++ b/sdk/config/ccimx51js/local.conf.sample
@@ -48,7 +48,10 @@
 #MACHINE ?= "routerstationpro"
 #
 # This sets the default machine to be qemux86 if no other machine is selected:
-MACHINE ??= "ccimx51js"
+#MACHINE ??= "qemux86"
+
+MACHINE = "ccimx51js"
+MACHINE_VARIANT = "wagv"
 
 #
 # Where to place downloads
diff --git a/sdk/config/ccimx53js/local.conf.sample b/sdk/config/ccimx53js/local.conf.sample
index d4256843a..21f400b8b 100644
--- a/sdk/config/ccimx53js/local.conf.sample
+++ b/sdk/config/ccimx53js/local.conf.sample
@@ -48,7 +48,10 @@
 #MACHINE ?= "routerstationpro"
 #
 # This sets the default machine to be qemux86 if no other machine is selected:
-MACHINE ??= "ccimx53js"
+#MACHINE ??= "qemux86"
+
+MACHINE = "ccimx53js"
+MACHINE_VARIANT = "w"
 
 #
 # Where to place downloads
diff --git a/sdk/config/cpx2/local.conf.sample b/sdk/config/cpx2/local.conf.sample
index d82afb843..95b29d4e2 100644
--- a/sdk/config/cpx2/local.conf.sample
+++ b/sdk/config/cpx2/local.conf.sample
@@ -48,7 +48,10 @@
 #MACHINE ?= "routerstationpro"
 #
 # This sets the default machine to be qemux86 if no other machine is selected:
-MACHINE ??= "cpx2"
+#MACHINE ??= "qemux86"
+
+MACHINE = "cpx2"
+MACHINE_VARIANT = ""
 
 #
 # Where to place downloads