June 2022 - U-Boot

[PATCH] board: atmel: remove calls to debug_uart_init
by Eugen Hristev 28 Jun '22

28 Jun '22

Since 0dba45864b ("arm: Init the debug UART") , the debug_uart_init is now called from crt.S It's no longer required to call it from the board file. With the current code, the banned <debug_uart> is printed twice: <debug_uart> <debug_uart> U-Boot 2022.07-rc4-00089-gee3d158fa8 (Jun 08 2022 - 17:39:29 +0300) Remove all calls from board_early_init_f . Suggested-by: Balamanikandan Gunasundar <Balamanikandan.Gunasundar(a)microchip.com> Signed-off-by: Eugen Hristev <eugen.hristev(a)microchip.com> --- board/atmel/at91sam9260ek/at91sam9260ek.c | 3 --- board/atmel/at91sam9261ek/at91sam9261ek.c | 3 --- board/atmel/at91sam9263ek/at91sam9263ek.c | 3 --- board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 3 --- board/atmel/at91sam9n12ek/at91sam9n12ek.c | 3 --- board/atmel/at91sam9rlek/at91sam9rlek.c | 3 --- board/atmel/at91sam9x5ek/at91sam9x5ek.c | 3 --- board/atmel/sam9x60_curiosity/sam9x60_curiosity.c | 3 --- board/atmel/sam9x60ek/sam9x60ek.c | 3 --- board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c | 4 ---- board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c | 4 ---- board/atmel/sama5d2_icp/sama5d2_icp.c | 3 --- board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c | 3 --- board/atmel/sama5d2_xplained/sama5d2_xplained.c | 4 ---- board/atmel/sama5d3_xplained/sama5d3_xplained.c | 3 --- board/atmel/sama5d3xek/sama5d3xek.c | 3 --- board/atmel/sama5d4_xplained/sama5d4_xplained.c | 3 --- board/atmel/sama5d4ek/sama5d4ek.c | 3 --- board/atmel/sama7g5ek/sama7g5ek.c | 3 --- 19 files changed, 60 deletions(-) diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c index 38f97bce20..a9ea9b558a 100644 --- a/board/atmel/at91sam9260ek/at91sam9260ek.c +++ b/board/atmel/at91sam9260ek/at91sam9260ek.c @@ -74,9 +74,6 @@ void board_debug_uart_init(void) #ifdef CONFIG_BOARD_EARLY_INIT_F int board_early_init_f(void) { -#ifdef CONFIG_DEBUG_UART - debug_uart_init(); -#endif return 0; } #endif diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c index 0318eeaa94..8a7a960c26 100644 --- a/board/atmel/at91sam9261ek/at91sam9261ek.c +++ b/board/atmel/at91sam9261ek/at91sam9261ek.c @@ -234,9 +234,6 @@ void board_debug_uart_init(void) #ifdef CONFIG_BOARD_EARLY_INIT_F int board_early_init_f(void) { -#ifdef CONFIG_DEBUG_UART - debug_uart_init(); -#endif return 0; } #endif diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c index 3218e14e86..c3e1734dda 100644 --- a/board/atmel/at91sam9263ek/at91sam9263ek.c +++ b/board/atmel/at91sam9263ek/at91sam9263ek.c @@ -192,9 +192,6 @@ void board_debug_uart_init(void) #ifdef CONFIG_BOARD_EARLY_INIT_F int board_early_init_f(void) { -#ifdef CONFIG_DEBUG_UART - debug_uart_init(); -#endif return 0; } #endif diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c index fcca8923e3..347197a606 100644 --- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c +++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c @@ -258,9 +258,6 @@ void board_debug_uart_init(void) #ifdef CONFIG_BOARD_EARLY_INIT_F int board_early_init_f(void) { -#ifdef CONFIG_DEBUG_UART - debug_uart_init(); -#endif return 0; } #endif diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c index a3fc55bbc3..018fed9cc2 100644 --- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c +++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c @@ -176,9 +176,6 @@ void board_debug_uart_init(void) #ifdef CONFIG_BOARD_EARLY_INIT_F int board_early_init_f(void) { -#ifdef CONFIG_DEBUG_UART - debug_uart_init(); -#endif return 0; } #endif diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c index f427ee658b..af59620d0c 100644 --- a/board/atmel/at91sam9rlek/at91sam9rlek.c +++ b/board/atmel/at91sam9rlek/at91sam9rlek.c @@ -169,9 +169,6 @@ void board_debug_uart_init(void) #ifdef CONFIG_BOARD_EARLY_INIT_F int board_early_init_f(void) { -#ifdef CONFIG_DEBUG_UART - debug_uart_init(); -#endif return 0; } #endif diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c index e0abe4aeb0..8192824c59 100644 --- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c +++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c @@ -105,9 +105,6 @@ void board_debug_uart_init(void) #ifdef CONFIG_BOARD_EARLY_INIT_F int board_early_init_f(void) { -#ifdef CONFIG_DEBUG_UART - debug_uart_init(); -#endif return 0; } #endif diff --git a/board/atmel/sam9x60_curiosity/sam9x60_curiosity.c b/board/atmel/sam9x60_curiosity/sam9x60_curiosity.c index 00de277812..d8f32c93b5 100644 --- a/board/atmel/sam9x60_curiosity/sam9x60_curiosity.c +++ b/board/atmel/sam9x60_curiosity/sam9x60_curiosity.c @@ -39,9 +39,6 @@ void board_debug_uart_init(void) int board_early_init_f(void) { -#ifdef CONFIG_DEBUG_UART - debug_uart_init(); -#endif return 0; } diff --git a/board/atmel/sam9x60ek/sam9x60ek.c b/board/atmel/sam9x60ek/sam9x60ek.c index 32e5a2bf23..7035fab878 100644 --- a/board/atmel/sam9x60ek/sam9x60ek.c +++ b/board/atmel/sam9x60ek/sam9x60ek.c @@ -101,9 +101,6 @@ void board_debug_uart_init(void) #ifdef CONFIG_BOARD_EARLY_INIT_F int board_early_init_f(void) { -#ifdef CONFIG_DEBUG_UART - debug_uart_init(); -#endif return 0; } #endif diff --git a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c index b69f1c8cfa..65d0a7532e 100644 --- a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c +++ b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c @@ -65,10 +65,6 @@ void board_debug_uart_init(void) #ifdef CONFIG_BOARD_EARLY_INIT_F int board_early_init_f(void) { -#ifdef CONFIG_DEBUG_UART - debug_uart_init(); -#endif - return 0; } #endif diff --git a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c index 67ada27072..c38585c6fe 100644 --- a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c +++ b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c @@ -58,10 +58,6 @@ void board_debug_uart_init(void) #ifdef CONFIG_BOARD_EARLY_INIT_F int board_early_init_f(void) { -#ifdef CONFIG_DEBUG_UART - debug_uart_init(); -#endif - return 0; } #endif diff --git a/board/atmel/sama5d2_icp/sama5d2_icp.c b/board/atmel/sama5d2_icp/sama5d2_icp.c index da697a7b0f..0207770028 100644 --- a/board/atmel/sama5d2_icp/sama5d2_icp.c +++ b/board/atmel/sama5d2_icp/sama5d2_icp.c @@ -48,9 +48,6 @@ void board_debug_uart_init(void) int board_early_init_f(void) { -#ifdef CONFIG_DEBUG_UART - debug_uart_init(); -#endif return 0; } diff --git a/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c b/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c index cca5bd1d8a..16e9183f54 100644 --- a/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c +++ b/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c @@ -108,9 +108,6 @@ void board_debug_uart_init(void) #ifdef CONFIG_BOARD_EARLY_INIT_F int board_early_init_f(void) { -#ifdef CONFIG_DEBUG_UART - debug_uart_init(); -#endif return 0; } #endif diff --git a/board/atmel/sama5d2_xplained/sama5d2_xplained.c b/board/atmel/sama5d2_xplained/sama5d2_xplained.c index 4bbb05c2fb..9e0f9c3b7e 100644 --- a/board/atmel/sama5d2_xplained/sama5d2_xplained.c +++ b/board/atmel/sama5d2_xplained/sama5d2_xplained.c @@ -64,10 +64,6 @@ void board_debug_uart_init(void) #ifdef CONFIG_BOARD_EARLY_INIT_F int board_early_init_f(void) { -#ifdef CONFIG_DEBUG_UART - debug_uart_init(); -#endif - return 0; } #endif diff --git a/board/atmel/sama5d3_xplained/sama5d3_xplained.c b/board/atmel/sama5d3_xplained/sama5d3_xplained.c index c25bf42e0a..a778f2694d 100644 --- a/board/atmel/sama5d3_xplained/sama5d3_xplained.c +++ b/board/atmel/sama5d3_xplained/sama5d3_xplained.c @@ -87,9 +87,6 @@ int board_late_init(void) #ifdef CONFIG_BOARD_EARLY_INIT_F int board_early_init_f(void) { -#ifdef CONFIG_DEBUG_UART - debug_uart_init(); -#endif return 0; } #endif diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c index b6f8dcd91d..132e7fad1e 100644 --- a/board/atmel/sama5d3xek/sama5d3xek.c +++ b/board/atmel/sama5d3xek/sama5d3xek.c @@ -140,9 +140,6 @@ void board_debug_uart_init(void) #ifdef CONFIG_BOARD_EARLY_INIT_F int board_early_init_f(void) { -#ifdef CONFIG_DEBUG_UART - debug_uart_init(); -#endif return 0; } #endif diff --git a/board/atmel/sama5d4_xplained/sama5d4_xplained.c b/board/atmel/sama5d4_xplained/sama5d4_xplained.c index 2088b48b7e..9fb7e6f308 100644 --- a/board/atmel/sama5d4_xplained/sama5d4_xplained.c +++ b/board/atmel/sama5d4_xplained/sama5d4_xplained.c @@ -102,9 +102,6 @@ void board_debug_uart_init(void) #ifdef CONFIG_BOARD_EARLY_INIT_F int board_early_init_f(void) { -#ifdef CONFIG_DEBUG_UART - debug_uart_init(); -#endif return 0; } #endif diff --git a/board/atmel/sama5d4ek/sama5d4ek.c b/board/atmel/sama5d4ek/sama5d4ek.c index 46ec1eb324..ba38533343 100644 --- a/board/atmel/sama5d4ek/sama5d4ek.c +++ b/board/atmel/sama5d4ek/sama5d4ek.c @@ -100,9 +100,6 @@ void board_debug_uart_init(void) #ifdef CONFIG_BOARD_EARLY_INIT_F int board_early_init_f(void) { -#ifdef CONFIG_DEBUG_UART - debug_uart_init(); -#endif return 0; } #endif diff --git a/board/atmel/sama7g5ek/sama7g5ek.c b/board/atmel/sama7g5ek/sama7g5ek.c index ae18ed05e0..7d83e76f9a 100644 --- a/board/atmel/sama7g5ek/sama7g5ek.c +++ b/board/atmel/sama7g5ek/sama7g5ek.c @@ -48,9 +48,6 @@ void board_debug_uart_init(void) int board_early_init_f(void) { -#if (IS_ENABLED(CONFIG_DEBUG_UART)) - debug_uart_init(); -#endif return 0; } -- 2.25.1

2 1

[PATCH 0/5] aspeed: Add to CI
by Joel Stanley 28 Jun '22

28 Jun '22

The Aspeed AST2600 is modelled in Qemu. This makes some configuration changes so it can be added to CI. It has a depednency on the u-boot-test-hooks patches I sent here: https://lore.kernel.org/u-boot/20220624023420.3925916-1-joel@jms.id.au I've given it a run on Azure and the tests passed. Joel Stanley (5): config/ast2600: Enable CRC32 config/ast2600: Make position independent config/ast2600: Disable hash hardware accel ast2600: Configure u-boot-with-spl.bin target CI: Add Aspeed AST2600 include/configs/evb_ast2600.h | 3 +++ .azure-pipelines.yml | 3 +++ .gitlab-ci.yml | 6 ++++++ configs/evb-ast2600_defconfig | 7 ++++--- 4 files changed, 16 insertions(+), 3 deletions(-) -- 2.35.1

4 12

[PATCH 0/7] clk: sunxi: Out-of-bounds access fix and driver cleanup
by Samuel Holland 28 Jun '22

28 Jun '22

This series fixes an issue with out-of-bounds access to the gate array (patches 1-2), uses the rearranged array size information to remove a bunch of duplicate code (patches 3-4), and then simplifies how the reset driver is bound (patches 5-7). The original motivation for these changes was adding a driver for the legacy A31/A23/A33 PRCM binding (which I will send separately), and trying to use OF_PLATDATA in SPL (which did not work out). But I think at least some of the cleanup is worth applying on its own. Patch 4 is generally the same change I made between v1 and v2 of the pinctrl series, using some #ifdefs to share a U_BOOT_DRIVER. It's not quite as clean as the pinctrl case, because here the SoC-specific parts are in different files, so all of the CCU descriptors have to be global. Samuel Holland (7): clk: sunxi: Store the array sizes in the CCU descriptor clk: sunxi: Prevent out-of-bounds gate array access reset: sunxi: Get the reset count from the CCU descriptor clk: sunxi: Use a single driver for all variants clk: sunxi: Convert driver private data to platform data reset: sunxi: Convert driver private data to platform data reset: sunxi: Reuse the platform data from the clock driver drivers/clk/sunxi/clk_a10.c | 27 +----- drivers/clk/sunxi/clk_a10s.c | 27 +----- drivers/clk/sunxi/clk_a23.c | 27 +----- drivers/clk/sunxi/clk_a31.c | 25 +---- drivers/clk/sunxi/clk_a31_r.c | 29 +----- drivers/clk/sunxi/clk_a64.c | 25 +---- drivers/clk/sunxi/clk_a80.c | 36 ++------ drivers/clk/sunxi/clk_a83t.c | 25 +---- drivers/clk/sunxi/clk_h3.c | 27 +----- drivers/clk/sunxi/clk_h6.c | 25 +---- drivers/clk/sunxi/clk_h616.c | 25 +---- drivers/clk/sunxi/clk_h6_r.c | 27 +----- drivers/clk/sunxi/clk_r40.c | 25 +---- drivers/clk/sunxi/clk_sunxi.c | 168 ++++++++++++++++++++++++++++++---- drivers/clk/sunxi/clk_v3s.c | 27 +----- drivers/reset/reset-sunxi.c | 55 ++--------- include/clk/sunxi.h | 21 +---- 17 files changed, 208 insertions(+), 413 deletions(-) -- 2.35.1

3 18

Issue with booting U-Boot from SD card, but using QSPI Flash for its Environment
by David Antliff 27 Jun '22

27 Jun '22

Hi, I'm having some difficulty configuring U-Boot, in particular setting it up so that it can load from an SD card, but access its Environment from QSPI Flash. First of all, is this even possible? Can the U-Boot environment be stored in a different location from where U-Boot was loaded? Currently, I have a U-Boot image running from QSPI Flash on a Xilinx MPSoC ARM64 platform. I'm using Xilinx PetaLinux however I think I understand how this configures U-Boot "under the hood" so I'll try to refer to uboot.cfg as much as I can. Along with all the defaults, I have set: #define CONFIG_ENV_OFFSET 0x2E00000 #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_CMD_ERASEENV 1 On this particular platform, there is a physical switch to switch the Xilinx first-stage bootloader (and ARM Trusted Firmware) between QSPI Flash to SD card. This platform also requires a so-called "BOOT.BIN", which contains the u-boot binary and other things (like the Xilinx FSBL, ARM Trusted Firmware, an FPGA image and other things), to be written to QSPI Flash, which I have done. This is all working correctly, and the serial console looks like this: Xilinx Zynq MP First Stage Boot Loader Release 2021.2 Oct 13 2021 - 07:15:53 NOTICE: BL31: v2.4(release):xlnx_rebase_v2.4_2021.1_update1-23-g9188496b9 NOTICE: BL31: Built : 07:41:24, Oct 13 2021 U-Boot 2021.01 (Oct 12 2021 - 09:28:42 +0000) CPU: ZynqMP Silicon: v3 Model: ZynqMP ZCU208 RevA Board: Xilinx ZynqMP DRAM: 4 GiB PMUFW: v1.1 EL Level: EL2 Chip ID: zu48dr NAND: 0 MiB MMC: mmc@ff170000: 0 Loading Environment from SPIFlash... SF: Detected mt25qu02g with page size 512 Bytes, erase size 128 KiB, total 512 MiB ... As you can see, U-Boot loads from QSPI Flash and the Environment is also loaded from QSPI Flash. All good. What I want to do is modify the system so that the earlier bootloader "BL31" loads U-Boot from the SD card. In my config I already have CONFIG_ENV_IS_IN_FAT set to 1. When I copy BOOT.BIN to the first, FAT partition on an SD card, and set my platform's boot mode to "SD Card" via the physical switch, the unit loads U-Boot from the SD card successfully, and the serial console shows the above but with: Loading Environment from FAT... *** Warning - bad CRC, using default environment It works, although this warning is expected because there is no Environment saved on the SD card yet. It does show that the SD card is being checked for the Environment though, so that's good. Note that this is the same build that I used for the QSPI flash boot earlier, so I'm currently under the impression that U-Boot only looks for its Environment based on where it was loaded from, even if other locations are enabled. The issue is that I would like to configure U-Boot to be loaded from the SD card, but to use QSPI for its Environment, so that we can store persistent U-Boot configuration on the board itself. Experimentally, it appears that U-Boot uses the medium it was loaded from as the place to look for its Environment, although I haven't been able to confirm this. According to the U-Boot documentation I've read, disabling FAT as the default should be achievable by unsetting the following in u-boot.cfg: CONFIG_ENV_IS_IN_FAT CONFIG_SYS_MMC_ENV_DEV CONFIG_ENV_FAT_DEVICE_AND_PART CONFIG_ENV_IS_IN_FAT CONFIG_ENV_FAT_FILE CONFIG_SYS_MMC_ENV_PART CONFIG_ENV_FAT_INTERFACE Performing the same installation steps as above, to have this new U-Boot loaded from the SD card, results in the following output: Xilinx Zynq MP First Stage Boot Loader Release 2021.2 Oct 13 2021 - 07:15:53 NOTICE: BL31: v2.4(release):xlnx_rebase_v2.4_2021.1_update1-23-g9188496b9 NOTICE: BL31: Built : 07:41:24, Oct 13 2021 And that's it! No more output. There is an LED on the board that goes from red to green, which I think indicates that the FPGA image within BOOT.BIN has been loaded into the gate array successfully, so I think the earlier boot loader has found BOOT.BIN. I have no reason therefore to think that U-Boot has not also been loaded, but if it has, it is generating no output. I tried increasing the debug level of U-Boot to 7 (DEBUG) in the hope of seeing something from U-Boot, but that makes no difference. It's also not booting Linux, which would normally happen next. Can anyone shed any light on why making this change might result in this behaviour? Is there some other configuration option I need to set to ensure that U-Boot can run from the SD card when CONFIG_ENV_IS_IN_FAT and friends are not set? Or perhaps I can keep CONFIG_ENV_IS_IN_FAT etc. and there's some other way to instruct U-Boot to use the QSPI Flash for its environment, even though it was loaded from SD card? -- David.

2 2

[GIT PULL] xilinx patches for v2022.10
by Michal Simek 27 Jun '22

27 Jun '22

Hi Tom, please pull the following patches to your next branch. There are a lot of changes especially with Microblaze and having an option to disable MANUAL RELOC. Gitlab CI doesn't show any issue. And there is merge conflict with your next branch (Kconfig layout change) which is easy to resolve. Simply remove all reported lines from include/configs/microblaze-generic.h and include/configs/xilinx_zynqmp.h Thanks, Michal The following changes since commit c18e5fb055ab789f58434e3cb432582adee0134c: dtoc: Update test_src_scan.py for new tegra compatibles (2022-06-14 13:59:23 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-microblaze.git tags/xilinx-for-v2022.10 for you to fetch changes up to 728a86edb63a647e6faf211c0dbc7bd0e4ff7ac6: timer: Add SPL_REGMAP dependency for Xilinx timer (2022-06-27 09:03:54 +0200) ---------------------------------------------------------------- Xilinx changes for v2022.10 cpu: - Add driver for microblaze cpu net: - Add support for DM_ETH_PHY to AXI emac and emaclite xilinx: - Switch platforms to DM_ETH_PHY - DT chagnes in ZynqMP and Zynq - Enable support for SquashFS zynqmp: - Add support for KR260 boards - Move BSS from address 0 - Move platform identification from board code to soc driver - Improve zynqmp_psu_init_minimize versal: - Enable loading app at EL1 serial: - Setup default address and clock rates for DEBUG uarts pinctrl: - Add support for tri state and output enable properties relocate-rela: - Clean relocate-rela implementation for ARM64 - Add support for Microblaze microblaze: - Add support for runtime relocation - Rework cache handling (wiring, Kconfig) based on cpuinfo - Remove interrupt support timer: - Extract axi timer driver from Microblaze to generic location ---------------------------------------------------------------- Amit Kumar Mahapatra (1): ARM: zynq: Fix size-cells for pl353 driver Ashok Reddy Soma (3): arm64: versal: Add support to load an app at EL1 pinctrl: zynqmp: Add support for output-enable and bias-high-impedance arm64: zynqmp: Fix usb node drive strength and slew rate Michal Simek (34): arm64: zynqmp: Add debug messages to bl2_plat_get_bl31_params() serial: Setup serial base and freq for zynq/zynqmp arm64: zynqmp: Add support for kr260 revA/B boards arm64: zynqmp: Enable DP for kv260-revA board arm64: zynqmp: Fix i2c addresses for vck190 SC arm64: zynqmp: Update tps53681 i2c address arm64: zynqmp: Fix tps544/u3007 node description tools: relocate-rela: Open binary u-boot file later Makefile: Fix description for relocate-rela parameters tools: relocate-rela: Use global variables tools: relocate-rela: Read rela start/end directly from ELF microblaze: Switch absolute branches to relative microblaze: Fix stack protection behavior microblaze: Fix early stack allocation microblaze: Remove CONFIG_TEXT_BASE from code microblaze: Fix typo in exception.c mips: Move endianness selection to arch/Kconfig microblaze: Enable REMAKE_ELF microblaze: Separate code end substraction microblaze: Change stack protection address to new stack address microblaze: Optimize register usage in relocate_code microblaze: Remove code around r20 in relocate_code() microblaze: Remove _start symbol handling at U-Boot start microblaze: Add comment about reset location microblaze: Create SYM_ADDR macro to deal with symbols tools: relocate-rela: Extract elf64 reloc to special function tools: relocate-rela: Check that relocation works only for EM_AARCH64 tools: relocate-rela: Add support for elf32 decoding tools: relocate-rela: Add support for 32bit Microblaze relocation microblaze: Add support for run time relocation microblaze: Convert axi timer to DM driver microblaze: Remove interrupt handler xilinx: Enable support for SquashFS timer: Add SPL_REGMAP dependency for Xilinx timer Ovidiu Panait (14): cmd: cpu: migrate cpu command to U_BOOT_CMD_WITH_SUBCMDS() cpu-uclass: relocate ops pointers for CONFIG_NEEDS_MANUAL_RELOC microblaze: start.S: remove unused code microblaze: cache: replace XILINX_USE_DCACHE -> CONFIG_DCACHE microblaze: cache: improve dcache Kconfig options microblaze: cache: improve icache Kconfig options microblaze: cache: split flush_cache() function microblaze: cache: introduce Kconfig options for icache/dcache sizes microblaze: cache: introduce flush_cache_all() microblaze: cache: introduce cpuinfo structure microblaze: cache: introduce flush_dcache_range() microblaze: Kconfig: introduce XILINX_MICROBLAZE0_FPGA_FAMILY option microblaze: add support for handling PVR data cpu: add CPU driver for microblaze Stefan Herbrechtsmeier (16): xilinx: zynqmp: Do not use 0 as spl bss start address firmware: zynqmp: Check if rx channel dev pointer is valid firmware: zynqmp: Probe driver before use xilinx: zynqmp: Replace strncat with strlcat xilinx: zynqmp: Add macro for device type mask xilinx: zynqmp: Reuse shift macros to define masks xilinx: zynqmp: Merge device lists soc: xilinx: zynqmp: Remove redundant checks for zynqmp_mmio_read soc: xilinx: zynqmp: Add machine identification support xilinx: cpuinfo: Print soc machine xilinx: common: Separate display cpu info function xilinx: zynqmp: make spi flash support optional tools: zynqmp_psu_init_minimize: Remove low level uart settings tools: zynqmp_psu_init_minimize: Use CR instead of LF tools: zynqmp_psu_init_minimize: Move helper functions below header includes arm64: zynqmp: Move helper functions below header includes T Karthik Reddy (3): net: xilinx: axi_emac: Use shared MDIO bus support for axi emac driver net: xilinx: axi_emaclite: Use shared MDIO bus support for axi emaclite driver xilinx: Add CONFIG_DM_ETH_PHY config MAINTAINERS | 1 + Makefile | 6 +- arch/Kconfig | 32 +- arch/arm/dts/Makefile | 2 + arch/arm/dts/zynq-7000.dtsi | 2 +- arch/arm/dts/zynqmp-e-a2197-00-revA.dts | 6 +- arch/arm/dts/zynqmp-g-a2197-00-revA.dts | 4 +- arch/arm/dts/zynqmp-m-a2197-01-revA.dts | 4 +- arch/arm/dts/zynqmp-m-a2197-02-revA.dts | 8 +- arch/arm/dts/zynqmp-m-a2197-03-revA.dts | 8 +- arch/arm/dts/zynqmp-sck-kr-g-revA.dts | 388 +++ arch/arm/dts/zynqmp-sck-kr-g-revB.dts | 388 +++ arch/arm/dts/zynqmp-sck-kv-g-revA.dts | 7 +- arch/arm/dts/zynqmp-sck-kv-g-revB.dts | 5 +- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 5 +- arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 5 +- arch/arm/dts/zynqmp-zcu100-revC.dts | 10 +- arch/arm/dts/zynqmp-zcu102-revA.dts | 5 +- arch/arm/dts/zynqmp-zcu104-revA.dts | 6 +- arch/arm/dts/zynqmp-zcu104-revC.dts | 6 +- arch/arm/dts/zynqmp-zcu106-revA.dts | 5 +- arch/arm/dts/zynqmp-zcu111-revA.dts | 5 +- arch/arm/mach-zynqmp/handoff.c | 4 + arch/m68k/Kconfig | 3 + arch/microblaze/Kconfig | 22 +- arch/microblaze/config.mk | 11 + arch/microblaze/cpu/Makefile | 4 +- arch/microblaze/cpu/cache.c | 86 +- arch/microblaze/cpu/cpuinfo.c | 131 + arch/microblaze/cpu/exception.c | 2 +- arch/microblaze/cpu/interrupts.c | 182 +- arch/microblaze/cpu/pvr.c | 41 + arch/microblaze/cpu/relocate.c | 111 + arch/microblaze/cpu/start.S | 174 +- arch/microblaze/cpu/timer.c | 123 - arch/microblaze/cpu/u-boot.lds | 14 + arch/microblaze/include/asm/cache.h | 5 + arch/microblaze/include/asm/cpuinfo.h | 114 + arch/microblaze/include/asm/global_data.h | 5 + arch/microblaze/include/asm/microblaze_intc.h | 37 - arch/microblaze/include/asm/microblaze_timer.h | 26 - arch/microblaze/include/asm/pvr.h | 75 + arch/microblaze/lib/bootm.c | 4 +- arch/mips/Kconfig | 18 - board/xilinx/common/Makefile | 3 + board/xilinx/common/board.c | 25 - board/xilinx/common/cpu-info.c | 35 + board/xilinx/microblaze-generic/Kconfig | 54 + board/xilinx/versal/board.c | 17 + board/xilinx/zynqmp/zynqmp-e-a2197-00-revA/psu_init_gpl.c | 3478 ++++++++++---------- board/xilinx/zynqmp/zynqmp-zcu208-revA/psu_init_gpl.c | 3231 +++++++++--------- board/xilinx/zynqmp/zynqmp-zcu216-revA/psu_init_gpl.c | 3231 +++++++++--------- board/xilinx/zynqmp/zynqmp.c | 289 +- cmd/cpu.c | 39 +- common/board_f.c | 2 + configs/microblaze-generic_defconfig | 2 + configs/xilinx_versal_virt_defconfig | 2 + configs/xilinx_zynq_virt_defconfig | 2 + configs/xilinx_zynqmp_virt_defconfig | 2 + drivers/core/device.c | 5 - drivers/cpu/Kconfig | 9 + drivers/cpu/Makefile | 1 + drivers/cpu/cpu-uclass.c | 30 + drivers/cpu/microblaze_cpu.c | 180 + drivers/firmware/firmware-zynqmp.c | 23 +- drivers/net/xilinx_axi_emac.c | 38 +- drivers/net/xilinx_emaclite.c | 43 +- drivers/pinctrl/pinctrl-zynqmp.c | 9 + drivers/serial/Kconfig | 4 + drivers/soc/soc_xilinx_zynqmp.c | 286 +- drivers/timer/Kconfig | 9 + drivers/timer/Makefile | 1 + drivers/timer/xilinx-timer.c | 82 + include/configs/microblaze-generic.h | 8 - include/configs/xilinx_zynqmp.h | 2 +- tools/relocate-rela.c | 545 ++- tools/zynqmp_psu_init_minimize.sh | 27 +- 77 files changed, 7897 insertions(+), 5917 deletions(-) create mode 100644 arch/arm/dts/zynqmp-sck-kr-g-revA.dts create mode 100644 arch/arm/dts/zynqmp-sck-kr-g-revB.dts create mode 100644 arch/microblaze/cpu/cpuinfo.c create mode 100644 arch/microblaze/cpu/pvr.c create mode 100644 arch/microblaze/cpu/relocate.c delete mode 100644 arch/microblaze/cpu/timer.c create mode 100644 arch/microblaze/include/asm/cpuinfo.h delete mode 100644 arch/microblaze/include/asm/microblaze_intc.h delete mode 100644 arch/microblaze/include/asm/microblaze_timer.h create mode 100644 arch/microblaze/include/asm/pvr.h create mode 100644 board/xilinx/common/cpu-info.c create mode 100644 drivers/cpu/microblaze_cpu.c create mode 100644 drivers/timer/xilinx-timer.c -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs

2 1

[PATCH] usb: kbd: allow probing even if usbkbd not in stdin
by kory.maincent＠bootlin.com 27 Jun '22

27 Jun '22

From: Kory Maincent <kory.maincent(a)bootlin.com> For now the driver does not probe if usbkbd was not present in stdin. This presents two issues, we can not probe the driver before setting stdin and we can not use this driver in other manner than stdin console. This patch fixes this by adding an else statement. It simply probes the driver without console management in the case "usbkbd" is not in stdin. Signed-off-by: Kory Maincent <kory.maincent(a)bootlin.com> --- common/usb_kbd.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/common/usb_kbd.c b/common/usb_kbd.c index 352d86fb2e..d385bea532 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -581,21 +581,22 @@ static int probe_usb_keyboard(struct usb_device *dev) stdinname = env_get("stdin"); #if CONFIG_IS_ENABLED(CONSOLE_MUX) - error = iomux_doenv(stdin, stdinname); - if (error) - return error; + if (strstr(stdinname, DEVNAME) != NULL) { + error = iomux_doenv(stdin, stdinname); + if (error) + return error; + } #else /* Check if this is the standard input device. */ - if (strcmp(stdinname, DEVNAME)) - return 1; - - /* Reassign the console */ - if (overwrite_console()) - return 1; + if (!strcmp(stdinname, DEVNAME)) { + /* Reassign the console */ + if (overwrite_console()) + return 1; - error = console_assign(stdin, DEVNAME); - if (error) - return error; + error = console_assign(stdin, DEVNAME); + if (error) + return error; + } #endif return 0; -- 2.25.1

3 4

spi-nand: how to store environment with badblock handling in qspi nand
by Kegl Rohit 27 Jun '22

27 Jun '22

Hello! Is it possible to store the environment inside a mtd partition when using a single qspi nand chip as storage? CONFIG_MTD_SPI_NAND=y The idea is to separate the NAND into two system A/B. 1.Solution: mtdparts_nand0=2m(uboot),16m(system) system will be an ubifs containing env+env_redundant + kernel_a+dtb_a+rootfs_a + kernel_b+dtb_b+rootfs_b. Uboot will read the env and load and start the selected a or b system. With this solution ubifs will do all badblock handling. But system a and b are not really isolated. All will be lost if the one ubifs gets bad. 2.Solution: mtdparts_nand0=2m(uboot),512k(env),512k(env_redundant),8m(system_a),8m(system_b) system_a/b will be ubifs containing kernel+dtb+rootfs. An environment outside the ubifs is needed to switch between system_a/b. But I could not find a suitable option to store the environment outside the ubi mtd partitions when using MTD_SPI_NAND. Here are my findings: CONFIG_ENV_IS_IN_NAND is used for the parallel NAND interface and wont work with MTD_SPI_NAND. CONFIG_ENV_IS_IN_SPI_FLASH is used for spi NOR flash and does not handle badblocks => also wont work. CONFIG_ENV_IS_IN_FLASH another flash subsystem?? Bad block handling seems to be only implemented for CONFIG_ENV_IS_IN_NAND using CONFIG_ENV_RANGE. Setting CONFIG_ENV_RANGE > CONFIG_ENV_SIZE will create tailing space for skipping bad blocks. CONFIG_ENV_IS_IN_UBI will do badblock handling, but it would be a huge overhead to create an extra ubifs mtd partition only for the environment. Has anyone already created the A/B system approach with the mtd spi nand interface and can give me some input? Am I missing something and there is a much simpler solution? Or would it be fine to use one big ubifs because ubi is reliable enough?

2 2

[RFC PATCH] tools: kwbimage: Allow to disable compilation of kwbimage on non-mvebu platforms
by Pali Rohár 27 Jun '22

27 Jun '22

kwbimage depends on libcrypto. 32-bit mvebu platforms (except Orion and Discovery, which are not in mach-mvebu) require kwimage for building SPL. Some users want to compile u-boot tools without libcrypto. Therefore add a new symbol CONFIG_TOOLS_KWBIMAGE which controls compilation of kwbimage and define correct dependences between mvebu, kwbimage and libcrypto targets. This allows disabling of kwbimage compilation on non-mvebu platforms. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- arch/arm/mach-mvebu/Kconfig | 1 + tools/Kconfig | 5 +++++ tools/Makefile | 5 ++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 54dff9986b41..1ccbccea1dda 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -15,6 +15,7 @@ config ARMADA_32BIT select SPL_SIMPLE_BUS if SPL select SUPPORT_SPL select TRANSLATION_OFFSET + select TOOLS_KWBIMAGE if SPL config ARMADA_64BIT bool diff --git a/tools/Kconfig b/tools/Kconfig index 91ce8ae3e516..40866c5713d9 100644 --- a/tools/Kconfig +++ b/tools/Kconfig @@ -25,6 +25,11 @@ config TOOLS_LIBCRYPTO This selection does not affect target features, such as runtime FIT signature verification. +config TOOLS_KWBIMAGE + bool "Enable kwbimage support in host tools" + default y + depends on TOOLS_LIBCRYPTO + config TOOLS_FIT def_bool y help diff --git a/tools/Makefile b/tools/Makefile index 75d8fe71d668..08f1f5a51fb3 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -118,7 +118,6 @@ dumpimage-mkimage-objs := aisimage.o \ imximage.o \ imx8image.o \ imx8mimage.o \ - kwbimage.o \ lib/md5.o \ lpc32xximage.o \ mxsimage.o \ @@ -150,6 +149,10 @@ dumpimage-mkimage-objs := aisimage.o \ $(RSA_OBJS-y) \ $(AES_OBJS-y) +ifdef CONFIG_TOOLS_KWBIMAGE +dumpimage-mkimage-objs += kwbimage.o +endif + dumpimage-objs := $(dumpimage-mkimage-objs) dumpimage.o mkimage-objs := $(dumpimage-mkimage-objs) mkimage.o fit_info-objs := $(dumpimage-mkimage-objs) fit_info.o -- 2.20.1

3 7

[PATCH] timer: Add SPL_REGMAP dependency for Xilinx timer
by Michal Simek 27 Jun '22

27 Jun '22

Add SPL_REGMAP dependency when SPL is enabled. This can avoid compilation issues if timer is selected but SPL_REGMAP not. Reported-by: Ovidiu Panait <ovidiu.panait(a)windriver.com> Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- drivers/timer/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig index 44d1a81bad3d..61156371a666 100644 --- a/drivers/timer/Kconfig +++ b/drivers/timer/Kconfig @@ -276,6 +276,7 @@ config XILINX_TIMER bool "Xilinx timer support" depends on TIMER select REGMAP + select SPL_REGMAP if SPL help Select this to enable support for the timer found on any Xilinx boards (axi timer). -- 2.36.1

2 1

[PATCH] xilinx: Enable support for SquashFS
by Michal Simek 27 Jun '22

27 Jun '22

Enable SquashFS for all xilinx platforms. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- configs/xilinx_versal_virt_defconfig | 1 + configs/xilinx_zynq_virt_defconfig | 1 + configs/xilinx_zynqmp_virt_defconfig | 1 + 3 files changed, 3 insertions(+) diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig index c9ae0185f8ad..1ab9ae2ac3cb 100644 --- a/configs/xilinx_versal_virt_defconfig +++ b/configs/xilinx_versal_virt_defconfig @@ -44,6 +44,7 @@ CONFIG_CMD_EFIDEBUG=y CONFIG_CMD_TIME=y CONFIG_CMD_TIMER=y CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_SQUASHFS=y CONFIG_CMD_MTDPARTS=y CONFIG_CMD_UBI=y CONFIG_PARTITION_TYPE_GUID=y diff --git a/configs/xilinx_zynq_virt_defconfig b/configs/xilinx_zynq_virt_defconfig index 120bc29393d8..489e86adb344 100644 --- a/configs/xilinx_zynq_virt_defconfig +++ b/configs/xilinx_zynq_virt_defconfig @@ -58,6 +58,7 @@ CONFIG_CMD_EFIDEBUG=y CONFIG_CMD_TIME=y CONFIG_CMD_TIMER=y CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_SQUASHFS=y CONFIG_CMD_MTDPARTS=y CONFIG_CMD_MTDPARTS_SPREAD=y CONFIG_CMD_MTDPARTS_SHOW_NET_SIZES=y diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig index de945c5c65b5..59b4cf6eaa2b 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -81,6 +81,7 @@ CONFIG_CMD_TIMER=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_TPM=y CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_SQUASHFS=y CONFIG_CMD_MTDPARTS=y CONFIG_CMD_MTDPARTS_SPREAD=y CONFIG_CMD_MTDPARTS_SHOW_NET_SIZES=y -- 2.36.1

2 1