brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-29 08:00:26 +09:00
Code Issues Projects Releases Wiki Activity

sunxi: Use BROM stored boot_media value to determine our boot-source

Browse Source 
Now that we know that the BROM stores a value indicating the boot-source
at the beginning of SRAM, use that instead of trying to recreate the
BROM's boot probing.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
This commit is contained in:
Hans de Goede 2016-07-09 15:31:47 +02:00
parent 4a8c7c1f45
commit ef36d9ae16
4 changed files with 12 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/include/asm/arch-sunxi/mmc.h
View File

@ -127,5 +127,4 @@ struct sunxi_mmc {
#define SUNXI_MMC_COMMON_RESET (1 << 18) #define SUNXI_MMC_COMMON_RESET (1 << 18)
struct mmc *sunxi_mmc_init(int sdc_no); struct mmc *sunxi_mmc_init(int sdc_no);
int sunxi_mmc_has_egon_boot_signature(struct mmc *mmc);
#endif /* _SUNXI_MMC_H */ #endif /* _SUNXI_MMC_H */

34
arch/arm/mach-sunxi/board.c
View File

@ -203,7 +203,8 @@ DECLARE_GLOBAL_DATA_PTR;
*/ */
u32 spl_boot_device(void) u32 spl_boot_device(void)
{ {
__maybe_unused struct mmc *mmc0, *mmc1; int boot_source;
/* /*
* When booting from the SD card or NAND memory, the "eGON.BT0" * When booting from the SD card or NAND memory, the "eGON.BT0"
* signature is expected to be found in memory at the address 0x0004 * signature is expected to be found in memory at the address 0x0004
@ -223,32 +224,19 @@ u32 spl_boot_device(void)
if (!is_boot0_magic(SPL_ADDR + 4)) /* eGON.BT0 */ if (!is_boot0_magic(SPL_ADDR + 4)) /* eGON.BT0 */
return BOOT_DEVICE_BOARD; return BOOT_DEVICE_BOARD;
#ifdef CONFIG_SPL_SPI_SUNXI boot_source = readb(SPL_ADDR + 0x28);
if (readb(SPL_ADDR + 0x28) == SUNXI_BOOTED_FROM_SPI) switch (boot_source) {
return BOOT_DEVICE_SPI; case SUNXI_BOOTED_FROM_MMC0:
#endif
/* The BROM will try to boot from mmc0 first, so try that first. */
#ifdef CONFIG_MMC
mmc_initialize(gd->bd);
mmc0 = find_mmc_device(0);
if (sunxi_mmc_has_egon_boot_signature(mmc0))
return BOOT_DEVICE_MMC1; return BOOT_DEVICE_MMC1;
#endif case SUNXI_BOOTED_FROM_NAND:
/* Fallback to booting NAND if enabled. */
if (IS_ENABLED(CONFIG_SPL_NAND_SUPPORT))
return BOOT_DEVICE_NAND; return BOOT_DEVICE_NAND;
case SUNXI_BOOTED_FROM_MMC2:
#ifdef CONFIG_MMC return BOOT_DEVICE_MMC2;
if (CONFIG_MMC_SUNXI_SLOT_EXTRA == 2) { case SUNXI_BOOTED_FROM_SPI:
mmc1 = find_mmc_device(1); return BOOT_DEVICE_SPI;
if (sunxi_mmc_has_egon_boot_signature(mmc1))
return BOOT_DEVICE_MMC2;
} }
#endif
panic("Could not determine boot source\n"); panic("Unknown boot source %d\n", boot_source);
return -1; /* Never reached */ return -1; /* Never reached */
} }

3
board/sunxi/board.c
View File

@ -369,8 +369,7 @@ int board_mmc_init(bd_t *bis)
* are searched there first. Note we only do this for u-boot proper, * are searched there first. Note we only do this for u-boot proper,
* not for the SPL, see spl_boot_device(). * not for the SPL, see spl_boot_device().
*/ */
if (!sunxi_mmc_has_egon_boot_signature(mmc0) && if (readb(SPL_ADDR + 0x28) == SUNXI_BOOTED_FROM_MMC2) {
sunxi_mmc_has_egon_boot_signature(mmc1)) {
/* Booting from emmc / mmc2, swap */ /* Booting from emmc / mmc2, swap */
mmc0->block_dev.devnum = 1; mmc0->block_dev.devnum = 1;
mmc1->block_dev.devnum = 0; mmc1->block_dev.devnum = 0;

17
drivers/mmc/sunxi_mmc.c
View File

@ -445,23 +445,6 @@ static int sunxi_mmc_getcd(struct mmc *mmc)
return !gpio_get_value(cd_pin); return !gpio_get_value(cd_pin);
} }
int sunxi_mmc_has_egon_boot_signature(struct mmc *mmc)
{
char *buf = malloc(512);
int valid_signature = 0;
if (buf == NULL)
panic("Failed to allocate memory\n");
if (mmc_getcd(mmc) && mmc_init(mmc) == 0 &&
mmc->block_dev.block_read(&mmc->block_dev, 16, 1, buf) == 1 &&
strncmp(&buf[4], "eGON.BT0", 8) == 0)
valid_signature = 1;
free(buf);
return valid_signature;
}
static const struct mmc_ops sunxi_mmc_ops = { static const struct mmc_ops sunxi_mmc_ops = {
.send_cmd = sunxi_mmc_send_cmd, .send_cmd = sunxi_mmc_send_cmd,
.set_ios = sunxi_mmc_set_ios, .set_ios = sunxi_mmc_set_ios,