From 1ea25a83fe87e98d20c4175325476a2de5b1df66 Mon Sep 17 00:00:00 2001
From: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
Date: Mon, 3 May 2021 13:55:27 +0100
Subject: [PATCH] tools/esp32/mk_qemu_img.sh: Group the offsets in variables.

---
 tools/esp32/mk_qemu_img.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/esp32/mk_qemu_img.sh b/tools/esp32/mk_qemu_img.sh
index 12c9429c71..4dfaeae011 100755
--- a/tools/esp32/mk_qemu_img.sh
+++ b/tools/esp32/mk_qemu_img.sh
@@ -23,6 +23,9 @@ SCRIPT_NAME=$(basename "${0}")
 
 BOOTLOADER_IMG=""
 PARTITION_IMG=""
+BOOTLOADER_OFFSET=0x1000
+PARTITION_OFFSET=0x8000
+NUTTX_OFFSET=0x10000
 NUTTX_IMG="nuttx.bin"
 FLASH_IMG="esp32_qemu_img.bin"
 
@@ -87,9 +90,9 @@ printf "\tBootloader: %s\n" "${BOOTLOADER_IMG}"
 printf "\tPartition Table: %s\n" "${PARTITION_IMG}"
 
 dd if=/dev/zero bs=1024 count=4096 of="${FLASH_IMG}" status=none
-imgappend ${FLASH_IMG} ${BOOTLOADER_IMG} 0x1000
-imgappend ${FLASH_IMG} ${PARTITION_IMG} 0x8000
-imgappend ${FLASH_IMG} ${NUTTX_IMG} 0x10000
+imgappend ${FLASH_IMG} ${BOOTLOADER_IMG} ${BOOTLOADER_OFFSET}
+imgappend ${FLASH_IMG} ${PARTITION_IMG} ${PARTITION_OFFSET}
+imgappend ${FLASH_IMG} ${NUTTX_IMG} ${NUTTX_OFFSET}
 
 if [ ${?} -ne 0 ]; then
   printf "Failed to generate %s!\n" "${FLASH_IMG}"