diff options
author | Fabio Estevam | 2017-10-04 11:29:57 -0500 |
---|---|---|
committer | Tom Rini | 2017-10-05 09:45:33 -0500 |
commit | 3ea0520512089cffbe02b7d6eb645cdfddb09c5c (patch) | |
tree | 6d86e9be83ae1f64d0605513ca57fd3c67dd22b5 /disk | |
parent | 4f42a0d7210bd8d4d1f5e2fb73456679d74c44cd (diff) | |
download | u-boot-3ea0520512089cffbe02b7d6eb645cdfddb09c5c.tar.gz u-boot-3ea0520512089cffbe02b7d6eb645cdfddb09c5c.tar.xz u-boot-3ea0520512089cffbe02b7d6eb645cdfddb09c5c.zip |
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.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/disk/part_dos.c b/disk/part_dos.c index 1a36be0446..6dd2c2d147 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c | |||
@@ -89,6 +89,7 @@ static int test_block_type(unsigned char *buffer) | |||
89 | 89 | ||
90 | static int part_test_dos(struct blk_desc *dev_desc) | 90 | static int part_test_dos(struct blk_desc *dev_desc) |
91 | { | 91 | { |
92 | #ifndef CONFIG_SPL_BUILD | ||
92 | ALLOC_CACHE_ALIGN_BUFFER(legacy_mbr, mbr, dev_desc->blksz); | 93 | ALLOC_CACHE_ALIGN_BUFFER(legacy_mbr, mbr, dev_desc->blksz); |
93 | 94 | ||
94 | if (blk_dread(dev_desc, 0, 1, (ulong *)mbr) != 1) | 95 | if (blk_dread(dev_desc, 0, 1, (ulong *)mbr) != 1) |
@@ -102,6 +103,15 @@ static int part_test_dos(struct blk_desc *dev_desc) | |||
102 | dev_desc->sig_type = SIG_TYPE_MBR; | 103 | dev_desc->sig_type = SIG_TYPE_MBR; |
103 | dev_desc->mbr_sig = mbr->unique_mbr_signature; | 104 | dev_desc->mbr_sig = mbr->unique_mbr_signature; |
104 | } | 105 | } |
106 | #else | ||
107 | ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz); | ||
108 | |||
109 | if (blk_dread(dev_desc, 0, 1, (ulong *)buffer) != 1) | ||
110 | return -1; | ||
111 | |||
112 | if (test_block_type(buffer) != DOS_MBR) | ||
113 | return -1; | ||
114 | #endif | ||
105 | 115 | ||
106 | return 0; | 116 | return 0; |
107 | } | 117 | } |