Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 13:43:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sh

Browse source
This commit is contained in:
Tom Rini 2023-08-20 11:09:11 -04:00
commit 17aad80355
3 changed files with 34 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
arch/arm/mach-rmobile/Makefile
View file

@ -25,6 +25,13 @@ cmd_objcopy = $(OBJCOPY) --gap-fill=0x00 $(OBJCOPYFLAGS) \
spl/u-boot-spl.srec: spl/u-boot-spl FORCE spl/u-boot-spl.srec: spl/u-boot-spl FORCE
$(call if_changed,objcopy) $(call if_changed,objcopy)
srec_cat_gte_160 := ${shell expr `srec_cat -VERSION | grep ^srec_cat | sed 's/^.* //g' | cut -f1-2 -d.` \>= "1.60"}
ifeq "$(srec_cat_gte_160)" "1"
srec_cat_le_cmd := "-constant-l-e"
else
srec_cat_le_cmd := "-l-e-constant"
endif
ifneq ($(CONFIG_R8A774C0)$(CONFIG_R8A77990)$(CONFIG_R8A77995),) ifneq ($(CONFIG_R8A774C0)$(CONFIG_R8A77990)$(CONFIG_R8A77995),)
# #
# The first 6 generate statements generate the R-Car Gen3 SCIF loader header. # The first 6 generate statements generate the R-Car Gen3 SCIF loader header.
@ -52,34 +59,34 @@ quiet_cmd_srec_cat = SRECCAT $@
cmd_srec_cat = srec_cat -output $@ -M 8 $< -M 8 \ cmd_srec_cat = srec_cat -output $@ -M 8 $< -M 8 \
-offset -0x13fd0 \ -offset -0x13fd0 \
-Output_Block_Size 16 \ -Output_Block_Size 16 \
-generate 0xe6300400 0xe6300404 -l-e-constant 0x0 4 \ -generate 0xe6300400 0xe6300404 $(srec_cat_le_cmd) 0x0 4 \
-generate 0xe630048c 0xe6300490 -l-e-constant 0x0 4 \ -generate 0xe630048c 0xe6300490 $(srec_cat_le_cmd) 0x0 4 \
-generate 0xe63005d4 0xe63005d8 -l-e-constant 0xe6304000 4 \ -generate 0xe63005d4 0xe63005d8 $(srec_cat_le_cmd) 0xe6304000 4 \
-generate 0xe63006e4 0xe63006e8 -l-e-constant $2 4 \ -generate 0xe63006e4 0xe63006e8 $(srec_cat_le_cmd) $2 4 \
-generate 0xe6301154 0xe6301158 -l-e-constant 0xe6304000 4 \ -generate 0xe6301154 0xe6301158 $(srec_cat_le_cmd) 0xe6304000 4 \
-generate 0xe6301264 0xe6301268 -l-e-constant $2 4 \ -generate 0xe6301264 0xe6301268 $(srec_cat_le_cmd) $2 4 \
-generate 0xe6304000 0xe6304004 -l-e-constant 0xd2bcc000 4 \ -generate 0xe6304000 0xe6304004 $(srec_cat_le_cmd) 0xd2bcc000 4 \
-generate 0xe6304004 0xe6304008 -l-e-constant 0xb26c0400 4 \ -generate 0xe6304004 0xe6304008 $(srec_cat_le_cmd) 0xb26c0400 4 \
-generate 0xe6304008 0xe630400c -l-e-constant 0xb2720001 4 \ -generate 0xe6304008 0xe630400c $(srec_cat_le_cmd) 0xb2720001 4 \
-generate 0xe630400c 0xe6304010 -l-e-constant 0xb27c0421 4 \ -generate 0xe630400c 0xe6304010 $(srec_cat_le_cmd) 0xb27c0421 4 \
-generate 0xe6304010 0xe6304014 -l-e-constant 0xb2710402 4 \ -generate 0xe6304010 0xe6304014 $(srec_cat_le_cmd) 0xb2710402 4 \
-generate 0xe6304014 0xe6304018 -l-e-constant 0xaa0203e0 4 \ -generate 0xe6304014 0xe6304018 $(srec_cat_le_cmd) 0xaa0203e0 4 \
-generate 0xe6304018 0xe630401c -l-e-constant 0xd28e0003 4 \ -generate 0xe6304018 0xe630401c $(srec_cat_le_cmd) 0xd28e0003 4 \
-generate 0xe630401c 0xe6304020 -l-e-constant 0xa8c11424 4 \ -generate 0xe630401c 0xe6304020 $(srec_cat_le_cmd) 0xa8c11424 4 \
-generate 0xe6304020 0xe6304024 -l-e-constant 0xa8811444 4 \ -generate 0xe6304020 0xe6304024 $(srec_cat_le_cmd) 0xa8811444 4 \
-generate 0xe6304024 0xe6304028 -l-e-constant 0xf1004063 4 \ -generate 0xe6304024 0xe6304028 $(srec_cat_le_cmd) 0xf1004063 4 \
-generate 0xe6304028 0xe630402c -l-e-constant 0x54ffffaa 4 \ -generate 0xe6304028 0xe630402c $(srec_cat_le_cmd) 0x54ffffaa 4 \
-generate 0xe630402c 0xe6304030 -l-e-constant 0xd61f0000 4 -generate 0xe630402c 0xe6304030 $(srec_cat_le_cmd) 0xd61f0000 4
else else
quiet_cmd_srec_cat = SRECCAT $@ quiet_cmd_srec_cat = SRECCAT $@
cmd_srec_cat = srec_cat -output $@ -M 8 $< -M 8 \ cmd_srec_cat = srec_cat -output $@ -M 8 $< -M 8 \
-Output_Block_Size 16 \ -Output_Block_Size 16 \
-generate 0xe6300400 0xe6300404 -l-e-constant 0x0 4 \ -generate 0xe6300400 0xe6300404 $(srec_cat_le_cmd) 0x0 4 \
-generate 0xe630048c 0xe6300490 -l-e-constant 0x0 4 \ -generate 0xe630048c 0xe6300490 $(srec_cat_le_cmd) 0x0 4 \
-generate 0xe63005d4 0xe63005d8 -l-e-constant $(CONFIG_SPL_TEXT_BASE) 4 \ -generate 0xe63005d4 0xe63005d8 $(srec_cat_le_cmd) $(CONFIG_SPL_TEXT_BASE) 4 \
-generate 0xe63006e4 0xe63006e8 -l-e-constant $2 4 \ -generate 0xe63006e4 0xe63006e8 $(srec_cat_le_cmd) $2 4 \
-generate 0xe6301154 0xe6301158 -l-e-constant $(CONFIG_SPL_TEXT_BASE) 4 \ -generate 0xe6301154 0xe6301158 $(srec_cat_le_cmd) $(CONFIG_SPL_TEXT_BASE) 4 \
-generate 0xe6301264 0xe6301268 -l-e-constant $2 4 -generate 0xe6301264 0xe6301268 $(srec_cat_le_cmd) $2 4
endif endif
spl/u-boot-spl.scif: spl/u-boot-spl.srec spl/u-boot-spl.bin spl/u-boot-spl.scif: spl/u-boot-spl.srec spl/u-boot-spl.bin

2
arch/arm/mach-rmobile/cpu_info.c
View file

@ -86,7 +86,7 @@ static int rmobile_cpuinfo_idx(void)
int i = 0; int i = 0;
u32 cpu_type = rmobile_get_cpu_type(); u32 cpu_type = rmobile_get_cpu_type();
for (; i < ARRAY_SIZE(rmobile_cpuinfo); i++) for (; i < ARRAY_SIZE(rmobile_cpuinfo) - 1; i++)
if (rmobile_cpuinfo[i].cpu_type == cpu_type) if (rmobile_cpuinfo[i].cpu_type == cpu_type)
break; break;

2
drivers/clk/renesas/clk-rcar-gen3.c
View file

@ -526,6 +526,7 @@ U_BOOT_DRIVER(clk_gen3) = {
.ops = &gen3_clk_ops, .ops = &gen3_clk_ops,
.probe = gen3_clk_probe, .probe = gen3_clk_probe,
.remove = gen3_clk_remove, .remove = gen3_clk_remove,
.flags = DM_FLAG_OS_PREPARE | DM_FLAG_VITAL,
}; };
static int gen3_reset_assert(struct reset_ctl *reset_ctl) static int gen3_reset_assert(struct reset_ctl *reset_ctl)
@ -565,6 +566,7 @@ U_BOOT_DRIVER(rst_gen3) = {
.name = "rst_gen3", .name = "rst_gen3",
.id = UCLASS_RESET, .id = UCLASS_RESET,
.ops = &rst_gen3_ops, .ops = &rst_gen3_ops,
.flags = DM_FLAG_OS_PREPARE | DM_FLAG_VITAL,
}; };
int gen3_cpg_bind(struct udevice *parent) int gen3_cpg_bind(struct udevice *parent)