]> code.ossystems Code Review - meta-freescale.git/commitdiff
u-boot: replace tab with 4 spaces
authorTing Liu <b28495@freescale.com>
Tue, 29 Oct 2013 08:19:19 +0000 (16:19 +0800)
committerZhenhua Luo <zhenhua.luo@freescale.com>
Sun, 12 Jan 2014 10:06:01 +0000 (18:06 +0800)
Signed-off-by: Ting Liu <b28495@freescale.com>
meta-fsl-ppc/recipes-bsp/u-boot/u-boot_git.bb

index fecdd71dcb25f3297a4dad7956c9c7bd5d488e2d..f4f2dcac40effb975959a7bec040f4bfec16de60 100644 (file)
@@ -17,14 +17,14 @@ SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH} \
 SRCREV = "831b30de4b768f0b3b7dbfa11739b14cea612d7e"
 
 python () {
-       if d.getVar("TCMODE", True) == "external-fsl":
-               return
+    if d.getVar("TCMODE", True) == "external-fsl":
+        return
 
-       ml = d.getVar("MULTILIB_VARIANTS", True)
-       arch = d.getVar("OVERRIDES", True)
+    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")
+    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 lib32-libgcc', d)}"
@@ -51,99 +51,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 CFLAGS
-       unset CPPFLAGS
-
-        if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
-        then
-            echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion
-            echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion
-        fi
-
-       if [ "x${UBOOT_MACHINES}" = "x" ]; then
-               UBOOT_MACHINES=${UBOOT_MACHINE}
-       fi
-
-       for board in ${UBOOT_MACHINES}; do
-               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";;
-               *)              UBOOT_TARGET="";;
-               esac
-
-               if [ "x${UBOOT_TARGET}" != "x" ]; then
-                       if [ "${UBOOT_TARGET}" = "u-boot-sd" ]; then
-                               cp ${S}/${board}/u-boot.bin  ${S}/${board}/${UBOOT_TARGET}.bin
+    unset LDFLAGS
+    unset CFLAGS
+    unset CPPFLAGS
+
+    if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
+    then
+        echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion
+        echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion
+    fi
+
+    if [ "x${UBOOT_MACHINES}" = "x" ]; then
+        UBOOT_MACHINES=${UBOOT_MACHINE}
+    fi
+
+    for board in ${UBOOT_MACHINES}; do
+        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";;
+            *)      UBOOT_TARGET="";;
+        esac
+
+        if [ "x${UBOOT_TARGET}" != "x" ]; then
+            if [ "${UBOOT_TARGET}" = "u-boot-sd" ]; then
+                cp ${S}/${board}/u-boot.bin  ${S}/${board}/${UBOOT_TARGET}.bin
             elif [ "${UBOOT_TARGET}" = "u-boot-nand" ];then
-                               if [ "${DEFAULTTUNE}" = "ppce500v2" ];then
-                    if echo $board |egrep "(P1010RDB|P1020RDB|P1021RDB|P1024RDB|P2020RDB|P1022DS|P1025RDB|BSC9131RDB|BSC9132QDS)" 2>&1 >/dev/null;then
+                if [ "${DEFAULTTUNE}" = "ppce500v2" ];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
-                               if [ -n "${BOOTFORMAT_CONFIG}" ];then
-                                               ${STAGING_BINDIR_NATIVE}/boot_format \
-                                               ${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
-                                               ${S}/${board}/u-boot.bin -spi ${S}/${board}/${UBOOT_TARGET}.bin
-                               else
-                                       cp ${S}/${board}/u-boot.bin  ${S}/${board}/${UBOOT_TARGET}.bin
-                               fi
-                       fi 
-               fi
-       done
+            else
+                if [ -n "${BOOTFORMAT_CONFIG}" ];then
+                    ${STAGING_BINDIR_NATIVE}/boot_format \
+                    ${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
+                    ${S}/${board}/u-boot.bin -spi ${S}/${board}/${UBOOT_TARGET}.bin
+                else
+                    cp ${S}/${board}/u-boot.bin  ${S}/${board}/${UBOOT_TARGET}.bin
+                fi
+            fi
+        fi
+    done
 }
 
 do_install(){
-       if [ "x${UBOOT_MACHINES}" = "x" ]; then
-               UBOOT_MACHINES=${UBOOT_MACHINE}
-       fi
-
-       for board in ${UBOOT_MACHINES}; do
-               case "${board}" in
-               *SDCARD*)       UBOOT_TARGET="u-boot-sd";;
-               *SPIFLASH*)     UBOOT_TARGET="u-boot-spi";;
-               *NAND*)         UBOOT_TARGET="u-boot-nand";;
-               *)              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
+    if [ "x${UBOOT_MACHINES}" = "x" ]; then
+        UBOOT_MACHINES=${UBOOT_MACHINE}
+    fi
+
+    for board in ${UBOOT_MACHINES}; do
+        case "${board}" in
+            *SDCARD*)   UBOOT_TARGET="u-boot-sd";;
+            *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
+            *NAND*)     UBOOT_TARGET="u-boot-nand";;
+            *)      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
-               case "${board}" in
-               *SDCARD*)       UBOOT_TARGET="u-boot-sd";;
-               *SPIFLASH*)     UBOOT_TARGET="u-boot-spi";;
-               *NAND*)         UBOOT_TARGET="u-boot-nand";;
-               *)              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
+    if [ "x${UBOOT_MACHINES}" = "x" ]; then
+        UBOOT_MACHINES=${UBOOT_MACHINE}
+    fi
+
+    for board in ${UBOOT_MACHINES}; do
+        case "${board}" in
+            *SDCARD*)   UBOOT_TARGET="u-boot-sd";;
+            *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
+            *NAND*)     UBOOT_TARGET="u-boot-nand";;
+            *)      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