From 9a4daad0a35eb5143037eea9f786a3e9d672bdd6 Mon Sep 17 00:00:00 2001 From: Marian Balakowicz Date: Fri, 29 Feb 2008 14:58:34 +0100 Subject: [new uImage] Update naming convention for bootm/uImage related code This patch introduces the following prefix convention for the image format handling and bootm related code: genimg_ - dual format shared code image_ - legacy uImage format specific code fit_ - new uImage format specific code boot_ - booting process related code Related routines are renamed and a few pieces of code are moved around and re-grouped. Signed-off-by: Marian Balakowicz --- board/cray/L1/L1.c | 2 +- board/esd/common/auto_update.c | 6 +++--- board/mcc200/auto_update.c | 6 +++--- board/mpl/common/common_util.c | 4 ++-- board/siemens/common/fpga.c | 4 ++-- board/trab/auto_update.c | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) (limited to 'board') diff --git a/board/cray/L1/L1.c b/board/cray/L1/L1.c index c00acc8..77f7f48 100644 --- a/board/cray/L1/L1.c +++ b/board/cray/L1/L1.c @@ -141,7 +141,7 @@ int misc_init_r (void) hdr = (image_header_t *) (CFG_MONITOR_BASE - image_get_header_size ()); #if defined(CONFIG_FIT) - if (gen_image_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { + if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { puts ("Non legacy image format not supported\n"); return -1; } diff --git a/board/esd/common/auto_update.c b/board/esd/common/auto_update.c index 976707d..1bf81c6 100644 --- a/board/esd/common/auto_update.c +++ b/board/esd/common/auto_update.c @@ -92,7 +92,7 @@ int au_check_cksum_valid(int i, long nbytes) hdr = (image_header_t *)LOAD_ADDR; #if defined(CONFIG_FIT) - if (gen_image_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { + if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { puts ("Non legacy image format not supported\n"); return -1; } @@ -125,7 +125,7 @@ int au_check_header_valid(int i, long nbytes) hdr = (image_header_t *)LOAD_ADDR; #if defined(CONFIG_FIT) - if (gen_image_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { + if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { puts ("Non legacy image format not supported\n"); return -1; } @@ -197,7 +197,7 @@ int au_do_update(int i, long sz) hdr = (image_header_t *)LOAD_ADDR; #if defined(CONFIG_FIT) - if (gen_image_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { + if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { puts ("Non legacy image format not supported\n"); return -1; } diff --git a/board/mcc200/auto_update.c b/board/mcc200/auto_update.c index fcae35a..5580c11 100644 --- a/board/mcc200/auto_update.c +++ b/board/mcc200/auto_update.c @@ -144,7 +144,7 @@ int au_check_cksum_valid(int idx, long nbytes) hdr = (image_header_t *)LOAD_ADDR; #if defined(CONFIG_FIT) - if (gen_image_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { + if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { puts ("Non legacy image format not supported\n"); return -1; } @@ -169,7 +169,7 @@ int au_check_header_valid(int idx, long nbytes) hdr = (image_header_t *)LOAD_ADDR; #if defined(CONFIG_FIT) - if (gen_image_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { + if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { puts ("Non legacy image format not supported\n"); return -1; } @@ -247,7 +247,7 @@ int au_do_update(int idx, long sz) hdr = (image_header_t *)LOAD_ADDR; #if defined(CONFIG_FIT) - if (gen_image_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { + if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { puts ("Non legacy image format not supported\n"); return -1; } diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c index fffd25c..785d204 100644 --- a/board/mpl/common/common_util.c +++ b/board/mpl/common/common_util.c @@ -74,7 +74,7 @@ mpl_prg(uchar *src, ulong size) info = &flash_info[0]; #if defined(CONFIG_PIP405) || defined(CONFIG_MIP405) || defined(CONFIG_PATI) - if (image_to_cpu (magic[0]) != IH_MAGIC) { + if (uimage_to_cpu (magic[0]) != IH_MAGIC) { puts("Bad Magic number\n"); return -1; } @@ -182,7 +182,7 @@ mpl_prg_image(uchar *ld_addr) int rc; #if defined(CONFIG_FIT) - if (gen_image_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { + if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { puts ("Non legacy image format not supported\n"); return -1; } diff --git a/board/siemens/common/fpga.c b/board/siemens/common/fpga.c index a9a6dfe..48c1850 100644 --- a/board/siemens/common/fpga.c +++ b/board/siemens/common/fpga.c @@ -138,7 +138,7 @@ static int fpga_load (fpga_t* fpga, ulong addr, int checkall) int verify, i; #if defined(CONFIG_FIT) - if (gen_image_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { + if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { puts ("Non legacy image format not supported\n"); return -1; } @@ -341,7 +341,7 @@ int fpga_init (void) hdr = (image_header_t *)addr; #if defined(CONFIG_FIT) - if (gen_image_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { + if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { puts ("Non legacy image format not supported\n"); return -1; } diff --git a/board/trab/auto_update.c b/board/trab/auto_update.c index 8f67535..fa08bff 100644 --- a/board/trab/auto_update.c +++ b/board/trab/auto_update.c @@ -212,7 +212,7 @@ au_check_cksum_valid(int idx, long nbytes) hdr = (image_header_t *)LOAD_ADDR; #if defined(CONFIG_FIT) - if (gen_image_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { + if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { puts ("Non legacy image format not supported\n"); return -1; } @@ -241,7 +241,7 @@ au_check_header_valid(int idx, long nbytes) hdr = (image_header_t *)LOAD_ADDR; #if defined(CONFIG_FIT) - if (gen_image_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { + if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { puts ("Non legacy image format not supported\n"); return -1; } @@ -341,7 +341,7 @@ au_do_update(int idx, long sz) hdr = (image_header_t *)LOAD_ADDR; #if defined(CONFIG_FIT) - if (gen_image_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { + if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { puts ("Non legacy image format not supported\n"); return -1; } @@ -437,7 +437,7 @@ au_update_eeprom(int idx) hdr = (image_header_t *)LOAD_ADDR; #if defined(CONFIG_FIT) - if (gen_image_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { + if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) { puts ("Non legacy image format not supported\n"); return -1; } -- cgit v1.1