Message ID | 1461143159-3500-1-git-send-email-semen.protsenko@linaro.org |
---|---|
State | Accepted |
Commit | ef5ebe951bec72631cdbc7cef9079e6c684e5d0b |
Delegated to: | Tom Rini |
Headers | show |
On Wed, Apr 20, 2016 at 12:05:59PM +0300, Sam Protsenko wrote: > According to common eMMC partition table for Android boot (see > PARTS_DEFAULT definition in include/configs/dra7xx_evm.h), "bootloader" > partition (where u-boot.img is stored) starts at 256 KiB. Which is equal > to 512 sectors (as 1 MMC sector size is 512 bytes). > > This patch fixes CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR constant so that > it points to correct address of "bootloader" partition and SPL is able to > read, parse and run u-boot.img correctly. > > This change was originally done as part of patch [1] in omapzoom u-boot. > Without this patch, SPL fails to parse U-Boot header with next error: > > mkimage signature not found - ih_magic = 4814325a > > While at it, also fix U-Boot partition size, which is 384 KiB (as stated in > include/configs/dra7xx_evm.h). > > [1] http://omapzoom.org/?p=repo/u-boot.git;a=commit;h=742b82d0c0aa0ed8096c2225a00e9f350212efa9 > > Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> Reviewed-by: Tom Rini <trini@konsulko.com>
On Wed, Apr 20, 2016 at 12:05:59PM +0300, Semen Protsenko wrote: > According to common eMMC partition table for Android boot (see > PARTS_DEFAULT definition in include/configs/dra7xx_evm.h), "bootloader" > partition (where u-boot.img is stored) starts at 256 KiB. Which is equal > to 512 sectors (as 1 MMC sector size is 512 bytes). > > This patch fixes CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR constant so that > it points to correct address of "bootloader" partition and SPL is able to > read, parse and run u-boot.img correctly. > > This change was originally done as part of patch [1] in omapzoom u-boot. > Without this patch, SPL fails to parse U-Boot header with next error: > > mkimage signature not found - ih_magic = 4814325a > > While at it, also fix U-Boot partition size, which is 384 KiB (as stated in > include/configs/dra7xx_evm.h). > > [1] http://omapzoom.org/?p=repo/u-boot.git;a=commit;h=742b82d0c0aa0ed8096c2225a00e9f350212efa9 > > Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> > Reviewed-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 787d04a..0725d79 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -229,8 +229,8 @@ #endif /* RAW SD card / eMMC locations. */ -#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */ -#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */ +#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200 /* address 0x40000 */ +#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x300 /* 384 KB */ /* FAT sd card locations. */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
According to common eMMC partition table for Android boot (see PARTS_DEFAULT definition in include/configs/dra7xx_evm.h), "bootloader" partition (where u-boot.img is stored) starts at 256 KiB. Which is equal to 512 sectors (as 1 MMC sector size is 512 bytes). This patch fixes CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR constant so that it points to correct address of "bootloader" partition and SPL is able to read, parse and run u-boot.img correctly. This change was originally done as part of patch [1] in omapzoom u-boot. Without this patch, SPL fails to parse U-Boot header with next error: mkimage signature not found - ih_magic = 4814325a While at it, also fix U-Boot partition size, which is 384 KiB (as stated in include/configs/dra7xx_evm.h). [1] http://omapzoom.org/?p=repo/u-boot.git;a=commit;h=742b82d0c0aa0ed8096c2225a00e9f350212efa9 Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> --- Changes for v2: - adjust also partition size to be 384 KiB Changes for v3: - keep U_BOOT_SECTOR value in hex for consistency include/configs/ti_armv7_common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)