summaryrefslogtreecommitdiffstats
path: root/tools/imximage.h
diff options
context:
space:
mode:
authorDirk Behme <dirk.behme@de.bosch.com>2012-02-22 22:50:19 +0000
committerStefano Babic <sbabic@denx.de>2012-03-27 09:41:14 +0200
commit49d3e2721164eaef5df702a26cfca6efd430be30 (patch)
treee60d714e465b7058275f16461a42bd4fb0ec1f08 /tools/imximage.h
parentcd207cde948ecf9ff50a0fa1ae2650f65579c9c9 (diff)
downloadtalos-obmc-uboot-49d3e2721164eaef5df702a26cfca6efd430be30.tar.gz
talos-obmc-uboot-49d3e2721164eaef5df702a26cfca6efd430be30.zip
imximage: Remove overwriting of flash_offset
The flash header supports different flash offsets for different boot devices. E.g. parallel NOR or OneNAND use a different offset than FLASH_OFFSET_STANDARD (== 0x400). The flash offset is correctly read from the configuration in parse_cfg_cmd(). But is then overwritten wrongly in set_imx_hdr_v1/2(). Fix this by removing this overwriting. Use the flash offset correctly read from the configuration, instead. If there is no flash_offset read from the configuration file, i.e. the BOOT_FROM tag is missing, exit with an error message. Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com> CC: Jason Liu <liu.h.jason@gmail.com> CC: Stefano Babic <sbabic@denx.de> Tested-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'tools/imximage.h')
-rw-r--r--tools/imximage.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/imximage.h b/tools/imximage.h
index d784a8d2ec..34f293d95a 100644
--- a/tools/imximage.h
+++ b/tools/imximage.h
@@ -32,6 +32,7 @@
#define HEADER_OFFSET 0x400
#define CMD_DATA_STR "DATA"
+#define FLASH_OFFSET_UNDEFINED 0xFFFFFFFF
#define FLASH_OFFSET_STANDARD 0x400
#define FLASH_OFFSET_NAND FLASH_OFFSET_STANDARD
#define FLASH_OFFSET_SD FLASH_OFFSET_STANDARD
OpenPOWER on IntegriCloud