diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/bootm_os.c | 2 | ||||
| -rw-r--r-- | common/cli_hush.c | 4 | ||||
| -rw-r--r-- | common/cmd_part.c | 2 | ||||
| -rw-r--r-- | common/spl/spl_mmc.c | 8 |
4 files changed, 10 insertions, 6 deletions
diff --git a/common/bootm_os.c b/common/bootm_os.c index 72477f0..cb83f4a 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -288,6 +288,8 @@ void do_bootvx_fdt(bootm_headers_t *images) if (ret) return; + fdt_fixup_ethernet(*of_flat_tree); + ret = fdt_add_subnode(*of_flat_tree, 0, "chosen"); if ((ret >= 0 || ret == -FDT_ERR_EXISTS)) { bootline = getenv("bootargs"); diff --git a/common/cli_hush.c b/common/cli_hush.c index 7f69c06..2fbfdbe 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -3508,9 +3508,9 @@ static char *insert_var_value_sub(char *inp, int tag_subst) char *p, *p1, *res_str = NULL; while ((p = strchr(inp, SPECIAL_VAR_SYMBOL))) { - /* check the beginning of the string for normal charachters */ + /* check the beginning of the string for normal characters */ if (p != inp) { - /* copy any charachters to the result string */ + /* copy any characters to the result string */ len = p - inp; res_str = xrealloc(res_str, (res_str_len + len)); strncpy((res_str + res_str_len), inp, len); diff --git a/common/cmd_part.c b/common/cmd_part.c index b860624..5599509 100644 --- a/common/cmd_part.c +++ b/common/cmd_part.c @@ -100,7 +100,7 @@ static int do_part_list(int argc, char * const argv[]) if (bootable && !info.bootable) continue; - sprintf(t, "%s%d", str[0] ? " " : "", p); + sprintf(t, "%s%x", str[0] ? " " : "", p); strcat(str, t); } setenv(var, str); diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index f2c1af5..c1c29c0 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -23,12 +23,13 @@ static int mmc_load_image_raw_sector(struct mmc *mmc, unsigned long sector) unsigned long count; u32 image_size_sectors; struct image_header *header; + int dev_num = mmc->block_dev.dev; header = (struct image_header *)(CONFIG_SYS_TEXT_BASE - sizeof(struct image_header)); /* read image header to find the image size & load address */ - count = mmc->block_dev.block_read(0, sector, 1, header); + count = mmc->block_dev.block_read(dev_num, sector, 1, header); debug("read sector %lx, count=%lu\n", sector, count); if (count == 0) goto end; @@ -45,7 +46,7 @@ static int mmc_load_image_raw_sector(struct mmc *mmc, unsigned long sector) mmc->read_bl_len; /* Read the header too to avoid extra memcpy */ - count = mmc->block_dev.block_read(0, sector, image_size_sectors, + count = mmc->block_dev.block_read(dev_num, sector, image_size_sectors, (void *)(ulong)spl_image.load_addr); debug("read %x sectors to %x\n", image_size_sectors, spl_image.load_addr); @@ -149,7 +150,8 @@ static int mmc_load_image_raw_os(struct mmc *mmc) { unsigned long count; - count = mmc->block_dev.block_read(0, + count = mmc->block_dev.block_read( + mmc->block_dev.dev, CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR, CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS, (void *) CONFIG_SYS_SPL_ARGS_ADDR); |