enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gateway AM-GZ80x: Re-brand as Amper & update u-boot to v2024.04 (#7113)

Browse Source 
* Gateway AM-GZ80x: Re-brand as Amper & update u-boot to v2024.04

During a search I noticed other companies are using the same
unit. Lets re-brand to Amper as technically that is the product
brand name.

Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>

* Delete old patch set: `patch: u-boot: v2023.10: board_gateway-gz80x`

Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>

* Update test target

---------

Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
Co-authored-by: Patrick Yavitz <pyavitz@armbian.com>
Co-authored-by: Igor <igor@armbian.com>
This commit is contained in:
c0rnelius 2024-08-21 08:00:43 -04:00 committed by GitHub
parent cc0f38aa45
commit 433f1241fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 255 additions and 64727 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
config/boards/gateway-gz80x.conf
View File

@ -1,26 +1,17 @@
# Amlogic A113X quad core 1Gb RAM SoC, eMMC 8Gb
BOARD_NAME="Gateway GZ80X"
BOARD_NAME="Gateway GZ80x"
BOARDFAMILY="meson-axg"
BOARD_MAINTAINER="pyavitz"
BOOTCONFIG="alfredsmart_gateway_gz80x_defconfig"
BOOTCONFIG="amper_gateway_am-gz80x_defconfig"
KERNEL_TARGET="current,edge"
KERNEL_TEST_TARGET="current"
BOOTBRANCH_BOARD="tag:v2023.10"
BOOTPATCHDIR="v2023.10"
BOOT_FDT_FILE="amlogic/meson-axg-alfredsmart-gateway-gz80x.dtb"
BOOTBRANCH_BOARD="tag:v2024.04"
BOOTPATCHDIR="v2024.04"
BOOT_FDT_FILE="amlogic/meson-axg-amper-gateway-am-gz80x.dtb"
SRC_EXTLINUX="yes"
SRC_CMDLINE="console=ttyAML0,115200n8 clk_ignore_unused loglevel=7"
HAS_VIDEO_OUTPUT="no"
function post_config_uboot_target__extra_configs_for_gateway_gz80x() {
display_alert "u-boot for ${BOARD}" "u-boot: enabling extra configs" "info"
run_host_command_logged scripts/config --enable CONFIG_SD_BOOT
run_host_command_logged scripts/config --enable CONFIG_EXT4_WRITE
run_host_command_logged scripts/config --enable CONFIG_FS_BTRFS
run_host_command_logged scripts/config --enable CONFIG_CMD_BTRFS
}
function post_family_tweaks_bsp__gateway_gz80x_udev() {
mkdir -p "${destination}"/etc/udev/rules.d
display_alert "$BOARD" "Install zwave udev rule" "info"

6
patch/kernel/archive/meson64-6.10/dt/meson-axg-alfredsmart-gateway-gz80x.dts → patch/kernel/archive/meson64-6.10/dt/meson-axg-amper-gateway-am-gz80x.dts
View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright (c) 2024 Patrick Yavitz <pyavitz@armbian.com>
* Copyright (c) 2024 Alfred Smart
*
*/
/dts-v1/;
@ -10,8 +10,8 @@
#include <dt-bindings/leds/common.h>
/ {
compatible = "alfredsmart,gateway-gz80x", "amlogic,a113d", "amlogic,meson-axg";
model = "Alfred Smart Gateway (AM-GZ80X)";
compatible = "amper,gateway-am-gz80x", "amlogic,a113x", "amlogic,meson-axg";
model = "Amper Gateway AM-GZ80x";
aliases {
serial0 = &uart_AO;

6
patch/kernel/archive/meson64-6.6/dt/meson-axg-alfredsmart-gateway-gz80x.dts → patch/kernel/archive/meson64-6.6/dt/meson-axg-amper-gateway-am-gz80x.dts
View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright (c) 2024 Patrick Yavitz <pyavitz@armbian.com>
* Copyright (c) 2024 Alfred Smart
*
*/
/dts-v1/;
@ -10,8 +10,8 @@
#include <dt-bindings/leds/common.h>
/ {
compatible = "alfredsmart,gateway-gz80x", "amlogic,a113d", "amlogic,meson-axg";
model = "Alfred Smart Gateway (AM-GZ80X)";
compatible = "amper,gateway-am-gz80x", "amlogic,a113x", "amlogic,meson-axg";
model = "Amper Gateway AM-GZ80x";
aliases {
serial0 = &uart_AO;

63704
patch/u-boot/v2023.10/board_gateway-gz80x/0003-Copy-and-update-amlogic-2019-aml-partition-keyman-co.patch
View File

File diff suppressed because it is too large Load Diff

505
patch/u-boot/v2023.10/board_gateway-gz80x/0004-Copy-and-update-amlogic-2019-aml-partition-keyman-co.patch
View File

@ -1,505 +0,0 @@
From aa7c8e63c6a81cf054af4392e7ae1fbf4e9bbf04 Mon Sep 17 00:00:00 2001
From: Viacheslav Bocharov <adeep@lexina.in>
Date: Tue, 3 Oct 2023 17:26:36 +0300
Subject: [PATCH 4/8] Copy and update amlogic-2019 aml partition/keyman code to
mainline (fixes)
---
.../meson-axg-jethome-jethub-j100-u-boot.dtsi | 92 +++++++++++++++++
cmd/Kconfig | 5 +
cmd/Makefile | 3 +
common/Makefile | 3 +
configs/jethub_j100_defconfig | 7 ++
configs/jethub_j80_defconfig | 7 ++
disk/Kconfig | 13 +++
disk/Makefile | 1 +
drivers/Kconfig | 4 +
drivers/Makefile | 3 +
drivers/mmc/Makefile | 3 +
drivers/mmc/mmc.c | 99 ++++++++++++++++++-
include/mmc.h | 25 +++++
include/part.h | 3 +
14 files changed, 267 insertions(+), 1 deletion(-)
diff --git a/arch/arm/dts/meson-axg-jethome-jethub-j100-u-boot.dtsi b/arch/arm/dts/meson-axg-jethome-jethub-j100-u-boot.dtsi
index 3ecb233f8e2..e0e6b2259cc 100644
--- a/arch/arm/dts/meson-axg-jethome-jethub-j100-u-boot.dtsi
+++ b/arch/arm/dts/meson-axg-jethome-jethub-j100-u-boot.dtsi
@@ -4,6 +4,98 @@
* Author: Vyacheslav Bocharov <adeep@lexina.in>
*/
+/ {
+ partitions: partitions {
+ parts = <1>;
+ part-0 = <&rootfs>;
+ rootfs: rootfs {
+ pname = "rootfs";
+ size = <0xffffffff 0xffffffff>;
+ mask = <4>;
+ };
+ };
+
+ efusekey: efusekey {
+ keynum = <5>;
+ key0 = <&key_0>;
+ key1 = <&key_1>;
+ key2 = <&key_2>;
+ key3 = <&key_3>;
+ key4 = <&key_4>;
+
+ key_0: key_0 {
+ keyname = "mac";
+ offset = <0>;
+ size = <6>;
+ };
+ key_1: key_1 {
+ keyname = "mac_bt";
+ offset = <6>;
+ size = <6>;
+ };
+ key_2: key_2 {
+ keyname = "mac_wifi";
+ offset = <12>;
+ size = <6>;
+ };
+ key_3: key_3 {
+ keyname = "usid";
+ offset = <18>;
+ size = <32>;
+ };
+ key_4: key_4 {
+ keyname = "serial";
+ offset = <50>;
+ size = <32>;
+ };
+ }; //End efusekey
+
+ unifykey {
+ compatible = "amlogic, unifykey";
+ status = "ok";
+ unifykey-num = <6>;
+ unifykey-index-0 = <&keysn_0>;
+ unifykey-index-1 = <&keysn_1>;
+ unifykey-index-2 = <&keysn_2>;
+ unifykey-index-3 = <&keysn_3>;
+ unifykey-index-4 = <&keysn_4>;
+ unifykey-index-5 = <&keysn_5>;
+
+ keysn_0: key_0 {
+ key-name = "usid";
+ key-device = "normal";
+ key-permit = "read";
+ };
+ keysn_1: key_1 {
+ key-name = "mac";
+ key-device = "normal";
+ key-permit = "read";
+ };
+ keysn_2: key_2 {
+ key-name = "mac_bt";
+ key-device = "normal";
+ key-permit = "read","write","del";
+ key-type = "mac";
+ };
+ keysn_3: key_3 {
+ key-name = "mac_wifi";
+ key-device = "normal";
+ key-permit = "read","write","del";
+ key-type = "mac";
+ };
+ keysn_4: key_4 {
+ key-name = "serial";
+ key-device = "normal";
+ key-permit = "read";
+ };
+ keysn_5:key_5 {
+ key-name = "deviceid";
+ key-device = "normal";
+ key-permit = "read","write","del";
+ };
+ }; //End unifykey
+};
+
&saradc {
status = "okay";
vref-supply = <&vddio_ao18>;
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 43ca10f69cc..71446cf0923 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -2698,6 +2698,11 @@ config CMD_REISER
reiserls - list files
reiserload - load a file
+config AML_STORAGE
+ bool "aml storage support"
+ help
+ storage cmd support
+
config CMD_YAFFS2
bool "yaffs2 - Access of YAFFS2 filesystem"
depends on YAFFS2
diff --git a/cmd/Makefile b/cmd/Makefile
index 9bebf321c39..1f68971aaee 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -214,6 +214,9 @@ obj-$(CONFIG_CMD_ETHSW) += ethsw.o
obj-$(CONFIG_CMD_AXI) += axi.o
obj-$(CONFIG_CMD_PVBLOCK) += pvblock.o
+obj-$(CONFIG_AML_STORAGE) += storage.o
+obj-$(CONFIG_CMD_MMC) += aml_mmc.o
+
# Power
obj-$(CONFIG_CMD_PMIC) += pmic.o
obj-$(CONFIG_CMD_REGULATOR) += regulator.o
diff --git a/common/Makefile b/common/Makefile
index f5c3d90f067..26d9aefeaaf 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -11,6 +11,9 @@ obj-y += exports.o
obj-$(CONFIG_HUSH_PARSER) += cli_hush.o
obj-$(CONFIG_AUTOBOOT) += autoboot.o
+obj-$(CONFIG_AML_STORAGE) += partitions.o
+obj-$(CONFIG_AML_STORAGE) += aml_dt.o
+
# # boards
obj-y += board_f.o
obj-y += board_r.o
diff --git a/configs/jethub_j100_defconfig b/configs/jethub_j100_defconfig
index 549d5514f7a..26a22d96a6d 100644
--- a/configs/jethub_j100_defconfig
+++ b/configs/jethub_j100_defconfig
@@ -68,3 +68,10 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e
CONFIG_USB_GADGET_PRODUCT_NUM=0xfada
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
+
+CONFIG_AML_DRIVER=y
+CONFIG_UNIFY_KEY_MANAGE=y
+CONFIG_SECURE_STORAGE=y
+CONFIG_AML_STORAGE=y
+CONFIG_EFUSE=y
+CONFIG_AML_PARTITION=y
diff --git a/configs/jethub_j80_defconfig b/configs/jethub_j80_defconfig
index df9b8f3aedf..46bc96516e7 100644
--- a/configs/jethub_j80_defconfig
+++ b/configs/jethub_j80_defconfig
@@ -72,3 +72,10 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e
CONFIG_USB_GADGET_PRODUCT_NUM=0xfada
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y
+
+CONFIG_AML_DRIVER=y
+CONFIG_UNIFY_KEY_MANAGE=y
+CONFIG_SECURE_STORAGE=y
+CONFIG_AML_STORAGE=y
+CONFIG_EFUSE=y
+CONFIG_AML_PARTITION=y
diff --git a/disk/Kconfig b/disk/Kconfig
index 85496958074..5c65ad5065c 100644
--- a/disk/Kconfig
+++ b/disk/Kconfig
@@ -165,4 +165,17 @@ config SPL_PARTITION_TYPE_GUID
Activate the configuration of GUID type
for EFI partition
+config AML_PARTITION
+ bool "Enable AML partition table"
+ depends on PARTITIONS
+ help
+ "AML_PARTITION_HELP"
+
+config AML_GPT
+ bool "Enable AML GPT partition table"
+ depends on PARTITIONS
+ select RANDOM_UUID
+ help
+ "AML_GPT_HELP"
+
endmenu
diff --git a/disk/Makefile b/disk/Makefile
index 45588cf66e4..23fc28bcbe4 100644
--- a/disk/Makefile
+++ b/disk/Makefile
@@ -17,4 +17,5 @@ obj-$(CONFIG_$(SPL_TPL_)DOS_PARTITION) += part_dos.o
obj-$(CONFIG_$(SPL_TPL_)ISO_PARTITION) += part_iso.o
obj-$(CONFIG_$(SPL_TPL_)AMIGA_PARTITION) += part_amiga.o
obj-$(CONFIG_$(SPL_TPL_)EFI_PARTITION) += part_efi.o
+#obj-$(CONFIG_AML_PARTITION) += part_aml.o
endif
diff --git a/drivers/Kconfig b/drivers/Kconfig
index a25f6ae02fd..c074b7dce93 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -156,6 +156,10 @@ source "drivers/watchdog/Kconfig"
source "drivers/xen/Kconfig"
+source "drivers/amlogic/Kconfig"
+
+source "drivers/efuse/Kconfig"
+
config PHYS_TO_BUS
bool "Custom physical to bus address mapping"
help
diff --git a/drivers/Makefile b/drivers/Makefile
index efc2a4afb24..91883a77af7 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -43,6 +43,9 @@ obj-$(CONFIG_$(SPL_)VIDEO) += video/
obj-y += bus/
+obj-$(CONFIG_AML_DRIVER) += amlogic/
+obj-$(CONFIG_EFUSE) += efuse/
+
ifndef CONFIG_TPL_BUILD
ifndef CONFIG_VPL_BUILD
ifdef CONFIG_SPL_BUILD
diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index 2c65c4765ab..2ee7af838ed 100644
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -4,7 +4,10 @@
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
obj-y += mmc.o
+obj-y += mmc_aml.o
obj-$(CONFIG_$(SPL_)DM_MMC) += mmc-uclass.o
+obj-$(CONFIG_CMD_MMC) += storage_emmc.o
+obj-$(CONFIG_MMC_MESON_GX) += aml_emmc_partition.o
ifdef CONFIG_$(SPL_TPL_)DM_MMC
obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += mmc_bootdev.o
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 31cfda28858..9b275b82e14 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -26,6 +26,24 @@
#include <div64.h>
#include "mmc_private.h"
+
+// TODO amlogic
+#include <linux/crc32.h>
+#include <rand.h>
+#include <amlstorage/partition_table.h>
+#include <amlstorage/emmc_partitions.h>
+
+struct aml_pattern aml_pattern_table[] = {
+ AML_PATTERN_ELEMENT(MMC_PATTERN_NAME, CALI_PATTERN),
+ AML_PATTERN_ELEMENT(MMC_MAGIC_NAME, MAGIC_PATTERN),
+ AML_PATTERN_ELEMENT(MMC_RANDOM_NAME, RANDOM_PATTERN),
+};
+
+int mmc_pattern_check(struct mmc *mmc, struct aml_pattern *table);
+void mmc_write_cali_mattern(void *addr, struct aml_pattern *table);
+
+// end TODO
+
#define DEFAULT_CMD6_TIMEOUT_MS 500
static int mmc_set_signal_voltage(struct mmc *mmc, uint signal_voltage);
@@ -2391,6 +2409,12 @@ static int mmc_startup_v4(struct mmc *mmc)
}
#endif
+ /* dev life time estimate type A/B */
+ mmc->dev_lifetime_est_typ_a
+ = ext_csd[EXT_CSD_DEV_LIFETIME_EST_TYP_A];
+ mmc->dev_lifetime_est_typ_b
+ = ext_csd[EXT_CSD_DEV_LIFETIME_EST_TYP_B];
+
/*
* Host needs to enable ERASE_GRP_DEF bit if device is
* partitioned. This bit will be lost every time after a reset
@@ -2984,7 +3008,7 @@ static int mmc_complete_init(struct mmc *mmc)
int mmc_init(struct mmc *mmc)
{
- int err = 0;
+ int err = 0, i;
__maybe_unused ulong start;
#if CONFIG_IS_ENABLED(DM_MMC)
struct mmc_uclass_priv *upriv = dev_get_uclass_priv(mmc->dev);
@@ -3003,6 +3027,18 @@ int mmc_init(struct mmc *mmc)
err = mmc_complete_init(mmc);
if (err)
pr_info("%s: %d, time %lu\n", __func__, err, get_timer(start));
+ info_disprotect |= DISPROTECT_KEY;
+ if (IS_MMC(mmc)) {
+ if (!is_partition_checked) {
+ if (mmc_device_init(mmc) == 0) {
+ is_partition_checked = true;
+ pr_info("eMMC/TSD partition table have been checked OK!\n");
+ for (i = 0; i < ARRAY_SIZE(aml_pattern_table); i++)
+ mmc_pattern_check(mmc, &aml_pattern_table[i]);
+ }
+ }
+ }
+ info_disprotect &= ~DISPROTECT_KEY;
return err;
}
@@ -3193,3 +3229,64 @@ __weak int mmc_get_env_dev(void)
return 0;
#endif
}
+
+/// TODO: amlogic
+int mmc_pattern_check(struct mmc *mmc, struct aml_pattern *table)
+{
+ void *addr = NULL;
+ u64 cnt = 0, n = 0, blk = 0;
+ u32 *buf = NULL;
+ u32 crc32_s = 0;
+ struct partitions *part = NULL;
+ struct virtual_partition *vpart = NULL;
+
+ vpart = aml_get_virtual_partition_by_name(table->name);
+
+ addr = (void *)malloc(vpart->size);
+ if (!addr) {
+ printf("%s malloc failed\n", table->name);
+ return 1;
+ }
+ part = aml_get_partition_by_name(MMC_RESERVED_NAME);
+ blk = (part->offset + vpart->offset) / mmc->read_bl_len;
+ cnt = vpart->size / mmc->read_bl_len;
+ n = blk_dread(mmc_get_blk_desc(mmc), blk, cnt, addr);
+ if (n != cnt) {
+ printf("read pattern failed\n");
+ free(addr);
+ return 1;
+ } else {
+ buf = (u32 *)addr;
+ crc32_s = crc32(0, (u8 *)addr, (vpart->size - 4));
+ if (crc32_s != buf[vpart->size/4 - 1]) {
+ printf("check %s failed,need to write\n",
+ table->name);
+ mmc_write_cali_mattern(addr, table);
+ n = blk_dwrite(mmc_get_blk_desc(mmc), blk, cnt, addr);
+ printf("several 0x%x pattern blocks write %s\n",
+ table->pattern, (n == cnt) ? "OK" : "ERROR");
+ }
+ printf("crc32_s:0x%x == storage crc_pattern:0x%x!!!\n",
+ crc32_s, buf[vpart->size/4 - 1]);
+ }
+ free(addr);
+ return (n == cnt) ? 0 : 1;
+}
+
+
+void mmc_write_cali_mattern(void *addr, struct aml_pattern *table)
+{
+ int i = 0;
+ unsigned int s = 10;
+ u32 *mattern = (u32 *)addr;
+ struct virtual_partition *vpart =
+ aml_get_virtual_partition_by_name(table->name);
+ for (i = 0;i < (vpart->size)/4 - 1;i++) {
+ if (!strcmp(table->name, "random"))
+ mattern[i] = rand_r(&s);
+ else
+ mattern[i] = table->pattern;
+ }
+ mattern[i] = crc32(0, (u8 *)addr, (vpart->size - 4));
+ return;
+}
diff --git a/include/mmc.h b/include/mmc.h
index 1022db3ffa7..721758c3c7b 100644
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -109,6 +109,10 @@ struct bd_info;
#define MMC_CMD_SET_BLOCK_COUNT 23
#define MMC_CMD_WRITE_SINGLE_BLOCK 24
#define MMC_CMD_WRITE_MULTIPLE_BLOCK 25
+#define MMC_CMD_SET_WRITE_PROTECT 28
+#define MMC_CMD_CLR_WRITE_PROT 29
+#define MMC_CMD_SEND_WRITE_PROT 30
+#define MMC_CMD_SEND_WRITE_PROT_TYPE 31
#define MMC_CMD_ERASE_GROUP_START 35
#define MMC_CMD_ERASE_GROUP_END 36
#define MMC_CMD_ERASE 38
@@ -213,6 +217,7 @@ static inline bool mmc_is_tuning_cmd(uint cmdidx)
/*
* EXT_CSD fields
*/
+#define EXT_CSD_CLASS_6_CTRL 59 /*R/W/E_P*/
#define EXT_CSD_ENH_START_ADDR 136 /* R/W */
#define EXT_CSD_ENH_SIZE_MULT 140 /* R/W */
#define EXT_CSD_GP_SIZE_MULT 143 /* R/W */
@@ -236,6 +241,7 @@ static inline bool mmc_is_tuning_cmd(uint cmdidx)
#define EXT_CSD_HS_TIMING 185 /* R/W */
#define EXT_CSD_REV 192 /* RO */
#define EXT_CSD_CARD_TYPE 196 /* RO */
+#define EXT_CSD_DRIVER_STRENGTH 197 /* RO */
#define EXT_CSD_PART_SWITCH_TIME 199 /* RO */
#define EXT_CSD_SEC_CNT 212 /* RO, 4 bytes */
#define EXT_CSD_HC_WP_GRP_SIZE 221 /* RO */
@@ -243,6 +249,9 @@ static inline bool mmc_is_tuning_cmd(uint cmdidx)
#define EXT_CSD_BOOT_MULT 226 /* RO */
#define EXT_CSD_SEC_FEATURE 231 /* RO */
#define EXT_CSD_GENERIC_CMD6_TIME 248 /* RO */
+#define EXT_CSD_DEV_LIFETIME_EST_TYP_A 268 /* RO */
+#define EXT_CSD_DEV_LIFETIME_EST_TYP_B 269 /* RO */
+
#define EXT_CSD_BKOPS_SUPPORT 502 /* RO */
/*
@@ -344,6 +353,20 @@ static inline bool mmc_is_tuning_cmd(uint cmdidx)
#define ENHNCD_SUPPORT (0x2)
#define PART_ENH_ATTRIB (0x1f)
+#define US_PWR_WP_DIS_BIT 1<<3
+#define US_PERM_WP_DIS_BIT 1<<4
+#define WP_CLEAR_TYPE 0
+#define WP_POWER_ON_TYPE (1<<1)
+#define WP_TEMPORARY_TYPE 1
+#define WP_PERMANENT_TYPE ((1<<0)|(1<<1))
+#define WP_TYPE_MASK 3
+#define WP_ENABLE_MASK 7
+#define WP_TEMPORARY_EN_BIT 0
+#define WP_POWER_ON_EN_BIT (1<<0)
+#define WP_PERM_EN_BIT (1<<2)
+#define WP_GRP_SIZE_MASK 31
+
+
#define MMC_QUIRK_RETRY_SEND_CID BIT(0)
#define MMC_QUIRK_RETRY_SET_BLOCKLEN BIT(1)
#define MMC_QUIRK_RETRY_APP_CMD BIT(2)
@@ -703,6 +726,8 @@ struct mmc {
#if CONFIG_IS_ENABLED(MMC_WRITE)
struct sd_ssr ssr; /* SD status register */
#endif
+ uint dev_lifetime_est_typ_a;
+ uint dev_lifetime_est_typ_b;
u64 capacity;
u64 capacity_user;
u64 capacity_boot;
diff --git a/include/part.h b/include/part.h
index 8e451bbdff9..b61e22c863b 100644
--- a/include/part.h
+++ b/include/part.h
@@ -30,12 +30,15 @@ struct block_drvr {
#define PART_TYPE_ISO 0x03
#define PART_TYPE_AMIGA 0x04
#define PART_TYPE_EFI 0x05
+#define PART_TYPE_AML 0x06
/* maximum number of partition entries supported by search */
#define DOS_ENTRY_NUMBERS 8
#define ISO_ENTRY_NUMBERS 64
#define MAC_ENTRY_NUMBERS 64
#define AMIGA_ENTRY_NUMBERS 8
+#define AML_ENTRY_NUMBERS 128
+
/*
* Type string for U-Boot bootable partitions
*/
--
2.43.2

102
patch/u-boot/v2023.10/board_gateway-gz80x/0005-Add-usid-serial-mac-read-from-emmc.patch
View File

@ -1,102 +0,0 @@
From 80d41294944231f135eb3b84dfc34658e0318b44 Mon Sep 17 00:00:00 2001
From: Vyacheslav Bocharov <adeep@lexina.in>
Date: Tue, 5 Jul 2022 19:06:25 +0300
Subject: [PATCH 5/8] Add usid/serial/mac read from emmc
---
board/amlogic/jethub-j100/jethub-j100.c | 63 +++++++++++++++++++++++--
1 file changed, 60 insertions(+), 3 deletions(-)
diff --git a/board/amlogic/jethub-j100/jethub-j100.c b/board/amlogic/jethub-j100/jethub-j100.c
index 6a2c4ad4c3c..41ef5db4932 100644
--- a/board/amlogic/jethub-j100/jethub-j100.c
+++ b/board/amlogic/jethub-j100/jethub-j100.c
@@ -5,6 +5,7 @@
*/
#include <common.h>
+#include <command.h>
#include <dm.h>
#include <init.h>
#include <net.h>
@@ -20,8 +21,65 @@ int misc_init_r(void)
u8 mac_addr[ARP_HLEN];
char serial[SM_SERIAL_SIZE];
u32 sid;
+ int ret;
- if (!meson_sm_get_serial(serial, SM_SERIAL_SIZE)) {
+ char _cmdbuf[96];
+ char keyname[32];
+ char keydata[256];
+ int ver=0;
+
+ memset (mac_addr,0, sizeof(mac_addr));
+ sprintf(_cmdbuf, "store init");
+ if(!run_command(_cmdbuf, 0))
+ {
+ sprintf(_cmdbuf, "keyman init 0x1234");
+ if(!run_command(_cmdbuf, 0))
+ {
+ strcpy(keyname, "usid");
+ memset (keydata, 0, sizeof(keydata));
+ sprintf(_cmdbuf, "keyman read %s %p str", keyname, keydata);
+ ret = run_command(_cmdbuf, 0);
+ if (!ret)
+ {
+ // j100__04012201sw00016142005c
+ // 0123456789
+ if (keydata[0] == 'j')
+ {
+ if (keydata[1] == '1')
+ {
+ sprintf(_cmdbuf, "%c%c",keydata[6],keydata[7]);
+ env_set("hwrev", _cmdbuf);
+ sprintf(_cmdbuf, "%c%c",keydata[8],keydata[9]);
+ env_set("perev", _cmdbuf);
+ }
+ }
+ }
+ // get serial
+ strcpy(keyname, "serial");
+ memset (keydata, 0, sizeof(keydata));
+ sprintf(_cmdbuf, "keyman read %s %p str", keyname, keydata);
+ ret = run_command(_cmdbuf, 0);
+
+ // get mac
+ strcpy(keyname, "mac");
+ memset (keydata, 0, sizeof(keydata));
+ sprintf(_cmdbuf, "keyman read %s %#p str", keyname, keydata);
+ ret = run_command(_cmdbuf, 0);
+ if (keydata[2]==':')
+ {
+ keydata[17] = (char) 0x00;
+ sprintf(_cmdbuf,"env set ethaddr %s", keydata);
+ ret = run_command(_cmdbuf, 0);
+ mac_addr[0] = (char) 0x01;
+ } else
+ {
+ printf("keyman read mac failed\n");
+ }
+ }
+ }
+
+ if (mac_addr[0]==0)
+ if (!meson_sm_get_serial(serial, SM_SERIAL_SIZE)) {
sid = crc32(0, (unsigned char *)serial, SM_SERIAL_SIZE);
/* Ensure the NIC specific bytes of the mac are not all 0 */
if ((sid & 0xffff) == 0)
@@ -34,9 +92,8 @@ int misc_init_r(void)
mac_addr[3] = (sid >> 16) & 0xff;
mac_addr[4] = (sid >> 8) & 0xff;
mac_addr[5] = (sid >> 0) & 0xff;
-
eth_env_set_enetaddr("ethaddr", mac_addr);
- }
+ }
return 0;
}
--
2.43.2

54
patch/u-boot/v2023.10/board_gateway-gz80x/0007-ARM-amlogic-revert-JetHub-D1-eth-mac-generation-with.patch
View File

@ -1,54 +0,0 @@
From 4c24d43140370f272a12b0695ffacb85863c51a7 Mon Sep 17 00:00:00 2001
From: Viacheslav Bocharov <adeep@lexina.in>
Date: Thu, 22 Dec 2022 15:10:29 +0300
Subject: [PATCH 7/8] ARM: amlogic: revert JetHub D1 eth mac generation with
manufacturer OUI
Partially revert add JetHub D1 eth mac generation with manufacturer OUI
commit 4f4f974a46244270c1c6723017711c0aa8250206
Signed-off-by: Viacheslav Bocharov <adeep@lexina.in>
---
board/amlogic/jethub-j100/jethub-j100.c | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/board/amlogic/jethub-j100/jethub-j100.c b/board/amlogic/jethub-j100/jethub-j100.c
index 41ef5db4932..0d1cb6b21dc 100644
--- a/board/amlogic/jethub-j100/jethub-j100.c
+++ b/board/amlogic/jethub-j100/jethub-j100.c
@@ -19,8 +19,6 @@
int misc_init_r(void)
{
u8 mac_addr[ARP_HLEN];
- char serial[SM_SERIAL_SIZE];
- u32 sid;
int ret;
char _cmdbuf[96];
@@ -78,22 +76,7 @@ int misc_init_r(void)
}
}
- if (mac_addr[0]==0)
- if (!meson_sm_get_serial(serial, SM_SERIAL_SIZE)) {
- sid = crc32(0, (unsigned char *)serial, SM_SERIAL_SIZE);
- /* Ensure the NIC specific bytes of the mac are not all 0 */
- if ((sid & 0xffff) == 0)
- sid |= 0x800000;
-
- /* OUI registered MAC address */
- mac_addr[0] = 0x10;
- mac_addr[1] = 0x27;
- mac_addr[2] = 0xBE;
- mac_addr[3] = (sid >> 16) & 0xff;
- mac_addr[4] = (sid >> 8) & 0xff;
- mac_addr[5] = (sid >> 0) & 0xff;
- eth_env_set_enetaddr("ethaddr", mac_addr);
- }
+ meson_generate_serial_ethaddr();
return 0;
}
--
2.43.2

28
patch/u-boot/v2023.10/board_gateway-gz80x/0008-board-amlogic-jethub-j100-fix-common-config-header.patch
View File

@ -1,28 +0,0 @@
From f55573d59d5bbe04046bb1a4f7b61a64ae5f3f78 Mon Sep 17 00:00:00 2001
From: Viacheslav Bocharov <adeep@lexina.in>
Date: Mon, 26 Feb 2024 18:06:30 +0300
Subject: [PATCH 8/8] board: amlogic: jethub j100: fix common config header
Fix JetHub board sequence to read correct gpio for rescue button
Signed-off-by: Viacheslav Bocharov <adeep@lexina.in>
---
include/configs/jethub.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/jethub.h b/include/configs/jethub.h
index e22db4991de..2c44bfc853e 100644
--- a/include/configs/jethub.h
+++ b/include/configs/jethub.h
@@ -11,7 +11,7 @@
#if defined(CONFIG_MESON_AXG)
#define BOOTENV_DEV_RESCUE(devtypeu, devtypel, instance) \
"bootcmd_rescue=" \
- "if gpio input 10; then " \
+ "if gpio input periphs-banks10; then " \
"run bootcmd_mmc0; " \
"run bootcmd_usb0;" \
"fi;\0"
--
2.43.2

314
patch/u-boot/v2023.10/board_gateway-gz80x/0009-Amlogic-Add-board-Alfred-Smart-Gateway-GZ80X.patch
View File

@ -1,314 +0,0 @@
From bab89bec5a1da77bff238218d609fa991a04f0ab Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@armbian.com>
Date: Fri, 9 Aug 2024 09:46:37 -0400
Subject: [PATCH] Amlogic: Add board Alfred Smart Gateway GZ80X
Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
---
arch/arm/dts/Makefile | 1 +
...-axg-alfredsmart-gateway-gz80x-u-boot.dtsi | 102 ++++++++++++++++++
.../meson-axg-alfredsmart-gateway-gz80x.dts | 87 +++++++++++++++
configs/alfredsmart_gateway_gz80x_defconfig | 76 +++++++++++++
4 files changed, 266 insertions(+)
create mode 100644 arch/arm/dts/meson-axg-alfredsmart-gateway-gz80x-u-boot.dtsi
create mode 100644 arch/arm/dts/meson-axg-alfredsmart-gateway-gz80x.dts
create mode 100644 configs/alfredsmart_gateway_gz80x_defconfig
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 85fd5b1157..4a77b83867 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -205,6 +205,7 @@ dtb-$(CONFIG_ARCH_S5P4418) += \
dtb-$(CONFIG_ARCH_MESON) += \
meson-a1-ad401.dtb \
meson-axg-s400.dtb \
+ meson-axg-alfredsmart-gateway-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-alfredsmart-gateway-gz80x-u-boot.dtsi b/arch/arm/dts/meson-axg-alfredsmart-gateway-gz80x-u-boot.dtsi
new file mode 100644
index 0000000000..e0e6b2259c
--- /dev/null
+++ b/arch/arm/dts/meson-axg-alfredsmart-gateway-gz80x-u-boot.dtsi
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2022 Vyacheslav Bocharov <adeep@lexina.in>
+ * Author: Vyacheslav Bocharov <adeep@lexina.in>
+ */
+
+/ {
+ partitions: partitions {
+ parts = <1>;
+ part-0 = <&rootfs>;
+ rootfs: rootfs {
+ pname = "rootfs";
+ size = <0xffffffff 0xffffffff>;
+ mask = <4>;
+ };
+ };
+
+ efusekey: efusekey {
+ keynum = <5>;
+ key0 = <&key_0>;
+ key1 = <&key_1>;
+ key2 = <&key_2>;
+ key3 = <&key_3>;
+ key4 = <&key_4>;
+
+ key_0: key_0 {
+ keyname = "mac";
+ offset = <0>;
+ size = <6>;
+ };
+ key_1: key_1 {
+ keyname = "mac_bt";
+ offset = <6>;
+ size = <6>;
+ };
+ key_2: key_2 {
+ keyname = "mac_wifi";
+ offset = <12>;
+ size = <6>;
+ };
+ key_3: key_3 {
+ keyname = "usid";
+ offset = <18>;
+ size = <32>;
+ };
+ key_4: key_4 {
+ keyname = "serial";
+ offset = <50>;
+ size = <32>;
+ };
+ }; //End efusekey
+
+ unifykey {
+ compatible = "amlogic, unifykey";
+ status = "ok";
+ unifykey-num = <6>;
+ unifykey-index-0 = <&keysn_0>;
+ unifykey-index-1 = <&keysn_1>;
+ unifykey-index-2 = <&keysn_2>;
+ unifykey-index-3 = <&keysn_3>;
+ unifykey-index-4 = <&keysn_4>;
+ unifykey-index-5 = <&keysn_5>;
+
+ keysn_0: key_0 {
+ key-name = "usid";
+ key-device = "normal";
+ key-permit = "read";
+ };
+ keysn_1: key_1 {
+ key-name = "mac";
+ key-device = "normal";
+ key-permit = "read";
+ };
+ keysn_2: key_2 {
+ key-name = "mac_bt";
+ key-device = "normal";
+ key-permit = "read","write","del";
+ key-type = "mac";
+ };
+ keysn_3: key_3 {
+ key-name = "mac_wifi";
+ key-device = "normal";
+ key-permit = "read","write","del";
+ key-type = "mac";
+ };
+ keysn_4: key_4 {
+ key-name = "serial";
+ key-device = "normal";
+ key-permit = "read";
+ };
+ keysn_5:key_5 {
+ key-name = "deviceid";
+ key-device = "normal";
+ key-permit = "read","write","del";
+ };
+ }; //End unifykey
+};
+
+&saradc {
+ status = "okay";
+ vref-supply = <&vddio_ao18>;
+};
diff --git a/arch/arm/dts/meson-axg-alfredsmart-gateway-gz80x.dts b/arch/arm/dts/meson-axg-alfredsmart-gateway-gz80x.dts
new file mode 100644
index 0000000000..fba7e78c85
--- /dev/null
+++ b/arch/arm/dts/meson-axg-alfredsmart-gateway-gz80x.dts
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2024 Patrick Yavitz <pyavitz@armbian.com>
+ * Copyright (c) 2024 Alfred Smart
+ */
+
+/dts-v1/;
+
+#include "meson-axg-jethome-jethub-j100.dts"
+#include <dt-bindings/leds/common.h>
+
+/ {
+ compatible = "alfredsmart,gateway-gz80x", "amlogic,a113d", "amlogic,meson-axg";
+ model = "Alfred Smart Gateway (AM-GZ80X)";
+
+ aliases {
+ serial0 = &uart_AO;
+ serial1 = &uart_B;
+ serial2 = &uart_AO_B;
+ ethernet0 = &ethmac;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
+ leds {
+ compatible = "gpio-leds";
+
+ led-blue {
+ color = <LED_COLOR_ID_BLUE>;
+ function = LED_FUNCTION_STATUS;
+ gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "default-on";
+ };
+
+ led-green {
+ color = <LED_COLOR_ID_GREEN>;
+ function = LED_FUNCTION_STATUS;
+ gpios = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "mmc1";
+ };
+
+ led-red {
+ color = <LED_COLOR_ID_RED>;
+ function = LED_FUNCTION_STATUS;
+ gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "usb-host";
+ };
+ };
+
+ /* 1024MB RAM */
+ memory@0 {
+ device_type = "memory";
+ reg = <0x0 0x0 0x0 0x40000000>;
+ };
+};
+
+/delete-node/ &i2c1;
+
+/* wifi module */
+&sd_emmc_b {
+ non-removable;
+
+ rtl8189ftv: wifi@1 {
+ reg = <1>;
+ };
+};
+
+&uart_B {
+ status = "okay";
+ pinctrl-0 = <&uart_b_z_pins>;
+ pinctrl-names = "default";
+};
+
+/* UART Wireless module */
+&uart_AO_B {
+ status = "okay";
+ pinctrl-0 = <&uart_ao_b_z_pins>;
+ pinctrl-names = "default";
+ reset-gpios = <&gpio GPIOZ_6 GPIO_ACTIVE_HIGH>;
+};
+
+&usb_pwr {
+ gpio = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+};
diff --git a/configs/alfredsmart_gateway_gz80x_defconfig b/configs/alfredsmart_gateway_gz80x_defconfig
new file mode 100644
index 0000000000..45d1c441c1
--- /dev/null
+++ b/configs/alfredsmart_gateway_gz80x_defconfig
@@ -0,0 +1,76 @@
+CONFIG_ARM=y
+CONFIG_SYS_BOARD="jethub-j100"
+CONFIG_SYS_CONFIG_NAME="jethub"
+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-alfredsmart-gateway-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-gz80x"
+CONFIG_SYS_LOAD_ADDR=0x01000000
+CONFIG_DEBUG_UART=y
+CONFIG_REMAKE_ELF=y
+CONFIG_OF_BOARD_SETUP=y
+# 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_RANDOM_UUID=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_RTC=y
+CONFIG_CMD_REGULATOR=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_MTD_UBI=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_DM_RTC=y
+CONFIG_RTC_PCF8563=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_AML_DRIVER=y
+CONFIG_UNIFY_KEY_MANAGE=y
+CONFIG_SECURE_STORAGE=y
+CONFIG_AML_STORAGE=y
+CONFIG_EFUSE=y
+CONFIG_AML_PARTITION=y
--
2.39.2

215
patch/u-boot/v2024.04/board_gateway-gz80x/001-Add-board-Amper-Gateway-AM-GZ80x.patch Normal file
View File

@ -0,0 +1,215 @@
From 7e431409a7c34b844b27c0bfa89fe582f4093dc7 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@armbian.com>
Date: Tue, 13 Aug 2024 07:13:24 -0400
Subject: [PATCH] Add board Amper Gateway AM-GZ80X
Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
---
arch/arm/dts/Makefile | 1 +
...-axg-amper-gateway-am-gz80x-u-boot.dtsi | 10 +++
.../meson-axg-amper-gateway-am-gz80x.dts | 87 +++++++++++++++++++
configs/amper_gateway_gz80x_defconfig | 69 +++++++++++++++
4 files changed, 167 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 configs/amper_gateway_am-gz80x_defconfig
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index b102ffb5f6..da81b57aec 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..ca380fdb4c
--- /dev/null
+++ b/arch/arm/dts/meson-axg-amper-gateway-am-gz80x-u-boot.dtsi
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2024 Patrick Yavitz <pyavitz@armbian.com>
+ *
+ */
+
+&saradc {
+ 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
new file mode 100644
index 0000000000..3606121039
--- /dev/null
+++ b/arch/arm/dts/meson-axg-amper-gateway-am-gz80x.dts
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2024 Patrick Yavitz <pyavitz@armbian.com>
+ *
+ */
+
+/dts-v1/;
+
+#include "meson-axg-jethome-jethub-j100.dts"
+#include <dt-bindings/leds/common.h>
+
+/ {
+ compatible = "amper,gateway-am-gz80x", "amlogic,a113x", "amlogic,meson-axg";
+ model = "Amper Gateway AM-GZ80x";
+
+ aliases {
+ serial0 = &uart_AO;
+ serial1 = &uart_B;
+ serial2 = &uart_AO_B;
+ ethernet0 = &ethmac;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
+ leds {
+ compatible = "gpio-leds";
+
+ led-blue {
+ color = <LED_COLOR_ID_BLUE>;
+ function = LED_FUNCTION_STATUS;
+ gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "default-on";
+ };
+
+ led-green {
+ color = <LED_COLOR_ID_GREEN>;
+ function = LED_FUNCTION_STATUS;
+ gpios = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "mmc1";
+ };
+
+ led-red {
+ color = <LED_COLOR_ID_RED>;
+ function = LED_FUNCTION_STATUS;
+ gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "usb-host";
+ };
+ };
+
+ /* 1024MB RAM */
+ memory@0 {
+ device_type = "memory";
+ reg = <0x0 0x0 0x0 0x40000000>;
+ };
+};
+
+/delete-node/ &i2c1;
+
+/* wifi module */
+&sd_emmc_b {
+ non-removable;
+
+ rtl8189ftv: wifi@1 {
+ reg = <1>;
+ };
+};
+
+&uart_B {
+ status = "okay";
+ pinctrl-0 = <&uart_b_z_pins>;
+ pinctrl-names = "default";
+};
+
+/* UART Wireless module */
+&uart_AO_B {
+ status = "okay";
+ pinctrl-0 = <&uart_ao_b_z_pins>;
+ pinctrl-names = "default";
+ reset-gpios = <&gpio GPIOZ_6 GPIO_ACTIVE_HIGH>;
+};
+
+&usb_pwr {
+ gpio = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+};
diff --git a/configs/amper_gateway_am-gz80x_defconfig b/configs/amper_gateway_am-gz80x_defconfig
new file mode 100644
index 0000000000..1bdefc0add
--- /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="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
--
2.39.2

0
patch/u-boot/v2023.10/board_gateway-gz80x/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch → patch/u-boot/v2024.04/board_gateway-gz80x/002-HACK-mmc-meson-gx-limit-to-24MHz.patch
View File

0
patch/u-boot/v2023.10/board_gateway-gz80x/0002-mmc-meson-gx-change-clock-phase-value-on-axg-SoCs.patch → patch/u-boot/v2024.04/board_gateway-gz80x/003-mmc-meson-gx-change-clock-phase-value-on-axg-SoCs.patch
View File

29
patch/u-boot/v2024.04/board_gateway-gz80x/004-HACK-meson64-boot-target-usb.patch Normal file
View File

@ -0,0 +1,29 @@
From 4af333376c257d432f641926d74c762921186b78 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@armbian.com>
Date: Sat, 27 Jan 2024 22:57:03 -0500
Subject: [PATCH] HACK: meson64 boot target usb
Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
---
include/configs/meson64.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/meson64.h b/include/configs/meson64.h
index efab9a624d..ae1b79da0f 100644
--- a/include/configs/meson64.h
+++ b/include/configs/meson64.h
@@ -99,10 +99,10 @@
#define BOOT_TARGET_DEVICES(func) \
func(ROMUSB, romusb, na) \
func(USB_DFU, usbdfu, na) \
+ BOOT_TARGET_DEVICES_USB(func) \
func(MMC, mmc, 0) \
func(MMC, mmc, 1) \
func(MMC, mmc, 2) \
- BOOT_TARGET_DEVICES_USB(func) \
BOOT_TARGET_NVME(func) \
BOOT_TARGET_SCSI(func) \
func(PXE, pxe, na) \
--
2.39.2