Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge tag 'u-boot-rockchip-20200916' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip

Browse source 
- Fix rv1108 grf access issue
- make_fit_atf: ignore empty PT_LOAD segment
This commit is contained in:
Tom Rini 2020-09-16 08:07:49 -04:00
commit 0487bb5ecd
6 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/dts/rv1108-u-boot.dtsi
View file

@ -4,3 +4,7 @@
*/ */
#include "rockchip-u-boot.dtsi" #include "rockchip-u-boot.dtsi"
&grf {
u-boot,dm-pre-reloc;
};

5
arch/arm/mach-rockchip/make_fit_atf.py
View file

@ -189,8 +189,9 @@ def unpack_elf(filename):
p_type, p_flags, p_offset = struct.unpack_from('<LLQ', elf, offset) p_type, p_flags, p_offset = struct.unpack_from('<LLQ', elf, offset)
if p_type == 1: # PT_LOAD if p_type == 1: # PT_LOAD
p_paddr, p_filesz = struct.unpack_from('<2Q', elf, offset + 0x18) p_paddr, p_filesz = struct.unpack_from('<2Q', elf, offset + 0x18)
p_data = elf[p_offset:p_offset + p_filesz] if p_filesz > 0:
segments.append((index, e_entry, p_paddr, p_data)) p_data = elf[p_offset:p_offset + p_filesz]
segments.append((index, e_entry, p_paddr, p_data))
return segments return segments
def main(): def main():

2
board/elgin/elgin_rv1108/elgin_rv1108.c
View file

@ -15,7 +15,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
int mach_cpu_init(void) int board_early_init_f(void)
{ {
struct rv1108_grf *grf; struct rv1108_grf *grf;
enum { enum {

2
board/rockchip/evb_rv1108/evb_rv1108.c
View file

@ -14,7 +14,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
int mach_cpu_init(void) int board_early_init_f(void)
{ {
struct rv1108_grf *grf; struct rv1108_grf *grf;
enum { enum {

1
configs/elgin-rv1108_defconfig
View file

@ -15,6 +15,7 @@ CONFIG_DEFAULT_FDT_FILE="rv1108-elgin-r1.dtb"
CONFIG_BOARD_LATE_INIT=y CONFIG_BOARD_LATE_INIT=y
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO=y
CONFIG_RANDOM_UUID=y CONFIG_RANDOM_UUID=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y

1
configs/evb-rv1108_defconfig
View file

@ -11,6 +11,7 @@ CONFIG_DEBUG_UART=y
CONFIG_DEFAULT_FDT_FILE="rv1108-evb.dtb" CONFIG_DEFAULT_FDT_FILE="rv1108-evb.dtb"
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_RANDOM_UUID=y CONFIG_RANDOM_UUID=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set