diff options
Diffstat (limited to 'meta/recipes-bsp/u-boot/u-boot.inc')
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot.inc | 281 |
1 files changed, 184 insertions, 97 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index f5b43f6e36..3c01720192 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc | |||
@@ -54,40 +54,21 @@ do_compile () { | |||
54 | 54 | ||
55 | if [ -n "${UBOOT_CONFIG}" -o -n "${UBOOT_DELTA_CONFIG}" ] | 55 | if [ -n "${UBOOT_CONFIG}" -o -n "${UBOOT_DELTA_CONFIG}" ] |
56 | then | 56 | then |
57 | unset i j k | 57 | unset i j |
58 | for config in ${UBOOT_MACHINE}; do | 58 | for config in ${UBOOT_MACHINE}; do |
59 | i=$(expr $i + 1); | 59 | i=$(expr $i + 1); |
60 | for type in ${UBOOT_CONFIG}; do | 60 | for type in ${UBOOT_CONFIG}; do |
61 | j=$(expr $j + 1); | 61 | j=$(expr $j + 1); |
62 | if [ $j -eq $i ] | 62 | if [ $j -eq $i ] |
63 | then | 63 | then |
64 | oe_runmake -C ${S} O=${B}/${config} ${UBOOT_MAKE_TARGET} | 64 | uboot_compile_config $i $config $type |
65 | for binary in ${UBOOT_BINARIES}; do | ||
66 | k=$(expr $k + 1); | ||
67 | if [ $k -eq $i ]; then | ||
68 | cp ${B}/${config}/${binary} ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} | ||
69 | fi | ||
70 | done | ||
71 | |||
72 | # Generate the uboot-initial-env | ||
73 | if [ -n "${UBOOT_INITIAL_ENV}" ]; then | ||
74 | oe_runmake -C ${S} O=${B}/${config} u-boot-initial-env | ||
75 | cp ${B}/${config}/u-boot-initial-env ${B}/${config}/u-boot-initial-env-${type} | ||
76 | fi | ||
77 | |||
78 | unset k | ||
79 | fi | 65 | fi |
80 | done | 66 | done |
81 | unset j | 67 | unset j |
82 | done | 68 | done |
83 | unset i | 69 | unset i |
84 | else | 70 | else |
85 | oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_TARGET} | 71 | uboot_compile |
86 | |||
87 | # Generate the uboot-initial-env | ||
88 | if [ -n "${UBOOT_INITIAL_ENV}" ]; then | ||
89 | oe_runmake -C ${S} O=${B} u-boot-initial-env | ||
90 | fi | ||
91 | fi | 72 | fi |
92 | 73 | ||
93 | if [ -n "${UBOOT_ENV}" ] && [ "${UBOOT_ENV_SUFFIX}" = "scr" ] | 74 | if [ -n "${UBOOT_ENV}" ] && [ "${UBOOT_ENV_SUFFIX}" = "scr" ] |
@@ -96,6 +77,46 @@ do_compile () { | |||
96 | fi | 77 | fi |
97 | } | 78 | } |
98 | 79 | ||
80 | uboot_compile_config () { | ||
81 | i=$1 | ||
82 | config=$2 | ||
83 | type=$3 | ||
84 | |||
85 | oe_runmake -C ${S} O=${B}/${config} ${UBOOT_MAKE_TARGET} | ||
86 | |||
87 | unset k | ||
88 | for binary in ${UBOOT_BINARIES}; do | ||
89 | k=$(expr $k + 1); | ||
90 | if [ $k -eq $i ]; then | ||
91 | uboot_compile_config_copy_binary $config $type $binary | ||
92 | fi | ||
93 | done | ||
94 | unset k | ||
95 | |||
96 | # Generate the uboot-initial-env | ||
97 | if [ -n "${UBOOT_INITIAL_ENV}" ]; then | ||
98 | oe_runmake -C ${S} O=${B}/${config} u-boot-initial-env | ||
99 | cp ${B}/${config}/u-boot-initial-env ${B}/${config}/u-boot-initial-env-${type} | ||
100 | fi | ||
101 | } | ||
102 | |||
103 | uboot_compile_config_copy_binary () { | ||
104 | config=$1 | ||
105 | type=$2 | ||
106 | binary=$3 | ||
107 | |||
108 | cp ${B}/${config}/${binary} ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} | ||
109 | } | ||
110 | |||
111 | uboot_compile () { | ||
112 | oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_TARGET} | ||
113 | |||
114 | # Generate the uboot-initial-env | ||
115 | if [ -n "${UBOOT_INITIAL_ENV}" ]; then | ||
116 | oe_runmake -C ${S} O=${B} u-boot-initial-env | ||
117 | fi | ||
118 | } | ||
119 | |||
99 | do_install () { | 120 | do_install () { |
100 | if [ -n "${UBOOT_CONFIG}" ] | 121 | if [ -n "${UBOOT_CONFIG}" ] |
101 | then | 122 | then |
@@ -105,32 +126,14 @@ do_install () { | |||
105 | j=$(expr $j + 1); | 126 | j=$(expr $j + 1); |
106 | if [ $j -eq $i ] | 127 | if [ $j -eq $i ] |
107 | then | 128 | then |
108 | install -D -m 644 ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} | 129 | uboot_install_config $config $type |
109 | ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} | ||
110 | ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY} | ||
111 | |||
112 | # Install the uboot-initial-env | ||
113 | if [ -n "${UBOOT_INITIAL_ENV}" ]; then | ||
114 | install -D -m 644 ${B}/${config}/u-boot-initial-env-${type} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} | ||
115 | ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type} | ||
116 | ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${type} | ||
117 | ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV} | ||
118 | fi | ||
119 | fi | 130 | fi |
120 | done | 131 | done |
121 | unset j | 132 | unset j |
122 | done | 133 | done |
123 | unset i | 134 | unset i |
124 | else | 135 | else |
125 | install -D -m 644 ${B}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} | 136 | uboot_install |
126 | ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} | ||
127 | |||
128 | # Install the uboot-initial-env | ||
129 | if [ -n "${UBOOT_INITIAL_ENV}" ]; then | ||
130 | install -D -m 644 ${B}/u-boot-initial-env ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} | ||
131 | ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE} | ||
132 | ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV} | ||
133 | fi | ||
134 | fi | 137 | fi |
135 | 138 | ||
136 | if [ -n "${UBOOT_ELF}" ] | 139 | if [ -n "${UBOOT_ELF}" ] |
@@ -143,17 +146,14 @@ do_install () { | |||
143 | j=$(expr $j + 1); | 146 | j=$(expr $j + 1); |
144 | if [ $j -eq $i ] | 147 | if [ $j -eq $i ] |
145 | then | 148 | then |
146 | install -m 644 ${B}/${config}/${UBOOT_ELF} ${D}/boot/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} | 149 | uboot_install_elf_config $config $type |
147 | ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} | ||
148 | ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY} | ||
149 | fi | 150 | fi |
150 | done | 151 | done |
151 | unset j | 152 | unset j |
152 | done | 153 | done |
153 | unset i | 154 | unset i |
154 | else | 155 | else |
155 | install -m 644 ${B}/${UBOOT_ELF} ${D}/boot/${UBOOT_ELF_IMAGE} | 156 | uboot_install_elf |
156 | ln -sf ${UBOOT_ELF_IMAGE} ${D}/boot/${UBOOT_ELF_BINARY} | ||
157 | fi | 157 | fi |
158 | fi | 158 | fi |
159 | 159 | ||
@@ -172,17 +172,14 @@ do_install () { | |||
172 | j=$(expr $j + 1); | 172 | j=$(expr $j + 1); |
173 | if [ $j -eq $i ] | 173 | if [ $j -eq $i ] |
174 | then | 174 | then |
175 | install -m 644 ${B}/${config}/${SPL_BINARY} ${D}/boot/${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} | 175 | uboot_install_spl_config $config $type |
176 | ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${D}/boot/${SPL_BINARYFILE}-${type} | ||
177 | ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${D}/boot/${SPL_BINARYFILE} | ||
178 | fi | 176 | fi |
179 | done | 177 | done |
180 | unset j | 178 | unset j |
181 | done | 179 | done |
182 | unset i | 180 | unset i |
183 | else | 181 | else |
184 | install -m 644 ${B}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} | 182 | uboot_install_spl |
185 | ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARYFILE} | ||
186 | fi | 183 | fi |
187 | fi | 184 | fi |
188 | 185 | ||
@@ -198,6 +195,63 @@ do_install () { | |||
198 | fi | 195 | fi |
199 | } | 196 | } |
200 | 197 | ||
198 | uboot_install_config () { | ||
199 | config=$1 | ||
200 | type=$2 | ||
201 | |||
202 | install -D -m 644 ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} | ||
203 | ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} | ||
204 | ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY} | ||
205 | |||
206 | # Install the uboot-initial-env | ||
207 | if [ -n "${UBOOT_INITIAL_ENV}" ]; then | ||
208 | install -D -m 644 ${B}/${config}/u-boot-initial-env-${type} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} | ||
209 | ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type} | ||
210 | ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${type} | ||
211 | ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV} | ||
212 | fi | ||
213 | } | ||
214 | |||
215 | uboot_install () { | ||
216 | install -D -m 644 ${B}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} | ||
217 | ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} | ||
218 | |||
219 | # Install the uboot-initial-env | ||
220 | if [ -n "${UBOOT_INITIAL_ENV}" ]; then | ||
221 | install -D -m 644 ${B}/u-boot-initial-env ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} | ||
222 | ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE} | ||
223 | ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV} | ||
224 | fi | ||
225 | } | ||
226 | |||
227 | uboot_install_elf_config () { | ||
228 | config=$1 | ||
229 | type=$2 | ||
230 | |||
231 | install -m 644 ${B}/${config}/${UBOOT_ELF} ${D}/boot/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} | ||
232 | ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} | ||
233 | ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY} | ||
234 | } | ||
235 | |||
236 | uboot_install_elf () { | ||
237 | install -m 644 ${B}/${UBOOT_ELF} ${D}/boot/${UBOOT_ELF_IMAGE} | ||
238 | ln -sf ${UBOOT_ELF_IMAGE} ${D}/boot/${UBOOT_ELF_BINARY} | ||
239 | } | ||
240 | |||
241 | uboot_install_spl_config () { | ||
242 | config=$1 | ||
243 | type=$2 | ||
244 | |||
245 | install -m 644 ${B}/${config}/${SPL_BINARY} ${D}/boot/${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} | ||
246 | ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${D}/boot/${SPL_BINARYFILE}-${type} | ||
247 | ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${D}/boot/${SPL_BINARYFILE} | ||
248 | } | ||
249 | |||
250 | uboot_install_spl () { | ||
251 | install -m 644 ${B}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} | ||
252 | ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARYFILE} | ||
253 | } | ||
254 | |||
201 | PACKAGE_BEFORE_PN += "${PN}-env ${PN}-extlinux" | 255 | PACKAGE_BEFORE_PN += "${PN}-env ${PN}-extlinux" |
202 | 256 | ||
203 | RPROVIDES:${PN}-env += "u-boot-default-env" | 257 | RPROVIDES:${PN}-env += "u-boot-default-env" |
@@ -223,40 +277,14 @@ do_deploy () { | |||
223 | j=$(expr $j + 1); | 277 | j=$(expr $j + 1); |
224 | if [ $j -eq $i ] | 278 | if [ $j -eq $i ] |
225 | then | 279 | then |
226 | install -D -m 644 ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ${DEPLOYDIR}/${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} | 280 | uboot_deploy_config $config $type |
227 | cd ${DEPLOYDIR} | ||
228 | ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK}-${type} | ||
229 | ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK} | ||
230 | ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY}-${type} | ||
231 | ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY} | ||
232 | |||
233 | # Deploy the uboot-initial-env | ||
234 | if [ -n "${UBOOT_INITIAL_ENV}" ]; then | ||
235 | install -D -m 644 ${B}/${config}/u-boot-initial-env-${type} ${DEPLOYDIR}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} | ||
236 | cd ${DEPLOYDIR} | ||
237 | ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${MACHINE}-${type} | ||
238 | ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${type} | ||
239 | fi | ||
240 | fi | 281 | fi |
241 | done | 282 | done |
242 | unset j | 283 | unset j |
243 | done | 284 | done |
244 | unset i | 285 | unset i |
245 | else | 286 | else |
246 | install -D -m 644 ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} | 287 | uboot_deploy |
247 | |||
248 | cd ${DEPLOYDIR} | ||
249 | rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK} | ||
250 | ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} | ||
251 | ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY} | ||
252 | |||
253 | # Deploy the uboot-initial-env | ||
254 | if [ -n "${UBOOT_INITIAL_ENV}" ]; then | ||
255 | install -D -m 644 ${B}/u-boot-initial-env ${DEPLOYDIR}/${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} | ||
256 | cd ${DEPLOYDIR} | ||
257 | ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${MACHINE} | ||
258 | ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${UBOOT_INITIAL_ENV} | ||
259 | fi | ||
260 | fi | 288 | fi |
261 | 289 | ||
262 | if [ -e ${WORKDIR}/fw_env.config ] ; then | 290 | if [ -e ${WORKDIR}/fw_env.config ] ; then |
@@ -276,20 +304,14 @@ do_deploy () { | |||
276 | j=$(expr $j + 1); | 304 | j=$(expr $j + 1); |
277 | if [ $j -eq $i ] | 305 | if [ $j -eq $i ] |
278 | then | 306 | then |
279 | install -m 644 ${B}/${config}/${UBOOT_ELF} ${DEPLOYDIR}/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} | 307 | uboot_deploy_elf_config $config $type |
280 | ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY}-${type} | ||
281 | ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY} | ||
282 | ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}-${type} | ||
283 | ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK} | ||
284 | fi | 308 | fi |
285 | done | 309 | done |
286 | unset j | 310 | unset j |
287 | done | 311 | done |
288 | unset i | 312 | unset i |
289 | else | 313 | else |
290 | install -m 644 ${B}/${UBOOT_ELF} ${DEPLOYDIR}/${UBOOT_ELF_IMAGE} | 314 | uboot_deploy_elf |
291 | ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_BINARY} | ||
292 | ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK} | ||
293 | fi | 315 | fi |
294 | fi | 316 | fi |
295 | 317 | ||
@@ -304,21 +326,14 @@ do_deploy () { | |||
304 | j=$(expr $j + 1); | 326 | j=$(expr $j + 1); |
305 | if [ $j -eq $i ] | 327 | if [ $j -eq $i ] |
306 | then | 328 | then |
307 | install -m 644 ${B}/${config}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} | 329 | uboot_deploy_spl_config $config $type |
308 | rm -f ${DEPLOYDIR}/${SPL_BINARYFILE} ${DEPLOYDIR}/${SPL_SYMLINK} | ||
309 | ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_BINARYFILE}-${type} | ||
310 | ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_BINARYFILE} | ||
311 | ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} | ||
312 | ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_SYMLINK} | ||
313 | fi | 330 | fi |
314 | done | 331 | done |
315 | unset j | 332 | unset j |
316 | done | 333 | done |
317 | unset i | 334 | unset i |
318 | else | 335 | else |
319 | install -m 644 ${B}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE} | 336 | uboot_deploy_spl |
320 | ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARYNAME} | ||
321 | ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK} | ||
322 | fi | 337 | fi |
323 | fi | 338 | fi |
324 | 339 | ||
@@ -342,4 +357,76 @@ do_deploy () { | |||
342 | fi | 357 | fi |
343 | } | 358 | } |
344 | 359 | ||
360 | uboot_deploy_config () { | ||
361 | config=$1 | ||
362 | type=$2 | ||
363 | |||
364 | install -D -m 644 ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ${DEPLOYDIR}/${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} | ||
365 | cd ${DEPLOYDIR} | ||
366 | ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK}-${type} | ||
367 | ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK} | ||
368 | ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY}-${type} | ||
369 | ln -sf ${UBOOT_BINARYNAME}-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY} | ||
370 | |||
371 | # Deploy the uboot-initial-env | ||
372 | if [ -n "${UBOOT_INITIAL_ENV}" ]; then | ||
373 | install -D -m 644 ${B}/${config}/u-boot-initial-env-${type} ${DEPLOYDIR}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} | ||
374 | cd ${DEPLOYDIR} | ||
375 | ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${MACHINE}-${type} | ||
376 | ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${type} | ||
377 | fi | ||
378 | } | ||
379 | |||
380 | uboot_deploy () { | ||
381 | install -D -m 644 ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} | ||
382 | |||
383 | cd ${DEPLOYDIR} | ||
384 | rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK} | ||
385 | ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} | ||
386 | ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY} | ||
387 | |||
388 | # Deploy the uboot-initial-env | ||
389 | if [ -n "${UBOOT_INITIAL_ENV}" ]; then | ||
390 | install -D -m 644 ${B}/u-boot-initial-env ${DEPLOYDIR}/${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} | ||
391 | cd ${DEPLOYDIR} | ||
392 | ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${UBOOT_INITIAL_ENV}-${MACHINE} | ||
393 | ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR} ${UBOOT_INITIAL_ENV} | ||
394 | fi | ||
395 | } | ||
396 | |||
397 | uboot_deploy_elf_config () { | ||
398 | config=$1 | ||
399 | type=$2 | ||
400 | |||
401 | install -m 644 ${B}/${config}/${UBOOT_ELF} ${DEPLOYDIR}/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} | ||
402 | ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY}-${type} | ||
403 | ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY} | ||
404 | ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}-${type} | ||
405 | ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK} | ||
406 | } | ||
407 | |||
408 | uboot_deploy_elf () { | ||
409 | install -m 644 ${B}/${UBOOT_ELF} ${DEPLOYDIR}/${UBOOT_ELF_IMAGE} | ||
410 | ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_BINARY} | ||
411 | ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK} | ||
412 | } | ||
413 | |||
414 | uboot_deploy_spl_config () { | ||
415 | config=$1 | ||
416 | type=$2 | ||
417 | |||
418 | install -m 644 ${B}/${config}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} | ||
419 | rm -f ${DEPLOYDIR}/${SPL_BINARYFILE} ${DEPLOYDIR}/${SPL_SYMLINK} | ||
420 | ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_BINARYFILE}-${type} | ||
421 | ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_BINARYFILE} | ||
422 | ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} | ||
423 | ln -sf ${SPL_BINARYNAME}-${type}-${PV}-${PR}${SPL_DELIMITER}${SPL_SUFFIX} ${DEPLOYDIR}/${SPL_SYMLINK} | ||
424 | } | ||
425 | |||
426 | uboot_deploy_spl () { | ||
427 | install -m 644 ${B}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE} | ||
428 | ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARYNAME} | ||
429 | ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK} | ||
430 | } | ||
431 | |||
345 | addtask deploy before do_build after do_compile | 432 | addtask deploy before do_build after do_compile |