[meta-freescale] [meta-fsl-ppc][PATCH ] u-boot-qoriq: rename to match verion 2014.01
zhenhua.luo at freescale.com
zhenhua.luo at freescale.com
Wed Jul 23 03:07:12 PDT 2014
Hi Chunrong,
Please use -M parameter next time, especially for recipe rename.
Best Regards,
Zhenhua
> -----Original Message-----
> From: b40290 at freescale.com [mailto:b40290 at freescale.com]
> Sent: Wednesday, July 23, 2014 2:59 PM
> To: meta-freescale at yoctoproject.org
> Cc: Liu Ting-B28495; Luo Zhenhua-B19537; Guo Chunrong-B40290
> Subject: [meta-fsl-ppc][PATCH ] u-boot-qoriq: rename to match verion
> 2014.01
>
> From: Chunrong Guo <B40290 at freescale.com>
>
> Signed-off-by: Chunrong Guo <B40290 at freescale.com>
> ---
> recipes-bsp/u-boot/u-boot-qoriq_2014.01.bb | 179
> +++++++++++++++++++++++++++++
> recipes-bsp/u-boot/u-boot-qoriq_git.bb | 179 -----------------------
> ------
> 2 files changed, 179 insertions(+), 179 deletions(-) create mode 100644
> recipes-bsp/u-boot/u-boot-qoriq_2014.01.bb
> delete mode 100644 recipes-bsp/u-boot/u-boot-qoriq_git.bb
>
> diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2014.01.bb b/recipes-bsp/u-
> boot/u-boot-qoriq_2014.01.bb
> new file mode 100644
> index 0000000..e16438f
> --- /dev/null
> +++ b/recipes-bsp/u-boot/u-boot-qoriq_2014.01.bb
> @@ -0,0 +1,179 @@
> +DESCRIPTION = "U-boot bootloader"
> +HOMEPAGE = "http://u-boot.sf.net"
> +SECTION = "bootloaders"
> +PROVIDES = "virtual/bootloader u-boot"
> +LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1"
> +LIC_FILES_CHKSUM = " \
> + file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> + file://Licenses/bsd-2-
> clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
> + file://Licenses/bsd-3-
> clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
> + file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
> + file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
> +"
> +
> +PV = "2014.01+fslgit"
> +INHIBIT_DEFAULT_DEPS = "1"
> +DEPENDS = "boot-format-native libgcc ${@base_contains('TCMODE',
> 'external-fsl', '', 'virtual/${TARGET_PREFIX}gcc', d)}"
> +
> +inherit deploy
> +
> +SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;nobranch=1"
> +SRCREV = "fe1d4f5739e752ad45ada6227a9fb19590af7194"
> +
> +python () {
> + if d.getVar("TCMODE", True) == "external-fsl":
> + return
> +
> + ml = d.getVar("MULTILIB_VARIANTS", True)
> + arch = d.getVar("OVERRIDES", True)
> +
> + if ("e5500-64b:" in arch or "e6500-64b:" in arch) and not "lib32" in
> ml:
> + raise bb.parse.SkipPackage("Building the u-boot for this arch
> +requires multilib to be enabled") }
> +
> +DEPENDS_append_e5500-64b = "${@base_contains('TCMODE', 'external-fsl',
> '', ' lib32-gcc-cross-powerpc lib32-libgcc', d)}"
> +PATH_append_e5500-64b =
> ":${STAGING_BINDIR_NATIVE}/powerpc${TARGET_VENDOR_virtclass-multilib-
> lib32}-${HOST_OS}/"
> +TOOLCHAIN_OPTIONS_append_e5500-64b = "${@base_contains('TCMODE',
> 'external-fsl', '', '/../lib32-${MACHINE}', d)}"
> +TARGET_VENDOR_virtclass-multilib-lib32 ?= "${@base_contains('TCMODE',
> 'external-fsl', '', '-${DISTRO}mllib32', d)}"
> +WRAP_TARGET_PREFIX_e5500-64b := "powerpc${TARGET_VENDOR_virtclass-
> multilib-lib32}-${HOST_OS}-"
> +
> +DEPENDS_append_e6500-64b = "${@base_contains('TCMODE', 'external-fsl',
> '', ' lib32-gcc-cross-powerpc lib32-libgcc', d)}"
> +PATH_append_e6500-64b =
> ":${STAGING_BINDIR_NATIVE}/powerpc${TARGET_VENDOR_virtclass-multilib-
> lib32}-${HOST_OS}/"
> +TOOLCHAIN_OPTIONS_append_e6500-64b = "${@base_contains('TCMODE',
> 'external-fsl', '', '/../lib32-${MACHINE}', d)}"
> +TARGET_VENDOR_virtclass-multilib-lib32 ?= "${@base_contains('TCMODE',
> 'external-fsl', '', '-${DISTRO}mllib32', d)}"
> +WRAP_TARGET_PREFIX_e6500-64b := "powerpc${TARGET_VENDOR_virtclass-
> multilib-lib32}-${HOST_OS}-"
> +WRAP_TARGET_PREFIX = "${TARGET_PREFIX}"
> +
> +PACKAGE_ARCH = "${MACHINE_ARCH}"
> +
> +UBOOT_LOCALVERSION = "${@d.getVar('SDK_VERSION', True).partition('
> ')[0]}"
> +
> +USRC ?= ""
> +S = '${@base_conditional("USRC", "", "${WORKDIR}/git", "${USRC}", d)}'
> +
> +CROSS_COMPILE = '${@base_conditional("TCMODE", "external-fsl",
> "${TARGET_PREFIX}", "${WRAP_TARGET_PREFIX}", d)}'
> +EXTRA_OEMAKE = 'CROSS_COMPILE=${CROSS_COMPILE} CC="${CROSS_COMPILE}gcc
> ${TOOLCHAIN_OPTIONS}"'
> +
> +do_compile () {
> + unset LDFLAGS
> + unset CFLAGS
> + unset CPPFLAGS
> +
> + if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
> + then
> + head=`git rev-parse --verify --short HEAD 2> /dev/null`
> + printf "%s%s%s" ${UBOOT_LOCALVERSION} +g $head >
> ${B}/.scmversion
> + printf "%s%s%s" ${UBOOT_LOCALVERSION} +g $head >
> ${S}/.scmversion
> + fi
> +
> + if [ "x${UBOOT_MACHINES}" = "x" ]; then
> + UBOOT_MACHINES=${UBOOT_MACHINE}
> + fi
> +
> + for board in ${UBOOT_MACHINES}; do
> + if ! grep -wq $board ${S}/boards.cfg;then
> + echo "WARNING: $board not supported in boards.cfg"
> + continue
> + fi
> +
> + oe_runmake O=${board} distclean
> + oe_runmake O=${board} ${board}
> + oe_runmake O=${board} all
> +
> + case "${board}" in
> + *SDCARD*) UBOOT_TARGET="u-boot-sd";;
> + *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
> + *NAND*) UBOOT_TARGET="u-boot-nand";;
> + *SRIO*) UBOOT_TARGET="u-boot-srio";;
> + *) UBOOT_TARGET="";;
> + esac
> +
> + # deal with sd/spi/nand/srio image
> + UBOOT_SOURCE=u-boot
> + if [ "x${UBOOT_TARGET}" != "x" ]; then
> + # some boards' nand image was named as u-boot-with-spl
> + if [ "${UBOOT_TARGET}" = "u-boot-nand" ];then
> + if echo $board |egrep -q
> "(P1010RDB|P1020RDB|P1021RDB|P2020RDB|P1022DS|BSC913|C293)";then
> + UBOOT_SOURCE=u-boot-with-spl
> + fi
> + elif [ "${UBOOT_TARGET}" = "u-boot-spi" ];then
> + if echo $board |egrep -q
> "(P1010RDB|P1020RDB|P1021RDB|P2020RDB|P1022DS)";then
> + UBOOT_SOURCE=u-boot-with-spl
> + fi
> + elif [ "${UBOOT_TARGET}" = "u-boot-sd" ];then
> + if echo $board |egrep -q
> "(P1010RDB|P1020RDB|P1021RDB|P2020RDB|P1022DS)";then
> + UBOOT_SOURCE=u-boot-with-spl
> + fi
> + fi
> + cp ${S}/${board}/${UBOOT_SOURCE}.bin
> + ${S}/${board}/${UBOOT_TARGET}.bin
> +
> + # use boot-format to regenerate spi image if
> BOOTFORMAT_CONFIG is not empty
> + if [ "${UBOOT_TARGET}" = "u-boot-spi" ] && [ -n
> "${BOOTFORMAT_CONFIG}" ];then
> + ${STAGING_BINDIR_NATIVE}/boot_format \
> +
> ${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
> + ${S}/${board}/${UBOOT_SOURCE}.bin -spi
> ${S}/${board}/${UBOOT_TARGET}.bin
> + fi
> + fi
> + done
> +}
> +
> +do_install(){
> + if [ "x${UBOOT_MACHINES}" = "x" ]; then
> + UBOOT_MACHINES=${UBOOT_MACHINE}
> + fi
> +
> + for board in ${UBOOT_MACHINES}; do
> + if ! grep -wq $board ${S}/boards.cfg;then
> + continue
> + fi
> +
> + case "${board}" in
> + *SDCARD*) UBOOT_TARGET="u-boot-sd";;
> + *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
> + *NAND*) UBOOT_TARGET="u-boot-nand";;
> + *SRIO*) UBOOT_TARGET="u-boot-srio";;
> + *) UBOOT_TARGET="u-boot";;
> + esac
> +
> + if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
> + mkdir -p ${D}/boot/
> + install ${S}/${board}/${UBOOT_TARGET}.bin
> ${D}/boot/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
> + ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
> ${D}/boot/${UBOOT_TARGET}.bin
> + fi
> + done
> +}
> +
> +do_deploy(){
> + if [ "x${UBOOT_MACHINES}" = "x" ]; then
> + UBOOT_MACHINES=${UBOOT_MACHINE}
> + fi
> +
> + for board in ${UBOOT_MACHINES}; do
> + if ! grep -wq $board ${S}/boards.cfg;then
> + continue
> + fi
> +
> + case "${board}" in
> + *SDCARD*) UBOOT_TARGET="u-boot-sd";;
> + *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
> + *NAND*) UBOOT_TARGET="u-boot-nand";;
> + *SRIO*) UBOOT_TARGET="u-boot-srio";;
> + *) UBOOT_TARGET="u-boot";;
> + esac
> +
> + if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
> + mkdir -p ${DEPLOYDIR}
> + install ${S}/${board}/${UBOOT_TARGET}.bin
> + ${DEPLOYDIR}/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
> +
> + cd ${DEPLOYDIR}
> + rm -f ${UBOOT_TARGET}-${board}.bin
> + ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
> ${UBOOT_TARGET}-${board}.bin
> + fi
> + done
> +}
> +addtask deploy after do_install
> +
> +PACKAGES += "${PN}-images"
> +FILES_${PN}-images += "/boot"
> +
> +ALLOW_EMPTY_${PN} = "1"
> diff --git a/recipes-bsp/u-boot/u-boot-qoriq_git.bb b/recipes-bsp/u-
> boot/u-boot-qoriq_git.bb
> deleted file mode 100644
> index e16438f..0000000
> --- a/recipes-bsp/u-boot/u-boot-qoriq_git.bb
> +++ /dev/null
> @@ -1,179 +0,0 @@
> -DESCRIPTION = "U-boot bootloader"
> -HOMEPAGE = "http://u-boot.sf.net"
> -SECTION = "bootloaders"
> -PROVIDES = "virtual/bootloader u-boot"
> -LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1"
> -LIC_FILES_CHKSUM = " \
> - file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> - file://Licenses/bsd-2-
> clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
> - file://Licenses/bsd-3-
> clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
> - file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
> - file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
> -"
> -
> -PV = "2014.01+fslgit"
> -INHIBIT_DEFAULT_DEPS = "1"
> -DEPENDS = "boot-format-native libgcc ${@base_contains('TCMODE',
> 'external-fsl', '', 'virtual/${TARGET_PREFIX}gcc', d)}"
> -
> -inherit deploy
> -
> -SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;nobranch=1"
> -SRCREV = "fe1d4f5739e752ad45ada6227a9fb19590af7194"
> -
> -python () {
> - if d.getVar("TCMODE", True) == "external-fsl":
> - return
> -
> - ml = d.getVar("MULTILIB_VARIANTS", True)
> - arch = d.getVar("OVERRIDES", True)
> -
> - if ("e5500-64b:" in arch or "e6500-64b:" in arch) and not "lib32" in
> ml:
> - raise bb.parse.SkipPackage("Building the u-boot for this arch
> requires multilib to be enabled")
> -}
> -
> -DEPENDS_append_e5500-64b = "${@base_contains('TCMODE', 'external-fsl',
> '', ' lib32-gcc-cross-powerpc lib32-libgcc', d)}"
> -PATH_append_e5500-64b =
> ":${STAGING_BINDIR_NATIVE}/powerpc${TARGET_VENDOR_virtclass-multilib-
> lib32}-${HOST_OS}/"
> -TOOLCHAIN_OPTIONS_append_e5500-64b = "${@base_contains('TCMODE',
> 'external-fsl', '', '/../lib32-${MACHINE}', d)}"
> -TARGET_VENDOR_virtclass-multilib-lib32 ?= "${@base_contains('TCMODE',
> 'external-fsl', '', '-${DISTRO}mllib32', d)}"
> -WRAP_TARGET_PREFIX_e5500-64b := "powerpc${TARGET_VENDOR_virtclass-
> multilib-lib32}-${HOST_OS}-"
> -
> -DEPENDS_append_e6500-64b = "${@base_contains('TCMODE', 'external-fsl',
> '', ' lib32-gcc-cross-powerpc lib32-libgcc', d)}"
> -PATH_append_e6500-64b =
> ":${STAGING_BINDIR_NATIVE}/powerpc${TARGET_VENDOR_virtclass-multilib-
> lib32}-${HOST_OS}/"
> -TOOLCHAIN_OPTIONS_append_e6500-64b = "${@base_contains('TCMODE',
> 'external-fsl', '', '/../lib32-${MACHINE}', d)}"
> -TARGET_VENDOR_virtclass-multilib-lib32 ?= "${@base_contains('TCMODE',
> 'external-fsl', '', '-${DISTRO}mllib32', d)}"
> -WRAP_TARGET_PREFIX_e6500-64b := "powerpc${TARGET_VENDOR_virtclass-
> multilib-lib32}-${HOST_OS}-"
> -WRAP_TARGET_PREFIX = "${TARGET_PREFIX}"
> -
> -PACKAGE_ARCH = "${MACHINE_ARCH}"
> -
> -UBOOT_LOCALVERSION = "${@d.getVar('SDK_VERSION', True).partition('
> ')[0]}"
> -
> -USRC ?= ""
> -S = '${@base_conditional("USRC", "", "${WORKDIR}/git", "${USRC}", d)}'
> -
> -CROSS_COMPILE = '${@base_conditional("TCMODE", "external-fsl",
> "${TARGET_PREFIX}", "${WRAP_TARGET_PREFIX}", d)}'
> -EXTRA_OEMAKE = 'CROSS_COMPILE=${CROSS_COMPILE} CC="${CROSS_COMPILE}gcc
> ${TOOLCHAIN_OPTIONS}"'
> -
> -do_compile () {
> - unset LDFLAGS
> - unset CFLAGS
> - unset CPPFLAGS
> -
> - if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
> - then
> - head=`git rev-parse --verify --short HEAD 2> /dev/null`
> - printf "%s%s%s" ${UBOOT_LOCALVERSION} +g $head >
> ${B}/.scmversion
> - printf "%s%s%s" ${UBOOT_LOCALVERSION} +g $head >
> ${S}/.scmversion
> - fi
> -
> - if [ "x${UBOOT_MACHINES}" = "x" ]; then
> - UBOOT_MACHINES=${UBOOT_MACHINE}
> - fi
> -
> - for board in ${UBOOT_MACHINES}; do
> - if ! grep -wq $board ${S}/boards.cfg;then
> - echo "WARNING: $board not supported in boards.cfg"
> - continue
> - fi
> -
> - oe_runmake O=${board} distclean
> - oe_runmake O=${board} ${board}
> - oe_runmake O=${board} all
> -
> - case "${board}" in
> - *SDCARD*) UBOOT_TARGET="u-boot-sd";;
> - *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
> - *NAND*) UBOOT_TARGET="u-boot-nand";;
> - *SRIO*) UBOOT_TARGET="u-boot-srio";;
> - *) UBOOT_TARGET="";;
> - esac
> -
> - # deal with sd/spi/nand/srio image
> - UBOOT_SOURCE=u-boot
> - if [ "x${UBOOT_TARGET}" != "x" ]; then
> - # some boards' nand image was named as u-boot-with-spl
> - if [ "${UBOOT_TARGET}" = "u-boot-nand" ];then
> - if echo $board |egrep -q
> "(P1010RDB|P1020RDB|P1021RDB|P2020RDB|P1022DS|BSC913|C293)";then
> - UBOOT_SOURCE=u-boot-with-spl
> - fi
> - elif [ "${UBOOT_TARGET}" = "u-boot-spi" ];then
> - if echo $board |egrep -q
> "(P1010RDB|P1020RDB|P1021RDB|P2020RDB|P1022DS)";then
> - UBOOT_SOURCE=u-boot-with-spl
> - fi
> - elif [ "${UBOOT_TARGET}" = "u-boot-sd" ];then
> - if echo $board |egrep -q
> "(P1010RDB|P1020RDB|P1021RDB|P2020RDB|P1022DS)";then
> - UBOOT_SOURCE=u-boot-with-spl
> - fi
> - fi
> - cp ${S}/${board}/${UBOOT_SOURCE}.bin
> ${S}/${board}/${UBOOT_TARGET}.bin
> -
> - # use boot-format to regenerate spi image if
> BOOTFORMAT_CONFIG is not empty
> - if [ "${UBOOT_TARGET}" = "u-boot-spi" ] && [ -n
> "${BOOTFORMAT_CONFIG}" ];then
> - ${STAGING_BINDIR_NATIVE}/boot_format \
> -
> ${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
> - ${S}/${board}/${UBOOT_SOURCE}.bin -spi
> ${S}/${board}/${UBOOT_TARGET}.bin
> - fi
> - fi
> - done
> -}
> -
> -do_install(){
> - if [ "x${UBOOT_MACHINES}" = "x" ]; then
> - UBOOT_MACHINES=${UBOOT_MACHINE}
> - fi
> -
> - for board in ${UBOOT_MACHINES}; do
> - if ! grep -wq $board ${S}/boards.cfg;then
> - continue
> - fi
> -
> - case "${board}" in
> - *SDCARD*) UBOOT_TARGET="u-boot-sd";;
> - *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
> - *NAND*) UBOOT_TARGET="u-boot-nand";;
> - *SRIO*) UBOOT_TARGET="u-boot-srio";;
> - *) UBOOT_TARGET="u-boot";;
> - esac
> -
> - if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
> - mkdir -p ${D}/boot/
> - install ${S}/${board}/${UBOOT_TARGET}.bin
> ${D}/boot/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
> - ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
> ${D}/boot/${UBOOT_TARGET}.bin
> - fi
> - done
> -}
> -
> -do_deploy(){
> - if [ "x${UBOOT_MACHINES}" = "x" ]; then
> - UBOOT_MACHINES=${UBOOT_MACHINE}
> - fi
> -
> - for board in ${UBOOT_MACHINES}; do
> - if ! grep -wq $board ${S}/boards.cfg;then
> - continue
> - fi
> -
> - case "${board}" in
> - *SDCARD*) UBOOT_TARGET="u-boot-sd";;
> - *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
> - *NAND*) UBOOT_TARGET="u-boot-nand";;
> - *SRIO*) UBOOT_TARGET="u-boot-srio";;
> - *) UBOOT_TARGET="u-boot";;
> - esac
> -
> - if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
> - mkdir -p ${DEPLOYDIR}
> - install ${S}/${board}/${UBOOT_TARGET}.bin
> ${DEPLOYDIR}/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
> -
> - cd ${DEPLOYDIR}
> - rm -f ${UBOOT_TARGET}-${board}.bin
> - ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
> ${UBOOT_TARGET}-${board}.bin
> - fi
> - done
> -}
> -addtask deploy after do_install
> -
> -PACKAGES += "${PN}-images"
> -FILES_${PN}-images += "/boot"
> -
> -ALLOW_EMPTY_${PN} = "1"
> --
> 1.9.2
More information about the meta-freescale
mailing list