mirror of
https://git.freebsd.org/ports.git
synced 2025-07-01 01:20:31 -04:00
ae95160278
This version is patched so that: * ELF and API features are enabled. * The default environment is trimmed to just what's needed to boot. * The saveenv command writes to the file u-boot.env on the FAT partition. * The DTB file name is chosen based on the board model and passed to ubldr using the fdtfile env variable. ubldr loads the DTB from /boot/dtb/ on the FreeBSD partition. * By default, it loads ELF ubldr from file ubldr on the FAT partition to address 0x42000000, and launches it. For information about running FreeBSD on Allwinner SoCs, see https://wiki.freebsd.org/FreeBSD/arm/Allwinner Differential Revision: https://reviews.freebsd.org/D2874 Reviewed by: garga Approved by: garga
80 lines
1.8 KiB
C
80 lines
1.8 KiB
C
--- drivers/mmc/mmc.c.orig 2015-04-13 14:53:03 UTC
|
|
+++ drivers/mmc/mmc.c
|
|
@@ -20,6 +20,7 @@
|
|
|
|
static struct list_head mmc_devices;
|
|
static int cur_dev_num = -1;
|
|
+static int mmc_error_print_max = -1;
|
|
|
|
__weak int board_mmc_getwp(struct mmc *mmc)
|
|
{
|
|
@@ -1560,9 +1561,14 @@ void mmc_destroy(struct mmc *mmc)
|
|
block_dev_desc_t *mmc_get_dev(int dev)
|
|
{
|
|
struct mmc *mmc = find_mmc_device(dev);
|
|
- if (!mmc || mmc_init(mmc))
|
|
+ if (!mmc)
|
|
return NULL;
|
|
|
|
+ /* If mmc_init fails, mmc->block_dev will be of type
|
|
+ * DEV_TYPE_UNKNOWN with blksz and lba set to zero.
|
|
+ */
|
|
+ mmc_init(mmc);
|
|
+
|
|
return &mmc->block_dev;
|
|
}
|
|
#endif
|
|
@@ -1594,7 +1600,7 @@ int mmc_start_init(struct mmc *mmc)
|
|
err = mmc->cfg->ops->init(mmc);
|
|
|
|
if (err)
|
|
- return err;
|
|
+ goto done;
|
|
|
|
mmc->ddr_mode = 0;
|
|
mmc_set_bus_width(mmc, 1);
|
|
@@ -1604,7 +1610,7 @@ int mmc_start_init(struct mmc *mmc)
|
|
err = mmc_go_idle(mmc);
|
|
|
|
if (err)
|
|
- return err;
|
|
+ goto done;
|
|
|
|
/* The internal partition reset to user partition(0) at every CMD0*/
|
|
mmc->part_num = 0;
|
|
@@ -1621,15 +1627,33 @@ int mmc_start_init(struct mmc *mmc)
|
|
|
|
if (err && err != IN_PROGRESS) {
|
|
#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
|
|
- printf("Card did not respond to voltage select!\n");
|
|
+ if (mmc_error_print_max < 4) {
|
|
+ mmc_error_print_max++;
|
|
+ printf("Card did not respond to voltage select!\n");
|
|
+
|
|
+ if (mmc_error_print_max == 4) {
|
|
+ printf("Discarding further error messages\n");
|
|
+ }
|
|
+ }
|
|
#endif
|
|
- return UNUSABLE_ERR;
|
|
+// return UNUSABLE_ERR;
|
|
+ goto done;
|
|
}
|
|
}
|
|
|
|
if (err == IN_PROGRESS)
|
|
mmc->init_in_progress = 1;
|
|
|
|
+done:
|
|
+ if (err) {
|
|
+ mmc->has_init = 0;
|
|
+ mmc->block_dev.type = DEV_TYPE_UNKNOWN;
|
|
+ mmc->block_dev.blksz = 0;
|
|
+ mmc->block_dev.lba = 0;
|
|
+ } else {
|
|
+ mmc->has_init = 1;
|
|
+ }
|
|
+
|
|
return err;
|
|
}
|
|
|