u-boot: replace tab with 4 spaces

Signed-off-by: Ting Liu <b28495@freescale.com>
author: Ting Liu <b28495@freescale.com> 2013-10-29 16:19:19 +0800
committer: Zhenhua Luo <zhenhua.luo@freescale.com> 2014-01-13 12:11:34 +0800
commit: c7f7c8c583515c47c43439e4a293767ebeb95bad (patch)
tree: cd145cacbaeca7ee6c7413acb8c4f10628cf9a52
parent: c7275ad4f9abcc8626cacdb14fcaf2882fbe1bf0 (diff)
download: meta-fsl-ppc-c7f7c8c583515c47c43439e4a293767ebeb95bad.tar.gz
1 files changed, 87 insertions, 87 deletions
diff --git a/recipes-bsp/u-boot/u-boot_git.bb b/recipes-bsp/u-boot/u-boot_git.bb
index 5954fc6..f11b517 100644
--- a/recipes-bsp/u-boot/u-boot_git.bb
+++ b/recipes-bsp/u-boot/u-boot_git.bb
@@ -15,14 +15,14 @@ SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git"
 SRCREV = "831b30de4b768f0b3b7dbfa11739b14cea612d7e"
 python () {
-        if d.getVar("TCMODE", True) == "external-fsl":
+    if d.getVar("TCMODE", True) == "external-fsl":
-                return
+        return
-        ml = d.getVar("MULTILIB_VARIANTS", True)
+    ml = d.getVar("MULTILIB_VARIANTS", True)
-        arch = d.getVar("OVERRIDES", True)
+    arch = d.getVar("OVERRIDES", True)
-        if ("e5500-64b:" in arch or "e6500-64b:" in arch) and not "lib32" in ml:
+    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")
+        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 lib32-libgcc', d)}"
@@ -49,99 +49,99 @@ CROSS_COMPILE = '${@base_conditional("TCMODE", "external-fsl", "${TARGET_PREFIX}
 EXTRA_OEMAKE = 'CROSS_COMPILE=${CROSS_COMPILE} CC="${CROSS_COMPILE}gcc ${TOOLCHAIN_OPTIONS}"'
 do_compile () {
-        unset LDFLAGS
+    unset LDFLAGS
-        unset CFLAGS
+    unset CFLAGS
-        unset CPPFLAGS
+    unset CPPFLAGS
-        if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
+    if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
-        then
+    then
-            echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion
+        echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion
-            echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion
+        echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion
-        fi
+    fi
-        if [ "x${UBOOT_MACHINES}" = "x" ]; then
+    if [ "x${UBOOT_MACHINES}" = "x" ]; then
-                UBOOT_MACHINES=${UBOOT_MACHINE}
+        UBOOT_MACHINES=${UBOOT_MACHINE}
-        fi
+    fi
-        for board in ${UBOOT_MACHINES}; do
+    for board in ${UBOOT_MACHINES}; do
-                oe_runmake O=${board} distclean
+        oe_runmake O=${board} distclean
-                oe_runmake O=${board} ${board}
+        oe_runmake O=${board} ${board}
-                oe_runmake O=${board} all
+        oe_runmake O=${board} all
-                case "${board}" in
+        case "${board}" in
-                *SDCARD*)       UBOOT_TARGET="u-boot-sd";;
+            *SDCARD*)   UBOOT_TARGET="u-boot-sd";;
-                *SPIFLASH*)     UBOOT_TARGET="u-boot-spi";;
+            *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
-                *NAND*)         UBOOT_TARGET="u-boot-nand";;
+            *NAND*)     UBOOT_TARGET="u-boot-nand";;
-                *)              UBOOT_TARGET="";;
+            *)      UBOOT_TARGET="";;
-                esac
+        esac
-                if [ "x${UBOOT_TARGET}" != "x" ]; then
+        if [ "x${UBOOT_TARGET}" != "x" ]; then
-                        if [ "${UBOOT_TARGET}" = "u-boot-sd" ]; then
+            if [ "${UBOOT_TARGET}" = "u-boot-sd" ]; then
-                                cp ${S}/${board}/u-boot.bin  ${S}/${board}/${UBOOT_TARGET}.bin
+                cp ${S}/${board}/u-boot.bin  ${S}/${board}/${UBOOT_TARGET}.bin
            elif [ "${UBOOT_TARGET}" = "u-boot-nand" ];then
-                                if [ "${DEFAULTTUNE}" = "ppce500v2" ];then
+                if [ "${DEFAULTTUNE}" = "ppce500v2" ];then
-                    if echo $board |egrep "(P1010RDB|P1020RDB|P1021RDB|P1024RDB|P2020RDB|P1022DS|P1025RDB|BSC9131RDB|BSC9132QDS)" 2>&1 >/dev/null;then
+                    if echo $board |egrep -q "(P1010RDB|P1020RDB|P1021RDB|P1024RDB|P2020RDB|P1022DS|P1025RDB|BSC9131)";then
                        cp ${S}/${board}/u-boot-with-spl.bin ${S}/${board}/${UBOOT_TARGET}.bin
                    fi
                else
                    cp ${S}/${board}/u-boot.bin  ${S}/${board}/${UBOOT_TARGET}.bin
                fi
-                        else
+            else
-                                if [ -n "${BOOTFORMAT_CONFIG}" ];then
+                if [ -n "${BOOTFORMAT_CONFIG}" ];then
-                                        ${STAGING_BINDIR_NATIVE}/boot_format \
+                    ${STAGING_BINDIR_NATIVE}/boot_format \
-                                                ${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
+                    ${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
-                                                ${S}/${board}/u-boot.bin -spi ${S}/${board}/${UBOOT_TARGET}.bin
+                    ${S}/${board}/u-boot.bin -spi ${S}/${board}/${UBOOT_TARGET}.bin
-                                else
+                else
-                                        cp ${S}/${board}/u-boot.bin  ${S}/${board}/${UBOOT_TARGET}.bin
+                    cp ${S}/${board}/u-boot.bin  ${S}/${board}/${UBOOT_TARGET}.bin
-                                fi
+                fi
-                        fi 
+            fi
-                fi
+        fi
-        done
+    done
 }
 do_install(){
-        if [ "x${UBOOT_MACHINES}" = "x" ]; then
+    if [ "x${UBOOT_MACHINES}" = "x" ]; then
-                UBOOT_MACHINES=${UBOOT_MACHINE}
+        UBOOT_MACHINES=${UBOOT_MACHINE}
-        fi
+    fi
-        for board in ${UBOOT_MACHINES}; do
+    for board in ${UBOOT_MACHINES}; do
-                case "${board}" in
+        case "${board}" in
-                *SDCARD*)       UBOOT_TARGET="u-boot-sd";;
+            *SDCARD*)   UBOOT_TARGET="u-boot-sd";;
-                *SPIFLASH*)     UBOOT_TARGET="u-boot-spi";;
+            *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
-                *NAND*)         UBOOT_TARGET="u-boot-nand";;
+            *NAND*)     UBOOT_TARGET="u-boot-nand";;
-                *)              UBOOT_TARGET="u-boot";;
+            *)      UBOOT_TARGET="u-boot";;
-                esac
+        esac
-                if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
+        if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
-                        mkdir -p ${D}/boot/
+            mkdir -p ${D}/boot/
-                        install ${S}/${board}/${UBOOT_TARGET}.bin ${D}/boot/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
+            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
+            ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${D}/boot/${UBOOT_TARGET}.bin
-                fi
+        fi
-        done
+    done
 }
 do_deploy(){
-        if [ "x${UBOOT_MACHINES}" = "x" ]; then
+    if [ "x${UBOOT_MACHINES}" = "x" ]; then
-                UBOOT_MACHINES=${UBOOT_MACHINE}
+        UBOOT_MACHINES=${UBOOT_MACHINE}
-        fi
+    fi
-        for board in ${UBOOT_MACHINES}; do
+    for board in ${UBOOT_MACHINES}; do
-                case "${board}" in
+        case "${board}" in
-                *SDCARD*)       UBOOT_TARGET="u-boot-sd";;
+            *SDCARD*)   UBOOT_TARGET="u-boot-sd";;
-                *SPIFLASH*)     UBOOT_TARGET="u-boot-spi";;
+            *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
-                *NAND*)         UBOOT_TARGET="u-boot-nand";;
+            *NAND*)     UBOOT_TARGET="u-boot-nand";;
-                *)              UBOOT_TARGET="u-boot";;
+            *)      UBOOT_TARGET="u-boot";;
-                esac
+        esac
-                if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
+        if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
-                        mkdir -p ${DEPLOYDIR}
+            mkdir -p ${DEPLOYDIR}
-                        install ${S}/${board}/${UBOOT_TARGET}.bin ${DEPLOYDIR}/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
+            install ${S}/${board}/${UBOOT_TARGET}.bin ${DEPLOYDIR}/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
-                        cd ${DEPLOYDIR}
+            cd ${DEPLOYDIR}
-                        rm -f ${UBOOT_TARGET}-${board}.bin
+            rm -f ${UBOOT_TARGET}-${board}.bin
-                        ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${UBOOT_TARGET}-${board}.bin
+            ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${UBOOT_TARGET}-${board}.bin
-                fi
+        fi
-        done
+    done
 }
 addtask deploy after do_install
author	Ting Liu <b28495@freescale.com>	2013-10-29 16:19:19 +0800
committer	Zhenhua Luo <zhenhua.luo@freescale.com>	2014-01-13 12:11:34 +0800
commit	c7f7c8c583515c47c43439e4a293767ebeb95bad (patch)
tree	cd145cacbaeca7ee6c7413acb8c4f10628cf9a52
parent	c7275ad4f9abcc8626cacdb14fcaf2882fbe1bf0 (diff)
download	meta-fsl-ppc-c7f7c8c583515c47c43439e4a293767ebeb95bad.tar.gz

diff --git a/recipes-bsp/u-boot/u-boot_git.bb b/recipes-bsp/u-boot/u-boot_git.bb index 5954fc6..f11b517 100644 --- a/recipes-bsp/u-boot/u-boot_git.bb +++ b/recipes-bsp/u-boot/u-boot_git.bb
@@ -15,14 +15,14 @@ SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git"
15	SRCREV = "831b30de4b768f0b3b7dbfa11739b14cea612d7e"	15	SRCREV = "831b30de4b768f0b3b7dbfa11739b14cea612d7e"
16		16
17	python () {	17	python () {
18	if d.getVar("TCMODE", True) == "external-fsl":	18	if d.getVar("TCMODE", True) == "external-fsl":
19	return	19	return
20		20
21	ml = d.getVar("MULTILIB_VARIANTS", True)	21	ml = d.getVar("MULTILIB_VARIANTS", True)
22	arch = d.getVar("OVERRIDES", True)	22	arch = d.getVar("OVERRIDES", True)
23		23
24	if ("e5500-64b:" in arch or "e6500-64b:" in arch) and not "lib32" in ml:	24	if ("e5500-64b:" in arch or "e6500-64b:" in arch) and not "lib32" in ml:
25	raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled")	25	raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled")
26	}	26	}
27		27
28	DEPENDS_append_e5500-64b = "${@base_contains('TCMODE', 'external-fsl', '', ' lib32-gcc-cross lib32-libgcc', d)}"	28	DEPENDS_append_e5500-64b = "${@base_contains('TCMODE', 'external-fsl', '', ' lib32-gcc-cross lib32-libgcc', d)}"
@@ -49,99 +49,99 @@ CROSS_COMPILE = '${@base_conditional("TCMODE", "external-fsl", "${TARGET_PREFIX}
49	EXTRA_OEMAKE = 'CROSS_COMPILE=${CROSS_COMPILE} CC="${CROSS_COMPILE}gcc ${TOOLCHAIN_OPTIONS}"'	49	EXTRA_OEMAKE = 'CROSS_COMPILE=${CROSS_COMPILE} CC="${CROSS_COMPILE}gcc ${TOOLCHAIN_OPTIONS}"'
50		50
51	do_compile () {	51	do_compile () {
52	unset LDFLAGS	52	unset LDFLAGS
53	unset CFLAGS	53	unset CFLAGS
54	unset CPPFLAGS	54	unset CPPFLAGS
55		55
56	if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]	56	if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
57	then	57	then
58	echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion	58	echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion
59	echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion	59	echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion
60	fi	60	fi
61		61
62	if [ "x${UBOOT_MACHINES}" = "x" ]; then	62	if [ "x${UBOOT_MACHINES}" = "x" ]; then
63	UBOOT_MACHINES=${UBOOT_MACHINE}	63	UBOOT_MACHINES=${UBOOT_MACHINE}
64	fi	64	fi
65		65
66	for board in ${UBOOT_MACHINES}; do	66	for board in ${UBOOT_MACHINES}; do
67	oe_runmake O=${board} distclean	67	oe_runmake O=${board} distclean
68	oe_runmake O=${board} ${board}	68	oe_runmake O=${board} ${board}
69	oe_runmake O=${board} all	69	oe_runmake O=${board} all
70		70
71	case "${board}" in	71	case "${board}" in
72	SDCARD) UBOOT_TARGET="u-boot-sd";;	72	SDCARD) UBOOT_TARGET="u-boot-sd";;
73	SPIFLASH) UBOOT_TARGET="u-boot-spi";;	73	SPIFLASH) UBOOT_TARGET="u-boot-spi";;
74	NAND) UBOOT_TARGET="u-boot-nand";;	74	NAND) UBOOT_TARGET="u-boot-nand";;
75	*) UBOOT_TARGET="";;	75	*) UBOOT_TARGET="";;
76	esac	76	esac
77		77
78	if [ "x${UBOOT_TARGET}" != "x" ]; then	78	if [ "x${UBOOT_TARGET}" != "x" ]; then
79	if [ "${UBOOT_TARGET}" = "u-boot-sd" ]; then	79	if [ "${UBOOT_TARGET}" = "u-boot-sd" ]; then
80	cp ${S}/${board}/u-boot.bin ${S}/${board}/${UBOOT_TARGET}.bin	80	cp ${S}/${board}/u-boot.bin ${S}/${board}/${UBOOT_TARGET}.bin
81	elif [ "${UBOOT_TARGET}" = "u-boot-nand" ];then	81	elif [ "${UBOOT_TARGET}" = "u-boot-nand" ];then
82	if [ "${DEFAULTTUNE}" = "ppce500v2" ];then	82	if [ "${DEFAULTTUNE}" = "ppce500v2" ];then
83	if echo $board \|egrep "(P1010RDB\|P1020RDB\|P1021RDB\|P1024RDB\|P2020RDB\|P1022DS\|P1025RDB\|BSC9131RDB\|BSC9132QDS)" 2>&1 >/dev/null;then	83	if echo $board \|egrep -q "(P1010RDB\|P1020RDB\|P1021RDB\|P1024RDB\|P2020RDB\|P1022DS\|P1025RDB\|BSC9131)";then
84	cp ${S}/${board}/u-boot-with-spl.bin ${S}/${board}/${UBOOT_TARGET}.bin	84	cp ${S}/${board}/u-boot-with-spl.bin ${S}/${board}/${UBOOT_TARGET}.bin
85	fi	85	fi
86	else	86	else
87	cp ${S}/${board}/u-boot.bin ${S}/${board}/${UBOOT_TARGET}.bin	87	cp ${S}/${board}/u-boot.bin ${S}/${board}/${UBOOT_TARGET}.bin
88	fi	88	fi
89	else	89	else
90	if [ -n "${BOOTFORMAT_CONFIG}" ];then	90	if [ -n "${BOOTFORMAT_CONFIG}" ];then
91	${STAGING_BINDIR_NATIVE}/boot_format \	91	${STAGING_BINDIR_NATIVE}/boot_format \
92	${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \	92	${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
93	${S}/${board}/u-boot.bin -spi ${S}/${board}/${UBOOT_TARGET}.bin	93	${S}/${board}/u-boot.bin -spi ${S}/${board}/${UBOOT_TARGET}.bin
94	else	94	else
95	cp ${S}/${board}/u-boot.bin ${S}/${board}/${UBOOT_TARGET}.bin	95	cp ${S}/${board}/u-boot.bin ${S}/${board}/${UBOOT_TARGET}.bin
96	fi	96	fi
97	fi	97	fi
98	fi	98	fi
99	done	99	done
100	}	100	}
101		101
102	do_install(){	102	do_install(){
103	if [ "x${UBOOT_MACHINES}" = "x" ]; then	103	if [ "x${UBOOT_MACHINES}" = "x" ]; then
104	UBOOT_MACHINES=${UBOOT_MACHINE}	104	UBOOT_MACHINES=${UBOOT_MACHINE}
105	fi	105	fi
106		106
107	for board in ${UBOOT_MACHINES}; do	107	for board in ${UBOOT_MACHINES}; do
108	case "${board}" in	108	case "${board}" in
109	SDCARD) UBOOT_TARGET="u-boot-sd";;	109	SDCARD) UBOOT_TARGET="u-boot-sd";;
110	SPIFLASH) UBOOT_TARGET="u-boot-spi";;	110	SPIFLASH) UBOOT_TARGET="u-boot-spi";;
111	NAND) UBOOT_TARGET="u-boot-nand";;	111	NAND) UBOOT_TARGET="u-boot-nand";;
112	*) UBOOT_TARGET="u-boot";;	112	*) UBOOT_TARGET="u-boot";;
113	esac	113	esac
114		114
115	if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then	115	if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
116	mkdir -p ${D}/boot/	116	mkdir -p ${D}/boot/
117	install ${S}/${board}/${UBOOT_TARGET}.bin ${D}/boot/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin	117	install ${S}/${board}/${UBOOT_TARGET}.bin ${D}/boot/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
118	ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${D}/boot/${UBOOT_TARGET}.bin	118	ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${D}/boot/${UBOOT_TARGET}.bin
119	fi	119	fi
120	done	120	done
121	}	121	}
122		122
123	do_deploy(){	123	do_deploy(){
124	if [ "x${UBOOT_MACHINES}" = "x" ]; then	124	if [ "x${UBOOT_MACHINES}" = "x" ]; then
125	UBOOT_MACHINES=${UBOOT_MACHINE}	125	UBOOT_MACHINES=${UBOOT_MACHINE}
126	fi	126	fi
127		127
128	for board in ${UBOOT_MACHINES}; do	128	for board in ${UBOOT_MACHINES}; do
129	case "${board}" in	129	case "${board}" in
130	SDCARD) UBOOT_TARGET="u-boot-sd";;	130	SDCARD) UBOOT_TARGET="u-boot-sd";;
131	SPIFLASH) UBOOT_TARGET="u-boot-spi";;	131	SPIFLASH) UBOOT_TARGET="u-boot-spi";;
132	NAND) UBOOT_TARGET="u-boot-nand";;	132	NAND) UBOOT_TARGET="u-boot-nand";;
133	*) UBOOT_TARGET="u-boot";;	133	*) UBOOT_TARGET="u-boot";;
134	esac	134	esac
135		135
136	if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then	136	if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
137	mkdir -p ${DEPLOYDIR}	137	mkdir -p ${DEPLOYDIR}
138	install ${S}/${board}/${UBOOT_TARGET}.bin ${DEPLOYDIR}/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin	138	install ${S}/${board}/${UBOOT_TARGET}.bin ${DEPLOYDIR}/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
139		139
140	cd ${DEPLOYDIR}	140	cd ${DEPLOYDIR}
141	rm -f ${UBOOT_TARGET}-${board}.bin	141	rm -f ${UBOOT_TARGET}-${board}.bin
142	ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${UBOOT_TARGET}-${board}.bin	142	ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${UBOOT_TARGET}-${board}.bin
143	fi	143	fi
144	done	144	done
145	}	145	}
146	addtask deploy after do_install	146	addtask deploy after do_install
147		147