LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rockchip: Enable building a SPI ROM image on jerry 

Add a simple binman config and enable CONFIG_HAS_ROM so that U-Boot
produces a ROM for jerry.

Change the binman image definition to support multiple images, since it
may be used to build both u-boot-rockchip.bin and u-boot.rom

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-07-19 13:55:57 -06:00
parent 4183eee3f6
commit 9b312e26fc
4 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arch/arm/dts/rk3288-u-boot.dtsi
View File

@ -12,6 +12,30 @@
}; };
}; };
#ifdef CONFIG_ROCKCHIP_SPI_IMAGE
&binman {
rom {
filename = "u-boot.rom";
size = <0x400000>;
pad-byte = <0xff>;
mkimage {
args = "-n rk3288 -T rkspi";
u-boot-spl {
};
};
u-boot-img {
offset = <0x20000>;
};
u-boot {
offset = <0x300000>;
};
fdtmap {
};
};
};
#endif
&dmc { &dmc {
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
}; };

8
arch/arm/dts/rockchip-u-boot.dtsi
View File

@ -6,7 +6,13 @@
#include <config.h> #include <config.h>
/ { / {
binman { binman: binman {
multiple-images;
};
};
&binman {
simple-bin {
filename = "u-boot-rockchip.bin"; filename = "u-boot-rockchip.bin";
pad-byte = <0xff>; pad-byte = <0xff>;

9
arch/arm/mach-rockchip/Kconfig
View File

@ -367,6 +367,15 @@ config TPL_ROCKCHIP_EARLYRETURN_TO_BROM
config SPL_MMC_SUPPORT config SPL_MMC_SUPPORT
default y if !SPL_ROCKCHIP_BACK_TO_BROM default y if !SPL_ROCKCHIP_BACK_TO_BROM
config ROCKCHIP_SPI_IMAGE
bool "Build a SPI image for rockchip"
depends on HAS_ROM
help
Some Rockchip SoCs support booting from SPI flash. Enable this
option to produce a 4MB SPI-flash image (called u-boot.rom)
containing U-Boot. The image is built by binman. U-Boot sits near
the start of the image.
source "arch/arm/mach-rockchip/px30/Kconfig" source "arch/arm/mach-rockchip/px30/Kconfig"
source "arch/arm/mach-rockchip/rk3036/Kconfig" source "arch/arm/mach-rockchip/rk3036/Kconfig"
source "arch/arm/mach-rockchip/rk3128/Kconfig" source "arch/arm/mach-rockchip/rk3128/Kconfig"

2
arch/arm/mach-rockchip/rk3288/Kconfig
View File

@ -5,7 +5,9 @@ choice
config TARGET_CHROMEBOOK_JERRY config TARGET_CHROMEBOOK_JERRY
bool "Google/Rockchip Veyron-Jerry Chromebook" bool "Google/Rockchip Veyron-Jerry Chromebook"
select HAS_ROM
select BOARD_LATE_INIT select BOARD_LATE_INIT
select ROCKCHIP_SPI_IMAGE
help help
Jerry is a RK3288-based clamshell device with 2 USB 3.0 ports, Jerry is a RK3288-based clamshell device with 2 USB 3.0 ports,
HDMI, an 11.9 inch EDP display, micro-SD card, touchpad and HDMI, an 11.9 inch EDP display, micro-SD card, touchpad and