Hi, Anand On Tue, May 19, 2026 at 1:24 PM Anand Moon <[email protected]> wrote: > > Hi Guodong, > > Thanks, > > On Tue, 19 May 2026 at 04:08, Guodong Xu <[email protected]> wrote: > > > > From: Raymond Mao <[email protected]> > > > > Restructure K1 SoC support to handle multiple boards through a single > > configuration: > > > > 1. Rename bananapi-f3_defconfig to spacemit_k1_defconfig. > > 2. Move all K1 board files to board/spacemit/k1/. > > 3. Replace TARGET_BANANAPI_F3 with TARGET_SPACEMIT_K1 and rename the > > board's <board>.h header to k1.h. > > > > Eliminates the need for board-specific defconfigs while maintaining > > hardware compatibility. > > > > Signed-off-by: Raymond Mao <[email protected]> > > Signed-off-by: Guodong Xu <[email protected]> > > > > :~/mainline/u-boot/risc-v/u-boot-riscv$ b4 am > [email protected] > Looking up > https://lore.kernel.org/all/[email protected]/ > Grabbing thread from > lore.kernel.org/all/[email protected]/t.mbox.gz > Analyzing 15 messages in the thread > Looking for additional code-review trailers on lore.kernel.org > Analyzing 51 code-review messages > Checking attestation on all messages, may take a moment...
> --- > [PATCH v4 1/14] spacemit: k1: support multi-board infrastructure > [PATCH v4 2/14] spacemit: k1: enable SPL with debug UART > [PATCH v4 3/14] configs: k1: enable early timer support > [PATCH v4 4/14] clk: spacemit: k1: prune SPL clock tree > [PATCH v4 5/14] configs: k1: add default option for clock driver in SPL > [PATCH v4 6/14] dts: k1: enable clocks in SPL > [PATCH v4 7/14] board: k1: initialize clock and serial devices in SPL > [PATCH v4 8/14] i2c: k1: add I2C driver support > [PATCH v4 9/14] spacemit: k1: add TLV EEPROM support in SPL > [PATCH v4 10/14] spacemit: k1: Add DDR firmware support to SPL > [PATCH v4 11/14] power: pmic: add support for Spacemit P1 PMIC > [PATCH v4 12/14] power: regulator: add support for Spacemit P1 SoC > [PATCH v4 13/14] board: k1: enable pmic in spl > [PATCH v4 14/14] doc: spacemit: add K1 SPL build and test guide > --- > NOTE: install dkimpy for DKIM signature verification > --- > Total patches: 14 > --- > Cover: ./v4_20260519_guodong_riscv_spacemit_k1_add_spl_support.cover > Link: > https://patch.msgid.link/[email protected] > Base: base-commit 52ec53db8f18ed476f30de3799067652948eba28 not known, > ignoring > git am ./v4_20260519_guodong_riscv_spacemit_k1_add_spl_support.mbx > amoon@Dell-5430:~/mainline/u-boot/risc-v/u-boot-riscv$ git am > ./v4_20260519_guodong_riscv_spacemit_k1_add_spl_support.mbx > Applying: spacemit: k1: support multi-board infrastructure > error: patch failed: configs/bananapi-f3_defconfig:6 > error: configs/bananapi-f3_defconfig: patch does not apply > Patch failed at 0001 spacemit: k1: support multi-board infrastructure Thanks for trying to apply this — and sorry the cover-letter dependency wasn't more visible. The v4 SPL series depends on my K1 clock/reset/dts migration series, which is still under review and not yet in mainline. The cover letter mentions it in reference [1]: https://lore.kernel.org/u-boot/20260510-b4-k1-clk-reset-upstream-dts-v1-0-db0b0503e...@riscstar.com/ [1] Apply both series in order on origin/master: b4 am 20260510-b4-k1-clk-reset-upstream-dts-v1-0-db0b0503e...@riscstar.com git am ./20260510_*.mbx # migration: 8 patches b4 am [email protected] git am ./v4_*.mbx # SPL: 14 patches I just re-verified the above on current u-boot/master (38dbe637c9d, post efi-2026-07-rc3); both series apply cleanly without conflicts. A combined branch with both stacks is also at: https://github.com/docularxu/u-boot/tree/b4/k1-spl-bring-up-v4 Build and test instructions are in patch 14/14 (doc/board/spacemit/k1-spl.rst). Thanks again for trying it out. Your Tested-by would be very welcome once you have it building. BR, Guodong > hint: Use 'git am --show-current-patch=diff' to see the failed patch > hint: When you have resolved this problem, run "git am --continue". > hint: If you prefer to skip this patch, run "git am --skip" instead. > hint: To restore the original branch and stop patching, run "git am --abort". > hint: Disable this message with "git config set advice.mergeConflict false" > amoon@Dell-5430:~/mainline/u-boot/risc-v/u-boot-riscv$ > > I could not apply these changes to the U-Boot mainline > Could you rebase the series on the U-Boot master branch? > > Thanks > -Anand >
