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

meta-digi-arm: adapt machines to new u-boot configure system 

Use Yocto's UBOOT_CONFIG new functionality to select the u-boot
configuration to build.

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

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2015-05-15 17:13:57 +02:00
parent 2c6f44c53d
commit 5cc2a7182d
7 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meta-digi-arm/conf/machine/ccardimx28js.conf
View File

@ -6,6 +6,13 @@ include conf/machine/include/ccardimx28.inc
IMXBOOTLETS_MACHINE = "CCARDIMX28JS"
# U-Boot configurations
UBOOT_CONFIG ??= "ccardimx28js"
UBOOT_CONFIG[ccardimx28js] = "ccardimx28js_config"
# Only for u-boot 'v2009.08':
UBOOT_CONFIG[ccardimx28js_261MHz] = "ccardimx28js_261MHz_config"
UBOOT_CONFIG[ccardimx28js_360MHz] = "ccardimx28js_360MHz_config"
KERNEL_DEVICETREE = "imx28-${MACHINE}.dtb"
# Serial console

4
meta-digi-arm/conf/machine/ccimx6sbc.conf
View File

@ -5,6 +5,10 @@
# Contains the ConnectCore 6 module.
include conf/machine/include/ccimx6.inc
# U-Boot configurations
UBOOT_CONFIG ??= "ccimx6qsbc"
UBOOT_CONFIG[ccimx6qsbc] = "ccimx6qsbc_config"
KERNEL_DEVICETREE = " \
imx6dl-ccimx6sbc.dtb \
imx6dl-ccimx6sbc-w.dtb \

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

@ -14,10 +14,14 @@ python __anonymous() {
}
# Platform u-boot settings (IS_KERNEL_2X implies also u-boot v2009.08)
UBOOT_BSTR = "${@base_conditional('IS_KERNEL_2X', '1' , '-ivt', '', d)}"
UBOOT_ENTRYPOINT = "0x40008000"
UBOOT_SUFFIX = "sb"
# Add '-ivt' to binary and symlink for old u-boot (v2009.08)
UBOOT_BSTR = "${@base_conditional('IS_KERNEL_2X', '1' , '-ivt', '', d)}"
UBOOT_BINARY = "u-boot${UBOOT_BSTR}.${UBOOT_SUFFIX}"
UBOOT_SYMLINK = "u-boot-${MACHINE}${UBOOT_BSTR}.${UBOOT_SUFFIX}"
# wpa_supplicant driver to use in '/etc/network/interfaces'
WPA_DRIVER = "nl80211"
@ -50,7 +54,3 @@ 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"
# UBOOT_CONFIG_VARIANT for different CPU speed (default is empty)
#UBOOT_CONFIG_VARIANT ?= "261MHz"
#UBOOT_CONFIG_VARIANT ?= "360MHz"

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

@ -68,9 +68,13 @@ MACHINE_FEATURES_append_wagv = " wifi accelerometer accel-video accel-graphics"
MACHINE_FEATURES_append_weagv = " wifi ext-eth accelerometer accel-video accel-graphics"
# 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"
UBOOT_CONFIG ??= "ccimx51js"
UBOOT_CONFIG_128 = "ccimx51js_128sdram"
UBOOT_CONFIG_128a = "ccimx51js_128sdram"
UBOOT_CONFIG_128agv = "ccimx51js_128sdram"
UBOOT_CONFIG_w128a = "ccimx51js_128sdram"
UBOOT_CONFIG_w128agv = "ccimx51js_128sdram"
UBOOT_CONFIG_weagv = "ccimx51js_ext_eth"
UBOOT_CONFIG[ccimx51js] = "ccimx51js_config"
UBOOT_CONFIG[ccimx51js_128sdram] = "ccimx51js_128sdram_config"
UBOOT_CONFIG[ccimx51js_ext_eth] = "ccimx51js_ext_eth_config"

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

@ -59,9 +59,14 @@ MACHINE_FEATURES_append_w128 = " wifi"
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"
UBOOT_CONFIG ??= "ccimx53js"
UBOOT_CONFIG_128 = "ccimx53js_128sdram"
UBOOT_CONFIG_4k = "ccimx53js_4Kpage"
UBOOT_CONFIG_e = "ccimx53js_ext_eth"
UBOOT_CONFIG_e4k = "ccimx53js_4Kpage"
UBOOT_CONFIG_w128 = "ccimx53js_128sdram"
UBOOT_CONFIG_we = "ccimx53js_ext_eth"
UBOOT_CONFIG[ccimx53js] = "ccimx53js_config"
UBOOT_CONFIG[ccimx53js_128sdram] = "ccimx53js_128sdram_config"
UBOOT_CONFIG[ccimx53js_4Kpage] = "ccimx53js_4Kpage_config"
UBOOT_CONFIG[ccimx53js_ext_eth] = "ccimx53js_ext_eth_config"

2
meta-digi-arm/conf/machine/include/ccimx6.inc
View File

@ -31,5 +31,3 @@ MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
MACHINE_EXTRA_RRECOMMENDS += "fsl-alsa-plugins"
MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth"
UBOOT_MACHINE = "ccimx6qsbc_config"

9
meta-digi-arm/conf/machine/include/digi-defaults.inc
View File

@ -55,12 +55,3 @@ USE_VT = "0"
# Add the machine variant to the valid machine override
MACHINEOVERRIDES .= "${@['', ':${MACHINE_VARIANT}']['${MACHINE_VARIANT}' != '']}"
MACHINE_VARIANT ?= ""
# U-Boot settings
UBOOT_BSTR ??= ""
UBOOT_CONFIG_VARIANT ??= ""
UBOOT_BINARY ?= "u-boot${UBOOT_BSTR}.${UBOOT_SUFFIX}"
UBOOT_IMAGE ?= 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "", "_${UBOOT_CONFIG_VARIANT}", d )}${UBOOT_BSTR}-${PV}-${PR}.${UBOOT_SUFFIX}'
UBOOT_MACHINE ?= '${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "", "_${UBOOT_CONFIG_VARIANT}", d )}_config'
UBOOT_MAKE_TARGET ?= "${UBOOT_BINARY}"
UBOOT_SYMLINK ?= 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "", "_${UBOOT_CONFIG_VARIANT}", d )}${UBOOT_BSTR}.${UBOOT_SUFFIX}'