GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-31 03:21:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Rini 2016-01-08 14:19:24 -05:00
commit d77a092dd3
5 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configs/chromebook_jerry_defconfig
View file

@ -27,7 +27,9 @@ CONFIG_RESET=y
CONFIG_DM_MMC=y CONFIG_DM_MMC=y
CONFIG_ROCKCHIP_DWMMC=y CONFIG_ROCKCHIP_DWMMC=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
# CONFIG_PINCTRL_FULL is not set
CONFIG_SPL_PINCTRL=y CONFIG_SPL_PINCTRL=y
# CONFIG_SPL_PINCTRL_FULL is not set
CONFIG_ROCKCHIP_PINCTRL=y CONFIG_ROCKCHIP_PINCTRL=y
CONFIG_DM_PMIC=y CONFIG_DM_PMIC=y
CONFIG_PMIC_ACT8846=y CONFIG_PMIC_ACT8846=y
@ -41,5 +43,7 @@ CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_USE_PRIVATE_LIBGCC=y
CONFIG_USE_TINY_PRINTF=y
CONFIG_CMD_DHRYSTONE=y CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y CONFIG_ERRNO_STR=y
CONFIG_ROCKCHIP_SPI=y

7
doc/README.rockchip
View file

@ -135,9 +135,10 @@ Booting from SPI
To write an image that boots from SPI flash (e.g. for the Haier Chromebook): To write an image that boots from SPI flash (e.g. for the Haier Chromebook):
./chromebook_jerry/tools/mkimage -n rk3036 -T rkspi -d chromebook_jerry/spl/u-boot-spl-dtb.bin out ./chromebook_jerry/tools/mkimage -n rk3288 -T rkspi \
dd if=spl.bin of=out.bin bs=128K conv=sync -d chromebook_jerry/spl/u-boot-spl-dtb.bin spl.bin && \
cat chromebook_jerry/u-boot-dtb.img out.bin dd if=spl.bin of=spl-out.bin bs=128K conv=sync && \
cat spl-out.bin chromebook_jerry/u-boot-dtb.img >out.bin && \
dd if=out.bin of=out.bin.pad bs=4M conv=sync dd if=out.bin of=out.bin.pad bs=4M conv=sync
This converts the SPL image to the required SPI format by adding the Rockchip This converts the SPL image to the required SPI format by adding the Rockchip

1
include/configs/chromebook_jerry.h
View file

@ -13,5 +13,6 @@
#define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_SUPPORT
#define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT
#define CONFIG_SPL_SPI_LOAD #define CONFIG_SPL_SPI_LOAD
#define CONFIG_SPI_FLASH_GIGADEVICE
#endif #endif

2
tools/Makefile
View file

@ -64,7 +64,7 @@ RSA_OBJS-$(CONFIG_FIT_SIGNATURE) := $(addprefix lib/rsa/, \
rsa-sign.o rsa-verify.o rsa-checksum.o \ rsa-sign.o rsa-verify.o rsa-checksum.o \
rsa-mod-exp.o) rsa-mod-exp.o)
ROCKCHIP_OBS = lib/rc4.o rkcommon.o rkimage.o rksd.o ROCKCHIP_OBS = lib/rc4.o rkcommon.o rkimage.o rksd.o rkspi.o
# common objs for dumpimage and mkimage # common objs for dumpimage and mkimage
dumpimage-mkimage-objs := aisimage.o \ dumpimage-mkimage-objs := aisimage.o \

2
tools/rkspi.c
View file

@ -54,7 +54,7 @@ static void rkspi_set_header(void *buf, struct stat *sbuf, int ifd,
* boot ROM. Its rationale is unknown. * boot ROM. Its rationale is unknown.
*/ */
for (sector = size / RKSPI_SECT_LEN - 1; sector >= 0; sector--) { for (sector = size / RKSPI_SECT_LEN - 1; sector >= 0; sector--) {
printf("sector %u\n", sector); debug("sector %u\n", sector);
memmove(buf + sector * RKSPI_SECT_LEN * 2, memmove(buf + sector * RKSPI_SECT_LEN * 2,
buf + sector * RKSPI_SECT_LEN, buf + sector * RKSPI_SECT_LEN,
RKSPI_SECT_LEN); RKSPI_SECT_LEN);