diff options
author | Jesse Gilles <jgilles@multitech.com> | 2014-01-17 13:45:19 -0600 |
---|---|---|
committer | Jesse Gilles <jgilles@multitech.com> | 2014-01-17 13:45:19 -0600 |
commit | 382a32756eaace2dd933426f5411cff4e111b70a (patch) | |
tree | 5b3da2b007e814c89a33bdeed0ce30cf5956cfa9 /multitech/recipes/images/corecdp-tftpboot.inc | |
parent | 1e2d685cc07a2c3c8165662e7c0ebeb19cb1c16d (diff) | |
parent | f88e1a39ae0758897f6c9680d27920d915c36952 (diff) |
Merge branch 'mtocgd' into mtocgd-2.3.2
Conflicts:
multitech/recipes/images/corecdp-tftpboot.inc
multitech/recipes/linux/linux_2.6.39-at91.bb
Diffstat (limited to 'multitech/recipes/images/corecdp-tftpboot.inc')
-rw-r--r-- | multitech/recipes/images/corecdp-tftpboot.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/multitech/recipes/images/corecdp-tftpboot.inc b/multitech/recipes/images/corecdp-tftpboot.inc index 35299b0..9acb68d 100644 --- a/multitech/recipes/images/corecdp-tftpboot.inc +++ b/multitech/recipes/images/corecdp-tftpboot.inc @@ -3,8 +3,9 @@ do_build_append () { if [ -n "${TFTPBOOT_DIR}" ]; then install -d ${DEPLOY_DIR_IMAGE} + rm -f ${TFTPBOOT_DIR}/oe_* ln -nfs ${DEPLOY_DIR_IMAGE}/at91bootstrap.bin ${TFTPBOOT_DIR}/oe_bootstrap.bin - if [ "${MACHINE}" = "mtocgd3" ]; then + if [ -f ${DEPLOY_DIR_IMAGE}/at91bootstrap_pmecc_padded.bin ]; then ln -nfs ${DEPLOY_DIR_IMAGE}/at91bootstrap_pmecc_padded.bin ${TFTPBOOT_DIR}/oe_bootstrap_pmecc_padded.bin fi ln -nfs ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin ${TFTPBOOT_DIR}/oe_u-boot.bin |