September 2023 - U-Boot

[PATCH] spl: Jump to image at end of board_init_r
by Jonas Karlman 10 Oct '23

10 Oct '23

spl_board_prepare_for_boot() is not called before jumping/invoking atf, optee, opensbi or linux images. Jump to image at the end of board_init_r() to fix this. Signed-off-by: Jonas Karlman <jonas(a)kwiboo.se> --- This patch have dependencies on the following patches: spl: add __noreturn attribute to spl_invoke_opensbi function https://patchwork.ozlabs.org/patch/1827057/ spl: add __noreturn attribute to spl_invoke_atf function https://patchwork.ozlabs.org/patch/1831366/ spl: Drop the switch() statement for OS selection from the "spl: Preparation for Universal Payload" series https://patchwork.ozlabs.org/patch/1839731/ --- common/spl/spl.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index f7608f14e365..79c39820262a 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -647,6 +647,8 @@ void board_init_r(gd_t *dummy1, ulong dummy2) BOOT_DEVICE_NONE, BOOT_DEVICE_NONE, }; + typedef void __noreturn (*jump_to_image_t)(struct spl_image_info *); + jump_to_image_t jump_to_image = &jump_to_image_no_args; struct spl_image_info spl_image; int ret, os; @@ -735,20 +737,20 @@ void board_init_r(gd_t *dummy1, ulong dummy2) } else if (CONFIG_IS_ENABLED(ATF) && os == IH_OS_ARM_TRUSTED_FIRMWARE) { debug("Jumping to U-Boot via ARM Trusted Firmware\n"); spl_fixup_fdt(spl_image_fdt_addr(&spl_image)); - spl_invoke_atf(&spl_image); + jump_to_image = &spl_invoke_atf; } else if (CONFIG_IS_ENABLED(OPTEE_IMAGE) && os == IH_OS_TEE) { debug("Jumping to U-Boot via OP-TEE\n"); spl_board_prepare_for_optee(spl_image_fdt_addr(&spl_image)); - jump_to_image_optee(&spl_image); + jump_to_image = &jump_to_image_optee; } else if (CONFIG_IS_ENABLED(OPENSBI) && os == IH_OS_OPENSBI) { debug("Jumping to U-Boot via RISC-V OpenSBI\n"); - spl_invoke_opensbi(&spl_image); + jump_to_image = &spl_invoke_opensbi; } else if (CONFIG_IS_ENABLED(OS_BOOT) && os == IH_OS_LINUX) { debug("Jumping to Linux\n"); if (IS_ENABLED(CONFIG_SPL_OS_BOOT)) spl_fixup_fdt((void *)SPL_PAYLOAD_ARGS_ADDR); spl_board_prepare_for_linux(); - jump_to_image_linux(&spl_image); + jump_to_image = &jump_to_image_linux; } else { debug("Unsupported OS image.. Jumping nevertheless..\n"); } @@ -788,7 +790,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) } spl_board_prepare_for_boot(); - jump_to_image_no_args(&spl_image); + jump_to_image(&spl_image); } /* -- 2.42.0

5 10

[PATCH] spl: add __noreturn attribute to spl_invoke_atf function
by Chanho Park 10 Oct '23

10 Oct '23

spl_invoke_atf function will not be returned to SPL. Thus, we need to set __noreturn function attribute to the function. Signed-off-by: Chanho Park <chanho61.park(a)samsung.com> --- common/spl/spl_atf.c | 8 ++++---- include/spl.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index 2c10252834f6..3bdd013a35fe 100644 --- a/common/spl/spl_atf.c +++ b/common/spl/spl_atf.c @@ -187,10 +187,10 @@ static inline void raw_write_daif(unsigned int daif) __asm__ __volatile__("msr DAIF, %x0\n\t" : : "r" (daif) : "memory"); } -typedef void (*atf_entry_t)(struct bl31_params *params, void *plat_params); +typedef void __noreturn (*atf_entry_t)(struct bl31_params *params, void *plat_params); -static void bl31_entry(uintptr_t bl31_entry, uintptr_t bl32_entry, - uintptr_t bl33_entry, uintptr_t fdt_addr) +static void __noreturn bl31_entry(uintptr_t bl31_entry, uintptr_t bl32_entry, + uintptr_t bl33_entry, uintptr_t fdt_addr) { atf_entry_t atf_entry = (atf_entry_t)bl31_entry; void *bl31_params; @@ -251,7 +251,7 @@ uintptr_t spl_fit_images_get_entry(void *blob, int node) return val; } -void spl_invoke_atf(struct spl_image_info *spl_image) +void __noreturn spl_invoke_atf(struct spl_image_info *spl_image) { uintptr_t bl32_entry = 0; uintptr_t bl33_entry = CONFIG_TEXT_BASE; diff --git a/include/spl.h b/include/spl.h index 93e906431e7d..01ed8f58afd8 100644 --- a/include/spl.h +++ b/include/spl.h @@ -770,7 +770,7 @@ int spl_ymodem_load_image(struct spl_image_info *spl_image, /** * spl_invoke_atf - boot using an ARM trusted firmware image */ -void spl_invoke_atf(struct spl_image_info *spl_image); +void __noreturn spl_invoke_atf(struct spl_image_info *spl_image); /** * bl2_plat_get_bl31_params() - return params for bl31. -- 2.39.2

2 1

[PATCH v3 00/38] spl: Preparation for Universal Payload
by Simon Glass 09 Oct '23

09 Oct '23

This series tidies up SPL a little and adds some core ofnode functions needed to support Universal Payload. It also includes a few minor fix-ups for sandbox. For SPL the changes include CONFIG naming, removing various #ifdefs and tidying up the FIT code. One notable piece of the ofnode improvements is support for flattening a livetree. This should be useful in future as we move FDT fixups to use the ofnode API. Changes in v3: - Mention testing on qemu-ppce500 - Add new patch to create a proper symbol for enabling the malloc() pool - Add new patch to enable CONFIG_SPL_SYS_MALLOC_F where needed - Add new patch to nable CONFIG_TPL_SYS_MALLOC_F where needed - Add new patch to use SYS_MALLOC_F instead of SYS_MALLOC_F_LEN - Add new patch to tidy up uses of CONFIG_SYS_MALLOC_F_LEN - Add new patch to clean up SYS_MALLOC_SIMPLE documentation - Add new patch to correct help in TPL_DM and VPL_DM - Rebase on the new patch Changes in v2: - Rename based on Tom's feedback - Improve readability by moving the size part to the header file - Explicitly copy two maintainers as it seems only Mario was auto-cc'd - Change the approach to use the header file - Use the same condition for both pieces to avoid possible problems - No changes as it still seems unclear what should be done Simon Glass (38): spl: Use CONFIG_SPL... instead of CONFIG_..._SPL_... spl: Rename SYS_SPL_ARGS_ADDR to SPL_PAYLOAD_ARGS_ADDR spl: Avoid #ifdef with CONFIG_SPL_SYS_MALLOC spl: mx6: powerpc: Drop the condition on timer_init() spl: Drop #ifdefs for BOARD_INIT and watchdog spl: Avoid #ifdef with CONFIG_SPL_PAYLOAD_ARGS_ADDR spl: Drop the switch() statement for OS selection spl: Create proper symbols for enabling the malloc() pool spl: Enable CONFIG_SPL_SYS_MALLOC_F where needed tpl: Enable CONFIG_TPL_SYS_MALLOC_F where needed spl: Use SYS_MALLOC_F instead of SYS_MALLOC_F_LEN Tidy up uses of CONFIG_SYS_MALLOC_F_LEN doc: Clean up SYS_MALLOC_SIMPLE dm: core: Correct help in TPL_DM and VPL_DM spl: Avoid an #ifdef when printing gd->malloc_ptr spl: Remove #ifdefs with BOOTSTAGE spl: Rename spl_load_fit_image() to load_simple_fit() spl: Move the full FIT code to spl_fit.c spl: Use the correct FIT_..._PROP constants spl: Move bloblist writing until the image is known dm: core: Reverse the argument order in ofnode_copy_props() dm: core: Ensure we run flattree tests on ofnode dm: core: Tidy up comments in the ofnode tests dm: core: Add a function to create an empty tree dm: core: Add a way to copy a node dm: core: Add a way to delete a node dm: core: Add a way to convert a devicetree to a dtb dm: core: Support writing a boolean dm: core: Support writing a 64-bit value dm: core: Add tests for oftree_path() sandbox: Move reading the RAM buffer into a better place sandbox: Init the EC properly even if no state file is available sandbox: Only read the state if we have a state file sandbox: Move the bloblist down a little in memory bloblist: Support initing from multiple places fdt: Allow the devicetree to come from a bloblist command: Include a required header in command.h pci: serial: Support reading PCI-register size with base Kconfig | 69 +++-- Makefile | 2 +- README | 18 -- arch/arm/cpu/armv7/ls102xa/fdt.c | 2 +- .../armv8/fsl-layerscape/doc/README.falcon | 2 +- arch/arm/lib/bdinfo.c | 2 +- arch/arm/mach-rockchip/rv1126/Kconfig | 3 + arch/arm/mach-snapdragon/Kconfig | 3 + arch/arm/mach-socfpga/Kconfig | 3 + arch/mips/cpu/start.S | 4 +- arch/mips/mach-mtmips/mt7621/spl/start.S | 4 +- arch/powerpc/cpu/mpc83xx/start.S | 2 +- arch/powerpc/cpu/mpc85xx/start.S | 4 +- arch/sandbox/cpu/start.c | 29 +- arch/sandbox/cpu/state.c | 2 + arch/sandbox/dts/test.dts | 6 +- arch/sh/lib/start.S | 4 +- boot/vbe_request.c | 2 +- boot/vbe_simple_os.c | 2 +- common/Kconfig | 2 +- common/Makefile | 6 +- common/bloblist.c | 15 +- common/board_f.c | 6 +- common/board_r.c | 2 +- common/dlmalloc.c | 12 +- common/init/board_init.c | 4 +- common/spl/Kconfig | 16 +- common/spl/Kconfig.nxp | 2 +- common/spl/spl.c | 226 ++++----------- common/spl/spl_ext.c | 4 +- common/spl/spl_fat.c | 4 +- common/spl/spl_fit.c | 127 +++++++-- common/spl/spl_mmc.c | 2 +- common/spl/spl_nand.c | 10 +- common/spl/spl_nor.c | 8 +- common/spl/spl_spi.c | 2 +- common/spl/spl_ubi.c | 2 +- common/spl/spl_xip.c | 2 +- configs/am335x_baltos_defconfig | 4 +- configs/am335x_boneblack_vboot_defconfig | 4 +- configs/am335x_evm_defconfig | 4 +- configs/am335x_evm_spiboot_defconfig | 4 +- configs/am335x_guardian_defconfig | 4 +- configs/am335x_hs_evm_defconfig | 4 +- configs/am335x_hs_evm_uart_defconfig | 4 +- configs/am335x_igep003x_defconfig | 4 +- configs/am335x_pdu001_defconfig | 4 +- configs/am335x_shc_defconfig | 4 +- configs/am335x_shc_ict_defconfig | 4 +- configs/am335x_shc_netboot_defconfig | 4 +- configs/am335x_shc_sdboot_defconfig | 4 +- configs/am335x_sl50_defconfig | 4 +- configs/am3517_evm_defconfig | 6 +- configs/am43xx_evm_defconfig | 4 +- configs/am43xx_evm_rtconly_defconfig | 4 +- configs/am43xx_evm_usbhost_boot_defconfig | 4 +- configs/am43xx_hs_evm_defconfig | 4 +- configs/am57xx_evm_defconfig | 4 +- configs/am57xx_hs_evm_defconfig | 4 +- configs/am57xx_hs_evm_usb_defconfig | 4 +- configs/am62ax_evm_r5_defconfig | 6 +- configs/am62x_evm_r5_defconfig | 8 +- configs/am64x_evm_a53_defconfig | 4 +- configs/am64x_evm_r5_defconfig | 8 +- configs/am65x_evm_a53_defconfig | 4 +- configs/am65x_evm_r5_defconfig | 8 +- configs/am65x_evm_r5_usbdfu_defconfig | 8 +- configs/am65x_evm_r5_usbmsc_defconfig | 8 +- configs/am65x_hs_evm_a53_defconfig | 4 +- configs/am65x_hs_evm_r5_defconfig | 8 +- configs/apalis-tk1_defconfig | 8 +- configs/apalis_imx6_defconfig | 2 +- configs/apalis_t30_defconfig | 8 +- configs/axm_defconfig | 8 +- configs/beaver_defconfig | 8 +- configs/bitmain_antminer_s9_defconfig | 4 +- configs/brppt1_mmc_defconfig | 4 +- configs/brppt2_defconfig | 2 +- configs/brsmarc1_defconfig | 4 +- configs/brxre1_defconfig | 4 +- configs/cardhu_defconfig | 8 +- configs/cei-tk1-som_defconfig | 8 +- configs/cgtqmx8_defconfig | 8 +- configs/chiliboard_defconfig | 4 +- configs/cl-som-imx7_defconfig | 2 +- configs/cm_fx6_defconfig | 2 +- configs/cm_t43_defconfig | 4 +- configs/colibri_imx6_defconfig | 2 +- configs/colibri_t20_defconfig | 8 +- configs/colibri_t30_defconfig | 8 +- configs/da850evm_defconfig | 8 +- configs/da850evm_nand_defconfig | 8 +- configs/dalmore_defconfig | 8 +- configs/deneb_defconfig | 8 +- configs/devkit8000_defconfig | 8 +- configs/dh_imx6_defconfig | 2 +- configs/display5_defconfig | 4 +- configs/display5_factory_defconfig | 4 +- configs/dra7xx_evm_defconfig | 4 +- configs/dra7xx_hs_evm_defconfig | 4 +- configs/dra7xx_hs_evm_usb_defconfig | 4 +- configs/draco_defconfig | 6 +- configs/endeavoru_defconfig | 8 +- configs/etamin_defconfig | 6 +- .../gardena-smart-gateway-at91sam_defconfig | 4 +- configs/ge_b1x5v2_defconfig | 2 +- configs/giedi_defconfig | 8 +- configs/grouper_common_defconfig | 8 +- configs/gwventana_emmc_defconfig | 4 +- configs/gwventana_nand_defconfig | 4 +- configs/harmony_defconfig | 8 +- configs/igep00x0_defconfig | 6 +- configs/imx28_xea_defconfig | 2 +- configs/imx6dl_icore_nand_defconfig | 2 +- configs/imx6dl_mamoj_defconfig | 4 +- configs/imx6q_bosch_acc_defconfig | 2 +- configs/imx6q_icore_nand_defconfig | 2 +- configs/imx6q_logic_defconfig | 4 +- configs/imx6qdl_icore_mipi_defconfig | 4 +- configs/imx6qdl_icore_mmc_defconfig | 4 +- configs/imx6qdl_icore_nand_defconfig | 2 +- configs/imx6qdl_icore_rqs_defconfig | 4 +- configs/imx6ul_geam_mmc_defconfig | 2 +- configs/imx6ul_geam_nand_defconfig | 2 +- configs/imx6ul_isiot_emmc_defconfig | 2 +- configs/imx6ul_isiot_nand_defconfig | 2 +- configs/imx6ulz_smm_m2_defconfig | 2 +- configs/imx7_cm_defconfig | 2 +- configs/imx8mm-cl-iot-gate-optee_defconfig | 8 +- configs/imx8mm-cl-iot-gate_defconfig | 8 +- configs/imx8mm-icore-mx8mm-ctouch2_defconfig | 8 +- configs/imx8mm-icore-mx8mm-edimm2.2_defconfig | 8 +- configs/imx8mm-mx8menlo_defconfig | 8 +- configs/imx8mm_beacon_defconfig | 8 +- configs/imx8mm_beacon_fspi_defconfig | 8 +- configs/imx8mm_data_modul_edm_sbc_defconfig | 8 +- configs/imx8mm_evk_defconfig | 8 +- configs/imx8mm_evk_fspi_defconfig | 8 +- configs/imx8mm_phg_defconfig | 8 +- configs/imx8mm_venice_defconfig | 6 +- configs/imx8mn_beacon_2g_defconfig | 8 +- configs/imx8mn_beacon_defconfig | 8 +- configs/imx8mn_beacon_fspi_defconfig | 8 +- configs/imx8mn_bsh_smm_s2_defconfig | 8 +- configs/imx8mn_bsh_smm_s2pro_defconfig | 8 +- configs/imx8mn_ddr4_evk_defconfig | 8 +- configs/imx8mn_evk_defconfig | 8 +- configs/imx8mn_var_som_defconfig | 8 +- configs/imx8mn_venice_defconfig | 8 +- configs/imx8mp-icore-mx8mp-edimm2.2_defconfig | 8 +- configs/imx8mp_beacon_defconfig | 8 +- configs/imx8mp_data_modul_edm_sbc_defconfig | 8 +- configs/imx8mp_dhcom_pdk2_defconfig | 8 +- configs/imx8mp_dhcom_pdk3_defconfig | 8 +- configs/imx8mp_evk_defconfig | 8 +- configs/imx8mp_rsb3720a1_4G_defconfig | 8 +- configs/imx8mp_rsb3720a1_6G_defconfig | 8 +- configs/imx8mp_venice_defconfig | 8 +- configs/imx8mq_cm_defconfig | 8 +- configs/imx8mq_evk_defconfig | 8 +- configs/imx8mq_phanbell_defconfig | 8 +- configs/imx8mq_reform2_defconfig | 8 +- configs/imx8qm_mek_defconfig | 8 +- configs/imx8qxp_mek_defconfig | 8 +- configs/imx8ulp_evk_defconfig | 8 +- configs/imx93_11x11_evk_defconfig | 8 +- configs/imx93_11x11_evk_ld_defconfig | 8 +- configs/iot2050_defconfig | 4 +- configs/j7200_evm_a72_defconfig | 4 +- configs/j7200_evm_r5_defconfig | 8 +- configs/j721e_evm_a72_defconfig | 4 +- configs/j721e_evm_r5_defconfig | 8 +- configs/j721s2_evm_a72_defconfig | 4 +- configs/j721s2_evm_r5_defconfig | 8 +- configs/jetson-tk1_defconfig | 8 +- configs/k2e_evm_defconfig | 4 +- configs/k2g_evm_defconfig | 4 +- configs/k2hk_evm_defconfig | 4 +- configs/k2l_evm_defconfig | 4 +- configs/kontron-sl-mx6ul_defconfig | 2 +- configs/kontron-sl-mx8mm_defconfig | 8 +- configs/kontron_pitx_imx8m_defconfig | 8 +- configs/kontron_sl28_defconfig | 2 +- configs/kp_imx6q_tpc_defconfig | 2 +- configs/librem5_defconfig | 8 +- configs/liteboard_defconfig | 2 +- configs/ls1021aiot_sdcard_defconfig | 6 +- configs/ls1021aqds_nand_defconfig | 6 +- configs/ls1021aqds_sdcard_ifc_defconfig | 6 +- configs/ls1021aqds_sdcard_qspi_defconfig | 6 +- configs/ls1021atsn_sdcard_defconfig | 6 +- ...s1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 6 +- configs/ls1021atwr_sdcard_ifc_defconfig | 6 +- configs/ls1021atwr_sdcard_qspi_defconfig | 6 +- configs/ls1043aqds_nand_defconfig | 6 +- configs/ls1043aqds_sdcard_ifc_defconfig | 2 +- configs/ls1043aqds_sdcard_qspi_defconfig | 2 +- configs/ls1043ardb_nand_SECURE_BOOT_defconfig | 6 +- configs/ls1043ardb_nand_defconfig | 6 +- .../ls1043ardb_sdcard_SECURE_BOOT_defconfig | 2 +- configs/ls1043ardb_sdcard_defconfig | 2 +- configs/ls1046aqds_nand_defconfig | 2 +- configs/ls1046aqds_sdcard_ifc_defconfig | 2 +- configs/ls1046aqds_sdcard_qspi_defconfig | 2 +- configs/ls1046ardb_emmc_defconfig | 2 +- configs/ls1046ardb_qspi_spl_defconfig | 4 +- .../ls1046ardb_sdcard_SECURE_BOOT_defconfig | 2 +- configs/ls1046ardb_sdcard_defconfig | 2 +- configs/ls1088aqds_sdcard_ifc_defconfig | 2 +- configs/ls1088aqds_sdcard_qspi_defconfig | 2 +- ...1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 2 +- configs/ls1088ardb_sdcard_qspi_defconfig | 2 +- configs/ls2080aqds_nand_defconfig | 2 +- configs/ls2080aqds_sdcard_defconfig | 2 +- configs/ls2080ardb_nand_defconfig | 2 +- configs/mccmon6_nor_defconfig | 4 +- configs/mccmon6_sd_defconfig | 2 +- configs/medcom-wide_defconfig | 8 +- configs/msc_sm2s_imx8mp_defconfig | 8 +- configs/mx6cuboxi_defconfig | 2 +- configs/mx6memcal_defconfig | 2 +- configs/mx6sabreauto_defconfig | 2 +- configs/mx6sabresd_defconfig | 2 +- configs/mx6slevk_spl_defconfig | 2 +- configs/mx6ul_14x14_evk_defconfig | 2 +- configs/mx6ul_9x9_evk_defconfig | 2 +- configs/myir_mys_6ulx_defconfig | 2 +- configs/novena_defconfig | 2 +- configs/nyan-big_defconfig | 8 +- configs/omap35_logic_defconfig | 6 +- configs/omap35_logic_somlv_defconfig | 6 +- configs/omap3_beagle_defconfig | 4 +- configs/omap3_evm_defconfig | 4 +- configs/omap3_logic_defconfig | 6 +- configs/omap3_logic_somlv_defconfig | 6 +- configs/omap4_panda_defconfig | 4 +- configs/omap4_sdp4430_defconfig | 4 +- configs/omapl138_lcdk_defconfig | 8 +- configs/openpiton_riscv64_spl_defconfig | 2 +- configs/opos6uldev_defconfig | 2 +- configs/paz00_defconfig | 8 +- configs/pcm058_defconfig | 2 +- configs/phycore-am335x-r2-regor_defconfig | 4 +- configs/phycore-am335x-r2-wega_defconfig | 4 +- configs/phycore-imx8mm_defconfig | 8 +- configs/phycore-imx8mp_defconfig | 8 +- configs/phycore_pcl063_defconfig | 2 +- configs/phycore_pcl063_ull_defconfig | 2 +- configs/pico-dwarf-imx6ul_defconfig | 2 +- configs/pico-dwarf-imx7d_defconfig | 2 +- configs/pico-hobbit-imx6ul_defconfig | 2 +- configs/pico-hobbit-imx7d_defconfig | 2 +- configs/pico-imx6_defconfig | 2 +- configs/pico-imx6ul_defconfig | 2 +- configs/pico-imx7d_bl33_defconfig | 2 +- configs/pico-imx7d_defconfig | 2 +- configs/pico-imx8mq_defconfig | 8 +- configs/pico-nymph-imx7d_defconfig | 2 +- configs/pico-pi-imx6ul_defconfig | 2 +- configs/pico-pi-imx7d_defconfig | 2 +- configs/plutux_defconfig | 8 +- configs/pxm2_defconfig | 6 +- configs/qemu-riscv32_spl_defconfig | 2 +- configs/qemu-riscv64_spl_defconfig | 2 +- configs/rastaban_defconfig | 6 +- configs/ringneck-px30_defconfig | 2 +- configs/riotboard_defconfig | 4 +- configs/rut_defconfig | 6 +- configs/sama5d27_giantboard_defconfig | 4 +- configs/sama5d27_som1_ek_mmc1_defconfig | 4 +- configs/sama5d27_som1_ek_mmc_defconfig | 4 +- configs/sama5d27_som1_ek_qspiflash_defconfig | 4 +- configs/sama5d27_wlsom1_ek_mmc_defconfig | 4 +- .../sama5d27_wlsom1_ek_qspiflash_defconfig | 4 +- configs/sama5d2_icp_mmc_defconfig | 4 +- configs/sama5d2_xplained_emmc_defconfig | 4 +- configs/sama5d2_xplained_mmc_defconfig | 4 +- configs/sama5d2_xplained_qspiflash_defconfig | 4 +- configs/sama5d2_xplained_spiflash_defconfig | 4 +- configs/sama5d3_xplained_mmc_defconfig | 4 +- configs/sama5d3_xplained_nandflash_defconfig | 4 +- configs/sama5d3xek_mmc_defconfig | 4 +- configs/sama5d3xek_nandflash_defconfig | 4 +- configs/sama5d3xek_spiflash_defconfig | 4 +- configs/sama5d4_xplained_mmc_defconfig | 4 +- configs/sama5d4_xplained_nandflash_defconfig | 4 +- configs/sama5d4_xplained_spiflash_defconfig | 4 +- configs/sama5d4ek_mmc_defconfig | 4 +- configs/sama5d4ek_nandflash_defconfig | 4 +- configs/sama5d4ek_spiflash_defconfig | 4 +- configs/seaboard_defconfig | 8 +- configs/seeed_npi_imx6ull_defconfig | 2 +- configs/sifive_unleashed_defconfig | 2 +- configs/sifive_unmatched_defconfig | 2 +- configs/smartweb_defconfig | 4 +- configs/sniper_defconfig | 6 +- configs/socfpga_agilex_atf_defconfig | 8 +- configs/socfpga_agilex_defconfig | 8 +- configs/socfpga_agilex_vab_defconfig | 8 +- configs/socfpga_arria10_defconfig | 8 +- configs/socfpga_chameleonv3_defconfig | 8 +- configs/socfpga_n5x_atf_defconfig | 8 +- configs/socfpga_n5x_defconfig | 8 +- configs/socfpga_n5x_vab_defconfig | 8 +- configs/socfpga_stratix10_atf_defconfig | 8 +- configs/socfpga_stratix10_defconfig | 8 +- configs/starfive_visionfive2_defconfig | 8 +- configs/stm32746g-eval_spl_defconfig | 2 +- configs/stm32f746-disco_spl_defconfig | 2 +- configs/stm32f769-disco_spl_defconfig | 2 +- ...stm32mp15-icore-stm32mp1-ctouch2_defconfig | 8 +- ...tm32mp15-icore-stm32mp1-edimm2.2_defconfig | 8 +- ...-microgea-stm32mp1-microdev2-of7_defconfig | 8 +- ...mp15-microgea-stm32mp1-microdev2_defconfig | 8 +- configs/stm32mp15_basic_defconfig | 8 +- configs/stm32mp15_dhcom_basic_defconfig | 8 +- configs/stm32mp15_dhcor_basic_defconfig | 8 +- configs/syzygy_hub_defconfig | 6 +- configs/taurus_defconfig | 8 +- configs/tec-ng_defconfig | 8 +- configs/tec_defconfig | 8 +- configs/thuban_defconfig | 6 +- configs/topic_miami_defconfig | 4 +- configs/topic_miamilite_defconfig | 4 +- configs/topic_miamiplus_defconfig | 4 +- configs/transformer_t30_defconfig | 8 +- configs/trimslice_defconfig | 8 +- configs/udoo_defconfig | 2 +- configs/udoo_neo_defconfig | 2 +- configs/variscite_dart6ul_defconfig | 2 +- configs/venice2_defconfig | 8 +- configs/ventana_defconfig | 8 +- configs/verdin-am62_r5_defconfig | 8 +- configs/verdin-imx8mm_defconfig | 8 +- configs/verdin-imx8mp_defconfig | 8 +- configs/vining_2000_defconfig | 2 +- configs/vyasa-rk3288_defconfig | 2 +- configs/wandboard_defconfig | 2 +- configs/x3_t30_defconfig | 8 +- configs/xilinx_zynq_virt_defconfig | 6 +- configs/xilinx_zynqmp_mini_emmc0_defconfig | 8 +- configs/xilinx_zynqmp_mini_emmc1_defconfig | 8 +- configs/xilinx_zynqmp_mini_qspi_defconfig | 8 +- configs/xilinx_zynqmp_virt_defconfig | 10 +- configs/zynq_cse_nand_defconfig | 8 +- configs/zynq_cse_nor_defconfig | 8 +- configs/zynq_cse_qspi_defconfig | 8 +- doc/arch/sandbox/sandbox.rst | 4 +- doc/develop/devicetree/control.rst | 3 + doc/develop/falcon.rst | 2 +- doc/usage/cmd/bdinfo.rst | 2 +- drivers/core/Kconfig | 14 +- drivers/core/fdtaddr.c | 6 +- drivers/core/of_access.c | 65 +++++ drivers/core/ofnode.c | 183 ++++++++++++- drivers/core/read.c | 6 +- drivers/core/util.c | 2 +- drivers/misc/cros_ec_sandbox.c | 9 +- drivers/pci/pci-uclass.c | 2 +- drivers/pci/pci_mvebu.c | 3 +- drivers/pci/pci_tegra.c | 2 +- drivers/pci/pcie_mediatek.c | 4 +- drivers/serial/Kconfig | 2 +- drivers/serial/ns16550.c | 15 +- dts/Kconfig | 8 + include/asm-generic/global_data.h | 12 +- include/bloblist.h | 23 ++ include/bootstage.h | 26 ++ include/command.h | 3 + include/configs/socfpga_common.h | 2 +- include/configs/socfpga_soc64_common.h | 2 +- include/dm/fdtaddr.h | 3 +- include/dm/of_access.h | 18 ++ include/dm/ofnode.h | 102 ++++++- include/dm/read.h | 8 +- include/fdtdec.h | 3 +- include/ns16550.h | 4 +- include/of_live.h | 18 ++ include/serial.h | 2 + include/spl.h | 28 +- include/system-constants.h | 20 +- lib/asm-offsets.c | 2 +- lib/fdtdec.c | 44 ++- lib/of_live.c | 141 ++++++++++ test/dm/ofnode.c | 258 ++++++++++++++++-- test/dm/pci.c | 14 +- test/lib/kconfig.c | 4 +- 387 files changed, 2074 insertions(+), 1204 deletions(-) -- 2.42.0.515.g380fc7ccd1-goog

4 49

[PATCH] arm64: xilinx: Do not use '_' in si5335 DT node names
by Michal Simek 09 Oct '23

09 Oct '23

Character '_' not recommended in node name. Use '-' instead. Pretty much run sed below for node names. s/si5335_/si5335-/ Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- Till now I didn't heard back that different style should be used that's why also sending this patch and separately from other similar change recently sent. --- arch/arm/dts/zynqmp-zcu100-revC.dts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/zynqmp-zcu100-revC.dts b/arch/arm/dts/zynqmp-zcu100-revC.dts index a84cd86694e2..44d1b24677d1 100644 --- a/arch/arm/dts/zynqmp-zcu100-revC.dts +++ b/arch/arm/dts/zynqmp-zcu100-revC.dts @@ -2,7 +2,8 @@ /* * dts file for Xilinx ZynqMP ZCU100 revC * - * (C) Copyright 2016 - 2021, Xilinx, Inc. + * (C) Copyright 2016 - 2022, Xilinx, Inc. + * (C) Copyright 2022 - 2023, Advanced Micro Devices, Inc. * * Michal Simek <michal.simek(a)amd.com> * Nathalie Chan King Choy @@ -131,13 +132,13 @@ io-channels = <&u35 0>, <&u35 1>, <&u35 2>, <&u35 3>; }; - si5335_0: si5335_0 { /* clk0_usb - u23 */ + si5335_0: si5335-0 { /* clk0_usb - u23 */ compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <26000000>; }; - si5335_1: si5335_1 { /* clk1_dp - u23 */ + si5335_1: si5335-1 { /* clk1_dp - u23 */ compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <27000000>; -- 2.36.1

1 1

[PATCH] Revert "clk: versal: Enable clock driver for Versal NET"
by Michal Simek 09 Oct '23

09 Oct '23

This partially reverts commit ff33227819f579ffb963e0dac6bc6a6566b89563. Versal NET clock node should use "xlnx,versal-net-clk", "xlnx,versal-clk" compatible string that's why it is not necessary to define Versal NET specific compatible string if there is no any other change needed. It can be get back if there is a need to differentiate clock support between Versal and Versal NET. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- drivers/clk/clk_versal.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c index 2e004beca2f9..c473643603a4 100644 --- a/drivers/clk/clk_versal.c +++ b/drivers/clk/clk_versal.c @@ -773,7 +773,6 @@ static struct clk_ops versal_clk_ops = { static const struct udevice_id versal_clk_ids[] = { { .compatible = "xlnx,versal-clk" }, - { .compatible = "xlnx,versal-net-clk" }, { } }; -- 2.36.1

1 1

[PATCH] arm64: zynqmp: Do not use '_' in DT node names
by Michal Simek 09 Oct '23

09 Oct '23

Using '_' is not recommended for node names. Use '-' instead. Pretty much run seds below for node names. s/heartbeat_led/heartbeat-led/ s/gtr_sel/gtr-sel/ s/zynqmp_ipi/zynqmp-ipi/ s/nvmem_firmware/nvmem-firmware/ s/soc_revision/soc-revision/ Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- arch/arm/dts/zynqmp-m-a2197-01-revA.dts | 8 ++++---- arch/arm/dts/zynqmp-m-a2197-02-revA.dts | 8 ++++---- arch/arm/dts/zynqmp-m-a2197-03-revA.dts | 8 ++++---- arch/arm/dts/zynqmp-p-a2197-00-revA.dts | 8 ++++---- arch/arm/dts/zynqmp-zcu208-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu216-revA.dts | 2 +- arch/arm/dts/zynqmp.dtsi | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/arch/arm/dts/zynqmp-m-a2197-01-revA.dts b/arch/arm/dts/zynqmp-m-a2197-01-revA.dts index cfd5ba1aac63..25ef646c8466 100644 --- a/arch/arm/dts/zynqmp-m-a2197-01-revA.dts +++ b/arch/arm/dts/zynqmp-m-a2197-01-revA.dts @@ -363,25 +363,25 @@ #gpio-cells = <2>; gpio-line-names = "sw4_1", "sw4_2", "sw4_3", "sw4_4", "", "", "", ""; - gtr_sel0 { + gtr-sel0 { gpio-hog; gpios = <0 0>; input; /* FIXME add meaning */ line-name = "sw4_1"; }; - gtr_sel1 { + gtr-sel1 { gpio-hog; gpios = <1 0>; input; /* FIXME add meaning */ line-name = "sw4_2"; }; - gtr_sel2 { + gtr-sel2 { gpio-hog; gpios = <2 0>; input; /* FIXME add meaning */ line-name = "sw4_3"; }; - gtr_sel3 { + gtr-sel3 { gpio-hog; gpios = <3 0>; input; /* FIXME add meaning */ diff --git a/arch/arm/dts/zynqmp-m-a2197-02-revA.dts b/arch/arm/dts/zynqmp-m-a2197-02-revA.dts index 18e14389f85f..ece9e6914541 100644 --- a/arch/arm/dts/zynqmp-m-a2197-02-revA.dts +++ b/arch/arm/dts/zynqmp-m-a2197-02-revA.dts @@ -365,25 +365,25 @@ #gpio-cells = <2>; gpio-line-names = "sw4_1", "sw4_2", "sw4_3", "sw4_4", "", "", "", ""; - gtr_sel0 { + gtr-sel0 { gpio-hog; gpios = <0 0>; input; /* FIXME add meaning */ line-name = "sw4_1"; }; - gtr_sel1 { + gtr-sel1 { gpio-hog; gpios = <1 0>; input; /* FIXME add meaning */ line-name = "sw4_2"; }; - gtr_sel2 { + gtr-sel2 { gpio-hog; gpios = <2 0>; input; /* FIXME add meaning */ line-name = "sw4_3"; }; - gtr_sel3 { + gtr-sel3 { gpio-hog; gpios = <3 0>; input; /* FIXME add meaning */ diff --git a/arch/arm/dts/zynqmp-m-a2197-03-revA.dts b/arch/arm/dts/zynqmp-m-a2197-03-revA.dts index cd7654a9f7ed..7372968e5734 100644 --- a/arch/arm/dts/zynqmp-m-a2197-03-revA.dts +++ b/arch/arm/dts/zynqmp-m-a2197-03-revA.dts @@ -359,25 +359,25 @@ #gpio-cells = <2>; gpio-line-names = "sw4_1", "sw4_2", "sw4_3", "sw4_4", "", "", "", ""; - gtr_sel0 { + gtr-sel0 { gpio-hog; gpios = <0 0>; input; /* FIXME add meaning */ line-name = "sw4_1"; }; - gtr_sel1 { + gtr-sel1 { gpio-hog; gpios = <1 0>; input; /* FIXME add meaning */ line-name = "sw4_2"; }; - gtr_sel2 { + gtr-sel2 { gpio-hog; gpios = <2 0>; input; /* FIXME add meaning */ line-name = "sw4_3"; }; - gtr_sel3 { + gtr-sel3 { gpio-hog; gpios = <3 0>; input; /* FIXME add meaning */ diff --git a/arch/arm/dts/zynqmp-p-a2197-00-revA.dts b/arch/arm/dts/zynqmp-p-a2197-00-revA.dts index 97b9cdf82ae7..c456c375ac80 100644 --- a/arch/arm/dts/zynqmp-p-a2197-00-revA.dts +++ b/arch/arm/dts/zynqmp-p-a2197-00-revA.dts @@ -427,25 +427,25 @@ #gpio-cells = <2>; gpio-line-names = "sw4_1", "sw4_2", "sw4_3", "sw4_4", "", "", "", ""; - gtr_sel0 { + gtr-sel0 { gpio-hog; gpios = <0 0>; input; /* FIXME add meaning */ line-name = "sw4_1"; }; - gtr_sel1 { + gtr-sel1 { gpio-hog; gpios = <1 0>; input; /* FIXME add meaning */ line-name = "sw4_2"; }; - gtr_sel2 { + gtr-sel2 { gpio-hog; gpios = <2 0>; input; /* FIXME add meaning */ line-name = "sw4_3"; }; - gtr_sel3 { + gtr-sel3 { gpio-hog; gpios = <3 0>; input; /* FIXME add meaning */ diff --git a/arch/arm/dts/zynqmp-zcu208-revA.dts b/arch/arm/dts/zynqmp-zcu208-revA.dts index d09e53f42fa8..22ad8d33a116 100644 --- a/arch/arm/dts/zynqmp-zcu208-revA.dts +++ b/arch/arm/dts/zynqmp-zcu208-revA.dts @@ -57,7 +57,7 @@ leds { compatible = "gpio-leds"; - heartbeat_led { + heartbeat-led { label = "heartbeat"; gpios = <&gpio 23 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; diff --git a/arch/arm/dts/zynqmp-zcu216-revA.dts b/arch/arm/dts/zynqmp-zcu216-revA.dts index fd026347c25f..575ff5b1b77b 100644 --- a/arch/arm/dts/zynqmp-zcu216-revA.dts +++ b/arch/arm/dts/zynqmp-zcu216-revA.dts @@ -57,7 +57,7 @@ leds { compatible = "gpio-leds"; - heartbeat_led { + heartbeat-led { label = "heartbeat"; gpios = <&gpio 23 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi index 30bd7b499603..f03c201caee9 100644 --- a/arch/arm/dts/zynqmp.dtsi +++ b/arch/arm/dts/zynqmp.dtsi @@ -136,7 +136,7 @@ }; }; - zynqmp_ipi: zynqmp_ipi { + zynqmp_ipi: zynqmp-ipi { bootph-all; compatible = "xlnx,zynqmp-ipi-mailbox"; interrupt-parent = <&gic>; @@ -206,12 +206,12 @@ mbox-names = "tx", "rx"; }; - nvmem_firmware { + nvmem-firmware { compatible = "xlnx,zynqmp-nvmem-fw"; #address-cells = <1>; #size-cells = <1>; - soc_revision: soc_revision@0 { + soc_revision: soc-revision@0 { reg = <0x0 0x4>; }; }; -- 2.36.1

1 1

[PATCH] arm: dts: xilinx: Remove undocumented is-dual property
by Michal Simek 09 Oct '23

09 Oct '23

Xilinx was using in past is-dual property for QSPIs to reflect their configurations. But handling for them never reached upstream code that's why better to remove them. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- arch/arm/dts/zynq-cc108.dts | 1 - arch/arm/dts/zynq-dlc20-rev1.0.dts | 1 - arch/arm/dts/zynq-minized.dts | 1 - arch/arm/dts/zynq-topic-miami.dts | 1 - arch/arm/dts/zynq-topic-miamilite.dts | 1 - arch/arm/dts/zynq-topic-miamiplus.dts | 1 - arch/arm/dts/zynqmp-m-a2197-01-revA.dts | 1 - arch/arm/dts/zynqmp-m-a2197-02-revA.dts | 1 - arch/arm/dts/zynqmp-m-a2197-03-revA.dts | 1 - arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts | 2 -- arch/arm/dts/zynqmp-zcu102-revA.dts | 1 - arch/arm/dts/zynqmp-zcu106-revA.dts | 1 - arch/arm/dts/zynqmp-zcu111-revA.dts | 1 - arch/arm/dts/zynqmp-zcu208-revA.dts | 1 - arch/arm/dts/zynqmp-zcu216-revA.dts | 1 - 15 files changed, 16 deletions(-) diff --git a/arch/arm/dts/zynq-cc108.dts b/arch/arm/dts/zynq-cc108.dts index dc942b0f595e..593ca4a49cf5 100644 --- a/arch/arm/dts/zynq-cc108.dts +++ b/arch/arm/dts/zynq-cc108.dts @@ -55,7 +55,6 @@ &qspi { status = "okay"; - is-dual = <0>; num-cs = <1>; flash@0 { /* 16 MB */ compatible = "n25q128a11", "jedec,spi-nor"; diff --git a/arch/arm/dts/zynq-dlc20-rev1.0.dts b/arch/arm/dts/zynq-dlc20-rev1.0.dts index d06838c5eeb3..8d0073780336 100644 --- a/arch/arm/dts/zynq-dlc20-rev1.0.dts +++ b/arch/arm/dts/zynq-dlc20-rev1.0.dts @@ -66,7 +66,6 @@ &qspi { bootph-all; status = "okay"; - is-dual = <0>; num-cs = <1>; spi-tx-bus-width = <4>; spi-rx-bus-width = <4>; diff --git a/arch/arm/dts/zynq-minized.dts b/arch/arm/dts/zynq-minized.dts index 3214ee49e283..96d2937de8bf 100644 --- a/arch/arm/dts/zynq-minized.dts +++ b/arch/arm/dts/zynq-minized.dts @@ -39,7 +39,6 @@ &qspi { status = "okay"; - is-dual = <0>; num-cs = <1>; flash@0 { compatible = "micron,m25p128"; diff --git a/arch/arm/dts/zynq-topic-miami.dts b/arch/arm/dts/zynq-topic-miami.dts index 57cb86aafd29..8307a2ef9dd3 100644 --- a/arch/arm/dts/zynq-topic-miami.dts +++ b/arch/arm/dts/zynq-topic-miami.dts @@ -33,7 +33,6 @@ &qspi { bootph-all; status = "okay"; - is-dual = <0>; num-cs = <1>; flash@0 { compatible = "st,m25p80", "n25q256a", "jedec,spi-nor"; diff --git a/arch/arm/dts/zynq-topic-miamilite.dts b/arch/arm/dts/zynq-topic-miamilite.dts index 366fd5bbb100..af0bc7ecf700 100644 --- a/arch/arm/dts/zynq-topic-miamilite.dts +++ b/arch/arm/dts/zynq-topic-miamilite.dts @@ -12,5 +12,4 @@ }; &qspi { - is-dual = <1>; }; diff --git a/arch/arm/dts/zynq-topic-miamiplus.dts b/arch/arm/dts/zynq-topic-miamiplus.dts index df538865296d..36a7db355e5b 100644 --- a/arch/arm/dts/zynq-topic-miamiplus.dts +++ b/arch/arm/dts/zynq-topic-miamiplus.dts @@ -21,5 +21,4 @@ }; &qspi { - is-dual = <1>; }; diff --git a/arch/arm/dts/zynqmp-m-a2197-01-revA.dts b/arch/arm/dts/zynqmp-m-a2197-01-revA.dts index 2c3e30ba8916..cfd5ba1aac63 100644 --- a/arch/arm/dts/zynqmp-m-a2197-01-revA.dts +++ b/arch/arm/dts/zynqmp-m-a2197-01-revA.dts @@ -71,7 +71,6 @@ &qspi { status = "okay"; - is-dual = <1>; flash@0 { compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; diff --git a/arch/arm/dts/zynqmp-m-a2197-02-revA.dts b/arch/arm/dts/zynqmp-m-a2197-02-revA.dts index ad724a135872..18e14389f85f 100644 --- a/arch/arm/dts/zynqmp-m-a2197-02-revA.dts +++ b/arch/arm/dts/zynqmp-m-a2197-02-revA.dts @@ -67,7 +67,6 @@ &qspi { status = "okay"; - is-dual = <1>; flash@0 { compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; diff --git a/arch/arm/dts/zynqmp-m-a2197-03-revA.dts b/arch/arm/dts/zynqmp-m-a2197-03-revA.dts index 296af0426ee2..cd7654a9f7ed 100644 --- a/arch/arm/dts/zynqmp-m-a2197-03-revA.dts +++ b/arch/arm/dts/zynqmp-m-a2197-03-revA.dts @@ -67,7 +67,6 @@ &qspi { status = "okay"; - is-dual = <1>; flash@0 { compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; diff --git a/arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts b/arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts index 3750bb38b585..0d96c6f9f041 100644 --- a/arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts +++ b/arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts @@ -56,7 +56,6 @@ &qspi { status = "okay"; - is-dual = <1>; flash@0 { compatible = "st,m25p80", "n25q256a", "jedec,spi-nor"; m25p,fast-read; @@ -66,7 +65,6 @@ spi-max-frequency = <166000000>; #address-cells = <1>; #size-cells = <1>; - is-dual = <1>; partition@0 { label = "qspi-boot-bin"; reg = <0x00000 0x60000>; diff --git a/arch/arm/dts/zynqmp-zcu102-revA.dts b/arch/arm/dts/zynqmp-zcu102-revA.dts index be75ca6443d8..e166c9555069 100644 --- a/arch/arm/dts/zynqmp-zcu102-revA.dts +++ b/arch/arm/dts/zynqmp-zcu102-revA.dts @@ -971,7 +971,6 @@ &qspi { status = "okay"; - is-dual = <1>; num-cs = <2>; flash@0 { compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ diff --git a/arch/arm/dts/zynqmp-zcu106-revA.dts b/arch/arm/dts/zynqmp-zcu106-revA.dts index 6cae681dc29f..b90ff61d2416 100644 --- a/arch/arm/dts/zynqmp-zcu106-revA.dts +++ b/arch/arm/dts/zynqmp-zcu106-revA.dts @@ -978,7 +978,6 @@ &qspi { status = "okay"; - is-dual = <1>; num-cs = <2>; flash@0 { compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ diff --git a/arch/arm/dts/zynqmp-zcu111-revA.dts b/arch/arm/dts/zynqmp-zcu111-revA.dts index d08865203ecf..ba9e4891fccc 100644 --- a/arch/arm/dts/zynqmp-zcu111-revA.dts +++ b/arch/arm/dts/zynqmp-zcu111-revA.dts @@ -789,7 +789,6 @@ &qspi { status = "okay"; - is-dual = <1>; num-cs = <2>; flash@0 { compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ diff --git a/arch/arm/dts/zynqmp-zcu208-revA.dts b/arch/arm/dts/zynqmp-zcu208-revA.dts index 702888177a1f..d09e53f42fa8 100644 --- a/arch/arm/dts/zynqmp-zcu208-revA.dts +++ b/arch/arm/dts/zynqmp-zcu208-revA.dts @@ -643,7 +643,6 @@ &qspi { status = "okay"; - is-dual = <1>; num-cs = <2>; flash@0 { compatible = "m25p80", "jedec,spi-nor"; /* U11 and U12 MT25QU02GCBBE12 1Gb */ diff --git a/arch/arm/dts/zynqmp-zcu216-revA.dts b/arch/arm/dts/zynqmp-zcu216-revA.dts index 989ac28c106b..fd026347c25f 100644 --- a/arch/arm/dts/zynqmp-zcu216-revA.dts +++ b/arch/arm/dts/zynqmp-zcu216-revA.dts @@ -653,7 +653,6 @@ &qspi { status = "okay"; - is-dual = <1>; num-cs = <2>; flash@0 { compatible = "m25p80", "jedec,spi-nor"; /* U11 and U12 MT25QU02GCBBE12 1Gb */ -- 2.36.1

1 1

[PATCH 00/11] xilinx: add missing boards/SC descriptions
by Michal Simek 09 Oct '23

09 Oct '23

Hi, I am sending series of zynqmp boards mostly related to system controller. System controller is small ZynqMP board sitting on Versal/Versal NET board doing board management. There is a internal spec about connection outside but pretty much DT description describe all connected IPs. The only thing what it is not covered in generic SC are i2c buses because they contain different devices. That's why they are described by DT overlays. The first version was created for vpk120-revA, next was generic SC revB and because of supply chain issue ethernet phy was replaced which ends up in revC version. The series also contain some cleanups and also adding new platforms like KD240. Thanks, Michal Michal Simek (11): arm64: zynqmp: Add support for KD240 Kria SOM CC arm64: zynqmp: Remove xlnx,fclk nodes arm64: zynqmp: Add support for vck190 revB system controller arm64: zynqmp: Add x-prc-01/02/03/04/05 revA support from SC arm64: zynqmp: Add support for vpk120-revA arm64: zynqmp: Create description for generic SC (vpk120-revB) arm64: zynqmp: Add support for SC revC arm64: zynqmp: Describe i2c structures for SCs arm64: zynqmp: Add support for VPXA2785 arm64: zynqmp: Add support for zcu670-revA arm64: zynqmp: Add support for zcu670-revB arch/arm/dts/Makefile | 20 + arch/arm/dts/zynqmp-clk-ccf.dtsi | 18 - arch/arm/dts/zynqmp-e-a2197-00-revB.dts | 34 + .../zynqmp-p-a2197-00-revA-x-prc-01-revA.dtso | 76 ++ .../zynqmp-p-a2197-00-revA-x-prc-02-revA.dtso | 76 ++ .../zynqmp-p-a2197-00-revA-x-prc-03-revA.dtso | 80 +++ .../zynqmp-p-a2197-00-revA-x-prc-04-revA.dtso | 86 +++ .../zynqmp-p-a2197-00-revA-x-prc-05-revA.dtso | 86 +++ arch/arm/dts/zynqmp-sc-revB.dts | 430 +++++++++++ arch/arm/dts/zynqmp-sc-revC.dts | 37 + arch/arm/dts/zynqmp-sc-vek280-revA.dtso | 230 ++++++ arch/arm/dts/zynqmp-sc-vek280-revB.dtso | 15 + arch/arm/dts/zynqmp-sc-vhk158-revA.dtso | 321 +++++++++ .../arm/dts/zynqmp-sc-vn-p-b2197-00-revA.dtso | 460 ++++++++++++ arch/arm/dts/zynqmp-sc-vpk120-revB.dtso | 326 +++++++++ arch/arm/dts/zynqmp-sc-vpk180-revA.dtso | 371 ++++++++++ arch/arm/dts/zynqmp-sc-vpk180-revB.dtso | 337 +++++++++ arch/arm/dts/zynqmp-sck-kd-g-revA.dtso | 353 +++++++++ arch/arm/dts/zynqmp-vp-x-a2785-00-revA.dts | 438 ++++++++++++ arch/arm/dts/zynqmp-vpk120-revA.dts | 574 +++++++++++++++ arch/arm/dts/zynqmp-zcu670-revA.dts | 669 +++++++++++++++++ arch/arm/dts/zynqmp-zcu670-revB.dts | 672 ++++++++++++++++++ configs/xilinx_zynqmp_virt_defconfig | 2 +- 23 files changed, 5692 insertions(+), 19 deletions(-) create mode 100644 arch/arm/dts/zynqmp-e-a2197-00-revB.dts create mode 100644 arch/arm/dts/zynqmp-p-a2197-00-revA-x-prc-01-revA.dtso create mode 100644 arch/arm/dts/zynqmp-p-a2197-00-revA-x-prc-02-revA.dtso create mode 100644 arch/arm/dts/zynqmp-p-a2197-00-revA-x-prc-03-revA.dtso create mode 100644 arch/arm/dts/zynqmp-p-a2197-00-revA-x-prc-04-revA.dtso create mode 100644 arch/arm/dts/zynqmp-p-a2197-00-revA-x-prc-05-revA.dtso create mode 100644 arch/arm/dts/zynqmp-sc-revB.dts create mode 100644 arch/arm/dts/zynqmp-sc-revC.dts create mode 100644 arch/arm/dts/zynqmp-sc-vek280-revA.dtso create mode 100644 arch/arm/dts/zynqmp-sc-vek280-revB.dtso create mode 100644 arch/arm/dts/zynqmp-sc-vhk158-revA.dtso create mode 100644 arch/arm/dts/zynqmp-sc-vn-p-b2197-00-revA.dtso create mode 100644 arch/arm/dts/zynqmp-sc-vpk120-revB.dtso create mode 100644 arch/arm/dts/zynqmp-sc-vpk180-revA.dtso create mode 100644 arch/arm/dts/zynqmp-sc-vpk180-revB.dtso create mode 100644 arch/arm/dts/zynqmp-sck-kd-g-revA.dtso create mode 100644 arch/arm/dts/zynqmp-vp-x-a2785-00-revA.dts create mode 100644 arch/arm/dts/zynqmp-vpk120-revA.dts create mode 100644 arch/arm/dts/zynqmp-zcu670-revA.dts create mode 100644 arch/arm/dts/zynqmp-zcu670-revB.dts -- 2.36.1

1 12

[PATCH 00/16] Add support for the Renesas RZ/G2L SMARC EVK
by Paul Barker 09 Oct '23

09 Oct '23

These patches add initial support for the RZ/G2L SMARC Evaluation board kit (EVK), consisting of the RZ/G2L System-on-Module (SOM) based on the R9A07G044L2 SoC, and a common SMARC carrier board. Support is included for the CPG (clock & reset control module), PFC (pinctrl & gpio module), SDHI (eMMC & SD card interfaces) & SCIF (serial port) modules. Enough functionality is included to boot a modern Linux kernel from the eMMC or SD card interfaces. The first patch in the series is an updated version of a patch I've sent previously [1]. It's included here as the later patch to enable RZ/G2L SCIF support depends on it. Further work will follow in time to add support for other interfaces on the RZ/G2L (such as Ethernet) and other SoCs in the RZ/G2L family (including the RZ/G2UL, RZ/G2LC, RZ/V2L & RZ/Five). [1]: https://lore.kernel.org/all/20230822181025.339748-2-paul.barker.ct@bp.renes… Paul Barker (16): serial: sh: Fix compile error when lacking HSCIF support dt-bindings: Add RZ/G2L CPG bindings dt-bindings: Add RZ/G2L PFC bindings dt-bindings: Add RZ/G2L IRQC bindings arm: rmobile: Add basic RZ/G2L family support arm: rmobile: Add basic R9A07G044L SoC support clk: renesas: Add RZ/G2L CPG driver arm: rmobile: Restrict PINCTRL_PFC selection to R-Car gen3/gen4 pinctrl: renesas: Add RZ/G2L PFC driver serial: sh: Add RZ/G2L SCIF support mmc: renesas-sdhi: Initialize module on RZ/G2L arm: rmobile: Include <asm/types.h> in header arm: rmobile: Add CPU detection for RZ/G2L arm: rmobile: Support RZ/G2L memory map arm: dts: Import RZ/G2L SMARC EVK device tree board: rzg2l: Add RZ/G2L SMARC EVK board arch/arm/dts/Makefile | 3 + arch/arm/dts/r9a07g044.dtsi | 1273 +++++++++++++++++ arch/arm/dts/r9a07g044l2-smarc.dts | 18 + arch/arm/dts/r9a07g044l2.dtsi | 13 + arch/arm/dts/rz-smarc-common.dtsi | 183 +++ arch/arm/dts/rzg2l-smarc-pinfunction.dtsi | 137 ++ arch/arm/dts/rzg2l-smarc-som.dtsi | 353 +++++ arch/arm/dts/rzg2l-smarc.dtsi | 144 ++ arch/arm/mach-rmobile/Kconfig | 19 +- arch/arm/mach-rmobile/Kconfig.rzg2l | 32 + arch/arm/mach-rmobile/Makefile | 5 +- arch/arm/mach-rmobile/cpu_info-rzg2l.c | 63 + arch/arm/mach-rmobile/include/mach/rmobile.h | 5 + arch/arm/mach-rmobile/include/mach/rzg2l.h | 13 + arch/arm/mach-rmobile/memmap-rzg2l.c | 115 ++ board/renesas/rzg2l/Kconfig | 18 + board/renesas/rzg2l/MAINTAINERS | 6 + board/renesas/rzg2l/Makefile | 4 + board/renesas/rzg2l/rzg2l.c | 76 + configs/renesas_rzg2l_smarc_defconfig | 52 + drivers/clk/renesas/Kconfig | 9 + drivers/clk/renesas/Makefile | 2 + drivers/clk/renesas/r9a07g044-cpg.c | 384 +++++ drivers/clk/renesas/rzg2l-cpg.c | 502 +++++++ drivers/clk/renesas/rzg2l-cpg.h | 318 ++++ drivers/mmc/renesas-sdhi.c | 61 + drivers/pinctrl/renesas/Kconfig | 9 + drivers/pinctrl/renesas/Makefile | 1 + drivers/pinctrl/renesas/rzg2l-pfc.c | 906 ++++++++++++ drivers/serial/serial_sh.c | 34 +- drivers/serial/serial_sh.h | 19 +- include/configs/rzg2l-smarc.h | 14 + include/dt-bindings/clock/r9a07g044-cpg.h | 220 +++ .../interrupt-controller/irqc-rzg2l.h | 25 + include/dt-bindings/pinctrl/rzg2l-pinctrl.h | 23 + 35 files changed, 5054 insertions(+), 5 deletions(-) create mode 100644 arch/arm/dts/r9a07g044.dtsi create mode 100644 arch/arm/dts/r9a07g044l2-smarc.dts create mode 100644 arch/arm/dts/r9a07g044l2.dtsi create mode 100644 arch/arm/dts/rz-smarc-common.dtsi create mode 100644 arch/arm/dts/rzg2l-smarc-pinfunction.dtsi create mode 100644 arch/arm/dts/rzg2l-smarc-som.dtsi create mode 100644 arch/arm/dts/rzg2l-smarc.dtsi create mode 100644 arch/arm/mach-rmobile/Kconfig.rzg2l create mode 100644 arch/arm/mach-rmobile/cpu_info-rzg2l.c create mode 100644 arch/arm/mach-rmobile/include/mach/rzg2l.h create mode 100644 arch/arm/mach-rmobile/memmap-rzg2l.c create mode 100644 board/renesas/rzg2l/Kconfig create mode 100644 board/renesas/rzg2l/MAINTAINERS create mode 100644 board/renesas/rzg2l/Makefile create mode 100644 board/renesas/rzg2l/rzg2l.c create mode 100644 configs/renesas_rzg2l_smarc_defconfig create mode 100644 drivers/clk/renesas/r9a07g044-cpg.c create mode 100644 drivers/clk/renesas/rzg2l-cpg.c create mode 100644 drivers/clk/renesas/rzg2l-cpg.h create mode 100644 drivers/pinctrl/renesas/rzg2l-pfc.c create mode 100644 include/configs/rzg2l-smarc.h create mode 100644 include/dt-bindings/clock/r9a07g044-cpg.h create mode 100644 include/dt-bindings/interrupt-controller/irqc-rzg2l.h create mode 100644 include/dt-bindings/pinctrl/rzg2l-pinctrl.h base-commit: b9b83a86f0e84e837191db120c279a9cc0e3434b -- 2.34.1

3 86

[RFC PATCH 0/5] Support display on stm32f469-disco board
by Dario Binacchi 08 Oct '23

08 Oct '23

The series adds support for the Orise Tech OTM8009A display on the stm32f469-disco board. Substantial differences in the drivers for clock management, LTDC and DSI compared to Linux, made it necessary to modify the device tree. These changes were made in stm32f469-disco-uboot.dtsi to avoid altering the Linux device tree. It is therefore desirable, as soon as possible, to add these drivers the functionalities so that they do not require device tree properties that deviate from those present in the Linux version. Dario Binacchi (5): ARM: dts: stm32f469-disco: sync with Linux 6.5 ARM: dts: stm32: make the LTDC clock usable by the clock driver ARM: dts: stm32: make the DSI clock usable by the clock driver ARM: dts: stm32: support display on stm32f469-disco board board: stm32f469-disco: add splash screen with stmicroelectronics logo arch/arm/dts/stm32f469-disco-u-boot.dtsi | 13 ++++++++ arch/arm/dts/stm32f469-disco.dts | 4 +-- configs/stm32f469-discovery_defconfig | 16 ++++++++++ drivers/video/stm32/stm32_ltdc.c | 37 ++++++++++++++++++++++- include/configs/stm32f469-discovery.h | 2 ++ tools/logos/stm32f469-discovery.bmp | Bin 0 -> 18532 bytes 6 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 tools/logos/stm32f469-discovery.bmp -- 2.34.1

2 10