mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-24 22:36:05 +00:00
Merge tag 'rpi-2025.04-rc4' of https://source.denx.de/u-boot/custodians/u-boot-raspberrypi
Updates for RPi for 2025.04: - Copy Bluetooth device address in DT - Keep warnings from firmware in DT, if any - Only add frame buffer node if CONFIG_FDT_SIMPLEFB is set - Add identifiers for the new RPi 5 series
This commit is contained in:
commit
8c8b066d34
1 changed files with 28 additions and 5 deletions
|
@ -193,6 +193,21 @@ static const struct rpi_model rpi_models_new_scheme[] = {
|
||||||
DTB_DIR "bcm2712-rpi-5-b.dtb",
|
DTB_DIR "bcm2712-rpi-5-b.dtb",
|
||||||
true,
|
true,
|
||||||
},
|
},
|
||||||
|
[0x18] = {
|
||||||
|
"Compute Module 5",
|
||||||
|
DTB_DIR "bcm2712-rpi-cm5-cm5io.dtb",
|
||||||
|
true,
|
||||||
|
},
|
||||||
|
[0x19] = {
|
||||||
|
"500",
|
||||||
|
DTB_DIR "bcm2712-rpi-500.dtb",
|
||||||
|
true,
|
||||||
|
},
|
||||||
|
[0x1A] = {
|
||||||
|
"Compute Module 5 Lite",
|
||||||
|
DTB_DIR "bcm2712-rpi-cm5l-cm5io.dtb",
|
||||||
|
true,
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct rpi_model rpi_models_old_scheme[] = {
|
static const struct rpi_model rpi_models_old_scheme[] = {
|
||||||
|
@ -579,8 +594,14 @@ void update_fdt_from_fw(void *fdt, void *fw_fdt)
|
||||||
/* kernel address randomisation seed as provided by the firmware */
|
/* kernel address randomisation seed as provided by the firmware */
|
||||||
copy_property(fdt, fw_fdt, "/chosen", "kaslr-seed");
|
copy_property(fdt, fw_fdt, "/chosen", "kaslr-seed");
|
||||||
|
|
||||||
|
/* warnings from the firmware (if any) */
|
||||||
|
copy_property(fdt, fw_fdt, "/chosen", "user-warnings");
|
||||||
|
|
||||||
/* address of the PHY device as provided by the firmware */
|
/* address of the PHY device as provided by the firmware */
|
||||||
copy_property(fdt, fw_fdt, "ethernet0/mdio@e14/ethernet-phy@1", "reg");
|
copy_property(fdt, fw_fdt, "ethernet0/mdio@e14/ethernet-phy@1", "reg");
|
||||||
|
|
||||||
|
/* Bluetooth device address as provided by the firmware */
|
||||||
|
copy_property(fdt, fw_fdt, "/soc/serial@7e201000/bluetooth", "local-bd-address");
|
||||||
}
|
}
|
||||||
|
|
||||||
int ft_board_setup(void *blob, struct bd_info *bd)
|
int ft_board_setup(void *blob, struct bd_info *bd)
|
||||||
|
@ -589,11 +610,13 @@ int ft_board_setup(void *blob, struct bd_info *bd)
|
||||||
|
|
||||||
update_fdt_from_fw(blob, (void *)fw_dtb_pointer);
|
update_fdt_from_fw(blob, (void *)fw_dtb_pointer);
|
||||||
|
|
||||||
node = fdt_node_offset_by_compatible(blob, -1, "simple-framebuffer");
|
if (CONFIG_IS_ENABLED(FDT_SIMPLEFB)) {
|
||||||
if (node < 0)
|
node = fdt_node_offset_by_compatible(blob, -1, "simple-framebuffer");
|
||||||
fdt_simplefb_add_node(blob);
|
if (node < 0)
|
||||||
else
|
fdt_simplefb_add_node(blob);
|
||||||
fdt_simplefb_enable_and_mem_rsv(blob);
|
else
|
||||||
|
fdt_simplefb_enable_and_mem_rsv(blob);
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_EFI_LOADER
|
#ifdef CONFIG_EFI_LOADER
|
||||||
/* Reserve the spin table */
|
/* Reserve the spin table */
|
||||||
|
|
Loading…
Add table
Reference in a new issue