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

meta-digi-arm: fix u-boot broken build 

The build was failing for any IMX platform because it was trying to
build a bootstream u-boot.

The u-boot variables (UBOOT_*) used by yocto were incorrectly set,
so I reworked and simplified them to fix the bug and ease maintenance.

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

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2013-08-02 14:45:16 +02:00
parent 00e6d38ca5
commit 93d275a43d
7 changed files with 15 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta-digi-arm/conf/machine/cpx2.conf
View File

@ -9,15 +9,6 @@ SOC_FAMILY = "mxs"
UBOOT_ENTRYPOINT = "0x41008000"
UBOOT_LOADADDRESS = "0x41008000"
# Set UBOOT_CONFIG_VARIANT in local.conf accordingly, default is empty: 261MHz,360MHz,test,dbg
UBOOT_CONFIG_VARIANT ?= ""
UBOOT_MACHINE = '${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "_", "_${UBOOT_CONFIG_VARIANT}_", d )}config'
UBOOT_MAKE_TARGET = "u-boot-ivt.sb"
UBOOT_SUFFIX = "sb"
UBOOT_IMAGE = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}ivt-${PV}-${PR}.${UBOOT_SUFFIX}'
UBOOT_BINARY = "u-boot-ivt.${UBOOT_SUFFIX}"
UBOOT_SYMLINK = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}ivt.${UBOOT_SUFFIX}'
SERIAL_CONSOLE = "115200 ttyAM0"
# wpa_supplicant driver to use in '/etc/network/interfaces'

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

@ -9,10 +9,6 @@ SOC_FAMILY = "mxs"
UBOOT_ENTRYPOINT = "0x41008000"
UBOOT_LOADADDRESS = "0x41008000"
# Set UBOOT_CONFIG_VARIANT in local.conf accordingly, default is empty: 261MHz,360MHz,test,dbg
UBOOT_CONFIG_VARIANT ?= ""
UBOOT_MACHINE = '${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "_", "_${UBOOT_CONFIG_VARIANT}_", d )}config'
# wpa_supplicant driver to use in '/etc/network/interfaces'
WPA_DRIVER = "nl80211"
@ -44,6 +40,6 @@ 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"
#UBOOT_CONFIG_VARIANT = "360MHz"
# UBOOT_CONFIG_VARIANT for different CPU speed (default is empty)
#UBOOT_CONFIG_VARIANT ?= "261MHz"
#UBOOT_CONFIG_VARIANT ?= "360MHz"

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

@ -19,3 +19,12 @@ 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}'

15
meta-digi-arm/conf/machine/include/imx-digi-base.inc
View File

@ -6,21 +6,6 @@ include conf/machine/include/tune-cortexa8.inc
# Disable perf features as 2.6.35.3 fail to build otherwise
PERF_FEATURES_ENABLE = ""
UBOOT_MAKE_TARGET = "u-boot.bin"
UBOOT_SUFFIX = "bin"
UBOOT_PADDING = "2"
# Set UBOOT_CONFIG_VARIANT in local.conf accordingly, default is empty:
# MX5X: 128sdram,ext_eth,128sdram_test,128sdram_dbg,test,dbg,test_dbg,db_pp,db_pa,db_rp,db_ra
# MX51: EAK
# MX53: 4Kpage
UBOOT_CONFIG_VARIANT ?= ""
UBOOT_MACHINE = '${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "_", "_${UBOOT_CONFIG_VARIANT}_", d )}config'
UBOOT_IMAGE = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "_${UBOOT_CONFIG_VARIANT}-", d )}${PV}-${PR}.${UBOOT_SUFFIX}'
UBOOT_SYMLINK = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "", "_${UBOOT_CONFIG_VARIANT}", d )}.${UBOOT_SUFFIX}'
XSERVER = "xserver-xorg \
xf86-input-evdev \
xf86-video-imxfb"

10
meta-digi-arm/conf/machine/wr21.conf
View File

@ -9,14 +9,4 @@ SOC_FAMILY = "mxs"
UBOOT_ENTRYPOINT = "0x41008000"
UBOOT_LOADADDRESS = "0x41008000"
# Set UBOOT_CONFIG_VARIANT in local.conf accordingly, default is empty: 261MHz,360MHz,test,dbg
UBOOT_CONFIG_VARIANT ?= ""
UBOOT_MACHINE = '${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "_", "_${UBOOT_CONFIG_VARIANT}_", d )}config'
UBOOT_MAKE_TARGET = "u-boot-ivt.sb"
UBOOT_SUFFIX = "sb"
UBOOT_IMAGE = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}ivt-${PV}-${PR}.${UBOOT_SUFFIX}'
UBOOT_BINARY = "u-boot-ivt.${UBOOT_SUFFIX}"
UBOOT_SYMLINK = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}ivt.${UBOOT_SUFFIX}'
SERIAL_CONSOLE = "115200 ttySP1"

7
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb
View File

@ -13,11 +13,8 @@ PR = "r0"
S = "${WORKDIR}/git"
UBOOT_MAKE_TARGET = "u-boot-ivt.sb"
UBOOT_SUFFIX = "sb"
UBOOT_IMAGE = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}ivt-${PV}-${PR}.${UBOOT_SUFFIX}'
UBOOT_BINARY = "u-boot-ivt.${UBOOT_SUFFIX}"
UBOOT_SYMLINK = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}ivt.${UBOOT_SUFFIX}'
UBOOT_BSTR_mxs = "-ivt"
UBOOT_SUFFIX_mxs = "sb"
DEPENDS_mxs += "elftosb-native imx-bootlets-dey"

6
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.01.bb
View File

@ -13,11 +13,7 @@ PR = "r0"
S = "${WORKDIR}/git"
UBOOT_MAKE_TARGET = "u-boot.sb"
UBOOT_SUFFIX = "sb"
UBOOT_IMAGE = 'u-boot-${MACHINE}${@base_conditional( "UBOOT_CONFIG_VARIANT", "", "-", "-${UBOOT_CONFIG_VARIANT}-", d )}${PV}-${PR}.${UBOOT_SUFFIX}'
UBOOT_BINARY = "u-boot.${UBOOT_SUFFIX}"
UBOOT_SYMLINK = 'u-boot-${MACHINE}.${UBOOT_SUFFIX}'
UBOOT_SUFFIX_mxs = "sb"
DEPENDS_mxs += "elftosb-native"