JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

JetHome: update u-boot patchset. Add emmc clock RFT patches.

Browse Source 
Signed-off-by: Viacheslav Bocharov <adeep@lexina.in>
This commit is contained in:
Viacheslav Bocharov
2023-10-03 15:44:45 +03:00
committed by Igor
parent bf7a249972
commit da5e6ec027
22 changed files with 65428 additions and 841 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
patch/u-boot/v2023.10/board_jethubj100/0001-mmc-meson-gx-clean-up-and-align-on-Linux-settings.patch Normal file
View File

@@ -0,0 +1,154 @@
From 4ddeedeace6efe89a1cc71df0c06673f7158b857 Mon Sep 17 00:00:00 2001
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Fri, 15 Sep 2023 18:01:29 +0200
Subject: [PATCH 1/7] mmc: meson-gx: clean up and align on Linux settings
* Remove obsolete comments
* Set core phase to 180 regardless of the SoC like Linux
* Enable always-on clock
AML mmc driver has been working okay(ish) for a few years
The purpose of this patch is to bring u-boot closer to what
Linux is doing
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
drivers/mmc/meson_gx_mmc.c | 45 ++++++++++++++++----------------------
drivers/mmc/meson_gx_mmc.h | 9 ++++++--
2 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index fcf4f03d1e..c6168792cb 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -17,13 +17,14 @@
#include <linux/log2.h>
#include "meson_gx_mmc.h"
-bool meson_gx_mmc_is_compatible(struct udevice *dev,
- enum meson_gx_mmc_compatible family)
-{
- enum meson_gx_mmc_compatible compat = dev_get_driver_data(dev);
-
- return compat == family;
-}
+struct meson_gx_mmc_version_data meson_gx_mmc_version[] = {
+ [MMC_COMPATIBLE_V2] = {
+ .clk_always_on = BIT(24),
+ },
+ [MMC_COMPATIBLE_V3] = {
+ .clk_always_on = BIT(28),
+ },
+};
static inline void *get_regbase(const struct mmc *mmc)
{
@@ -44,13 +45,17 @@ static inline void meson_write(struct mmc *mmc, uint32_t val, int offset)
static void meson_mmc_config_clock(struct mmc *mmc)
{
+ struct meson_mmc_plat *pdata = mmc->priv;
uint32_t meson_mmc_clk = 0;
unsigned int clk, clk_src, clk_div;
if (!mmc->clock)
return;
- /* TOFIX This should use the proper clock taken from DT */
+ /* Clk always on */
+ meson_mmc_clk |= pdata->version->clk_always_on;
+ meson_mmc_clk |= CLK_CO_PHASE_180;
+ meson_mmc_clk |= CLK_TX_PHASE_000;
/* 1GHz / CLK_MAX_DIV = 15,9 MHz */
if (mmc->clock > 16000000) {
@@ -62,20 +67,6 @@ static void meson_mmc_config_clock(struct mmc *mmc)
}
clk_div = DIV_ROUND_UP(clk, mmc->clock);
- /*
- * SM1 SoCs doesn't work fine over 50MHz with CLK_CO_PHASE_180
- * If CLK_CO_PHASE_270 is used, it's more stable than other.
- * Other SoCs use CLK_CO_PHASE_180 by default.
- * It needs to find what is a proper value about each SoCs.
- */
- if (meson_gx_mmc_is_compatible(mmc->dev, MMC_COMPATIBLE_SM1))
- meson_mmc_clk |= CLK_CO_PHASE_270;
- else
- meson_mmc_clk |= CLK_CO_PHASE_180;
-
- /* 180 phase tx clock */
- meson_mmc_clk |= CLK_TX_PHASE_000;
-
/* clock settings */
meson_mmc_clk |= clk_src;
meson_mmc_clk |= clk_div;
@@ -243,6 +234,7 @@ static const struct dm_mmc_ops meson_dm_mmc_ops = {
static int meson_mmc_of_to_plat(struct udevice *dev)
{
+ enum meson_gx_mmc_compatible compat = dev_get_driver_data(dev);
struct meson_mmc_plat *pdata = dev_get_plat(dev);
fdt_addr_t addr;
@@ -251,6 +243,7 @@ static int meson_mmc_of_to_plat(struct udevice *dev)
return -EINVAL;
pdata->regbase = (void *)addr;
+ pdata->version = &meson_gx_mmc_version[compat];
return 0;
}
@@ -277,7 +270,7 @@ static int meson_mmc_probe(struct udevice *dev)
cfg->voltages = MMC_VDD_33_34 | MMC_VDD_32_33 |
MMC_VDD_31_32 | MMC_VDD_165_195;
cfg->host_caps = MMC_MODE_8BIT | MMC_MODE_4BIT |
- MMC_MODE_HS_52MHz | MMC_MODE_HS;
+ SD_HS | MMC_MODE_HS_52MHz | MMC_MODE_HS;
cfg->f_min = DIV_ROUND_UP(SD_EMMC_CLKSRC_24M, CLK_MAX_DIV);
cfg->f_max = 100000000; /* 100 MHz */
cfg->b_max = 511; /* max 512 - 1 blocks */
@@ -321,9 +314,9 @@ int meson_mmc_bind(struct udevice *dev)
}
static const struct udevice_id meson_mmc_match[] = {
- { .compatible = "amlogic,meson-gx-mmc", .data = MMC_COMPATIBLE_GX },
- { .compatible = "amlogic,meson-axg-mmc", .data = MMC_COMPATIBLE_GX },
- { .compatible = "amlogic,meson-sm1-mmc", .data = MMC_COMPATIBLE_SM1 },
+ { .compatible = "amlogic,meson-gx-mmc", .data = MMC_COMPATIBLE_V2 },
+ { .compatible = "amlogic,meson-axg-mmc", .data = MMC_COMPATIBLE_V3 },
+ { .compatible = "amlogic,meson-sm1-mmc", .data = MMC_COMPATIBLE_V3 },
{ /* sentinel */ }
};
diff --git a/drivers/mmc/meson_gx_mmc.h b/drivers/mmc/meson_gx_mmc.h
index 8974b78f55..3ec913d1b5 100644
--- a/drivers/mmc/meson_gx_mmc.h
+++ b/drivers/mmc/meson_gx_mmc.h
@@ -10,8 +10,8 @@
#include <linux/bitops.h>
enum meson_gx_mmc_compatible {
- MMC_COMPATIBLE_GX,
- MMC_COMPATIBLE_SM1,
+ MMC_COMPATIBLE_V2,
+ MMC_COMPATIBLE_V3,
};
#define SDIO_PORT_A 0
@@ -84,7 +84,12 @@ enum meson_gx_mmc_compatible {
#define MESON_SD_EMMC_CMD_RSP2 0x64
#define MESON_SD_EMMC_CMD_RSP3 0x68
+struct meson_gx_mmc_version_data {
+ uint32_t clk_always_on;
+};
+
struct meson_mmc_plat {
+ struct meson_gx_mmc_version_data *version;
struct mmc_config cfg;
struct mmc mmc;
void *regbase;
--
2.34.1

42
patch/u-boot/v2023.10/board_jethubj100/0002-mmc-meson-gx-set-270-core-phase-during-the-identific.patch Normal file
View File

@@ -0,0 +1,42 @@
From 250bb8a1d083eda665fde994226ecd51bb44672b Mon Sep 17 00:00:00 2001
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Fri, 15 Sep 2023 18:01:30 +0200
Subject: [PATCH 2/7] mmc: meson-gx: set 270 core phase during the
identification
It has been reported that some devices have problems with a 180 degree
core phase. Setting 270 helped some of these devices. Other continue to
struggle (while it works fine with 180 in Linux ... :sigh:)
Poking around the HW, it seems that setting a 270 core phase during the
identification, then using 180 for the rest of the operations, helps the
device operate correctly.
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
drivers/mmc/meson_gx_mmc.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index c6168792cb..284be2b9dc 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -54,9 +54,14 @@ static void meson_mmc_config_clock(struct mmc *mmc)
/* Clk always on */
meson_mmc_clk |= pdata->version->clk_always_on;
- meson_mmc_clk |= CLK_CO_PHASE_180;
meson_mmc_clk |= CLK_TX_PHASE_000;
+ /* Core phase according to mode */
+ if (mmc->selected_mode == MMC_LEGACY)
+ meson_mmc_clk |= CLK_CO_PHASE_270;
+ else
+ meson_mmc_clk |= CLK_CO_PHASE_180;
+
/* 1GHz / CLK_MAX_DIV = 15,9 MHz */
if (mmc->clock > 16000000) {
clk = SD_EMMC_CLKSRC_DIV2;
--
2.34.1

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

File diff suppressed because it is too large Load Diff

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

@@ -0,0 +1,505 @@
From ada871aefa0472d5524e8c501ff8c376de3a3398 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/7] 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 3ecb233f8e..e0e6b2259c 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 43ca10f69c..71446cf092 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 9bebf321c3..1f68971aae 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 f5c3d90f06..26d9aefeaa 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 549d5514f7..26a22d96a6 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 df9b8f3aed..46bc96516e 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 8549695807..5c65ad5065 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 45588cf66e..23fc28bcbe 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 a25f6ae02f..c074b7dce9 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 efc2a4afb2..91883a77af 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 2c65c4765a..2ee7af838e 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 31cfda2885..9b275b82e1 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 1022db3ffa..721758c3c7 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 8e451bbdff..b61e22c863 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.34.1

102
patch/u-boot/v2023.10/board_jethubj100/0005-Add-usid-serial-mac-read-from-emmc.patch Normal file
View File

@@ -0,0 +1,102 @@
From 5c51b2b597557e8981efe18f136e2304eeb2f364 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/7] 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 6a2c4ad4c3..41ef5db493 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.34.1

67
patch/u-boot/v2023.10/board_jethubj100/0006-HACK-force-disable-efi-options-for-JetHub-D1-H1.patch Normal file
View File

@@ -0,0 +1,67 @@
From 5b8e200dbcc24e457d45076b2e17795c5c28e851 Mon Sep 17 00:00:00 2001
From: Vyacheslav Bocharov <adeep@lexina.in>
Date: Thu, 1 Sep 2022 09:53:19 +0300
Subject: [PATCH 6/7] HACK: force disable efi options for JetHub D1+/H1
---
configs/jethub_j100_defconfig | 19 +++++++++++++++++++
configs/jethub_j80_defconfig | 19 +++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/configs/jethub_j100_defconfig b/configs/jethub_j100_defconfig
index 26a22d96a6..112445ffef 100644
--- a/configs/jethub_j100_defconfig
+++ b/configs/jethub_j100_defconfig
@@ -75,3 +75,22 @@ CONFIG_SECURE_STORAGE=y
CONFIG_AML_STORAGE=y
CONFIG_EFUSE=y
CONFIG_AML_PARTITION=y
+
+CONFIG_BOOTMETH_EFILOADER=n
+CONFIG_CMD_BOOTEFI=n
+CONFIG_CMD_BOOTEFI_HELLO_COMPILE=n
+CONFIG_EFI_PARTITION=n
+CONFIG_EFI_LOADER=n
+CONFIG_CMD_BOOTEFI_BOOTMGR=n
+CONFIG_EFI_SETUP_EARLY=n
+CONFIG_EFI_VARIABLE_FILE_STORE=n
+CONFIG_EFI_GET_TIME=n
+CONFIG_EFI_DEVICE_PATH_TO_TEXT=n
+CONFIG_EFI_DEVICE_PATH_UTIL=n
+CONFIG_EFI_DT_FIXUP=n
+CONFIG_EFI_LOADER_HII=n
+CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=n
+CONFIG_EFI_UNICODE_CAPITALIZATION=n
+CONFIG_EFI_HAVE_RUNTIME_RESET=n
+CONFIG_EFI_RNG_PROTOCOL=n
+CONFIG_EFI_LOAD_FILE2_INITRD=n
diff --git a/configs/jethub_j80_defconfig b/configs/jethub_j80_defconfig
index 46bc96516e..5d1344b0b5 100644
--- a/configs/jethub_j80_defconfig
+++ b/configs/jethub_j80_defconfig
@@ -79,3 +79,22 @@ CONFIG_SECURE_STORAGE=y
CONFIG_AML_STORAGE=y
CONFIG_EFUSE=y
CONFIG_AML_PARTITION=y
+
+CONFIG_BOOTMETH_EFILOADER=n
+CONFIG_CMD_BOOTEFI=n
+CONFIG_CMD_BOOTEFI_HELLO_COMPILE=n
+CONFIG_EFI_PARTITION=n
+CONFIG_EFI_LOADER=n
+CONFIG_CMD_BOOTEFI_BOOTMGR=n
+CONFIG_EFI_SETUP_EARLY=n
+CONFIG_EFI_VARIABLE_FILE_STORE=n
+CONFIG_EFI_GET_TIME=n
+CONFIG_EFI_DEVICE_PATH_TO_TEXT=n
+CONFIG_EFI_DEVICE_PATH_UTIL=n
+CONFIG_EFI_DT_FIXUP=n
+CONFIG_EFI_LOADER_HII=n
+CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=n
+CONFIG_EFI_UNICODE_CAPITALIZATION=n
+CONFIG_EFI_HAVE_RUNTIME_RESET=n
+CONFIG_EFI_RNG_PROTOCOL=n
+CONFIG_EFI_LOAD_FILE2_INITRD=n
--
2.34.1

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

@@ -0,0 +1,54 @@
From 371cd54d99e129dc7b0ded357fb3e6766f5ce1f1 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/7] 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 41ef5db493..0d1cb6b21d 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.34.1

154
patch/u-boot/v2023.10/board_jethubj80/0001-mmc-meson-gx-clean-up-and-align-on-Linux-settings.patch Normal file
View File

@@ -0,0 +1,154 @@
From 4ddeedeace6efe89a1cc71df0c06673f7158b857 Mon Sep 17 00:00:00 2001
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Fri, 15 Sep 2023 18:01:29 +0200
Subject: [PATCH 1/7] mmc: meson-gx: clean up and align on Linux settings
* Remove obsolete comments
* Set core phase to 180 regardless of the SoC like Linux
* Enable always-on clock
AML mmc driver has been working okay(ish) for a few years
The purpose of this patch is to bring u-boot closer to what
Linux is doing
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
drivers/mmc/meson_gx_mmc.c | 45 ++++++++++++++++----------------------
drivers/mmc/meson_gx_mmc.h | 9 ++++++--
2 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index fcf4f03d1e..c6168792cb 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -17,13 +17,14 @@
#include <linux/log2.h>
#include "meson_gx_mmc.h"
-bool meson_gx_mmc_is_compatible(struct udevice *dev,
- enum meson_gx_mmc_compatible family)
-{
- enum meson_gx_mmc_compatible compat = dev_get_driver_data(dev);
-
- return compat == family;
-}
+struct meson_gx_mmc_version_data meson_gx_mmc_version[] = {
+ [MMC_COMPATIBLE_V2] = {
+ .clk_always_on = BIT(24),
+ },
+ [MMC_COMPATIBLE_V3] = {
+ .clk_always_on = BIT(28),
+ },
+};
static inline void *get_regbase(const struct mmc *mmc)
{
@@ -44,13 +45,17 @@ static inline void meson_write(struct mmc *mmc, uint32_t val, int offset)
static void meson_mmc_config_clock(struct mmc *mmc)
{
+ struct meson_mmc_plat *pdata = mmc->priv;
uint32_t meson_mmc_clk = 0;
unsigned int clk, clk_src, clk_div;
if (!mmc->clock)
return;
- /* TOFIX This should use the proper clock taken from DT */
+ /* Clk always on */
+ meson_mmc_clk |= pdata->version->clk_always_on;
+ meson_mmc_clk |= CLK_CO_PHASE_180;
+ meson_mmc_clk |= CLK_TX_PHASE_000;
/* 1GHz / CLK_MAX_DIV = 15,9 MHz */
if (mmc->clock > 16000000) {
@@ -62,20 +67,6 @@ static void meson_mmc_config_clock(struct mmc *mmc)
}
clk_div = DIV_ROUND_UP(clk, mmc->clock);
- /*
- * SM1 SoCs doesn't work fine over 50MHz with CLK_CO_PHASE_180
- * If CLK_CO_PHASE_270 is used, it's more stable than other.
- * Other SoCs use CLK_CO_PHASE_180 by default.
- * It needs to find what is a proper value about each SoCs.
- */
- if (meson_gx_mmc_is_compatible(mmc->dev, MMC_COMPATIBLE_SM1))
- meson_mmc_clk |= CLK_CO_PHASE_270;
- else
- meson_mmc_clk |= CLK_CO_PHASE_180;
-
- /* 180 phase tx clock */
- meson_mmc_clk |= CLK_TX_PHASE_000;
-
/* clock settings */
meson_mmc_clk |= clk_src;
meson_mmc_clk |= clk_div;
@@ -243,6 +234,7 @@ static const struct dm_mmc_ops meson_dm_mmc_ops = {
static int meson_mmc_of_to_plat(struct udevice *dev)
{
+ enum meson_gx_mmc_compatible compat = dev_get_driver_data(dev);
struct meson_mmc_plat *pdata = dev_get_plat(dev);
fdt_addr_t addr;
@@ -251,6 +243,7 @@ static int meson_mmc_of_to_plat(struct udevice *dev)
return -EINVAL;
pdata->regbase = (void *)addr;
+ pdata->version = &meson_gx_mmc_version[compat];
return 0;
}
@@ -277,7 +270,7 @@ static int meson_mmc_probe(struct udevice *dev)
cfg->voltages = MMC_VDD_33_34 | MMC_VDD_32_33 |
MMC_VDD_31_32 | MMC_VDD_165_195;
cfg->host_caps = MMC_MODE_8BIT | MMC_MODE_4BIT |
- MMC_MODE_HS_52MHz | MMC_MODE_HS;
+ SD_HS | MMC_MODE_HS_52MHz | MMC_MODE_HS;
cfg->f_min = DIV_ROUND_UP(SD_EMMC_CLKSRC_24M, CLK_MAX_DIV);
cfg->f_max = 100000000; /* 100 MHz */
cfg->b_max = 511; /* max 512 - 1 blocks */
@@ -321,9 +314,9 @@ int meson_mmc_bind(struct udevice *dev)
}
static const struct udevice_id meson_mmc_match[] = {
- { .compatible = "amlogic,meson-gx-mmc", .data = MMC_COMPATIBLE_GX },
- { .compatible = "amlogic,meson-axg-mmc", .data = MMC_COMPATIBLE_GX },
- { .compatible = "amlogic,meson-sm1-mmc", .data = MMC_COMPATIBLE_SM1 },
+ { .compatible = "amlogic,meson-gx-mmc", .data = MMC_COMPATIBLE_V2 },
+ { .compatible = "amlogic,meson-axg-mmc", .data = MMC_COMPATIBLE_V3 },
+ { .compatible = "amlogic,meson-sm1-mmc", .data = MMC_COMPATIBLE_V3 },
{ /* sentinel */ }
};
diff --git a/drivers/mmc/meson_gx_mmc.h b/drivers/mmc/meson_gx_mmc.h
index 8974b78f55..3ec913d1b5 100644
--- a/drivers/mmc/meson_gx_mmc.h
+++ b/drivers/mmc/meson_gx_mmc.h
@@ -10,8 +10,8 @@
#include <linux/bitops.h>
enum meson_gx_mmc_compatible {
- MMC_COMPATIBLE_GX,
- MMC_COMPATIBLE_SM1,
+ MMC_COMPATIBLE_V2,
+ MMC_COMPATIBLE_V3,
};
#define SDIO_PORT_A 0
@@ -84,7 +84,12 @@ enum meson_gx_mmc_compatible {
#define MESON_SD_EMMC_CMD_RSP2 0x64
#define MESON_SD_EMMC_CMD_RSP3 0x68
+struct meson_gx_mmc_version_data {
+ uint32_t clk_always_on;
+};
+
struct meson_mmc_plat {
+ struct meson_gx_mmc_version_data *version;
struct mmc_config cfg;
struct mmc mmc;
void *regbase;
--
2.34.1

42
patch/u-boot/v2023.10/board_jethubj80/0002-mmc-meson-gx-set-270-core-phase-during-the-identific.patch Normal file
View File

@@ -0,0 +1,42 @@
From 250bb8a1d083eda665fde994226ecd51bb44672b Mon Sep 17 00:00:00 2001
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Fri, 15 Sep 2023 18:01:30 +0200
Subject: [PATCH 2/7] mmc: meson-gx: set 270 core phase during the
identification
It has been reported that some devices have problems with a 180 degree
core phase. Setting 270 helped some of these devices. Other continue to
struggle (while it works fine with 180 in Linux ... :sigh:)
Poking around the HW, it seems that setting a 270 core phase during the
identification, then using 180 for the rest of the operations, helps the
device operate correctly.
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
drivers/mmc/meson_gx_mmc.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index c6168792cb..284be2b9dc 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -54,9 +54,14 @@ static void meson_mmc_config_clock(struct mmc *mmc)
/* Clk always on */
meson_mmc_clk |= pdata->version->clk_always_on;
- meson_mmc_clk |= CLK_CO_PHASE_180;
meson_mmc_clk |= CLK_TX_PHASE_000;
+ /* Core phase according to mode */
+ if (mmc->selected_mode == MMC_LEGACY)
+ meson_mmc_clk |= CLK_CO_PHASE_270;
+ else
+ meson_mmc_clk |= CLK_CO_PHASE_180;
+
/* 1GHz / CLK_MAX_DIV = 15,9 MHz */
if (mmc->clock > 16000000) {
clk = SD_EMMC_CLKSRC_DIV2;
--
2.34.1

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

File diff suppressed because it is too large Load Diff

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

@@ -0,0 +1,505 @@
From ada871aefa0472d5524e8c501ff8c376de3a3398 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/7] 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 3ecb233f8e..e0e6b2259c 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 43ca10f69c..71446cf092 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 9bebf321c3..1f68971aae 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 f5c3d90f06..26d9aefeaa 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 549d5514f7..26a22d96a6 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 df9b8f3aed..46bc96516e 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 8549695807..5c65ad5065 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 45588cf66e..23fc28bcbe 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 a25f6ae02f..c074b7dce9 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 efc2a4afb2..91883a77af 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 2c65c4765a..2ee7af838e 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 31cfda2885..9b275b82e1 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 1022db3ffa..721758c3c7 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 8e451bbdff..b61e22c863 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.34.1

102
patch/u-boot/v2023.10/board_jethubj80/0005-Add-usid-serial-mac-read-from-emmc.patch Normal file
View File

@@ -0,0 +1,102 @@
From 5c51b2b597557e8981efe18f136e2304eeb2f364 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/7] 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 6a2c4ad4c3..41ef5db493 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.34.1

67
patch/u-boot/v2023.10/board_jethubj80/0006-HACK-force-disable-efi-options-for-JetHub-D1-H1.patch Normal file
View File

@@ -0,0 +1,67 @@
From 5b8e200dbcc24e457d45076b2e17795c5c28e851 Mon Sep 17 00:00:00 2001
From: Vyacheslav Bocharov <adeep@lexina.in>
Date: Thu, 1 Sep 2022 09:53:19 +0300
Subject: [PATCH 6/7] HACK: force disable efi options for JetHub D1+/H1
---
configs/jethub_j100_defconfig | 19 +++++++++++++++++++
configs/jethub_j80_defconfig | 19 +++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/configs/jethub_j100_defconfig b/configs/jethub_j100_defconfig
index 26a22d96a6..112445ffef 100644
--- a/configs/jethub_j100_defconfig
+++ b/configs/jethub_j100_defconfig
@@ -75,3 +75,22 @@ CONFIG_SECURE_STORAGE=y
CONFIG_AML_STORAGE=y
CONFIG_EFUSE=y
CONFIG_AML_PARTITION=y
+
+CONFIG_BOOTMETH_EFILOADER=n
+CONFIG_CMD_BOOTEFI=n
+CONFIG_CMD_BOOTEFI_HELLO_COMPILE=n
+CONFIG_EFI_PARTITION=n
+CONFIG_EFI_LOADER=n
+CONFIG_CMD_BOOTEFI_BOOTMGR=n
+CONFIG_EFI_SETUP_EARLY=n
+CONFIG_EFI_VARIABLE_FILE_STORE=n
+CONFIG_EFI_GET_TIME=n
+CONFIG_EFI_DEVICE_PATH_TO_TEXT=n
+CONFIG_EFI_DEVICE_PATH_UTIL=n
+CONFIG_EFI_DT_FIXUP=n
+CONFIG_EFI_LOADER_HII=n
+CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=n
+CONFIG_EFI_UNICODE_CAPITALIZATION=n
+CONFIG_EFI_HAVE_RUNTIME_RESET=n
+CONFIG_EFI_RNG_PROTOCOL=n
+CONFIG_EFI_LOAD_FILE2_INITRD=n
diff --git a/configs/jethub_j80_defconfig b/configs/jethub_j80_defconfig
index 46bc96516e..5d1344b0b5 100644
--- a/configs/jethub_j80_defconfig
+++ b/configs/jethub_j80_defconfig
@@ -79,3 +79,22 @@ CONFIG_SECURE_STORAGE=y
CONFIG_AML_STORAGE=y
CONFIG_EFUSE=y
CONFIG_AML_PARTITION=y
+
+CONFIG_BOOTMETH_EFILOADER=n
+CONFIG_CMD_BOOTEFI=n
+CONFIG_CMD_BOOTEFI_HELLO_COMPILE=n
+CONFIG_EFI_PARTITION=n
+CONFIG_EFI_LOADER=n
+CONFIG_CMD_BOOTEFI_BOOTMGR=n
+CONFIG_EFI_SETUP_EARLY=n
+CONFIG_EFI_VARIABLE_FILE_STORE=n
+CONFIG_EFI_GET_TIME=n
+CONFIG_EFI_DEVICE_PATH_TO_TEXT=n
+CONFIG_EFI_DEVICE_PATH_UTIL=n
+CONFIG_EFI_DT_FIXUP=n
+CONFIG_EFI_LOADER_HII=n
+CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=n
+CONFIG_EFI_UNICODE_CAPITALIZATION=n
+CONFIG_EFI_HAVE_RUNTIME_RESET=n
+CONFIG_EFI_RNG_PROTOCOL=n
+CONFIG_EFI_LOAD_FILE2_INITRD=n
--
2.34.1

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

@@ -0,0 +1,54 @@
From 371cd54d99e129dc7b0ded357fb3e6766f5ce1f1 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/7] 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 41ef5db493..0d1cb6b21d 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.34.1