aboutsummaryrefslogtreecommitdiff
path: root/disk
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@nxp.com>2017-10-04 13:29:57 -0300
committerTom Rini <trini@konsulko.com>2017-10-05 10:45:33 -0400
commit3ea0520512089cffbe02b7d6eb645cdfddb09c5c (patch)
tree6d86e9be83ae1f64d0605513ca57fd3c67dd22b5 /disk
parent4f42a0d7210bd8d4d1f5e2fb73456679d74c44cd (diff)
downloadu-boot-3ea0520512089cffbe02b7d6eb645cdfddb09c5c.zip
u-boot-3ea0520512089cffbe02b7d6eb645cdfddb09c5c.tar.gz
u-boot-3ea0520512089cffbe02b7d6eb645cdfddb09c5c.tar.bz2
disk: part_dos: Use the original allocation scheme for the SPL case
Since commit ff98cb90514d ("part: extract MBR signature from partitions") SPL boot on i.MX6 starts to fail: U-Boot SPL 2017.09-00221-g0d6ab32 (Oct 02 2017 - 15:13:19) Trying to boot from MMC1 (keep in loop) Use the original allocation scheme for the SPL case, so that MX6 boards can boot again. This is a temporary solution to avoid the boot regression. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Acked-by: Rob Clark <robdclark@gmail.com> Tested-by: Peter Robinson <pbrobinson@gmail.com>
Diffstat (limited to 'disk')
-rw-r--r--disk/part_dos.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/disk/part_dos.c b/disk/part_dos.c
index 1a36be0..6dd2c2d 100644
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -89,6 +89,7 @@ static int test_block_type(unsigned char *buffer)
static int part_test_dos(struct blk_desc *dev_desc)
{
+#ifndef CONFIG_SPL_BUILD
ALLOC_CACHE_ALIGN_BUFFER(legacy_mbr, mbr, dev_desc->blksz);
if (blk_dread(dev_desc, 0, 1, (ulong *)mbr) != 1)
@@ -102,6 +103,15 @@ static int part_test_dos(struct blk_desc *dev_desc)
dev_desc->sig_type = SIG_TYPE_MBR;
dev_desc->mbr_sig = mbr->unique_mbr_signature;
}
+#else
+ ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz);
+
+ if (blk_dread(dev_desc, 0, 1, (ulong *)buffer) != 1)
+ return -1;
+
+ if (test_block_type(buffer) != DOS_MBR)
+ return -1;
+#endif
return 0;
}