* [U-Boot] [PATCH v4] imls: Add support to list images in NAND device
@ 2012-12-17 8:32 Vipin Kumar
2013-02-20 1:15 ` Scott Wood
2013-02-22 22:57 ` [U-Boot] [U-Boot, " Scott Wood
0 siblings, 2 replies; 5+ messages in thread
From: Vipin Kumar @ 2012-12-17 8:32 UTC (permalink / raw)
To: u-boot
This patch adds support to list images in NAND flash through imls
Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
---
Changes in v4
- Keep stdout dumps in one line
- Continue even after read errors for all the blocks
README | 3 +-
common/cmd_bootm.c | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 166 insertions(+), 4 deletions(-)
diff --git a/README b/README
index 2077c3b..46fd21d 100644
--- a/README
+++ b/README
@@ -831,7 +831,8 @@ The following options need to be configured:
CONFIG_CMD_I2C * I2C serial bus support
CONFIG_CMD_IDE * IDE harddisk support
CONFIG_CMD_IMI iminfo
- CONFIG_CMD_IMLS List all found images
+ CONFIG_CMD_IMLS List all images found in NOR flash
+ CONFIG_CMD_IMLS_NAND List all images found in NAND flash
CONFIG_CMD_IMMAP * IMMR dump support
CONFIG_CMD_IMPORTENV * import an environment
CONFIG_CMD_INI * import data from an ini file into the env
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index d256ddf..938e500 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -80,9 +80,15 @@ static int image_info(unsigned long addr);
#include <flash.h>
#include <mtd/cfi_flash.h>
extern flash_info_t flash_info[]; /* info for FLASH chips */
+#endif
+
+#if defined(CONFIG_CMD_IMLS) || defined(CONFIG_CMD_IMLS_NAND)
static int do_imls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
#endif
+#include <linux/err.h>
+#include <nand.h>
+
#ifdef CONFIG_SILENT_CONSOLE
static void fixup_silent_linux(void);
#endif
@@ -1175,7 +1181,7 @@ U_BOOT_CMD(
/* imls - list all images found in flash */
/*******************************************************************/
#if defined(CONFIG_CMD_IMLS)
-static int do_imls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_imls_nor(void)
{
flash_info_t *info;
int i, j;
@@ -1224,6 +1230,161 @@ next_sector: ;
}
next_bank: ;
}
+ return 0;
+}
+#endif
+
+#if defined(CONFIG_CMD_IMLS_NAND)
+static int nand_imls_legacyimage(nand_info_t *nand, int nand_dev, loff_t off,
+ size_t len)
+{
+ void *imgdata;
+ int ret;
+
+ imgdata = malloc(len);
+ if (!imgdata) {
+ printf("May be a Legacy Image at NAND device %d offset %08llX:\n",
+ nand_dev, off);
+ printf(" Low memory(cannot allocate memory for image)\n");
+ return -ENOMEM;
+ }
+
+ ret = nand_read_skip_bad(nand, off, &len,
+ imgdata);
+ if (ret < 0 && ret != -EUCLEAN) {
+ free(imgdata);
+ return ret;
+ }
+
+ if (!image_check_hcrc(imgdata)) {
+ free(imgdata);
+ return 0;
+ }
+
+ printf("Legacy Image at NAND device %d offset %08llX:\n",
+ nand_dev, off);
+ image_print_contents(imgdata);
+
+ puts(" Verifying Checksum ... ");
+ if (!image_check_dcrc(imgdata))
+ puts("Bad Data CRC\n");
+ else
+ puts("OK\n");
+
+ free(imgdata);
+
+ return 0;
+}
+
+static int nand_imls_fitimage(nand_info_t *nand, int nand_dev, loff_t off,
+ size_t len)
+{
+ void *imgdata;
+ int ret;
+
+ imgdata = malloc(len);
+ if (!imgdata) {
+ printf("May be a FIT Image at NAND device %d offset %08llX:\n",
+ nand_dev, off);
+ printf(" Low memory(cannot allocate memory for image)\n");
+ return -ENOMEM;
+ }
+
+ ret = nand_read_skip_bad(nand, off, &len,
+ imgdata);
+ if (ret < 0 && ret != -EUCLEAN) {
+ free(imgdata);
+ return ret;
+ }
+
+ if (!fit_check_format(imgdata)) {
+ free(imgdata);
+ return 0;
+ }
+
+ printf("FIT Image@NAND device %d offset %08llX:\n", nand_dev, off);
+
+ fit_print_contents(imgdata);
+ free(imgdata);
+
+ return 0;
+}
+
+static int do_imls_nand(void)
+{
+ nand_info_t *nand;
+ int nand_dev = nand_curr_device;
+ size_t len;
+ loff_t off;
+ u32 buffer[16];
+
+ if (nand_dev < 0 || nand_dev >= CONFIG_SYS_MAX_NAND_DEVICE) {
+ puts("\nNo NAND devices available\n");
+ return -ENODEV;
+ }
+
+ printf("\n");
+
+ for (nand_dev = 0; nand_dev < CONFIG_SYS_MAX_NAND_DEVICE; nand_dev++) {
+ nand = &nand_info[nand_dev];
+ if (!nand->name || !nand->size)
+ continue;
+
+ for (off = 0; off < nand->size; off += nand->erasesize) {
+ const image_header_t *header;
+ int ret;
+
+ if (nand_block_isbad(nand, off))
+ continue;
+
+ len = sizeof(buffer);
+
+ ret = nand_read(nand, off, &len, (u8 *)buffer);
+ if (ret < 0 && ret != -EUCLEAN) {
+ printf("NAND read error %d at offset %08llX\n",
+ ret, off);
+ continue;
+ }
+
+ switch (genimg_get_format(buffer)) {
+ case IMAGE_FORMAT_LEGACY:
+ header = (const image_header_t *)buffer;
+
+ len = image_get_image_size(header);
+ nand_imls_legacyimage(nand, nand_dev, off, len);
+ break;
+#if defined(CONFIG_FIT)
+ case IMAGE_FORMAT_FIT:
+ len = fit_get_size(buffer);
+ nand_imls_fitimage(nand, nand_dev, off, len);
+ break;
+#endif
+ }
+ }
+ }
+
+ return 0;
+}
+#endif
+
+#if defined(CONFIG_CMD_IMLS) || defined(CONFIG_CMD_IMLS_NAND)
+static int do_imls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+ int ret_nor = 0, ret_nand = 0;
+
+#if defined(CONFIG_CMD_IMLS)
+ ret_nor = do_imls_nor();
+#endif
+
+#if defined(CONFIG_CMD_IMLS_NAND)
+ ret_nand = do_imls_nand();
+#endif
+
+ if (ret_nor)
+ return ret_nor;
+
+ if (ret_nand)
+ return ret_nand;
return (0);
}
@@ -1232,8 +1393,8 @@ U_BOOT_CMD(
imls, 1, 1, do_imls,
"list all images found in flash",
"\n"
- " - Prints information about all images found at sector\n"
- " boundaries in flash."
+ " - Prints information about all images found@sector/block\n"
+ " boundaries in nor/nand flash."
);
#endif
--
1.8.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH v4] imls: Add support to list images in NAND device
2012-12-17 8:32 [U-Boot] [PATCH v4] imls: Add support to list images in NAND device Vipin Kumar
@ 2013-02-20 1:15 ` Scott Wood
2013-02-20 3:37 ` Vipin Kumar
2013-02-22 22:57 ` [U-Boot] [U-Boot, " Scott Wood
1 sibling, 1 reply; 5+ messages in thread
From: Scott Wood @ 2013-02-20 1:15 UTC (permalink / raw)
To: u-boot
On 12/17/2012 02:32:48 AM, Vipin Kumar wrote:
> This patch adds support to list images in NAND flash through imls
>
> Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
> ---
> Changes in v4
> - Keep stdout dumps in one line
> - Continue even after read errors for all the blocks
>
> README | 3 +-
> common/cmd_bootm.c | 167
> ++++++++++++++++++++++++++++++++++++++++++++++++++++-
> 2 files changed, 166 insertions(+), 4 deletions(-)
>
> diff --git a/README b/README
> index 2077c3b..46fd21d 100644
> --- a/README
> +++ b/README
> @@ -831,7 +831,8 @@ The following options need to be configured:
> CONFIG_CMD_I2C * I2C serial bus support
> CONFIG_CMD_IDE * IDE harddisk support
> CONFIG_CMD_IMI iminfo
> - CONFIG_CMD_IMLS List all found images
> + CONFIG_CMD_IMLS List all images found in NOR
> flash
> + CONFIG_CMD_IMLS_NAND List all images found in NAND
> flash
> CONFIG_CMD_IMMAP * IMMR dump support
> CONFIG_CMD_IMPORTENV * import an environment
> CONFIG_CMD_INI * import data from an ini file
> into the env
> diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
> index d256ddf..938e500 100644
> --- a/common/cmd_bootm.c
> +++ b/common/cmd_bootm.c
> @@ -80,9 +80,15 @@ static int image_info(unsigned long addr);
> #include <flash.h>
> #include <mtd/cfi_flash.h>
> extern flash_info_t flash_info[]; /* info for FLASH chips */
> +#endif
> +
> +#if defined(CONFIG_CMD_IMLS) || defined(CONFIG_CMD_IMLS_NAND)
> static int do_imls(cmd_tbl_t *cmdtp, int flag, int argc, char *
> const argv[]);
> #endif
>
> +#include <linux/err.h>
> +#include <nand.h>
> +
> #ifdef CONFIG_SILENT_CONSOLE
> static void fixup_silent_linux(void);
> #endif
> @@ -1175,7 +1181,7 @@ U_BOOT_CMD(
> /* imls - list all images found in flash */
> /*******************************************************************/
> #if defined(CONFIG_CMD_IMLS)
> -static int do_imls(cmd_tbl_t *cmdtp, int flag, int argc, char *
> const argv[])
> +static int do_imls_nor(void)
> {
> flash_info_t *info;
> int i, j;
> @@ -1224,6 +1230,161 @@ next_sector: ;
> }
> next_bank: ;
> }
> + return 0;
> +}
> +#endif
> +
> +#if defined(CONFIG_CMD_IMLS_NAND)
> +static int nand_imls_legacyimage(nand_info_t *nand, int nand_dev,
> loff_t off,
> + size_t len)
> +{
> + void *imgdata;
> + int ret;
> +
> + imgdata = malloc(len);
> + if (!imgdata) {
> + printf("May be a Legacy Image at NAND device %d offset
> %08llX:\n",
> + nand_dev, off);
> + printf(" Low memory(cannot allocate memory for
> image)\n");
> + return -ENOMEM;
> + }
So, it looks like any reasonably-sized kernel image is going to hit
this out-of-memory condition given how unreasonably small U-Boot malloc
heaps generally are.
As a side note, running this showed U-Boot itself as "may be a legacy
image"... it seems that for some reason all the ppc arches start with
the uImage header, but otherwise aren't valid uImages.
-Scott
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH v4] imls: Add support to list images in NAND device
2013-02-20 1:15 ` Scott Wood
@ 2013-02-20 3:37 ` Vipin Kumar
2013-02-20 18:12 ` Scott Wood
0 siblings, 1 reply; 5+ messages in thread
From: Vipin Kumar @ 2013-02-20 3:37 UTC (permalink / raw)
To: u-boot
On 2/20/2013 6:45 AM, Scott Wood wrote:
> On 12/17/2012 02:32:48 AM, Vipin Kumar wrote:
>> This patch adds support to list images in NAND flash through imls
>>
>> Signed-off-by: Vipin Kumar<vipin.kumar@st.com>
>> ---
>> Changes in v4
>> - Keep stdout dumps in one line
>> - Continue even after read errors for all the blocks
>>
>> README | 3 +-
>> common/cmd_bootm.c | 167
>> ++++++++++++++++++++++++++++++++++++++++++++++++++++-
>> 2 files changed, 166 insertions(+), 4 deletions(-)
>>
>> diff --git a/README b/README
>> index 2077c3b..46fd21d 100644
>> --- a/README
>> +++ b/README
>> @@ -831,7 +831,8 @@ The following options need to be configured:
>> CONFIG_CMD_I2C * I2C serial bus support
>> CONFIG_CMD_IDE * IDE harddisk support
>> CONFIG_CMD_IMI iminfo
>> - CONFIG_CMD_IMLS List all found images
>> + CONFIG_CMD_IMLS List all images found in NOR
>> flash
>> + CONFIG_CMD_IMLS_NAND List all images found in NAND
>> flash
>> CONFIG_CMD_IMMAP * IMMR dump support
>> CONFIG_CMD_IMPORTENV * import an environment
>> CONFIG_CMD_INI * import data from an ini file
>> into the env
>> diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
>> index d256ddf..938e500 100644
>> --- a/common/cmd_bootm.c
>> +++ b/common/cmd_bootm.c
>> @@ -80,9 +80,15 @@ static int image_info(unsigned long addr);
>> #include<flash.h>
>> #include<mtd/cfi_flash.h>
>> extern flash_info_t flash_info[]; /* info for FLASH chips */
>> +#endif
>> +
>> +#if defined(CONFIG_CMD_IMLS) || defined(CONFIG_CMD_IMLS_NAND)
>> static int do_imls(cmd_tbl_t *cmdtp, int flag, int argc, char *
>> const argv[]);
>> #endif
>>
>> +#include<linux/err.h>
>> +#include<nand.h>
>> +
>> #ifdef CONFIG_SILENT_CONSOLE
>> static void fixup_silent_linux(void);
>> #endif
>> @@ -1175,7 +1181,7 @@ U_BOOT_CMD(
>> /* imls - list all images found in flash */
>> /*******************************************************************/
>> #if defined(CONFIG_CMD_IMLS)
>> -static int do_imls(cmd_tbl_t *cmdtp, int flag, int argc, char *
>> const argv[])
>> +static int do_imls_nor(void)
>> {
>> flash_info_t *info;
>> int i, j;
>> @@ -1224,6 +1230,161 @@ next_sector: ;
>> }
>> next_bank: ;
>> }
>> + return 0;
>> +}
>> +#endif
>> +
>> +#if defined(CONFIG_CMD_IMLS_NAND)
>> +static int nand_imls_legacyimage(nand_info_t *nand, int nand_dev,
>> loff_t off,
>> + size_t len)
>> +{
>> + void *imgdata;
>> + int ret;
>> +
>> + imgdata = malloc(len);
>> + if (!imgdata) {
>> + printf("May be a Legacy Image at NAND device %d offset
>> %08llX:\n",
>> + nand_dev, off);
>> + printf(" Low memory(cannot allocate memory for
>> image)\n");
>> + return -ENOMEM;
>> + }
>
> So, it looks like any reasonably-sized kernel image is going to hit
> this out-of-memory condition given how unreasonably small U-Boot malloc
> heaps generally are.
>
Yes, that's right. And it is a pity
> As a side note, running this showed U-Boot itself as "may be a legacy
> image"... it seems that for some reason all the ppc arches start with
> the uImage header, but otherwise aren't valid uImages.
This "may be a legacy image" print is when we have successfully copied
and validated the 64 byte mkimage header and are not able to allocate
the memory from heap for the image data. What it means is that although
the whole image might be a good "Legacy image" but we can not guarantee
because we have not yet validated the dcrc.
Thats why this print "May be a legacy image"
-Vipin
>
> -Scott
> .
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH v4] imls: Add support to list images in NAND device
2013-02-20 3:37 ` Vipin Kumar
@ 2013-02-20 18:12 ` Scott Wood
0 siblings, 0 replies; 5+ messages in thread
From: Scott Wood @ 2013-02-20 18:12 UTC (permalink / raw)
To: u-boot
On 02/19/2013 09:37:23 PM, Vipin Kumar wrote:
> On 2/20/2013 6:45 AM, Scott Wood wrote:
>> On 12/17/2012 02:32:48 AM, Vipin Kumar wrote:
>>> +#if defined(CONFIG_CMD_IMLS_NAND)
>>> +static int nand_imls_legacyimage(nand_info_t *nand, int nand_dev,
>>> loff_t off,
>>> + size_t len)
>>> +{
>>> + void *imgdata;
>>> + int ret;
>>> +
>>> + imgdata = malloc(len);
>>> + if (!imgdata) {
>>> + printf("May be a Legacy Image at NAND device %d offset
>>> %08llX:\n",
>>> + nand_dev, off);
>>> + printf(" Low memory(cannot allocate memory for
>>> image)\n");
>>> + return -ENOMEM;
>>> + }
>>
>> So, it looks like any reasonably-sized kernel image is going to hit
>> this out-of-memory condition given how unreasonably small U-Boot
>> malloc
>> heaps generally are.
>>
>
> Yes, that's right. And it is a pity
I think I'll apply this anyway, as it is still helpful, but a future
enhancement could be to do a streaming read of the image to verify the
CRC.
>> As a side note, running this showed U-Boot itself as "may be a legacy
>> image"... it seems that for some reason all the ppc arches start with
>> the uImage header, but otherwise aren't valid uImages.
>
> This "may be a legacy image" print is when we have successfully
> copied and validated the 64 byte mkimage header and are not able to
> allocate the memory from heap for the image data. What it means is
> that although the whole image might be a good "Legacy image" but we
> can not guarantee because we have not yet validated the dcrc.
>
> Thats why this print "May be a legacy image"
Sure, that comment was meant as "hmm, powerpc is doing something weird"
rather than anything wrong with this patch.
-Scott
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [U-Boot, v4] imls: Add support to list images in NAND device
2012-12-17 8:32 [U-Boot] [PATCH v4] imls: Add support to list images in NAND device Vipin Kumar
2013-02-20 1:15 ` Scott Wood
@ 2013-02-22 22:57 ` Scott Wood
1 sibling, 0 replies; 5+ messages in thread
From: Scott Wood @ 2013-02-22 22:57 UTC (permalink / raw)
To: u-boot
On Sun, Dec 16, 2012 at 10:32:48PM -0000, Vipin Kumar wrote:
> This patch adds support to list images in NAND flash through imls
>
> Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
>
> ---
> Changes in v4
> - Keep stdout dumps in one line
> - Continue even after read errors for all the blocks
>
> README | 3 +-
> common/cmd_bootm.c | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
> 2 files changed, 166 insertions(+), 4 deletions(-)
Applied to u-boot-nand-flash, but please follow up by enabling this
in at least one board so that it continues to get build-tested.
-Scott
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-02-22 22:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-17 8:32 [U-Boot] [PATCH v4] imls: Add support to list images in NAND device Vipin Kumar
2013-02-20 1:15 ` Scott Wood
2013-02-20 3:37 ` Vipin Kumar
2013-02-20 18:12 ` Scott Wood
2013-02-22 22:57 ` [U-Boot] [U-Boot, " Scott Wood
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox