Merge git://git.denx.de/u-boot-rockchip

This commit is contained in:
Tom Rini 2017-11-10 08:19:01 -05:00
commit 60567a320f
2 changed files with 6 additions and 6 deletions

View file

@ -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 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 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: corresponds with this setting in U-Boot:
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x4000 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x4000
@ -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 && ./tools/mkimage -n rk3288 -T rksd -d ./tpl/u-boot-tpl.bin out &&
cat ./spl/u-boot-spl-dtb.bin >> out && cat ./spl/u-boot-spl-dtb.bin >> out &&
sudo dd if=out of=/dev/mmcblk0 seek=64 && 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 Booting from an SD card on RK3188
================================= =================================

View file

@ -31,10 +31,10 @@
#define CONFIG_SYS_SPL_ARGS_ADDR 0x0ffe5000 #define CONFIG_SYS_SPL_ARGS_ADDR 0x0ffe5000
#define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K) #define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K)
/* Falcon Mode - MMC support: args@1MB kernel@2MB */ /* Falcon Mode - MMC support: args@16MB kernel@17MB */
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */ #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_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512)
#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x1000 /* 2MB */ #define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x8800 /* 17MB */
#endif #endif
#endif #endif