summaryrefslogtreecommitdiffstats
path: root/board/esd/common
diff options
context:
space:
mode:
authorMarian Balakowicz <m8@semihalf.com>2008-02-04 08:28:09 +0100
committerMarian Balakowicz <m8@semihalf.com>2008-02-25 15:53:49 +0100
commitd5934ad7756f038a393a9cfab76a4fe306d9d930 (patch)
tree0299a8fc06709c436f3e1715f80f3e5f9f00885d /board/esd/common
parent5583cbf736474ef754e128a54fb78632f57b48fd (diff)
downloadblackbird-obmc-uboot-d5934ad7756f038a393a9cfab76a4fe306d9d930.tar.gz
blackbird-obmc-uboot-d5934ad7756f038a393a9cfab76a4fe306d9d930.zip
[new uImage] Add dual format uImage support framework
This patch adds framework for dual format images. Format detection is added and the bootm controll flow is updated to include cases for new FIT format uImages. When the legacy (image_header based) format is detected appropriate legacy specific handling is invoked. For the new (FIT based) format uImages dual boot framework has a minial support, that will only print out a corresponding debug messages. Implementation of the FIT specific handling will be added in following patches. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
Diffstat (limited to 'board/esd/common')
-rw-r--r--board/esd/common/auto_update.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/board/esd/common/auto_update.c b/board/esd/common/auto_update.c
index cb8087bee8..976707dfe6 100644
--- a/board/esd/common/auto_update.c
+++ b/board/esd/common/auto_update.c
@@ -91,6 +91,12 @@ int au_check_cksum_valid(int i, long nbytes)
image_header_t *hdr;
hdr = (image_header_t *)LOAD_ADDR;
+#if defined(CONFIG_FIT)
+ if (gen_image_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) {
+ puts ("Non legacy image format not supported\n");
+ return -1;
+ }
+#endif
if ((au_image[i].type == AU_FIRMWARE) &&
(au_image[i].size != image_get_data_size (hdr))) {
@@ -118,6 +124,13 @@ int au_check_header_valid(int i, long nbytes)
unsigned long checksum;
hdr = (image_header_t *)LOAD_ADDR;
+#if defined(CONFIG_FIT)
+ if (gen_image_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) {
+ puts ("Non legacy image format not supported\n");
+ return -1;
+ }
+#endif
+
/* check the easy ones first */
#undef CHECK_VALID_DEBUG
#ifdef CHECK_VALID_DEBUG
@@ -183,6 +196,12 @@ int au_do_update(int i, long sz)
#endif
hdr = (image_header_t *)LOAD_ADDR;
+#if defined(CONFIG_FIT)
+ if (gen_image_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) {
+ puts ("Non legacy image format not supported\n");
+ return -1;
+ }
+#endif
switch (au_image[i].type) {
case AU_SCRIPT:
OpenPOWER on IntegriCloud