diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-05-06 09:30:28 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-05-06 09:30:28 +0200 |
| commit | c8af035b4176af0e8da2cdd2d10109b56e06444e (patch) | |
| tree | 5e1e6feff42470e7c167c89ee07b7e8b1c37f81b /commands | |
| parent | 3cdd18632e72cbb8b0402df3e4821dfd7d24643b (diff) | |
| parent | 9e809ef4317cf96a477342a09b8c205a49e44554 (diff) | |
| download | barebox-c8af035b4176af0e8da2cdd2d10109b56e06444e.tar.gz barebox-c8af035b4176af0e8da2cdd2d10109b56e06444e.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/Kconfig | 4 | ||||
| -rw-r--r-- | commands/bootm.c | 7 | ||||
| -rw-r--r-- | commands/i2c.c | 2 |
3 files changed, 4 insertions, 9 deletions
diff --git a/commands/Kconfig b/commands/Kconfig index e6168cede2..6a759ce204 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -356,12 +356,12 @@ config CMD_MEMSET config CMD_CRC tristate select CRC32 - prompt "crc" + prompt "crc32" config CMD_CRC_CMP tristate depends on CMD_CRC - prompt "compare 2 files crc" + prompt "compare 2 files using crc32" config CMD_DIGEST tristate diff --git a/commands/bootm.c b/commands/bootm.c index e5dfc6ab3c..5dd1703538 100644 --- a/commands/bootm.c +++ b/commands/bootm.c @@ -127,9 +127,6 @@ static int bootm_open_initrd_uimage(struct image_data *data) data->initrd = data->os; } - if (data->initrd_address == UIMAGE_SOME_ADDRESS) - data->initrd_address = data->initrd->header.ih_load; - return 0; } @@ -256,7 +253,7 @@ static int do_bootm(int argc, char *argv[]) memset(&data, 0, sizeof(struct image_data)); - data.initrd_address = UIMAGE_SOME_ADDRESS; + data.initrd_address = UIMAGE_INVALID_ADDRESS; data.os_address = UIMAGE_SOME_ADDRESS; data.verify = 0; data.verbose = 0; @@ -408,8 +405,6 @@ static int do_bootm(int argc, char *argv[]) #endif if (data.os_address == UIMAGE_SOME_ADDRESS) data.os_address = UIMAGE_INVALID_ADDRESS; - if (data.initrd_address == UIMAGE_SOME_ADDRESS) - data.initrd_address = UIMAGE_INVALID_ADDRESS; handler = bootm_find_handler(os_type, &data); if (!handler) { diff --git a/commands/i2c.c b/commands/i2c.c index 8370b43dab..626255d612 100644 --- a/commands/i2c.c +++ b/commands/i2c.c @@ -45,7 +45,7 @@ static int do_i2c_probe(int argc, char *argv[]) if (stopaddr > 0x7F) stopaddr = 0x7F; - printf("probing i2c range 0X%02x - 0x%02x :\n", startaddr, stopaddr); + printf("probing i2c range 0x%02x - 0x%02x :\n", startaddr, stopaddr); for (addr = startaddr; addr <= stopaddr; addr++) { client.addr = addr; ret = i2c_write_reg(&client, 0x00, ®, 0); |