diff options
| author | Tom Rini <[email protected]> | 2020-08-06 11:06:02 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-08-06 11:06:02 -0400 |
| commit | 99c69538093143984edf0bcebdadc0a6d767c0a4 (patch) | |
| tree | 9c95f9c37b4e0a5e61acfc5f794239f3a77e9178 /cmd | |
| parent | 1521326b7a6725009b90330b3cef5a1d38831ee8 (diff) | |
| parent | 96be2f072768a91eb0df3767b9c8c880dd1e4b5b (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Cleanup in Marvell bubt cmd (Tom & Jagan)
- Add a series of MikroTik CRS3xx, 98DX3236 based switches (Luka)
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/mvebu/bubt.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c index a27b0df8ae7..0d52be8dbf7 100644 --- a/cmd/mvebu/bubt.c +++ b/cmd/mvebu/bubt.c @@ -176,16 +176,6 @@ static int mmc_burn_image(size_t image_size) return err; } -#ifdef CONFIG_SYS_MMC_ENV_PART - if (mmc->part_num != CONFIG_SYS_MMC_ENV_PART) { - err = mmc_switch_part(mmc_dev_num, CONFIG_SYS_MMC_ENV_PART); - if (err) { - printf("MMC partition switch failed\n"); - return err; - } - } -#endif - /* SD reserves LBA-0 for MBR and boots from LBA-1, * MMC/eMMC boots from LBA-0 */ @@ -217,11 +207,6 @@ static int mmc_burn_image(size_t image_size) } printf("Done!\n"); -#ifdef CONFIG_SYS_MMC_ENV_PART - if (mmc->part_num != CONFIG_SYS_MMC_ENV_PART) - mmc_switch_part(mmc_dev_num, mmc->part_num); -#endif - return 0; } @@ -299,9 +284,6 @@ static int spi_burn_image(size_t image_size) return -ENOMEDIUM; } -#ifdef CONFIG_SPI_FLASH_PROTECTION - spi_flash_protect(flash, 0); -#endif erase_bytes = image_size + (flash->erase_size - image_size % flash->erase_size); printf("Erasing %d bytes (%d blocks) at offset 0 ...", @@ -320,10 +302,6 @@ static int spi_burn_image(size_t image_size) else printf("Done!\n"); -#ifdef CONFIG_SPI_FLASH_PROTECTION - spi_flash_protect(flash, 1); -#endif - return ret; } |