u-boot-qoirq: update to commit eb3d4fc

To align with meta-fsl-arm, re-use u-boot.inc from oe-core New commit imported: eb3d4fc powerpc/mpc85xx: fix disable port for FMAN erratum A007273 63dfac1 powerpc/mpc85xx: restrict platform for FMAN erratum A007273 54e5fde powerpc/mpc85xx: Add workaround for FMAN erratum A007273 61ac6ba drivers:usb:fsl: Add affected SOCs for USB Erratum A007792 ced4086 fsl/ddr: updated ddr errata-A008378 for arm and power SoCs 17f724f fsl/errata: move fsl_errata.h to common directory 6acff65 arm: ls102x: add get_svr and IS_SVR_REV helper 0caf24c arm: ls102xa: Set fdt_high and initrd_high to the value of 0xffffffff 263a323 powerpc: e6500: Lock/unlock L2 cache instead of L1 as init_ram f28fd70 powerpc: configs: Fix init_ram physical address for several boards 46be0a4 ls102xa: fdt: Disable IFC in SD boot for QSPI f1ca68a ls102xa: etsec: Use proper settings for BE BDs e0712fe mpc85xx/u-boot*.lds: remove _GLOBAL_OFFSET_TABLE_ definition a04b8b3 mmc: fsl_esdhc: fix mmc read/write error on T4160/T4080 23a735b arm: ls1021a: Fix the patch check warnings for the previous commit 5a42d5d SECURE_BOOT: Correct reading of ITS bit f6310eb arm: ls1021a: Add QSPI or IFC support in SD boot ab2db1a arm: ls102xa: fix patch check issue. 7611d2c Merge pull request #40 in SDK/u-boot-devel from ~B29983/u-boot-devel-tyt:feature/QUBOOT-1181-the-u-boot-deepsleep-resume-time to master d406c4f arm: ls102xa: enable all the snoop signal for masters. 1686b84 Merge pull request #38 in SDK/u-boot-devel from ~B46683/u-boot-devel:bugfix/QUBOOT-1173-ls1021atwr-sd-boot-don-t-support to master 0258a33 Merge pull request #37 in SDK/u-boot-devel from ~B18965/my-u-boot-devel:master to master dfc49e9 arm: ls1021atwr: optimize the deep sleep latency 2023326 Merge pull request #34 in SDK/u-boot-devel from ~B40530/u-boot-devel:feature/QUBOOT-789-sd-boot-on-t4-rdb to master 3a8f547 Merge pull request #35 in SDK/u-boot-devel from ~B47093/u-boot-devel-sdhc:feature/QLINUX-3755-support-the-uhs-speed-mode-for to master e4957df Merge pull request #31 in SDK/u-boot-devel from DNNPI/ls1-uboot:feature/LS1-for-SDK1.9 to master 774b080 configs: ls1021atwr: Enable ID EEPROM for SD boot 95a9abb arm: mmu: Add missing volatile for reading SCTLR register c9a7868 mmc: fsl_esdhc: enable EVDD automatic control for SD/MMC legacy card 3fe5a18 Merge pull request #27 in SDK/u-boot-devel from ~B45475/u-boot-devel-fork:feature/QUBOOT-1057-support-qe-tdm-on-t1040rdbd4 to master 767a4ad powerpc/t1040qds: enable peripheral clock for eSDHC 0867fed powerpc/t1040qds: enable adapter card type identification support 26d6853 mmc: fsl_esdhc: enable dat[4:7] for eMMC4.5 acd4c74 powerpc/t4rdb: Add SD boot support for T4240RDB board b773c94 configs: ls1021atwr: Disable DSPI2 with NOR boot 98bf337 mtd: sf: Add support AT26DF081A chip 91bdf34 dm: dts: ls1021a-twr: Enable DSPI2 on LS1021ATWR 7289cb9 configs: ls1021atwr: Enable DSPI for LS1021ATWR 870af21 t1040d4rdb: assign muxed pins to qe-tdm when set hwconfig qe-tdm 300674e powerpc/t1023rdb: change default core frequency to 1200MHz 45f88eb powerpc/t1023rdb: eMMC boot without external SD card aee4875 board/t1023rdb: add support for T1023RDB RevC 2c86026 ls1021atwr: sdboot: change serdes 0x20 to 0x30 8d38d25 LS102XA:workaround:disable priorities within DDR 2621445 arm: ls1021a: allow OCRAM access permission as R/W in SPL 10bc2b0 crypto/fsl: fix "era" property value on LE platforms 6d5733d arm: ls102xa: enable snooping for CAAM transactions d3e6f11 Revert "Enable snooping on transactions from CAAM block" a5dc0f7 arm: ls1021a: Ensure LS1021 ARM Generic Timer CompareValue Set 64-bit 0669b57 LS102XA: Workaround: DDR require a register write 449ab6a ls102xa: Enable snoop and DVM message requests. 6ae8810 Revert "arm: ls102xa: workaround for cache coherency problem" 617f1fd Revert "sf: Add support for flag status register on Micron chips" 18bd7bb arm: ls102xa: Add LE mode support for audio IPs on Rev2.0 silicon 80a22d8 QE: modify the address of qe ucode 784f7f2 arm: ls1021atwr: program the regulator for deep sleep 8971e50 ls1021atwr: added deep sleep support in uboot 9f692ae ls102xa: etsec: Enable Tx Data and TxBD snooping 79da560 arm/ls102xa:Add support of conditional workaround implementation as per SoC ver b6876d0 arm: ls102xa: Adjust the load address of U-Boot for NOR boot Signed-off-by: Ting Liu <ting.liu@freescale.com> Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
author: Ting Liu <ting.liu@freescale.com> 2015-12-22 16:15:30 +0800
committer: Zhenhua Luo <zhenhua.luo@nxp.com> 2015-12-28 11:00:56 +0800
commit: 9dc3897573f479496bcbcfefd551d5ea2fc9d8aa (patch)
tree: 44fe1a8db4fccdaf7d3f36d33b834426caca20cf /recipes-bsp
parent: fbf43a99c0fe81d5ad83c2a69910038451580a05 (diff)
download: meta-fsl-ppc-9dc3897573f479496bcbcfefd551d5ea2fc9d8aa.tar.gz
1 files changed, 58 insertions, 138 deletions
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
index eebd979..7b942c7 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
@@ -1,4 +1,7 @@
-DESCRIPTION = "U-boot bootloader"
+require recipes-bsp/u-boot/u-boot.inc
+inherit fsl-u-boot-localversion
+DESCRIPTION = "U-boot provided by Freescale with focus on QorIQ boards"
 HOMEPAGE = "http://u-boot.sf.net"
 SECTION = "bootloaders"
 PROVIDES = "virtual/bootloader u-boot"
@@ -13,16 +16,16 @@ LIC_FILES_CHKSUM = " \
 PV_append = "+fslgit"
 INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "boot-format-native libgcc ${@base_contains('TCMODE', 'external-fsl', '', 'virtual/${TARGET_PREFIX}gcc', d)}"
+DEPENDS = "libgcc virtual/${TARGET_PREFIX}gcc"
+DEPENDS_append_qoriq-ppc = " boot-format-native"
 inherit deploy
-SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;nobranch=1 \
+SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=sdk-v1.9.x \
-    file://0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch \
    file://gcc5.patch \
    file://add-fgnu89-inline-option-for-gcc5.patch \
 "
-SRCREV = "6ba8eedbcdc4b063f59a63e6288b938af739e8ad"
+SRCREV = "eb3d4fc5759729d7af71ac31ebf6a7e8d0e79da3"
 python () {
    if d.getVar("TCMODE", True) == "external-fsl":
@@ -45,148 +48,65 @@ 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)}'
-EXTRA_OEMAKE = 'CROSS_COMPILE=${WRAP_TARGET_PREFIX} CC="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
+LOCALVERSION = "+fsl"
-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
-    python ./tools/genboardscfg.py
-    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
+EXTRA_OEMAKE = 'CROSS_COMPILE=${WRAP_TARGET_PREFIX} CC="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
-        oe_runmake O=${board} ${board}_config
-        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
+do_compile_append_qoriq-ppc () {
-        UBOOT_SOURCE=u-boot.bin
+    # some board's final nand/spi/sdcard binary was not named as u-boot.bin
-        if [ "x${UBOOT_TARGET}" != "x" ] && echo $board |egrep -qi "SECBOOT|SECURE"; then
+    unset i j
-            cp ${S}/${board}/${UBOOT_SOURCE}  ${S}/${board}/${UBOOT_TARGET}.bin
+    if [ "x${UBOOT_CONFIG}" != "x" ]; then
-        elif [ "x${UBOOT_TARGET}" != "x" ]; then
+        for config in ${UBOOT_MACHINE}; do
-            # some boards' final binary was not named as u-boot.bin
+            i=`expr $i + 1`;
-            if [ "${UBOOT_TARGET}" = "u-boot-nand" ];then
+            UBOOT_SOURCE=${UBOOT_BINARY}
-                if echo $board |egrep -q "^(BSC|C29|P10|P2020RDB)";then
+            if echo ${config} |egrep -v "SECBOOT|SECURE" |egrep -qi "SDCARD|SPIFLASH|NAND"; then
-                    UBOOT_SOURCE=u-boot-with-spl.bin
+                if echo ${config} |egrep -qi "NAND";then
-                elif echo $board |egrep -q "^(B4|T1|T2|T4)";then
+                    if echo ${config} |egrep -qi "^(BSC|C29|P10|P2020RDB)";then
-                    UBOOT_SOURCE=u-boot-with-spl-pbl.bin
+                        UBOOT_SOURCE=u-boot-with-spl.bin
-                elif echo $board |egrep -q "^(P2041|P3|P4|P5)";then
+                    elif echo ${config} |egrep -qi "^(B4|T1|T2|T4)";then
-                    UBOOT_SOURCE=u-boot.pbl
+                        UBOOT_SOURCE=u-boot-with-spl-pbl.bin
+                    elif echo ${config} |egrep -qi "^(P2041|P3|P4|P5)";then
+                        UBOOT_SOURCE=u-boot.pbl
+                    fi
+                elif echo ${config} |egrep -qi "SPIFLASH";then
+                    if echo ${config} |egrep -qi "^(P10|P2020RDB)";then
+                        UBOOT_SOURCE=u-boot-with-spl.bin
+                    elif echo ${config} |egrep -qi "^(T1|T2)";then
+                        UBOOT_SOURCE=u-boot-with-spl-pbl.bin
+                    elif echo ${config} |egrep -qi "^(B4|P2041|P3|P4|P5|T4)";then
+                        UBOOT_SOURCE=u-boot.pbl
+                    fi
+                elif echo ${config} |egrep -qi "SDCARD";then
+                    if echo ${config} |egrep -qi "^(P10|P2020RDB)";then
+                        UBOOT_SOURCE=u-boot-with-spl.bin
+                    elif echo ${config} |egrep -qi "^(B4|T1|T2|T4)";then
+                        UBOOT_SOURCE=u-boot-with-spl-pbl.bin
+                    elif echo ${config} |egrep -qi "^(P2041|P3|P4|P5)";then
+                        UBOOT_SOURCE=u-boot.pbl
+                    fi
                fi
-            elif [ "${UBOOT_TARGET}" = "u-boot-spi" ];then
+                for type in ${UBOOT_CONFIG}; do
-                if echo $board |egrep -q "^(P10|P2020RDB)";then
+                    j=`expr $j + 1`;
-                    UBOOT_SOURCE=u-boot-with-spl.bin
+                    if [ $j -eq $i ]; then
-                elif echo $board |egrep -q "^(T1|T2)";then
+                        cp ${S}/${config}/${UBOOT_SOURCE} ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX}
-                    UBOOT_SOURCE=u-boot-with-spl-pbl.bin
+                        # use boot-format to regenerate spi image if BOOTFORMAT_CONFIG is not empty
-                elif echo $board |egrep -q "^(B4|P2041|P3|P4|P5|T4)";then
+                        if echo ${config} |egrep -qi "SPIFLASH" && [ -n "${BOOTFORMAT_CONFIG}" ];then
-                    UBOOT_SOURCE=u-boot.pbl
+                            ${STAGING_BINDIR_NATIVE}/boot_format \
-                fi
+                            ${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
-            elif [ "${UBOOT_TARGET}" = "u-boot-sd" ];then
+                            ${S}/${config}/${UBOOT_SOURCE} -spi ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX}
-                if echo $board |egrep -q "^(P10|P2020RDB)";then
+                        fi
-                    UBOOT_SOURCE=u-boot-with-spl.bin
+                    fi
-                elif echo $board |egrep -q "^(B4|T1|T2|T4)";then
+                done
-                    UBOOT_SOURCE=u-boot-with-spl-pbl.bin
+                unset  j
-                elif echo $board |egrep -q "^(P2041|P3|P4|P5)";then
-                    UBOOT_SOURCE=u-boot.pbl
-                fi
-            fi
-            cp ${S}/${board}/${UBOOT_SOURCE}  ${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} -spi ${S}/${board}/${UBOOT_TARGET}.bin
            fi
-        fi
+        done
-    done
+        unset i
-}
-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"
+COMPATIBLE_MACHINE = "(qoriq)"
-ALLOW_EMPTY_${PN} = "1"
author	Ting Liu <ting.liu@freescale.com>	2015-12-22 16:15:30 +0800
committer	Zhenhua Luo <zhenhua.luo@nxp.com>	2015-12-28 11:00:56 +0800
commit	9dc3897573f479496bcbcfefd551d5ea2fc9d8aa (patch)
tree	44fe1a8db4fccdaf7d3f36d33b834426caca20cf /recipes-bsp
parent	fbf43a99c0fe81d5ad83c2a69910038451580a05 (diff)
download	meta-fsl-ppc-9dc3897573f479496bcbcfefd551d5ea2fc9d8aa.tar.gz

diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb index eebd979..7b942c7 100644 --- a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb +++ b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
@@ -1,4 +1,7 @@
1	DESCRIPTION = "U-boot bootloader"	1	require recipes-bsp/u-boot/u-boot.inc
		2	inherit fsl-u-boot-localversion
		3
		4	DESCRIPTION = "U-boot provided by Freescale with focus on QorIQ boards"
2	HOMEPAGE = "http://u-boot.sf.net"	5	HOMEPAGE = "http://u-boot.sf.net"
3	SECTION = "bootloaders"	6	SECTION = "bootloaders"
4	PROVIDES = "virtual/bootloader u-boot"	7	PROVIDES = "virtual/bootloader u-boot"
@@ -13,16 +16,16 @@ LIC_FILES_CHKSUM = " \
13		16
14	PV_append = "+fslgit"	17	PV_append = "+fslgit"
15	INHIBIT_DEFAULT_DEPS = "1"	18	INHIBIT_DEFAULT_DEPS = "1"
16	DEPENDS = "boot-format-native libgcc ${@base_contains('TCMODE', 'external-fsl', '', 'virtual/${TARGET_PREFIX}gcc', d)}"	19	DEPENDS = "libgcc virtual/${TARGET_PREFIX}gcc"
		20	DEPENDS_append_qoriq-ppc = " boot-format-native"
17		21
18	inherit deploy	22	inherit deploy
19		23
20	SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;nobranch=1 \	24	SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=sdk-v1.9.x \
21	file://0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch \
22	file://gcc5.patch \	25	file://gcc5.patch \
23	file://add-fgnu89-inline-option-for-gcc5.patch \	26	file://add-fgnu89-inline-option-for-gcc5.patch \
24	"	27	"
25	SRCREV = "6ba8eedbcdc4b063f59a63e6288b938af739e8ad"	28	SRCREV = "eb3d4fc5759729d7af71ac31ebf6a7e8d0e79da3"
26		29
27	python () {	30	python () {
28	if d.getVar("TCMODE", True) == "external-fsl":	31	if d.getVar("TCMODE", True) == "external-fsl":
@@ -45,148 +48,65 @@ WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
45		48
46	PACKAGE_ARCH = "${MACHINE_ARCH}"	49	PACKAGE_ARCH = "${MACHINE_ARCH}"
47		50
48	UBOOT_LOCALVERSION = "${@d.getVar('SDK_VERSION', True).partition(' ')[0]}"
49
50	USRC ?= ""	51	USRC ?= ""
51	S = '${@base_conditional("USRC", "", "${WORKDIR}/git", "${USRC}", d)}'	52	S = '${@base_conditional("USRC", "", "${WORKDIR}/git", "${USRC}", d)}'
52		53
53	EXTRA_OEMAKE = 'CROSS_COMPILE=${WRAP_TARGET_PREFIX} CC="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'	54	LOCALVERSION = "+fsl"
54
55	do_compile () {
56	unset LDFLAGS
57	unset CFLAGS
58	unset CPPFLAGS
59
60	if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
61	then
62	head=`git rev-parse --verify --short HEAD 2> /dev/null`
63	printf "%s%s%s" ${UBOOT_LOCALVERSION} +g $head > ${B}/.scmversion
64	printf "%s%s%s" ${UBOOT_LOCALVERSION} +g $head > ${S}/.scmversion
65	fi
66
67	if [ "x${UBOOT_MACHINES}" = "x" ]; then
68	UBOOT_MACHINES=${UBOOT_MACHINE}
69	fi
70
71	python ./tools/genboardscfg.py
72	for board in ${UBOOT_MACHINES}; do
73	if ! grep -wq $board ${S}/boards.cfg;then
74	echo "WARNING: $board not supported in boards.cfg"
75	continue
76	fi
77		55
78	oe_runmake O=${board} distclean	56	EXTRA_OEMAKE = 'CROSS_COMPILE=${WRAP_TARGET_PREFIX} CC="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
79	oe_runmake O=${board} ${board}_config
80	oe_runmake O=${board} all
81
82	case "${board}" in
83	SDCARD) UBOOT_TARGET="u-boot-sd";;
84	SPIFLASH) UBOOT_TARGET="u-boot-spi";;
85	NAND) UBOOT_TARGET="u-boot-nand";;
86	SRIO) UBOOT_TARGET="u-boot-srio";;
87	*) UBOOT_TARGET="";;
88	esac
89		57
90	# deal with sd/spi/nand/srio image	58	do_compile_append_qoriq-ppc () {
91	UBOOT_SOURCE=u-boot.bin	59	# some board's final nand/spi/sdcard binary was not named as u-boot.bin
92	if [ "x${UBOOT_TARGET}" != "x" ] && echo $board \|egrep -qi "SECBOOT\|SECURE"; then	60	unset i j
93	cp ${S}/${board}/${UBOOT_SOURCE} ${S}/${board}/${UBOOT_TARGET}.bin	61	if [ "x${UBOOT_CONFIG}" != "x" ]; then
94	elif [ "x${UBOOT_TARGET}" != "x" ]; then	62	for config in ${UBOOT_MACHINE}; do
95	# some boards' final binary was not named as u-boot.bin	63	i=`expr $i + 1`;
96	if [ "${UBOOT_TARGET}" = "u-boot-nand" ];then	64	UBOOT_SOURCE=${UBOOT_BINARY}
97	if echo $board \|egrep -q "^(BSC\|C29\|P10\|P2020RDB)";then	65	if echo ${config} \|egrep -v "SECBOOT\|SECURE" \|egrep -qi "SDCARD\|SPIFLASH\|NAND"; then
98	UBOOT_SOURCE=u-boot-with-spl.bin	66	if echo ${config} \|egrep -qi "NAND";then
99	elif echo $board \|egrep -q "^(B4\|T1\|T2\|T4)";then	67	if echo ${config} \|egrep -qi "^(BSC\|C29\|P10\|P2020RDB)";then
100	UBOOT_SOURCE=u-boot-with-spl-pbl.bin	68	UBOOT_SOURCE=u-boot-with-spl.bin
101	elif echo $board \|egrep -q "^(P2041\|P3\|P4\|P5)";then	69	elif echo ${config} \|egrep -qi "^(B4\|T1\|T2\|T4)";then
102	UBOOT_SOURCE=u-boot.pbl	70	UBOOT_SOURCE=u-boot-with-spl-pbl.bin
		71	elif echo ${config} \|egrep -qi "^(P2041\|P3\|P4\|P5)";then
		72	UBOOT_SOURCE=u-boot.pbl
		73	fi
		74	elif echo ${config} \|egrep -qi "SPIFLASH";then
		75	if echo ${config} \|egrep -qi "^(P10\|P2020RDB)";then
		76	UBOOT_SOURCE=u-boot-with-spl.bin
		77	elif echo ${config} \|egrep -qi "^(T1\|T2)";then
		78	UBOOT_SOURCE=u-boot-with-spl-pbl.bin
		79	elif echo ${config} \|egrep -qi "^(B4\|P2041\|P3\|P4\|P5\|T4)";then
		80	UBOOT_SOURCE=u-boot.pbl
		81	fi
		82	elif echo ${config} \|egrep -qi "SDCARD";then
		83	if echo ${config} \|egrep -qi "^(P10\|P2020RDB)";then
		84	UBOOT_SOURCE=u-boot-with-spl.bin
		85	elif echo ${config} \|egrep -qi "^(B4\|T1\|T2\|T4)";then
		86	UBOOT_SOURCE=u-boot-with-spl-pbl.bin
		87	elif echo ${config} \|egrep -qi "^(P2041\|P3\|P4\|P5)";then
		88	UBOOT_SOURCE=u-boot.pbl
		89	fi
103	fi	90	fi
104	elif [ "${UBOOT_TARGET}" = "u-boot-spi" ];then	91	for type in ${UBOOT_CONFIG}; do
105	if echo $board \|egrep -q "^(P10\|P2020RDB)";then	92	j=`expr $j + 1`;
106	UBOOT_SOURCE=u-boot-with-spl.bin	93	if [ $j -eq $i ]; then
107	elif echo $board \|egrep -q "^(T1\|T2)";then	94	cp ${S}/${config}/${UBOOT_SOURCE} ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX}
108	UBOOT_SOURCE=u-boot-with-spl-pbl.bin	95	# use boot-format to regenerate spi image if BOOTFORMAT_CONFIG is not empty
109	elif echo $board \|egrep -q "^(B4\|P2041\|P3\|P4\|P5\|T4)";then	96	if echo ${config} \|egrep -qi "SPIFLASH" && [ -n "${BOOTFORMAT_CONFIG}" ];then
110	UBOOT_SOURCE=u-boot.pbl	97	${STAGING_BINDIR_NATIVE}/boot_format \
111	fi	98	${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
112	elif [ "${UBOOT_TARGET}" = "u-boot-sd" ];then	99	${S}/${config}/${UBOOT_SOURCE} -spi ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX}
113	if echo $board \|egrep -q "^(P10\|P2020RDB)";then	100	fi
114	UBOOT_SOURCE=u-boot-with-spl.bin	101	fi
115	elif echo $board \|egrep -q "^(B4\|T1\|T2\|T4)";then	102	done
116	UBOOT_SOURCE=u-boot-with-spl-pbl.bin	103	unset j
117	elif echo $board \|egrep -q "^(P2041\|P3\|P4\|P5)";then
118	UBOOT_SOURCE=u-boot.pbl
119	fi
120	fi
121	cp ${S}/${board}/${UBOOT_SOURCE} ${S}/${board}/${UBOOT_TARGET}.bin
122
123	# use boot-format to regenerate spi image if BOOTFORMAT_CONFIG is not empty
124	if [ "${UBOOT_TARGET}" = "u-boot-spi" ] && [ -n "${BOOTFORMAT_CONFIG}" ];then
125	${STAGING_BINDIR_NATIVE}/boot_format \
126	${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
127	${S}/${board}/${UBOOT_SOURCE} -spi ${S}/${board}/${UBOOT_TARGET}.bin
128	fi	104	fi
129	fi	105	done
130	done	106	unset i
131	}
132
133	do_install(){
134	if [ "x${UBOOT_MACHINES}" = "x" ]; then
135	UBOOT_MACHINES=${UBOOT_MACHINE}
136	fi
137
138	for board in ${UBOOT_MACHINES}; do
139	if ! grep -wq $board ${S}/boards.cfg;then
140	continue
141	fi
142
143	case "${board}" in
144	SDCARD) UBOOT_TARGET="u-boot-sd";;
145	SPIFLASH) UBOOT_TARGET="u-boot-spi";;
146	NAND) UBOOT_TARGET="u-boot-nand";;
147	SRIO) UBOOT_TARGET="u-boot-srio";;
148	*) UBOOT_TARGET="u-boot";;
149	esac
150
151	if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
152	mkdir -p ${D}/boot/
153	install ${S}/${board}/${UBOOT_TARGET}.bin ${D}/boot/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
154	ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${D}/boot/${UBOOT_TARGET}.bin
155	fi
156	done
157	}
158
159	do_deploy(){
160	if [ "x${UBOOT_MACHINES}" = "x" ]; then
161	UBOOT_MACHINES=${UBOOT_MACHINE}
162	fi	107	fi
163
164	for board in ${UBOOT_MACHINES}; do
165	if ! grep -wq $board ${S}/boards.cfg;then
166	continue
167	fi
168
169	case "${board}" in
170	SDCARD) UBOOT_TARGET="u-boot-sd";;
171	SPIFLASH) UBOOT_TARGET="u-boot-spi";;
172	NAND) UBOOT_TARGET="u-boot-nand";;
173	SRIO) UBOOT_TARGET="u-boot-srio";;
174	*) UBOOT_TARGET="u-boot";;
175	esac
176
177	if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
178	mkdir -p ${DEPLOYDIR}
179	install ${S}/${board}/${UBOOT_TARGET}.bin ${DEPLOYDIR}/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
180
181	cd ${DEPLOYDIR}
182	rm -f ${UBOOT_TARGET}-${board}.bin
183	ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${UBOOT_TARGET}-${board}.bin
184	fi
185	done
186	}	108	}
187	addtask deploy after do_install
188		109
189	PACKAGES += "${PN}-images"	110	PACKAGES += "${PN}-images"
190	FILES_${PN}-images += "/boot"	111	FILES_${PN}-images += "/boot"
191		112	COMPATIBLE_MACHINE = "(qoriq)"
192	ALLOW_EMPTY_${PN} = "1"