Skip to content

Commit

Permalink
Use unsigned long long define for storage offsets
Browse files Browse the repository at this point in the history
Without this a storage offset above 32 bits gets stuffed into the lower
32 bit region instead of the intended location.

Changelog: Fix u-boot environment location on some configurations

Signed-off-by: Dan Walkes <danwalkes@trellis-logic.com>
  • Loading branch information
dwalkes committed Jul 29, 2019
1 parent 7487fa7 commit b5b702b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions meta-mender-core/recipes-bsp/u-boot/u-boot-mender-common.inc
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ do_provide_mender_defines() {

MENDER_DTB_NAME=$(mender_get_clean_kernel_devicetree)

HEX_MENDER_UBOOT_ENV_STORAGE_DEVICE_OFFSET_1="$(printf 0x%x "${MENDER_UBOOT_ENV_STORAGE_DEVICE_OFFSET_1}")"
HEX_MENDER_UBOOT_ENV_STORAGE_DEVICE_OFFSET_2="$(printf 0x%x "${MENDER_UBOOT_ENV_STORAGE_DEVICE_OFFSET_2}")"
HEX_MENDER_UBOOT_ENV_STORAGE_DEVICE_OFFSET_1="$(printf 0x%x "${MENDER_UBOOT_ENV_STORAGE_DEVICE_OFFSET_1}")ULL"
HEX_MENDER_UBOOT_ENV_STORAGE_DEVICE_OFFSET_2="$(printf 0x%x "${MENDER_UBOOT_ENV_STORAGE_DEVICE_OFFSET_2}")ULL"

if [ -n "${MENDER_UBOOT_PRE_SETUP_COMMANDS}" ]; then
MENDER_UBOOT_PRE_SETUP_COMMANDS="${MENDER_UBOOT_PRE_SETUP_COMMANDS}"
Expand Down

0 comments on commit b5b702b

Please sign in to comment.