diff options
Diffstat (limited to 'board')
| -rw-r--r-- | board/cm5200/fwupdate.c | 4 | ||||
| -rw-r--r-- | board/mpl/pip405/README | 4 | ||||
| -rw-r--r-- | board/sunxi/board.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/board/cm5200/fwupdate.c b/board/cm5200/fwupdate.c index 2b92362..2ed90de 100644 --- a/board/cm5200/fwupdate.c +++ b/board/cm5200/fwupdate.c @@ -81,7 +81,7 @@ static int load_rescue_image(ulong addr) char dev[7]; char addr_str[16]; char * const argv[6] = { "fatload", "usb", dev, addr_str, nxri, NULL }; - block_dev_desc_t *stor_dev = NULL; + struct blk_desc *stor_dev = NULL; cmd_tbl_t *bcmd; /* Get name of firmware directory */ @@ -117,7 +117,7 @@ static int load_rescue_image(ulong addr) /* Detect partition */ for (partno = -1, i = 0; i < 6; i++) { - if (get_partition_info(stor_dev, i, &info) == 0) { + if (part_get_info(stor_dev, i, &info) == 0) { if (fat_register_device(stor_dev, i) == 0) { /* Check if rescue image is present */ FW_DEBUG("Looking for firmware directory '%s'" diff --git a/board/mpl/pip405/README b/board/mpl/pip405/README index 1b73dbe..e900c56 100644 --- a/board/mpl/pip405/README +++ b/board/mpl/pip405/README @@ -217,8 +217,8 @@ Added files: Block device changes: --------------------- To allow the use of dos_part.c, mac_part.c and iso_part.c, the parameter -block_dev_desc will be used when accessing the functions in these files. The block -device descriptor (block_dev_desc) contains a pointer to the read routine of the +blk_desc will be used when accessing the functions in these files. The block +device descriptor (blk_desc) contains a pointer to the read routine of the device, which will be used to read blocks from the device. Renamed function ide_print to dev_print and moved it to the file disk/part.c to use it for IDE ATAPI and SCSI devices. diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 15b7af6..80eae9c 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -337,8 +337,8 @@ int board_mmc_init(bd_t *bis) if (!sunxi_mmc_has_egon_boot_signature(mmc0) && sunxi_mmc_has_egon_boot_signature(mmc1)) { /* Booting from emmc / mmc2, swap */ - mmc0->block_dev.dev = 1; - mmc1->block_dev.dev = 0; + mmc0->block_dev.devnum = 1; + mmc1->block_dev.devnum = 0; } #endif |