Gateway GZ80x: update to u-boot-v2024.07

config/boards/gateway-gz80x.conf

@@ -5,8 +5,8 @@ BOARD_MAINTAINER="pyavitz"
 BOOTCONFIG="amper_gateway_am-gz80x_defconfig"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
-BOOTBRANCH_BOARD="tag:v2024.04"
-BOOTPATCHDIR="v2024.04"
+BOOTBRANCH_BOARD="tag:v2024.07"
+BOOTPATCHDIR="v2024.07"
 BOOT_FDT_FILE="amlogic/meson-axg-amper-gateway-am-gz80x.dtb"
 SRC_EXTLINUX="yes"
 SRC_CMDLINE="console=ttyAML0,115200n8 clk_ignore_unused loglevel=7"

patch/u-boot/v2024.04/board_gateway-gz80x/001-Add-board-Amper-Gateway-AM-GZ80x.patch → patch/u-boot/v2024.07/board_gateway-gz80x/001-Add-board-Amper-Gateway-AM-GZ80x.patch

@@ -1,33 +1,20 @@
-From 945e2a0eabe3760f545e751c41e9ed7551787d29 Mon Sep 17 00:00:00 2001
+From 7d170bc4d0c2fbdb01bdf5b0fd9b8201cf65b121 Mon Sep 17 00:00:00 2001
 From: Patrick Yavitz <[email protected]>
-Date: Sat, 14 Sep 2024 19:54:57 -0400
+Date: Thu, 19 Sep 2024 17:39:49 -0400
 Subject: [PATCH] Add board Amper Gateway AM-GZ80x
 
 Signed-off-by: Patrick Yavitz <[email protected]>
 ---
- arch/arm/dts/Makefile                         |   1 +
  ...son-axg-amper-gateway-am-gz80x-u-boot.dtsi |   9 +
- .../dts/meson-axg-amper-gateway-am-gz80x.dts  |  38 +++
- .../dts/meson-axg-amper-gateway-gz80x.dtsi    | 293 ++++++++++++++++++
- configs/amper_gateway_am-gz80x_defconfig      |  69 +++++
- 5 files changed, 410 insertions(+)
+ configs/amper_gateway_am-gz80x_defconfig      |  69 ++++
+ .../meson-axg-amper-gateway-am-gz80x.dts      |  37 +++
+ .../meson-axg-amper-gateway-gz80x.dtsi        | 297 ++++++++++++++++++
+ 4 files changed, 412 insertions(+)
  create mode 100644 arch/arm/dts/meson-axg-amper-gateway-am-gz80x-u-boot.dtsi
- create mode 100644 arch/arm/dts/meson-axg-amper-gateway-am-gz80x.dts
- create mode 100644 arch/arm/dts/meson-axg-amper-gateway-gz80x.dtsi
  create mode 100644 configs/amper_gateway_am-gz80x_defconfig
+ create mode 100644 dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-am-gz80x.dts
+ create mode 100644 dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-gz80x.dtsi
 
-diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index b102ffb5f6..dc25441b9d 100644
---- a/arch/arm/dts/Makefile
-+++ b/arch/arm/dts/Makefile
-@@ -215,6 +215,7 @@ dtb-$(CONFIG_ARCH_S5P4418) += \
- dtb-$(CONFIG_ARCH_MESON) += \
- 	meson-a1-ad401.dtb \
- 	meson-axg-s400.dtb \
-+	meson-axg-amper-gateway-am-gz80x.dtb \
- 	meson-axg-jethome-jethub-j100.dtb \
- 	meson-gxbb-kii-pro.dtb \
- 	meson-gxbb-nanopi-k2.dtb \
 diff --git a/arch/arm/dts/meson-axg-amper-gateway-am-gz80x-u-boot.dtsi b/arch/arm/dts/meson-axg-amper-gateway-am-gz80x-u-boot.dtsi
 new file mode 100644
 index 0000000000..814f891bdc
@@ -43,12 +30,87 @@ index 0000000000..814f891bdc
 +	status = "okay";
 +	vref-supply = <&vddio_ao18>;
 +};
-diff --git a/arch/arm/dts/meson-axg-amper-gateway-am-gz80x.dts b/arch/arm/dts/meson-axg-amper-gateway-am-gz80x.dts
+diff --git a/configs/amper_gateway_am-gz80x_defconfig b/configs/amper_gateway_am-gz80x_defconfig
+new file mode 100644
+index 0000000000..5991f66c29
+--- /dev/null
++++ b/configs/amper_gateway_am-gz80x_defconfig
+@@ -0,0 +1,69 @@
++CONFIG_ARM=y
++CONFIG_ARCH_MESON=y
++CONFIG_TEXT_BASE=0x01000000
++CONFIG_NR_DRAM_BANKS=1
++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="amlogic/meson-axg-amper-gateway-am-gz80x"
++CONFIG_OF_LIBFDT_OVERLAY=y
++CONFIG_DM_RESET=y
++CONFIG_MESON_AXG=y
++CONFIG_DEBUG_UART_BASE=0xff803000
++CONFIG_DEBUG_UART_CLOCK=24000000
++CONFIG_IDENT_STRING=" gateway-am-gz80x"
++CONFIG_SYS_LOAD_ADDR=0x01000000
++CONFIG_DEBUG_UART=y
++CONFIG_REMAKE_ELF=y
++CONFIG_SD_BOOT=y
++CONFIG_OF_BOARD_SETUP=y
++CONFIG_USE_PREBOOT=y
++CONFIG_PREBOOT="usb start"
++# CONFIG_DISPLAY_CPUINFO is not set
++CONFIG_MISC_INIT_R=y
++CONFIG_SYS_MAXARGS=32
++# CONFIG_CMD_BDI is not set
++# CONFIG_CMD_IMI is not set
++CONFIG_CMD_EEPROM=y
++CONFIG_CMD_ADC=y
++CONFIG_CMD_GPIO=y
++CONFIG_CMD_I2C=y
++# CONFIG_CMD_LOADS is not set
++CONFIG_CMD_MMC=y
++CONFIG_CMD_USB=y
++CONFIG_CMD_USB_MASS_STORAGE=y
++CONFIG_CMD_REGULATOR=y
++CONFIG_CMD_BTRFS=y
++CONFIG_PARTITION_TYPE_GUID=y
++CONFIG_OF_CONTROL=y
++CONFIG_SYS_RELOC_GD_ENV_ADDR=y
++CONFIG_SARADC_MESON=y
++CONFIG_DM_I2C=y
++CONFIG_SYS_I2C_MESON=y
++CONFIG_MMC_MESON_GX=y
++CONFIG_PHY_REALTEK=y
++CONFIG_ETH_DESIGNWARE_MESON8B=y
++CONFIG_MESON_GXL_USB_PHY=y
++CONFIG_PINCTRL=y
++CONFIG_PINCTRL_MESON_AXG=y
++CONFIG_DM_REGULATOR=y
++CONFIG_DM_REGULATOR_FIXED=y
++CONFIG_DEBUG_UART_ANNOUNCE=y
++CONFIG_DEBUG_UART_SKIP_INIT=y
++CONFIG_MESON_SERIAL=y
++CONFIG_USB=y
++CONFIG_DM_USB_GADGET=y
++CONFIG_USB_XHCI_HCD=y
++CONFIG_USB_XHCI_DWC3=y
++CONFIG_USB_DWC2=y
++CONFIG_USB_DWC3=y
++# CONFIG_USB_DWC3_GADGET is not set
++CONFIG_USB_DWC3_MESON_GXL=y
++CONFIG_USB_GADGET=y
++CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e
++CONFIG_USB_GADGET_PRODUCT_NUM=0xfada
++CONFIG_USB_GADGET_DWC2_OTG=y
++CONFIG_USB_GADGET_DOWNLOAD=y
++CONFIG_EXT4_WRITE=y
++CONFIG_RANDOM_UUID=y
+diff --git a/dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-am-gz80x.dts b/dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-am-gz80x.dts
 new file mode 100644
-index 0000000000..a6cf5ad81b
+index 0000000000..0a7b48bd03
 --- /dev/null
-+++ b/arch/arm/dts/meson-axg-amper-gateway-am-gz80x.dts
-@@ -0,0 +1,38 @@
++++ b/dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-am-gz80x.dts
+@@ -0,0 +1,37 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
 + * Copyright (c) 2024 Patrick Yavitz <[email protected]>
@@ -63,7 +125,6 @@ index 0000000000..a6cf5ad81b
 +	model = "Amper Gateway AM-GZ80x";
 +
 +	aliases {
-+		serial0 = &uart_AO;
 +		serial1 = &uart_B;
 +		serial2 = &uart_AO_B;
 +		ethernet0 = &ethmac;
@@ -87,12 +148,12 @@ index 0000000000..a6cf5ad81b
 +	pinctrl-0 = <&uart_b_z_pins>;
 +	pinctrl-names = "default";
 +};
-diff --git a/arch/arm/dts/meson-axg-amper-gateway-gz80x.dtsi b/arch/arm/dts/meson-axg-amper-gateway-gz80x.dtsi
+diff --git a/dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-gz80x.dtsi b/dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-gz80x.dtsi
 new file mode 100644
-index 0000000000..a11e33dd06
+index 0000000000..807238c4a6
 --- /dev/null
-+++ b/arch/arm/dts/meson-axg-amper-gateway-gz80x.dtsi
-@@ -0,0 +1,293 @@
++++ b/dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-gz80x.dtsi
+@@ -0,0 +1,297 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
 + * Copyright (c) 2024 Patrick Yavitz <[email protected]>
@@ -106,6 +167,10 @@ index 0000000000..a11e33dd06
 +#include <dt-bindings/thermal/thermal.h>
 +
 +/ {
++	aliases {
++		serial0 = &uart_AO;
++	};
++
 +	chosen {
 +		stdout-path = "serial0:115200n8";
 +	};
@@ -386,81 +451,30 @@ index 0000000000..a11e33dd06
 +	status = "okay";
 +	vbus-supply = <&usb_pwr>;
 +};
+-- 
+2.39.5
+
+From ef5448afc8f03237dcc87741b241505769a8af42 Mon Sep 17 00:00:00 2001
+From: Patrick Yavitz <[email protected]>
+Date: Thu, 19 Sep 2024 17:47:20 -0400
+Subject: [PATCH] CONFIG_OF_UPSTREAM
+
+Compile upstream dt
+
+Signed-off-by: Patrick Yavitz <[email protected]>
+---
+ configs/amper_gateway_am-gz80x_defconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
 diff --git a/configs/amper_gateway_am-gz80x_defconfig b/configs/amper_gateway_am-gz80x_defconfig
-new file mode 100644
-index 0000000000..5991f66c29
---- /dev/null
+index 5991f66c29..d1d9749bdb 100644
+--- a/configs/amper_gateway_am-gz80x_defconfig
 +++ b/configs/amper_gateway_am-gz80x_defconfig
-@@ -0,0 +1,69 @@
-+CONFIG_ARM=y
-+CONFIG_ARCH_MESON=y
-+CONFIG_TEXT_BASE=0x01000000
-+CONFIG_NR_DRAM_BANKS=1
-+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-axg-amper-gateway-am-gz80x"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_DM_RESET=y
-+CONFIG_MESON_AXG=y
-+CONFIG_DEBUG_UART_BASE=0xff803000
-+CONFIG_DEBUG_UART_CLOCK=24000000
-+CONFIG_IDENT_STRING=" gateway-am-gz80x"
-+CONFIG_SYS_LOAD_ADDR=0x01000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_REMAKE_ELF=y
-+CONFIG_SD_BOOT=y
-+CONFIG_OF_BOARD_SETUP=y
-+CONFIG_USE_PREBOOT=y
-+CONFIG_PREBOOT="usb start"
-+# CONFIG_DISPLAY_CPUINFO is not set
-+CONFIG_MISC_INIT_R=y
-+CONFIG_SYS_MAXARGS=32
-+# CONFIG_CMD_BDI is not set
-+# CONFIG_CMD_IMI is not set
-+CONFIG_CMD_EEPROM=y
-+CONFIG_CMD_ADC=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_I2C=y
-+# CONFIG_CMD_LOADS is not set
-+CONFIG_CMD_MMC=y
-+CONFIG_CMD_USB=y
-+CONFIG_CMD_USB_MASS_STORAGE=y
-+CONFIG_CMD_REGULATOR=y
-+CONFIG_CMD_BTRFS=y
-+CONFIG_PARTITION_TYPE_GUID=y
-+CONFIG_OF_CONTROL=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_SARADC_MESON=y
-+CONFIG_DM_I2C=y
-+CONFIG_SYS_I2C_MESON=y
-+CONFIG_MMC_MESON_GX=y
-+CONFIG_PHY_REALTEK=y
-+CONFIG_ETH_DESIGNWARE_MESON8B=y
-+CONFIG_MESON_GXL_USB_PHY=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCTRL_MESON_AXG=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DEBUG_UART_ANNOUNCE=y
-+CONFIG_DEBUG_UART_SKIP_INIT=y
-+CONFIG_MESON_SERIAL=y
-+CONFIG_USB=y
-+CONFIG_DM_USB_GADGET=y
-+CONFIG_USB_XHCI_HCD=y
-+CONFIG_USB_XHCI_DWC3=y
-+CONFIG_USB_DWC2=y
-+CONFIG_USB_DWC3=y
-+# CONFIG_USB_DWC3_GADGET is not set
-+CONFIG_USB_DWC3_MESON_GXL=y
-+CONFIG_USB_GADGET=y
-+CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e
-+CONFIG_USB_GADGET_PRODUCT_NUM=0xfada
-+CONFIG_USB_GADGET_DWC2_OTG=y
-+CONFIG_USB_GADGET_DOWNLOAD=y
-+CONFIG_EXT4_WRITE=y
-+CONFIG_RANDOM_UUID=y
+@@ -1,3 +1,4 @@
++CONFIG_OF_UPSTREAM=y
+ CONFIG_ARM=y
+ CONFIG_ARCH_MESON=y
+ CONFIG_TEXT_BASE=0x01000000
 -- 
-2.39.2
+2.39.5