开云体育

Hi Neil, Thank you for the series. Boot tested AOSP on VIM3. Tested-by: Mattijs Korpershoek <mkorpershoek@...

Since meson G12A, G12B & SM1 based boards switched to using upstream DT, so drop redundant files from arch/arm/dts directory. Only *-u-boot.dtsi files kept in arch/arm/dts directory for these boards.

Since meson GXL, GXM & AXG based boards switched to using upstream DT, so drop redundant files from arch/arm/dts directory. Only *-u-boot.dtsi files kept in arch/arm/dts directory for these boards.

Enable OF_UPSTREAM to use upstream DT and add amlogic/ prefix to the DEFAULT_DEVICE_TREE. And thereby directly build DTB from dts/upstream/src/ including *-u-boot.dtsi files from arch/$(ARCH)/dts/

Enable OF_UPSTREAM to use upstream DT and add amlogic/ prefix to the DEFAULT_DEVICE_TREE. And thereby directly build DTB from dts/upstream/src/ including *-u-boot.dtsi files from arch/$(ARCH)/dts/

Remove amlogic/ path prefix in CFG_EXTRA_ENV_SETTINGS fdtfile when using CONFIG_OF_UPSTREAM, otherwise amlogic/ is added twice. Signed-off-by: Neil Armstrong <neil.armstrong@...> ---

Enable OF_UPSTREAM to use upstream DT and add amlogic/ prefix to the DEFAULT_DEVICE_TREE. And thereby directly build DTB from dts/upstream/src/ including *-u-boot.dtsi files from arch/$(ARCH)/dts/

Thanks ! I'll send a v2 with this fix and your ack! Neil

Builds and run ok. for related: Acked-by: Viacheslav Bocharov <adeep@...> 28/03/2024 10.50, neil.armstrong@... wrote:

Hi, Sorry for the delay. I will test this early next week (Tuesday) Thank you !

Hi Mattijs, Can you check it doesn't break android boot ? Neil

Hi, You're right, I forgot to remove the fdtfile prefix, can you retry with: =====><=========================================== diff --git a/include/configs/meson64.h b/include/configs/meson64.h index

Hi, Neil! With this patchset I got wrong fdt link in env with double prefix: fdtfile=amlogic/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb but if i remove "amlogic" prefix in config it does not build

Thanks, squashed! Neil

Fix linter errors Fixes: 2fc5e3c1668cffdb4b894986e98c1ee10f6e9955 Signed-off-by: Viacheslav Bocharov <adeep@...> --- doc/board/amlogic/jethub-j100.rst | 2 +- 1 file changed, 1 insertion(+), 1

Applied to u-boot/master, thanks! -- Tom

Hi Tom, Please pull this set of last minute fixes Thanks, Neil The following changes since commit bd0aedde3ea3691616c17c720e2d25351308c0a1: board: toradex: verdin-am62_r5: Increase

I have a CI failure: https://source.denx.de/u-boot/custodians/u-boot-amlogic/-/jobs/804174 /builds/u-boot/custodians/u-boot-amlogic/doc/board/amlogic/jethub-j100.rst:4:Title underline too short.

Hi, Thanks, Applied to https://source.denx.de/u-boot/custodians/u-boot-amlogic (u-boot-amlogic) [1/1] board: amlogic: fix buffler overflow in seria, mac & usid read

Hi, Thanks, Applied to https://source.denx.de/u-boot/custodians/u-boot-amlogic (u-boot-amlogic) [1/2] ARM: dts: fix Ethernet on WeTek Hub/Play2