[U-Boot] [PATCH 1/2] Revert "ti_armv7_common.h: Fix U-Boot location on eMMC"

[U-Boot] [PATCH 1/2] Revert "ti_armv7_common.h: Fix U-Boot location on eMMC"

[Tom Rini]

We cannot change the long standing hard-coded offset for raw boot mode
for everyone to accommodate how Android expects things to be done here.

This reverts commit ef5ebe951bec72631cdbc7cef9079e6c684e5d0b.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/ti_armv7_common.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 2c7d542..7db0881 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -219,8 +219,8 @@
 #endif
 
 /* RAW SD card / eMMC locations. */
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR	0x200	/* address 0x40000 */
-#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS	0x300	/* 384 KB */
+#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR	0x300 /* address 0x60000 */
+#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS	0x200 /* 256 KB */
 
 /* FAT sd card locations. */
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION	1
-- 
1.9.1

[U-Boot] [PATCH 2/2] Revert "omap3: Use raw SPL by default for mmc1"

[Tom Rini]

Unfortunately with this change we now are unable to do FS mode boots
from MMC1 as with the way the code works today we will always load and
assume that the hard-coded raw location contains U-Boot.  Further, we
cannot fix this by just changing other logic to try FS-then-RAW as it
would also make us have to ignore what order the ROM is telling us to
try.

This reverts commit 22d90d560a2b01c47f180e196e6c6485eb8e65db.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/cpu/armv7/omap-common/boot-common.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c
index ed9ba7b..0456263 100644
--- a/arch/arm/cpu/armv7/omap-common/boot-common.c
+++ b/arch/arm/cpu/armv7/omap-common/boot-common.c
@@ -111,6 +111,8 @@ void save_omap_boot_params(void)
 	    (boot_device <= MMC_BOOT_DEVICES_END)) {
 		switch (boot_device) {
 		case BOOT_DEVICE_MMC1:
+			boot_mode = MMCSD_MODE_FS;
+			break;
 		case BOOT_DEVICE_MMC2:
 			boot_mode = MMCSD_MODE_RAW;
 			break;
-- 
1.9.1

[U-Boot] [PATCH 2/2] Revert "omap3: Use raw SPL by default for mmc1"

[Tom Rini]

On Mon, May 02, 2016 at 12:16:26PM -0400, Tom Rini wrote:

> Unfortunately with this change we now are unable to do FS mode boots
> from MMC1 as with the way the code works today we will always load and
> assume that the hard-coded raw location contains U-Boot.  Further, we
> cannot fix this by just changing other logic to try FS-then-RAW as it
> would also make us have to ignore what order the ROM is telling us to
> try.
> 
> This reverts commit 22d90d560a2b01c47f180e196e6c6485eb8e65db.
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160502/06a43d82/attachment.sig>

[U-Boot] [PATCH 1/2] Revert "ti_armv7_common.h: Fix U-Boot location on eMMC"

[Tom Rini]

On Mon, May 02, 2016 at 12:16:25PM -0400, Tom Rini wrote:

> We cannot change the long standing hard-coded offset for raw boot mode
> for everyone to accommodate how Android expects things to be done here.
> 
> This reverts commit ef5ebe951bec72631cdbc7cef9079e6c684e5d0b.
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160502/ecc0b056/attachment.sig>