mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-29 08:00:26 +09:00
sunxi: Create helper function veryfing valid boot signature on MMC
This patch extracts checking for valid SD card "eGON.BT0" signature from `board_mmc_init` into function `sunxi_mmc_has_egon_boot_signature`. Buffer for mmc sector is allocated and freed at runtime. `panic` is triggered on malloc failure. Signed-off-by: Daniel Kochmański <dkochmanski@turtle-solutions.eu> CC: Roy Spliet <r.spliet@ultimaker.com> Cc: Ian Campbell <ijc@hellion.org.uk> [hdegoede@redhat.com: Small bugfix to make it work for devs other then mmc0] Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
parent
1b26bab12e
commit
645c48f50e
@ -127,4 +127,5 @@ 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 */
|
||||||
|
@ -299,12 +299,8 @@ int board_mmc_init(bd_t *bis)
|
|||||||
* Both mmc0 and mmc2 are bootable, figure out where we're booting
|
* Both mmc0 and mmc2 are bootable, figure out where we're booting
|
||||||
* from. Try mmc0 first, just like the brom does.
|
* from. Try mmc0 first, just like the brom does.
|
||||||
*/
|
*/
|
||||||
if (mmc_getcd(mmc0) && mmc_init(mmc0) == 0 &&
|
if (sunxi_mmc_has_egon_boot_signature(mmc0))
|
||||||
mmc0->block_dev.block_read(0, 16, 1, buf) == 1) {
|
return 0;
|
||||||
buf[12] = 0;
|
|
||||||
if (strcmp(&buf[4], "eGON.BT0") == 0)
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* no bootable card in mmc0, so we must be booting from mmc2, swap */
|
/* no bootable card in mmc0, so we must be booting from mmc2, swap */
|
||||||
mmc0->block_dev.dev = 1;
|
mmc0->block_dev.dev = 1;
|
||||||
|
@ -433,6 +433,23 @@ 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.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,
|
||||||
|
Loading…
Reference in New Issue
Block a user