Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-09-21 15:12:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
- Fix efuse read data number for rk3399
- make_fit_atf.py: fix .its generation for a single atf image
This commit is contained in:
Tom Rini 2019-09-30 07:20:35 -04:00
commit 2852482efd
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -82,7 +82,7 @@ def append_conf_section(file, cnt, dtname, segments):
file.write('\t\t\tdescription = "%s";\n' % dtname)
file.write('\t\t\tfirmware = "atf_1";\n')
file.write('\t\t\tloadables = "uboot"')
if segments != 0:
if segments > 1:
file.write(',')
for i in range(1, segments):
file.write('"atf_%d"' % (i + 1))
@ -90,7 +90,7 @@ def append_conf_section(file, cnt, dtname, segments):
file.write(',')
else:
file.write(';\n')
if segments == 0:
if segments <= 1:
file.write(';\n')
file.write('\t\t\tfdt = "fdt_1";\n')
file.write('\t\t};\n')

2
arch/arm/mach-rockchip/misc.c
View file

@ -70,7 +70,7 @@ int rockchip_cpuid_from_efuse(const u32 cpuid_offset,
}
/* read the cpu_id range from the efuses */
ret = misc_read(dev, cpuid_offset, cpuid, sizeof(cpuid));
ret = misc_read(dev, cpuid_offset, cpuid, cpuid_length);
if (ret) {
debug("%s: reading cpuid from the efuses failed\n",
__func__);