diff options
| -rw-r--r-- | meta/recipes-bsp/u-boot/u-boot.inc | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 80f828df52..718435f13f 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc | |||
| @@ -91,19 +91,19 @@ do_configure () { | |||
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | do_compile () { | 93 | do_compile () { |
| 94 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then | 94 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then |
| 95 | sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' ${S}/config.mk | 95 | sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' ${S}/config.mk |
| 96 | fi | 96 | fi |
| 97 | 97 | ||
| 98 | unset LDFLAGS | 98 | unset LDFLAGS |
| 99 | unset CFLAGS | 99 | unset CFLAGS |
| 100 | unset CPPFLAGS | 100 | unset CPPFLAGS |
| 101 | 101 | ||
| 102 | if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ] | 102 | if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ] |
| 103 | then | 103 | then |
| 104 | echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion | 104 | echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion |
| 105 | echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion | 105 | echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion |
| 106 | fi | 106 | fi |
| 107 | 107 | ||
| 108 | if [ -n "${UBOOT_CONFIG}" ] | 108 | if [ -n "${UBOOT_CONFIG}" ] |
| 109 | then | 109 | then |
| @@ -130,16 +130,15 @@ do_compile () { | |||
| 130 | unset k | 130 | unset k |
| 131 | fi | 131 | fi |
| 132 | done | 132 | done |
| 133 | unset j | 133 | unset j |
| 134 | done | 134 | done |
| 135 | unset i | 135 | unset i |
| 136 | else | 136 | else |
| 137 | oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_TARGET} | 137 | oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_TARGET} |
| 138 | 138 | ||
| 139 | # Generate the uboot-initial-env | 139 | # Generate the uboot-initial-env |
| 140 | oe_runmake -C ${S} O=${B} u-boot-initial-env | 140 | oe_runmake -C ${S} O=${B} u-boot-initial-env |
| 141 | fi | 141 | fi |
| 142 | |||
| 143 | } | 142 | } |
| 144 | 143 | ||
| 145 | do_install () { | 144 | do_install () { |
| @@ -162,9 +161,9 @@ do_install () { | |||
| 162 | ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${PN}-initial-env | 161 | ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} ${D}/${sysconfdir}/${PN}-initial-env |
| 163 | fi | 162 | fi |
| 164 | done | 163 | done |
| 165 | unset j | 164 | unset j |
| 166 | done | 165 | done |
| 167 | unset i | 166 | unset i |
| 168 | else | 167 | else |
| 169 | install -D -m 644 ${B}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} | 168 | install -D -m 644 ${B}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} |
| 170 | ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} | 169 | ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} |
| @@ -219,9 +218,9 @@ do_install () { | |||
| 219 | ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${D}/boot/${SPL_BINARYNAME} | 218 | ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${D}/boot/${SPL_BINARYNAME} |
| 220 | fi | 219 | fi |
| 221 | done | 220 | done |
| 222 | unset j | 221 | unset j |
| 223 | done | 222 | done |
| 224 | unset i | 223 | unset i |
| 225 | else | 224 | else |
| 226 | install -m 644 ${B}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} | 225 | install -m 644 ${B}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} |
| 227 | ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARYNAME} | 226 | ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARYNAME} |
| @@ -238,7 +237,6 @@ do_install () { | |||
| 238 | then | 237 | then |
| 239 | install -Dm 0644 ${UBOOT_EXTLINUX_CONFIG} ${D}/${UBOOT_EXTLINUX_INSTALL_DIR}/${UBOOT_EXTLINUX_CONF_NAME} | 238 | install -Dm 0644 ${UBOOT_EXTLINUX_CONFIG} ${D}/${UBOOT_EXTLINUX_INSTALL_DIR}/${UBOOT_EXTLINUX_CONF_NAME} |
| 240 | fi | 239 | fi |
| 241 | |||
| 242 | } | 240 | } |
| 243 | 241 | ||
| 244 | PACKAGE_BEFORE_PN += "${PN}-env" | 242 | PACKAGE_BEFORE_PN += "${PN}-env" |
| @@ -275,9 +273,9 @@ do_deploy () { | |||
| 275 | ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} ${PN}-initial-env-${type} | 273 | ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} ${PN}-initial-env-${type} |
| 276 | fi | 274 | fi |
| 277 | done | 275 | done |
| 278 | unset j | 276 | unset j |
| 279 | done | 277 | done |
| 280 | unset i | 278 | unset i |
| 281 | else | 279 | else |
| 282 | install -D -m 644 ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} | 280 | install -D -m 644 ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} |
| 283 | 281 | ||
| @@ -346,9 +344,9 @@ do_deploy () { | |||
| 346 | ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_SYMLINK} | 344 | ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_SYMLINK} |
| 347 | fi | 345 | fi |
| 348 | done | 346 | done |
| 349 | unset j | 347 | unset j |
| 350 | done | 348 | done |
| 351 | unset i | 349 | unset i |
| 352 | else | 350 | else |
| 353 | install -m 644 ${B}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE} | 351 | install -m 644 ${B}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE} |
| 354 | rm -f ${DEPLOYDIR}/${SPL_BINARYNAME} ${DEPLOYDIR}/${SPL_SYMLINK} | 352 | rm -f ${DEPLOYDIR}/${SPL_BINARYNAME} ${DEPLOYDIR}/${SPL_SYMLINK} |
