From 341e44ed667a1ac959fac0830e5f6e2e2b409f9a Mon Sep 17 00:00:00 2001 From: Goldschmidt Simon Date: Fri, 10 Nov 2017 11:38:32 +0000 Subject: [PATCH 1/3] rockchip: doc: update U-Boot location info The U-Boot location has been moved to block 16384. This is 8MB, not 4MB. Signed-off-by: Simon Goldschmidt Reviewed-by: Jagan Teki Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- doc/README.rockchip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README.rockchip b/doc/README.rockchip index 9d5af3d53d..a7761af3e8 100644 --- a/doc/README.rockchip +++ b/doc/README.rockchip @@ -102,7 +102,7 @@ To write an image that boots from an SD card (assumed to be /dev/sdc): sudo dd if=firefly-rk3288/u-boot-dtb.img of=/dev/sdc seek=16384 This puts the Rockchip header and SPL image first and then places the U-Boot -image at block 16384 (i.e. 4MB from the start of the SD card). This +image at block 16384 (i.e. 8MB from the start of the SD card). This corresponds with this setting in U-Boot: #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x4000 From d80599e8946f52c10b1069054ff30ade97c79091 Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Fri, 10 Nov 2017 17:18:43 +0530 Subject: [PATCH 2/3] rockchip: doc: Fix U-Boot proper location for falcon This patch fixed U-Boot proper location has been missed to update in bewlo commit "rockchip: doc: update U-Boot location info" (sha1: 73e6dbe855f357a8330cfd53ff3033303611c1ad) Signed-off-by: Jagan Teki Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- doc/README.rockchip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README.rockchip b/doc/README.rockchip index a7761af3e8..da99f301ff 100644 --- a/doc/README.rockchip +++ b/doc/README.rockchip @@ -166,7 +166,7 @@ To write an image that boots from an SD card (assumed to be /dev/mmcblk0): ./tools/mkimage -n rk3288 -T rksd -d ./tpl/u-boot-tpl.bin out && cat ./spl/u-boot-spl-dtb.bin >> out && sudo dd if=out of=/dev/mmcblk0 seek=64 && - sudo dd if=u-boot-dtb.img of=/dev/mmcblk0 seek=256 + sudo dd if=u-boot-dtb.img of=/dev/mmcblk0 seek=16384 Booting from an SD card on RK3188 ================================= From 36b6e0cc3ca9deea0ea02c10e44bda8979c94637 Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Fri, 10 Nov 2017 17:18:44 +0530 Subject: [PATCH 3/3] rockchip: configs: vyasa: Update falcon offsets Update the falcon offsets for args to 16MB and kernel to 17MB Since the below commit updated U-Boot proper location along with rockchip boot image offsets "spl: set SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR to 0x4000 for rockchip" (sha1: 8f4d62b403db45dfa8b1cadb9da9096c79b7df47) Signed-off-by: Jagan Teki Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- include/configs/vyasa-rk3288.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/configs/vyasa-rk3288.h b/include/configs/vyasa-rk3288.h index 8774e42430..c8c7fc7f3e 100644 --- a/include/configs/vyasa-rk3288.h +++ b/include/configs/vyasa-rk3288.h @@ -31,10 +31,10 @@ #define CONFIG_SYS_SPL_ARGS_ADDR 0x0ffe5000 #define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K) -/* Falcon Mode - MMC support: args@1MB kernel@2MB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512) -#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x1000 /* 2MB */ +/* Falcon Mode - MMC support: args@16MB kernel@17MB */ +#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x8000 /* 16MB */ +#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512) +#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x8800 /* 17MB */ #endif #endif