Skip to content

Commit

Permalink
jethubj200: rewrite u-boot patches against v2024.07 final
Browse files Browse the repository at this point in the history
  • Loading branch information
@rpardini @igorpecovnik
rpardini authored and igorpecovnik committed Jul 8, 2024
1 parent f60b3bb commit bb8ff7b
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 47 deletions.
57 changes: 25 additions & 32 deletions patch/u-boot/v2024.07/board_jethubj200/0001-Add-JetHub-D2.patch
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,24 @@
From 7c0d110e84f30723172475e018294b45a0db58ee Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Viacheslav Bocharov <[email protected]>
Date: Thu, 27 Jun 2024 16:20:54 +0300
Subject: [PATCH 1/2] Add JetHub D2
Subject: Add JetHub D2

---
arch/arm/dts/Makefile | 3 +-
.../meson-sm1-jethome-jethub-j200-u-boot.dtsi | 13 +
.../arm/dts/meson-sm1-jethome-jethub-j200.dts | 654 ++++++++++++++++++
board/amlogic/jethub-j200/MAINTAINERS | 8 +
board/amlogic/jethub-j200/Makefile | 6 +
board/amlogic/jethub-j200/jethub-j200.c | 89 +++
configs/jethub_j200_defconfig | 119 ++++
doc/board/amlogic/index.rst | 1 +
doc/board/amlogic/jethub-j200.rst | 50 ++
drivers/power/regulator/regulator-uclass.c | 2 +-
include/configs/jethub.h | 8 +
arch/arm/dts/Makefile | 3 +-
arch/arm/dts/meson-sm1-jethome-jethub-j200-u-boot.dtsi | 13 +
arch/arm/dts/meson-sm1-jethome-jethub-j200.dts | 654 ++++++++++
board/amlogic/jethub-j200/MAINTAINERS | 8 +
board/amlogic/jethub-j200/Makefile | 6 +
board/amlogic/jethub-j200/jethub-j200.c | 89 ++
configs/jethub_j200_defconfig | 119 ++
doc/board/amlogic/index.rst | 1 +
doc/board/amlogic/jethub-j200.rst | 50 +
drivers/power/regulator/regulator-uclass.c | 2 +-
include/configs/jethub.h | 8 +
11 files changed, 951 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/dts/meson-sm1-jethome-jethub-j200-u-boot.dtsi
create mode 100644 arch/arm/dts/meson-sm1-jethome-jethub-j200.dts
create mode 100644 board/amlogic/jethub-j200/MAINTAINERS
create mode 100644 board/amlogic/jethub-j200/Makefile
create mode 100644 board/amlogic/jethub-j200/jethub-j200.c
create mode 100644 configs/jethub_j200_defconfig
create mode 100644 doc/board/amlogic/jethub-j200.rst

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 8fb6a8a1f17..701bf093259 100644
index 111111111111..222222222222 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -100,7 +100,8 @@ dtb-$(CONFIG_ARCH_S5P4418) += \
Expand All @@ -40,7 +33,7 @@ index 8fb6a8a1f17..701bf093259 100644
tegra20-medcom-wide.dtb \
diff --git a/arch/arm/dts/meson-sm1-jethome-jethub-j200-u-boot.dtsi b/arch/arm/dts/meson-sm1-jethome-jethub-j200-u-boot.dtsi
new file mode 100644
index 00000000000..a6f11e8cdfb
index 000000000000..111111111111
--- /dev/null
+++ b/arch/arm/dts/meson-sm1-jethome-jethub-j200-u-boot.dtsi
@@ -0,0 +1,13 @@
Expand All @@ -59,7 +52,7 @@ index 00000000000..a6f11e8cdfb
+};
diff --git a/arch/arm/dts/meson-sm1-jethome-jethub-j200.dts b/arch/arm/dts/meson-sm1-jethome-jethub-j200.dts
new file mode 100644
index 00000000000..3151a99974c
index 000000000000..111111111111
--- /dev/null
+++ b/arch/arm/dts/meson-sm1-jethome-jethub-j200.dts
@@ -0,0 +1,654 @@
Expand Down Expand Up @@ -719,7 +712,7 @@ index 00000000000..3151a99974c
+};
diff --git a/board/amlogic/jethub-j200/MAINTAINERS b/board/amlogic/jethub-j200/MAINTAINERS
new file mode 100644
index 00000000000..82f4e1c40fd
index 000000000000..111111111111
--- /dev/null
+++ b/board/amlogic/jethub-j200/MAINTAINERS
@@ -0,0 +1,8 @@
Expand All @@ -733,7 +726,7 @@ index 00000000000..82f4e1c40fd
+F: include/configs/jethub.h
diff --git a/board/amlogic/jethub-j200/Makefile b/board/amlogic/jethub-j200/Makefile
new file mode 100644
index 00000000000..cb1f5cbcb26
index 000000000000..111111111111
--- /dev/null
+++ b/board/amlogic/jethub-j200/Makefile
@@ -0,0 +1,6 @@
Expand All @@ -745,7 +738,7 @@ index 00000000000..cb1f5cbcb26
+obj-y := jethub-j200.o
diff --git a/board/amlogic/jethub-j200/jethub-j200.c b/board/amlogic/jethub-j200/jethub-j200.c
new file mode 100644
index 00000000000..8fed8a7a1d9
index 000000000000..111111111111
--- /dev/null
+++ b/board/amlogic/jethub-j200/jethub-j200.c
@@ -0,0 +1,89 @@
Expand Down Expand Up @@ -840,7 +833,7 @@ index 00000000000..8fed8a7a1d9
+
diff --git a/configs/jethub_j200_defconfig b/configs/jethub_j200_defconfig
new file mode 100644
index 00000000000..3ae5d885c58
index 000000000000..111111111111
--- /dev/null
+++ b/configs/jethub_j200_defconfig
@@ -0,0 +1,119 @@
Expand Down Expand Up @@ -964,7 +957,7 @@ index 00000000000..3ae5d885c58
+CONFIG_GPIO_HOG=y
+CONFIG_CMD_SPI=y
diff --git a/doc/board/amlogic/index.rst b/doc/board/amlogic/index.rst
index 46f44bf34ec..855fc7d2852 100644
index 111111111111..222222222222 100644
--- a/doc/board/amlogic/index.rst
+++ b/doc/board/amlogic/index.rst
@@ -95,6 +95,7 @@ Board Documentation
Expand All @@ -977,7 +970,7 @@ index 46f44bf34ec..855fc7d2852 100644
khadas-vim3
diff --git a/doc/board/amlogic/jethub-j200.rst b/doc/board/amlogic/jethub-j200.rst
new file mode 100644
index 00000000000..9441cf99bf8
index 000000000000..111111111111
--- /dev/null
+++ b/doc/board/amlogic/jethub-j200.rst
@@ -0,0 +1,50 @@
Expand Down Expand Up @@ -1032,7 +1025,7 @@ index 00000000000..9441cf99bf8
+ $ dd if=fip/u-boot.bin.sd.bin of=$DEV conv=fsync,notrunc bs=512 skip=1 seek=1
+ $ dd if=fip/u-boot.bin.sd.bin of=$DEV conv=fsync,notrunc bs=1 count=440
diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c
index d9e1fb68295..2a34d00110d 100644
index 111111111111..222222222222 100644
--- a/drivers/power/regulator/regulator-uclass.c
+++ b/drivers/power/regulator/regulator-uclass.c
@@ -186,7 +186,7 @@ int regulator_set_enable(struct udevice *dev, bool enable)
Expand All @@ -1045,7 +1038,7 @@ index d9e1fb68295..2a34d00110d 100644
}

diff --git a/include/configs/jethub.h b/include/configs/jethub.h
index 2c44bfc853e..58fb10f2430 100644
index 111111111111..222222222222 100644
--- a/include/configs/jethub.h
+++ b/include/configs/jethub.h
@@ -2,6 +2,7 @@
Expand All @@ -1071,5 +1064,5 @@ index 2c44bfc853e..58fb10f2430 100644
#define BOOTENV_DEV_RESCUE(devtypeu, devtypel, instance) \
"bootcmd_rescue=" \
--
2.45.2
Armbian

22 changes: 11 additions & 11 deletions patch/u-boot/v2024.07/board_jethubj200/0002-Add-some-amlogic-sm-functions.patch
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
From e66a7f0f9cf2d73840668c06cae52c3858da0604 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Viacheslav Bocharov <[email protected]>
Date: Tue, 31 Oct 2023 12:16:43 +0300
Subject: [PATCH 2/2] Add some amlogic sm functions
Subject: Add some amlogic sm functions

---
arch/arm/include/asm/arch-meson/sm.h | 18 ++++++++++
arch/arm/mach-meson/sm.c | 41 +++++++++++++++++++++++
cmd/meson/sm.c | 49 +++++++++++++++++++++++++++-
arch/arm/include/asm/arch-meson/sm.h | 18 ++++
arch/arm/mach-meson/sm.c | 41 ++++++++
cmd/meson/sm.c | 49 +++++++++-
drivers/sm/meson-sm.c | 1 +
include/meson/sm.h | 1 +
5 files changed, 109 insertions(+), 1 deletion(-)

diff --git a/arch/arm/include/asm/arch-meson/sm.h b/arch/arm/include/asm/arch-meson/sm.h
index 4b1d564bc48..57ab90ab1c9 100644
index 111111111111..222222222222 100644
--- a/arch/arm/include/asm/arch-meson/sm.h
+++ b/arch/arm/include/asm/arch-meson/sm.h
@@ -26,7 +26,16 @@ ssize_t meson_sm_read_efuse(uintptr_t offset, void *buffer, size_t size);
Expand Down Expand Up @@ -49,7 +49,7 @@ index 4b1d564bc48..57ab90ab1c9 100644
REBOOT_REASON_COLD = 0,
REBOOT_REASON_NORMAL = 1,
diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c
index 914fd11c989..6f4861a30c0 100644
index 111111111111..222222222222 100644
--- a/arch/arm/mach-meson/sm.c
+++ b/arch/arm/mach-meson/sm.c
@@ -77,7 +77,26 @@ ssize_t meson_sm_write_efuse(uintptr_t offset, void *buffer, size_t size)
Expand Down Expand Up @@ -109,7 +109,7 @@ index 914fd11c989..6f4861a30c0 100644
#define REBOOT_REASON_MASK GENMASK(15, 12)

diff --git a/cmd/meson/sm.c b/cmd/meson/sm.c
index de9a242e17f..faa7240621d 100644
index 111111111111..222222222222 100644
--- a/cmd/meson/sm.c
+++ b/cmd/meson/sm.c
@@ -33,6 +33,25 @@ static int do_sm_serial(struct cmd_tbl *cmdtp, int flag, int argc,
Expand Down Expand Up @@ -190,7 +190,7 @@ index de9a242e17f..faa7240621d 100644
+ "sm getmax [name] - get max size of user accesible efuse and store to environment\n"
);
diff --git a/drivers/sm/meson-sm.c b/drivers/sm/meson-sm.c
index 15b3b0e2672..c98af83a67b 100644
index 111111111111..222222222222 100644
--- a/drivers/sm/meson-sm.c
+++ b/drivers/sm/meson-sm.c
@@ -167,6 +167,7 @@ static const struct meson_sm_data meson_sm_gxbb_data = {
Expand All @@ -202,7 +202,7 @@ index 15b3b0e2672..c98af83a67b 100644
SET_CMD(MESON_SMC_CMD_EFUSE_WRITE, 0x82000031),
SET_CMD(MESON_SMC_CMD_CHIP_ID_GET, 0x82000044),
diff --git a/include/meson/sm.h b/include/meson/sm.h
index fbaab1f1ee0..99da308fb95 100644
index 111111111111..222222222222 100644
--- a/include/meson/sm.h
+++ b/include/meson/sm.h
@@ -9,6 +9,7 @@
Expand All @@ -214,5 +214,5 @@ index fbaab1f1ee0..99da308fb95 100644
MESON_SMC_CMD_EFUSE_WRITE, /* write efuse memory */
MESON_SMC_CMD_CHIP_ID_GET, /* readh chip unique id */
--
2.45.2
Armbian

43 changes: 39 additions & 4 deletions patch/u-boot/v2024.07/board_jethubj200/enable-DT-overlays-support.patch
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,42 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Ayotte <[email protected]>
Date: Thu, 13 Dec 2018 17:09:54 -0500
Subject: [ARCHEOLOGY] add missing u-boot-meson64 patch for overlays

> X-Git-Archeology: - Revision c779ae2faadbfd5472927f58742cdb2371944935: https://github.com/armbian/build/commit/c779ae2faadbfd5472927f58742cdb2371944935
> X-Git-Archeology: Date: Thu, 13 Dec 2018 17:09:54 -0500
> X-Git-Archeology: From: Martin Ayotte <[email protected]>
> X-Git-Archeology: Subject: add missing u-boot-meson64 patch for overlays
> X-Git-Archeology:
> X-Git-Archeology: - Revision e610f00bc7fdcab5ba4c648fa21148518b4b767b: https://github.com/armbian/build/commit/e610f00bc7fdcab5ba4c648fa21148518b4b767b
> X-Git-Archeology: Date: Thu, 20 Jan 2022 23:18:55 +0100
> X-Git-Archeology: From: Igor Pecovnik <[email protected]>
> X-Git-Archeology: Subject: Bump Meson64 u-boot to 2022.01 (#3418)
> X-Git-Archeology:
> X-Git-Archeology: - Revision de26797423e22d58ec2882d7032c67f77196ecc5: https://github.com/armbian/build/commit/de26797423e22d58ec2882d7032c67f77196ecc5
> X-Git-Archeology: Date: Sun, 06 Nov 2022 20:32:46 +0100
> X-Git-Archeology: From: Igor Pecovnik <[email protected]>
> X-Git-Archeology: Subject: Move all legacy u-boot patches under one general legacy folder (#4386)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 24938adafeea9cd158557891eb85ea0730b41852: https://github.com/armbian/build/commit/24938adafeea9cd158557891eb85ea0730b41852
> X-Git-Archeology: Date: Fri, 14 Jun 2024 00:34:34 +0200
> X-Git-Archeology: From: Viacheslav Bocharov <[email protected]>
> X-Git-Archeology: Subject: JetHub D2 (j200) add u-boot 2024.01 patches
> X-Git-Archeology:
> X-Git-Archeology: - Revision 654d208053f60d5793b25ea354df80a8d2116779: https://github.com/armbian/build/commit/654d208053f60d5793b25ea354df80a8d2116779
> X-Git-Archeology: Date: Wed, 03 Jul 2024 11:26:07 +0200
> X-Git-Archeology: From: Viacheslav Bocharov <[email protected]>
> X-Git-Archeology: Subject: JetHome: Update JetHub family
> X-Git-Archeology:
---
arch/arm/Kconfig | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1f3fa15..3f23cc8 100644
index 111111111111..222222222222 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -652,8 +652,10 @@ config ARCH_OMAP2PLUS

@@ -811,6 +811,8 @@ config ARCH_OMAP2PLUS
config ARCH_MESON
bool "Amlogic Meson"
select GPIO_EXTRA_HEADER
Expand All @@ -12,4 +45,6 @@ index 1f3fa15..3f23cc8 100644
imply DISTRO_DEFAULTS
imply DM_RNG
help
Support for the Meson SoC family developed by Amlogic Inc.,
--
Armbian

0 comments on commit bb8ff7b

Please sign in to comment.