On Thu, Dec 28, 2023 at 03:09:41PM +0000, Simon Glass wrote: > Hi Tom, > > On Thu, Dec 28, 2023 at 1:56 PM Tom Rini <tr...@konsulko.com> wrote: > > > > On Thu, Dec 28, 2023 at 01:37:11PM +0000, Simon Glass wrote: > > > Hi Sumit, > > > > > > On Thu, Dec 28, 2023 at 11:59 AM Sumit Garg <sumit.g...@linaro.org> wrote: > > > > > > > > Although there were still some variations in board DTS files based on > > > > meson-gxbb SoC but I think those were minor differences from upstream > > > > and shouldn't impact boot on these devices. > > > > > > > > So switch to upstream DT via mirroring amlogic/ directory from > > > > devicetree-rebasing/src/arm64/amlogic/ directory. And thereby directly > > > > building DTB from there including *-u-boot.dtsi files from > > > > arch/$(ARCH)/dts/ directory. > > > > > > > > Reviewed-by: Neil Armstrong <neil.armstr...@linaro.org> > > > > Signed-off-by: Sumit Garg <sumit.g...@linaro.org> > > > > --- > > > > > > > > Changes in v3: > > > > -------------- > > > > - Dropped Makefile portion and enabled OF_UPSTREAM for SoC instead. > > > > > > > > Changes in v2: > > > > -------------- > > > > - Picked up review tag > > > > > > > > arch/arm/mach-meson/Kconfig | 1 + > > > > configs/nanopi-k2_defconfig | 2 +- > > > > configs/odroid-c2_defconfig | 2 +- > > > > configs/p200_defconfig | 2 +- > > > > configs/p201_defconfig | 2 +- > > > > configs/videostrong-kii-pro_defconfig | 2 +- > > > > configs/wetek-hub_defconfig | 2 +- > > > > configs/wetek-play2_defconfig | 2 +- > > > > dts/arch/arm64/amlogic | 1 + > > > > 9 files changed, 9 insertions(+), 7 deletions(-) > > > > create mode 120000 dts/arch/arm64/amlogic > > > > > > > > > > Reviewed-by: Simon Glass <s...@chromium.org> > > > > > > > diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig > > > > index d6c89058061..8ddb59161a0 100644 > > > > --- a/arch/arm/mach-meson/Kconfig > > > > +++ b/arch/arm/mach-meson/Kconfig > > > > @@ -25,6 +25,7 @@ choice > > > > config MESON_GXBB > > > > bool "GXBB" > > > > select MESON_GX > > > > + imply OF_UPSTREAM > > > > help > > > > Select this if your SoC is an S905 > > > > > > > > diff --git a/configs/nanopi-k2_defconfig b/configs/nanopi-k2_defconfig > > > > index 41dbf7981f8..2e1c756bf7a 100644 > > > > --- a/configs/nanopi-k2_defconfig > > > > +++ b/configs/nanopi-k2_defconfig > > > > @@ -6,7 +6,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y > > > > CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 > > > > CONFIG_ENV_SIZE=0x2000 > > > > CONFIG_DM_GPIO=y > > > > -CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-nanopi-k2" > > > > +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxbb-nanopi-k2" > > > > CONFIG_OF_LIBFDT_OVERLAY=y > > > > CONFIG_DM_RESET=y > > > > CONFIG_DEBUG_UART_BASE=0xc81004c0 > > > > > > So now I am wondering if we can (later) have the SoC be implied when > > > using OF_UPSTREAM so we can do: > > > > > > CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-nanopi-k2" > > > > > > and it will add the 'amlogic/' automatically? > > > > > > Perhaps that might be a way to bridge the gap in terms of file layout? > > > > That's going to start to look real ugly real quick I suspect and I'm not > > sure what it really gets us? It seems to me that the convention of > > "vendor/board" has already been well enough adapted outside of the > > kernel, with the odd sticking point being getting everyone used to > > whatever will be happening for 32bit boards long term. So I think hiding > > the vendor part of the string here will be more, not less, confusing > > long term. > > Now that I dig in a bit, I see that the devicetree-rebasing tree does > not have any Makefiles in it. How does Linux build with it? Does > anyone have instructions?
Linux doesn't build with it, it's the relevant parts of the kernel tree extracted for other projects to more easily use (more or less). -- Tom
signature.asc
Description: PGP signature