diff options
| author | Daniel Kochmański <dkochmanski@turtle-solutions.eu> | 2015-05-29 16:55:41 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2015-07-24 16:17:08 +0200 |
| commit | 645c48f50eab307a9879a82c4d066e74114ec78a (patch) | |
| tree | 6172bf372026f375bab16294b1baeaac74b384be /board | |
| parent | 1b26bab12e85e8b0d382d6775e40d14445249574 (diff) | |
| download | talos-obmc-uboot-645c48f50eab307a9879a82c4d066e74114ec78a.tar.gz talos-obmc-uboot-645c48f50eab307a9879a82c4d066e74114ec78a.zip | |
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>
Diffstat (limited to 'board')
| -rw-r--r-- | board/sunxi/board.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/board/sunxi/board.c b/board/sunxi/board.c index ed60e74808..76e4b9bcc1 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -299,12 +299,8 @@ int board_mmc_init(bd_t *bis) * Both mmc0 and mmc2 are bootable, figure out where we're booting * from. Try mmc0 first, just like the brom does. */ - if (mmc_getcd(mmc0) && mmc_init(mmc0) == 0 && - mmc0->block_dev.block_read(0, 16, 1, buf) == 1) { - buf[12] = 0; - if (strcmp(&buf[4], "eGON.BT0") == 0) - return 0; - } + if (sunxi_mmc_has_egon_boot_signature(mmc0)) + return 0; /* no bootable card in mmc0, so we must be booting from mmc2, swap */ mmc0->block_dev.dev = 1; |
