From fb9ec7221a4d06a8b467624ac5b6db7c54055f76 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 28 Jan 2015 11:40:12 +0100 Subject: [PATCH] meta-digi: add variants table to config templates Signed-off-by: Javier Viguera (cherry picked from commit db1782bd24c4347cb9f4db33210e0f3fd6e73298) --- .../conf/machine/include/ccardimx28.inc | 3 +-- meta-digi-arm/conf/machine/include/ccimx51.inc | 3 +-- meta-digi-arm/conf/machine/include/ccimx53.inc | 3 +-- meta-digi-arm/conf/machine/include/ccimx6.inc | 3 +-- sdk/config/ccardimx28js/local.conf.sample | 14 ++++++++++++++ sdk/config/ccimx51js/local.conf.sample | 18 ++++++++++++++++++ sdk/config/ccimx53js/local.conf.sample | 16 ++++++++++++++++ sdk/config/ccimx6sbc/local.conf.sample | 16 ++++++++++++++++ 8 files changed, 68 insertions(+), 8 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/ccardimx28.inc b/meta-digi-arm/conf/machine/include/ccardimx28.inc index 61a22d0ce..8a98377d8 100644 --- a/meta-digi-arm/conf/machine/include/ccardimx28.inc +++ b/meta-digi-arm/conf/machine/include/ccardimx28.inc @@ -33,8 +33,7 @@ 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. +# Maintain in sync with the same table in platform local.conf template. # # Name WiFi Eth2 BT 1wire # ------------------------------------------- diff --git a/meta-digi-arm/conf/machine/include/ccimx51.inc b/meta-digi-arm/conf/machine/include/ccimx51.inc index 91bcf8513..30ae1d49c 100644 --- a/meta-digi-arm/conf/machine/include/ccimx51.inc +++ b/meta-digi-arm/conf/machine/include/ccimx51.inc @@ -37,8 +37,7 @@ KERNEL_MODULE_AUTOLOAD += "pmic_battery" # # Supported variants # -# To build any of these variants configure MACHINE_VARIANT on the project's -# local.conf to the variant name. +# Maintain in sync with the same table in platform local.conf template. # # Name WiFi Eth2 RAM=128MB NAND=2GB Accel GPU VPU # --------------------------------------------------------------------------- diff --git a/meta-digi-arm/conf/machine/include/ccimx53.inc b/meta-digi-arm/conf/machine/include/ccimx53.inc index 741a6da60..271c7423b 100644 --- a/meta-digi-arm/conf/machine/include/ccimx53.inc +++ b/meta-digi-arm/conf/machine/include/ccimx53.inc @@ -35,8 +35,7 @@ KERNEL_MODULE_AUTOLOAD += "mt9v111_camera" # # Supported variants # -# To build any of these variants configure MACHINE_VARIANT on the project's -# local.conf to the variant name. +# Maintain in sync with the same table in platform local.conf template. # # Name WiFi Eth2 RAM NAND # ------------------------------------------ diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc index 3bbd83543..de368cb82 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6.inc @@ -33,8 +33,7 @@ MACHINE_EXTRA_RRECOMMENDS += "fsl-alsa-plugins" # # Supported variants # -# To build any of these variants configure MACHINE_VARIANT on the project's -# local.conf to the variant name. +# Maintain in sync with the same table in platform local.conf template. # # Name WiFi[w] BT[b] Proc[q|dl] DDR[1024|512|256] # ----------------------------------------------------------------- diff --git a/sdk/config/ccardimx28js/local.conf.sample b/sdk/config/ccardimx28js/local.conf.sample index cb41669aa..def574054 100644 --- a/sdk/config/ccardimx28js/local.conf.sample +++ b/sdk/config/ccardimx28js/local.conf.sample @@ -36,6 +36,20 @@ #MACHINE ??= "qemux86" MACHINE = "ccardimx28js" + +# +# Supported variants +# +# Maintain in sync with the same table in platform machine config file. +# +# 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 MACHINE_VARIANT = "web1" # diff --git a/sdk/config/ccimx51js/local.conf.sample b/sdk/config/ccimx51js/local.conf.sample index f21e8624d..6b30c9a22 100644 --- a/sdk/config/ccimx51js/local.conf.sample +++ b/sdk/config/ccimx51js/local.conf.sample @@ -36,6 +36,24 @@ #MACHINE ??= "qemux86" MACHINE = "ccimx51js" + +# +# Supported variants +# +# Maintain in sync with the same table in platform machine config file. +# +# 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 MACHINE_VARIANT = "wagv" # diff --git a/sdk/config/ccimx53js/local.conf.sample b/sdk/config/ccimx53js/local.conf.sample index 16f3b50f6..a25e198b3 100644 --- a/sdk/config/ccimx53js/local.conf.sample +++ b/sdk/config/ccimx53js/local.conf.sample @@ -36,6 +36,22 @@ #MACHINE ??= "qemux86" MACHINE = "ccimx53js" + +# +# Supported variants +# +# Maintain in sync with the same table in platform machine config file. +# +# 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 MACHINE_VARIANT = "w" # diff --git a/sdk/config/ccimx6sbc/local.conf.sample b/sdk/config/ccimx6sbc/local.conf.sample index c956f3f96..6c27852e9 100644 --- a/sdk/config/ccimx6sbc/local.conf.sample +++ b/sdk/config/ccimx6sbc/local.conf.sample @@ -36,6 +36,22 @@ #MACHINE ??= "qemux86" MACHINE = "ccimx6sbc" + +# +# Supported variants +# +# Maintain in sync with the same table in platform machine config file. +# +# Name WiFi[w] BT[b] Proc[q|dl] DDR[1024|512|256] +# ----------------------------------------------------------------- +# wbq1024 Y Y quad/dual 1024MiB (0x01,0x02,0x04) +# wbq512 Y Y quad/dual 512MiB (0x03,0x06) +# wq1024 Y N quad/dual 1024MiB (0x05) +# wdl256 Y N duallite/solo 256MiB (0x07) +# q512 N N quad/dual 512MiB (0x08) +# dl256 N N duallite/solo 256MiB (0x09) +# wdl512 Y N duallite/solo 512MiB (0x0A) +# wbdl1024 Y Y duallite/solo 1024MiB (0x0B) MACHINE_VARIANT = "wbq1024" #