diff options
| author | Andrew Davis <afd@ti.com> | 2022-08-04 21:49:27 -0500 |
|---|---|---|
| committer | Ryan Eatmon <reatmon@ti.com> | 2022-08-06 19:04:37 -0500 |
| commit | 4e9b3f4744e79b216774304878304c14a129a95c (patch) | |
| tree | d12d8dad976fb95a1597e33454b4bdb21fefa258 | |
| parent | 7a0f1d4288ad361086ef677c05ec7056556e434f (diff) | |
| download | meta-ti-4e9b3f4744e79b216774304878304c14a129a95c.tar.gz | |
u-boot-ti: Do not prepend output files with DEPLOYDIR
We already cd into DEPLOYDIR so this is not needed. This now matches the
keystone version below. Also fixes build in some odd situations.
Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-ti.inc | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc index 1f8fb6de..acc06fea 100644 --- a/recipes-bsp/u-boot/u-boot-ti.inc +++ b/recipes-bsp/u-boot/u-boot-ti.inc | |||
| @@ -187,15 +187,15 @@ do_deploy_append () { | |||
| 187 | then | 187 | then |
| 188 | cd ${DEPLOYDIR} | 188 | cd ${DEPLOYDIR} |
| 189 | if [ "x${SPL_UART_BINARY}" != "x" ]; then | 189 | if [ "x${SPL_UART_BINARY}" != "x" ]; then |
| 190 | install ${B}/${config}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE}-${type} | 190 | install ${B}/${config}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}-${type} |
| 191 | rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK} | 191 | rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK} |
| 192 | ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_BINARY}-${type} | 192 | ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}-${type} |
| 193 | ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_BINARY} | 193 | ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY} |
| 194 | ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_SYMLINK}-${type} | 194 | ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}-${type} |
| 195 | ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_SYMLINK} | 195 | ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK} |
| 196 | fi | 196 | fi |
| 197 | if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then | 197 | if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then |
| 198 | install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE}-${type} | 198 | install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}-${type} |
| 199 | rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK} | 199 | rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK} |
| 200 | ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}-${type} | 200 | ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}-${type} |
| 201 | ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK} | 201 | ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK} |
| @@ -203,7 +203,7 @@ do_deploy_append () { | |||
| 203 | ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY} | 203 | ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY} |
| 204 | fi | 204 | fi |
| 205 | if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then | 205 | if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then |
| 206 | install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE}-${type} | 206 | install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}-${type} |
| 207 | rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK} | 207 | rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK} |
| 208 | ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}-${type} | 208 | ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}-${type} |
| 209 | ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK} | 209 | ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK} |
| @@ -211,7 +211,7 @@ do_deploy_append () { | |||
| 211 | ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY} | 211 | ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY} |
| 212 | fi | 212 | fi |
| 213 | if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then | 213 | if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then |
| 214 | install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${DEPLOYDIR}/${UBOOT_HS_ISSW_IMAGE}-${type} | 214 | install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}-${type} |
| 215 | rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK} | 215 | rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK} |
| 216 | ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}-${type} | 216 | ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}-${type} |
| 217 | ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK} | 217 | ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK} |
| @@ -219,7 +219,7 @@ do_deploy_append () { | |||
| 219 | ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY} | 219 | ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY} |
| 220 | fi | 220 | fi |
| 221 | if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then | 221 | if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then |
| 222 | install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${DEPLOYDIR}/${UBOOT_HS_2ND_IMAGE}-${type} | 222 | install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}-${type} |
| 223 | rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK} | 223 | rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK} |
| 224 | ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}-${type} | 224 | ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}-${type} |
| 225 | ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK} | 225 | ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK} |
| @@ -234,31 +234,31 @@ do_deploy_append () { | |||
| 234 | else | 234 | else |
| 235 | cd ${DEPLOYDIR} | 235 | cd ${DEPLOYDIR} |
| 236 | if [ "x${SPL_UART_BINARY}" != "x" ]; then | 236 | if [ "x${SPL_UART_BINARY}" != "x" ]; then |
| 237 | install ${B}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE} | 237 | install ${B}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE} |
| 238 | rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK} | 238 | rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK} |
| 239 | ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_BINARY} | 239 | ln -sf ${SPL_UART_IMAGE} ${SPL_UART_BINARY} |
| 240 | ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_SYMLINK} | 240 | ln -sf ${SPL_UART_IMAGE} ${SPL_UART_SYMLINK} |
| 241 | fi | 241 | fi |
| 242 | if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then | 242 | if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then |
| 243 | install ${B}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE} | 243 | install ${B}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE} |
| 244 | rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK} | 244 | rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK} |
| 245 | ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK} | 245 | ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK} |
| 246 | ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY} | 246 | ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY} |
| 247 | fi | 247 | fi |
| 248 | if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then | 248 | if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then |
| 249 | install ${B}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE} | 249 | install ${B}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE} |
| 250 | rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK} | 250 | rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK} |
| 251 | ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK} | 251 | ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK} |
| 252 | ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY} | 252 | ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY} |
| 253 | fi | 253 | fi |
| 254 | if [ -f ${B}/${UBOOT_HS_ISSW_BINARY} ]; then | 254 | if [ -f ${B}/${UBOOT_HS_ISSW_BINARY} ]; then |
| 255 | install ${B}/${UBOOT_HS_ISSW_BINARY} ${DEPLOYDIR}/${UBOOT_HS_ISSW_IMAGE} | 255 | install ${B}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE} |
| 256 | rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK} | 256 | rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK} |
| 257 | ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_SYMLINK} | 257 | ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_SYMLINK} |
| 258 | ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_BINARY} | 258 | ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_BINARY} |
| 259 | fi | 259 | fi |
| 260 | if [ -f ${B}/${UBOOT_HS_2ND_BINARY} ]; then | 260 | if [ -f ${B}/${UBOOT_HS_2ND_BINARY} ]; then |
| 261 | install ${B}/${UBOOT_HS_2ND_BINARY} ${DEPLOYDIR}/${UBOOT_HS_2ND_IMAGE} | 261 | install ${B}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE} |
| 262 | rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK} | 262 | rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK} |
| 263 | ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_SYMLINK} | 263 | ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_SYMLINK} |
| 264 | ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY} | 264 | ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY} |