diff --git a/meta-digi-arm/conf/machine/include/ccardimx28.inc b/meta-digi-arm/conf/machine/include/ccardimx28.inc index 9ea508630..de957473e 100644 --- a/meta-digi-arm/conf/machine/include/ccardimx28.inc +++ b/meta-digi-arm/conf/machine/include/ccardimx28.inc @@ -12,11 +12,6 @@ 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}' # wpa_supplicant driver to use in '/etc/network/interfaces' WPA_DRIVER = "nl80211" diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 72197b450..01a892b22 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -1,6 +1,7 @@ # Digi BSP default providers PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-dey" PREFERRED_PROVIDER_u-boot ?= "u-boot-dey" +PREFERRED_VERSION_u-boot-dey ?= "2009.08" PREFERRED_PROVIDER_virtual/kernel ?= "linux-dey" PREFERRED_VERSION_linux-dey = "2.6.35.14" PREFERRED_VERSION_linux-libc-headers-dey ?= "${PREFERRED_VERSION_linux-dey}" diff --git a/meta-digi-arm/recipes-bsp/nvram/nvram.bb b/meta-digi-arm/recipes-bsp/nvram/nvram.bb index 8432425a5..da248db9c 100644 --- a/meta-digi-arm/recipes-bsp/nvram/nvram.bb +++ b/meta-digi-arm/recipes-bsp/nvram/nvram.bb @@ -5,7 +5,7 @@ SECTION = "base" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -require recipes-bsp/u-boot/u-boot-dey-rev.inc +require recipes-bsp/u-boot/u-boot-dey-rev_${PREFERRED_VERSION_u-boot-dey}.inc PR = "${DISTRO}.r0" @@ -24,7 +24,7 @@ LIB_GIT_SHA1 = "$(cd ${WORKDIR}/git && git rev-parse --short HEAD)" CFLAGS += "-Wall -DLINUX -DCMD_GIT_SHA1=\"${CMD_GIT_SHA1}\" -DLIB_GIT_SHA1=\"${LIB_GIT_SHA1}\" -Ilib/include -I${STAGING_INCDIR}/libdigi" do_configure() { - rm -f lib && ln -s git/common/digi/cmd_nvram/lib + rm -f lib && ln -s ${UBOOT_NVRAM_LIBPATH} } do_compile() { diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc similarity index 90% rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev.inc rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc index a4fafea66..13b336743 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc @@ -7,3 +7,5 @@ SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', ' SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git" SRC_URI_internal = "${DIGI_LOG_GIT}u-boot-denx.git;protocol=git" SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}" + +UBOOT_NVRAM_LIBPATH = "git/common/digi/cmd_nvram/lib" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc new file mode 100644 index 000000000..d59aa5946 --- /dev/null +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc @@ -0,0 +1,11 @@ +# Copyright (C) 2013 Digi International + +SRCREV_external = "" +SRCREV_internal = "90d75fb2d12740184bf5000b0b4fc13854801bf7" +SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}" + +SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git" +SRC_URI_internal = "${DIGI_LOG_GIT}u-boot-denx.git;protocol=git" +SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}" + +UBOOT_NVRAM_LIBPATH = "git/board/digi/common/cmd_nvram/lib" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb index 6c8eec21b..15ebee819 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Bootloader for Digi platforms" require recipes-bsp/u-boot/u-boot.inc -include u-boot-dey-rev.inc +include u-boot-dey-rev_${PV}.inc PROVIDES += "u-boot" @@ -13,6 +13,12 @@ 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}' + DEPENDS_mxs += "elftosb-native imx-bootlets-dey" EXTRA_OEMAKE += 'HOSTSTRIP=true' diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.01.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.01.bb new file mode 100644 index 000000000..cc85b5d9f --- /dev/null +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.01.bb @@ -0,0 +1,25 @@ +# Copyright (C) 2012 Digi International + +DESCRIPTION = "Bootloader for Digi platforms" +require recipes-bsp/u-boot/u-boot.inc +include u-boot-dey-rev_${PV}.inc + +PROVIDES += "u-boot" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" + +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}' + +DEPENDS_mxs += "elftosb-native" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "(ccardimx28js|cpx2|wr21)"