diff options
| author | Andrew Davis <afd@ti.com> | 2022-09-13 03:55:38 +0000 |
|---|---|---|
| committer | Ryan Eatmon <reatmon@ti.com> | 2022-09-22 11:23:07 -0500 |
| commit | c64c2ad48d9395bf4cb08d06ea4b5c09429938bd (patch) | |
| tree | 821767b5cb16e35c87470eda3f09e3df726bf298 /meta-ti-bsp/recipes-bsp | |
| parent | 8a81c48da1e0be488f5be4058d13c9a0815023a7 (diff) | |
| download | meta-ti-c64c2ad48d9395bf4cb08d06ea4b5c09429938bd.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>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Diffstat (limited to 'meta-ti-bsp/recipes-bsp')
| -rw-r--r-- | meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc index 7a22161d..d29c80cf 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | |||
| @@ -174,15 +174,15 @@ do_deploy:append () { | |||
| 174 | then | 174 | then |
| 175 | cd ${DEPLOYDIR} | 175 | cd ${DEPLOYDIR} |
| 176 | if [ "x${SPL_UART_BINARY}" != "x" ]; then | 176 | if [ "x${SPL_UART_BINARY}" != "x" ]; then |
| 177 | install ${B}/${config}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE}-${type} | 177 | install ${B}/${config}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}-${type} |
| 178 | rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK} | 178 | rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK} |
| 179 | ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_BINARY}-${type} | 179 | ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}-${type} |
| 180 | ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_BINARY} | 180 | ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY} |
| 181 | ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_SYMLINK}-${type} | 181 | ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}-${type} |
| 182 | ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_SYMLINK} | 182 | ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK} |
| 183 | fi | 183 | fi |
| 184 | if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then | 184 | if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then |
| 185 | install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE}-${type} | 185 | install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}-${type} |
| 186 | rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK} | 186 | rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK} |
| 187 | ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}-${type} | 187 | ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}-${type} |
| 188 | ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK} | 188 | ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK} |
| @@ -190,7 +190,7 @@ do_deploy:append () { | |||
| 190 | ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY} | 190 | ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY} |
| 191 | fi | 191 | fi |
| 192 | if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then | 192 | if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then |
| 193 | install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE}-${type} | 193 | install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}-${type} |
| 194 | rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK} | 194 | rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK} |
| 195 | ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}-${type} | 195 | ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}-${type} |
| 196 | ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK} | 196 | ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK} |
| @@ -198,7 +198,7 @@ do_deploy:append () { | |||
| 198 | ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY} | 198 | ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY} |
| 199 | fi | 199 | fi |
| 200 | if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then | 200 | if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then |
| 201 | install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${DEPLOYDIR}/${UBOOT_HS_ISSW_IMAGE}-${type} | 201 | install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}-${type} |
| 202 | rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK} | 202 | rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK} |
| 203 | ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}-${type} | 203 | ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}-${type} |
| 204 | ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK} | 204 | ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK} |
| @@ -206,7 +206,7 @@ do_deploy:append () { | |||
| 206 | ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY} | 206 | ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY} |
| 207 | fi | 207 | fi |
| 208 | if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then | 208 | if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then |
| 209 | install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${DEPLOYDIR}/${UBOOT_HS_2ND_IMAGE}-${type} | 209 | install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}-${type} |
| 210 | rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK} | 210 | rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK} |
| 211 | ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}-${type} | 211 | ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}-${type} |
| 212 | ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK} | 212 | ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK} |
| @@ -221,31 +221,31 @@ do_deploy:append () { | |||
| 221 | else | 221 | else |
| 222 | cd ${DEPLOYDIR} | 222 | cd ${DEPLOYDIR} |
| 223 | if [ "x${SPL_UART_BINARY}" != "x" ]; then | 223 | if [ "x${SPL_UART_BINARY}" != "x" ]; then |
| 224 | install ${B}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE} | 224 | install ${B}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE} |
| 225 | rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK} | 225 | rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK} |
| 226 | ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_BINARY} | 226 | ln -sf ${SPL_UART_IMAGE} ${SPL_UART_BINARY} |
| 227 | ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_SYMLINK} | 227 | ln -sf ${SPL_UART_IMAGE} ${SPL_UART_SYMLINK} |
| 228 | fi | 228 | fi |
| 229 | if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then | 229 | if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then |
| 230 | install ${B}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE} | 230 | install ${B}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE} |
| 231 | rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK} | 231 | rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK} |
| 232 | ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK} | 232 | ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK} |
| 233 | ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY} | 233 | ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY} |
| 234 | fi | 234 | fi |
| 235 | if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then | 235 | if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then |
| 236 | install ${B}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE} | 236 | install ${B}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE} |
| 237 | rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK} | 237 | rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK} |
| 238 | ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK} | 238 | ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK} |
| 239 | ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY} | 239 | ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY} |
| 240 | fi | 240 | fi |
| 241 | if [ -f ${B}/${UBOOT_HS_ISSW_BINARY} ]; then | 241 | if [ -f ${B}/${UBOOT_HS_ISSW_BINARY} ]; then |
| 242 | install ${B}/${UBOOT_HS_ISSW_BINARY} ${DEPLOYDIR}/${UBOOT_HS_ISSW_IMAGE} | 242 | install ${B}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE} |
| 243 | rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK} | 243 | rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK} |
| 244 | ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_SYMLINK} | 244 | ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_SYMLINK} |
| 245 | ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_BINARY} | 245 | ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_BINARY} |
| 246 | fi | 246 | fi |
| 247 | if [ -f ${B}/${UBOOT_HS_2ND_BINARY} ]; then | 247 | if [ -f ${B}/${UBOOT_HS_2ND_BINARY} ]; then |
| 248 | install ${B}/${UBOOT_HS_2ND_BINARY} ${DEPLOYDIR}/${UBOOT_HS_2ND_IMAGE} | 248 | install ${B}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE} |
| 249 | rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK} | 249 | rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK} |
| 250 | ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_SYMLINK} | 250 | ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_SYMLINK} |
| 251 | ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY} | 251 | ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY} |