Dne ponedeljek, 20. januar 2025 ob 00:42:19 Srednjeevropski standardni čas je Andre Przywara napisal(a): > On Sun, 19 Jan 2025 20:45:43 +0100 > Jernej Škrabec <jernej.skra...@gmail.com> wrote: > > Hi Jernej, > > > Dne nedelja, 19. januar 2025 ob 17:41:54 Srednjeevropski standardni čas je > > Andre Przywara napisal(a): > > > In contrast to some other Allwinner SoCs, there is no difference between > > > the DTs for the Allwinner F1C100/F1C200 SoCs (sunvi) between the U-Boot > > > and the Linux kernel repository. > > > > > > Remove the old copies of the F1Cx00 related .dts and .dtsi files, and > > > switch the whole suniv SoC over to use OF_UPSTREAM. > > > > > > Signed-off-by: Andre Przywara <andre.przyw...@arm.com> > > > --- > > > arch/arm/dts/Makefile | 2 - > > > arch/arm/dts/suniv-f1c100s-licheepi-nano.dts | 73 ---- > > > arch/arm/dts/suniv-f1c100s.dtsi | 330 ------------------- > > > arch/arm/dts/suniv-f1c200s-lctech-pi.dts | 76 ----- > > > arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts | 81 ----- > > > arch/arm/mach-sunxi/Kconfig | 1 + > > > configs/lctech_pi_f1c200s_defconfig | 2 +- > > > configs/licheepi_nano_defconfig | 2 +- > > > 8 files changed, 3 insertions(+), 564 deletions(-) > > > delete mode 100644 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts > > > delete mode 100644 arch/arm/dts/suniv-f1c100s.dtsi > > > delete mode 100644 arch/arm/dts/suniv-f1c200s-lctech-pi.dts > > > delete mode 100644 arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts > > > > > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > > > index aef0425c967..5627daa94db 100644 > > > --- a/arch/arm/dts/Makefile > > > +++ b/arch/arm/dts/Makefile > > > @@ -530,8 +530,6 @@ dtb-$(CONFIG_STM32H7) += stm32h743i-disco.dtb \ > > > stm32h743i-eval.dtb \ > > > stm32h750i-art-pi.dtb > > > > > > -dtb-$(CONFIG_MACH_SUNIV) += \ > > > - suniv-f1c100s-licheepi-nano.dtb > > > dtb-$(CONFIG_MACH_SUN4I) += \ > > > sun4i-a10-a1000.dtb \ > > > sun4i-a10-ba10-tvbox.dtb \ > > > > > diff --git a/arch/arm/dts/suniv-f1c100s-licheepi-nano.dts > > > b/arch/arm/dts/suniv-f1c100s-licheepi-nano.dts > > > deleted file mode 100644 > > > index 43896723a99..00000000000 > > > --- a/arch/arm/dts/suniv-f1c100s-licheepi-nano.dts > > > +++ /dev/null > > .... > > > > diff --git a/arch/arm/dts/suniv-f1c100s.dtsi > > > b/arch/arm/dts/suniv-f1c100s.dtsi > > > deleted file mode 100644 > > > index 3c61d59ab5f..00000000000 > > > --- a/arch/arm/dts/suniv-f1c100s.dtsi > > > +++ /dev/null > > ... > > > > diff --git a/arch/arm/dts/suniv-f1c200s-lctech-pi.dts > > > b/arch/arm/dts/suniv-f1c200s-lctech-pi.dts > > > deleted file mode 100644 > > > index 2d2a3f026df..00000000000 > > > --- a/arch/arm/dts/suniv-f1c200s-lctech-pi.dts > > > +++ /dev/null > > ... > > > > diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig > > > index 8065161e61e..866b55833c0 100644 > > > --- a/arch/arm/mach-sunxi/Kconfig > > > +++ b/arch/arm/mach-sunxi/Kconfig > > > @@ -279,6 +279,7 @@ config MACH_SUNIV > > > select SUPPORT_SPL > > > select SKIP_LOWLEVEL_INIT_ONLY > > > select SPL_SKIP_LOWLEVEL_INIT_ONLY > > > + imply OF_UPSTREAM > > > > > > config MACH_SUN4I > > > bool "sun4i (Allwinner A10)" > > > diff --git a/configs/lctech_pi_f1c200s_defconfig > > > b/configs/lctech_pi_f1c200s_defconfig > > > index e1e8d3aaaa3..1588b3b4955 100644 > > > --- a/configs/lctech_pi_f1c200s_defconfig > > > +++ b/configs/lctech_pi_f1c200s_defconfig > > > @@ -1,6 +1,6 @@ > > > CONFIG_ARM=y > > > CONFIG_ARCH_SUNXI=y > > > -CONFIG_DEFAULT_DEVICE_TREE="suniv-f1c200s-lctech-pi" > > > +CONFIG_DEFAULT_DEVICE_TREE="allwinner/suniv-f1c200s-lctech-pi" > > > > What's with this board? I don't see it being removed from Makefile. If it > > is not there, then this board has been broken all along? > > No, all defconfigs build fine, that's tested with CI on every PR merged. > > As it turns out, the build system builds the DTs as listed in the > CONFIG_DEFAULT_DEVICE_TREE variable, but also in CONFIG_OF_LIST > automatically, so those lists in the Makefile are actually somewhat > redundant. I am not entirely sure if there are corner case when they > are needed, though, but even removing the whole Makefile stanza for > A64, for instance, builds those boards fine. > > So the LCTech Pi build is fine, both with and without this patch.
Thanks for explanation. This is then: Reviewed-by: Jernej Skrabec <jernej.skra...@gmail.com> Best regards, Jernej > > Thanks, > Andre > > > > > Best regards, > > Jernej > > > > > CONFIG_SPL=y > > > CONFIG_MACH_SUNIV=y > > > CONFIG_DRAM_CLK=156 > > > diff --git a/configs/licheepi_nano_defconfig > > > b/configs/licheepi_nano_defconfig > > > index d59affb0d9c..051b1901f20 100644 > > > --- a/configs/licheepi_nano_defconfig > > > +++ b/configs/licheepi_nano_defconfig > > > @@ -1,6 +1,6 @@ > > > CONFIG_ARM=y > > > CONFIG_ARCH_SUNXI=y > > > -CONFIG_DEFAULT_DEVICE_TREE="suniv-f1c100s-licheepi-nano" > > > +CONFIG_DEFAULT_DEVICE_TREE="allwinner/suniv-f1c100s-licheepi-nano" > > > CONFIG_SPL=y > > > CONFIG_MACH_SUNIV=y > > > CONFIG_DRAM_CLK=156 > > > > > > > > > > > > > > >
