Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta-digi-arm: Use append format for variant override. 

The previous "+=" format was doing a complete variable override instead
of an append. Features like usbhost or usbdevice were disappearing.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
This commit is contained in:
Alex Gonzalez 2013-04-25 14:19:24 +02:00
parent 618e2484f5
commit c83eed3126
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meta-digi-arm/conf/machine/include/ccardimx28.inc
View File

@ -40,11 +40,11 @@ MACHINE_FEATURES += "alsa touchscreen"
# Variant configuration # Variant configuration
MACHINE_FEATURES_web1 += "wifi ext-eth bluetooth 1-wire" MACHINE_FEATURES_append_web1 = " wifi ext-eth bluetooth 1-wire"
MACHINE_FEATURES_web += "wifi ext-eth bluetooth" MACHINE_FEATURES_append_web = " wifi ext-eth bluetooth"
MACHINE_FEATURES_wb += "wifi bluetooth" MACHINE_FEATURES_append_wb = " wifi bluetooth"
MACHINE_FEATURES_w += "wifi" MACHINE_FEATURES_append_w = " wifi"
MACHINE_FEATURES_e += "ext-eth" MACHINE_FEATURES_append_e = " ext-eth"
# Variants for different CPU speed # Variants for different CPU speed
#UBOOT_CONFIG_VARIANT = "261MHz" #UBOOT_CONFIG_VARIANT = "261MHz"

19
meta-digi-arm/conf/machine/include/ccimx51.inc
View File

@ -43,18 +43,19 @@ module_autoload_pmic_battery = "pmic_battery"
# w128a Y N 128 Y N N # w128a Y N 128 Y N N
MACHINE_FEATURES_wagv += "wifi accelerometer accel-video accel-graphics" MACHINE_FEATURES_append_wagv = " wifi accelerometer accel-video accel-graphics"
MACHINE_FEATURES_weagv += "wifi ext-eth accelerometer accel-video accel-graphics" MACHINE_FEATURES_append_weagv = " wifi ext-eth accelerometer accel-video accel-graphics"
UBOOT_CONFIG_VARIANT_weagv = "ext_eth" UBOOT_CONFIG_VARIANT_weagv = "ext_eth"
MACHINE_FEATURES_w128agv += "wifi accelerometer accel-video accel-graphics" MACHINE_FEATURES_append_w128agv = " wifi accelerometer accel-video accel-graphics"
UBOOT_CONFIG_VARIANT_w128agv = "128sdram" UBOOT_CONFIG_VARIANT_w128agv = "128sdram"
MACHINE_FEATURES_eavg += "ext-eth accelerometer accel-video accel-graphics" MACHINE_FEATURES_append_eavg = " ext-eth accelerometer accel-video accel-graphics"
MACHINE_FEATURES_agv += "accelerometer accel-video accel-graphics" MACHINE_FEATURES_append_agv = " accelerometer accel-video accel-graphics"
MACHINE_FEATURES_w += "wifi" MACHINE_FEATURES_append_w = " wifi"
UBOOT_CONFIG_VARIANT_128 = "128sdram" UBOOT_CONFIG_VARIANT_128 = "128sdram"
MACHINE_FEATURES_128avg += "accelerometer accel-video accel-graphics" MACHINE_FEATURES_append_128avg = " accelerometer accel-video accel-graphics"
UBOOT_CONFIG_VARIANT_128avg = "128sdram" UBOOT_CONFIG_VARIANT_128avg = "128sdram"
MACHINE_FEATURES_128a += "accelerometer" MACHINE_FEATURES_append_128a = " accelerometer"
UBOOT_CONFIG_VARIANT_128a = "128sdram" UBOOT_CONFIG_VARIANT_128a = "128sdram"
MACHINE_FEATURES_w128a += "wifi accelerometer" MACHINE_FEATURES_append_w128a = " wifi accelerometer"
UBOOT_CONFIG_VARIANT_w128a = "128sdram" UBOOT_CONFIG_VARIANT_w128a = "128sdram"

13
meta-digi-arm/conf/machine/include/ccimx53.inc
View File

@ -44,14 +44,15 @@ MACHINE_FEATURES += "accelerometer"
# Variant configuration # Variant configuration
MACHINE_FEATURES_we += "wifi ext-eth" MACHINE_FEATURES_append_we = " wifi ext-eth"
UBOOT_CONFIG_VARIANT_we = "ext_eth" UBOOT_CONFIG_VARIANT_append_we = " ext_eth"
MACHINE_FEATURES_w += "wifi" MACHINE_FEATURES_append_w = " wifi"
MACHINE_FEATURES_w128 += "wifi" MACHINE_FEATURES_append_w128 = " wifi"
UBOOT_CONFIG_VARIANT_w128 = "128sdram" UBOOT_CONFIG_VARIANT_w128 = "128sdram"
MACHINE_FEATURES_e += "ext-ext" MACHINE_FEATURES_append_e = " ext-ext"
UBOOT_CONFIG_VARIANT_e = "ext_eth" UBOOT_CONFIG_VARIANT_e = "ext_eth"
UBOOT_CONFIG_VARIANT_4k = "4Kpage" UBOOT_CONFIG_VARIANT_4k = "4Kpage"
MACHINE_FEATURES_e += "ext-eth" MACHINE_FEATURES_append_e = " ext-eth"
UBOOT_CONFIG_VARIANT_e = "ext_eth" UBOOT_CONFIG_VARIANT_e = "ext_eth"
UBOOT_CONFIG_VARIANT_128 = "128sdram" UBOOT_CONFIG_VARIANT_128 = "128sdram"