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