Skip to content

Commit 8de9690

Browse files
committed
sunxi64: longanpi-3h u-boot v2024.10 -> v2026.07 (H618 LPDDR4)
Was self-pinned to v2024.10 with a board patchset that added the DT + defconfig and an eMMC-boot tweak. In v2026.07 the DT (sun50i-h618-longanpi-3h + longan-module-3h.dtsi, including the eMMC mmc2 node, already without mmc-hs400-1_8v) is fully upstream, so only the defconfig is carried board-scoped. defconfig forward-ported with v2026.07 adaptations: DRAM Kconfig renamed DRAM_SUN50I_H616_* -> DRAM_SUNXI_* (identical H618 LPDDR4 values to the validated cherryba-m1), allwinner/ DT prefix for OF_UPSTREAM, +MMC_SUNXI_SLOT_EXTRA=2 / SUPPORT_EMMC_BOOT. Rides the sunxi64 family default now. Drop the v2024.10 self-pin and its isolated BOOTDIR. Signed-off-by: Igor Pecovnik <igor@armbian.com>
1 parent 5fc3853 commit 8de9690

2 files changed

Lines changed: 58 additions & 3 deletions

File tree

config/boards/longanpi-3h.csc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ BOARDFAMILY="sun50iw9"
55
BOARD_MAINTAINER=""
66
INTRODUCED="2023"
77
BOOTCONFIG="longanpi_3h_defconfig"
8-
BOOTBRANCH="tag:v2024.10"
9-
BOOTPATCHDIR="v2024.10"
10-
BOOTDIR="u-boot-${BOARD}"
8+
# u-boot rides the sunxi64 family default (v2026.07-rc4 / v2026.07-sunxi64).
9+
# DT (sun50i-h618-longanpi-3h + longan-module-3h.dtsi, incl. eMMC) is upstream;
10+
# the defconfig is carried board-scoped in v2026.07-sunxi64/board_longanpi-3h.
11+
# Was self-pinned to v2024.10.
1112
BOOT_LOGO="desktop"
1213
OVERLAY_PREFIX="sun50i-h616"
1314
KERNEL_TARGET="current,edge"
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
From: Armbian
2+
Subject: [PATCH] longanpi-3h: add defconfig for v2026.07 (H618 LPDDR4)
3+
4+
Forward-ported from the v2024.10 board patchset (0006/0007). The DT
5+
(sun50i-h618-longanpi-3h + longan-module-3h.dtsi, including the eMMC mmc2 node)
6+
is now upstream in v2026.07 and already drops mmc-hs400-1_8v, so only the
7+
defconfig is carried here.
8+
9+
Adaptations for v2026.07:
10+
- DRAM Kconfig renamed DRAM_SUN50I_H616_* -> DRAM_SUNXI_* (same values as the
11+
already-validated cherryba-m1; identical H618 LPDDR4 tuning).
12+
- CONFIG_DEFAULT_DEVICE_TREE gains the allwinner/ prefix (OF_UPSTREAM).
13+
- Added MMC_SUNXI_SLOT_EXTRA=2 + SUPPORT_EMMC_BOOT=y for the onboard eMMC
14+
(matches cherryba-m1).
15+
16+
SD boot is the primary path; if eMMC boot proves flaky on hardware, revisit the
17+
old sdc_no==2 f_max=20MHz reduction (the family already carries the generic
18+
mmc 20ms stabilization delay).
19+
20+
--- /dev/null
21+
+++ b/configs/longanpi_3h_defconfig
22+
@@ -0,0 +1,32 @@
23+
+CONFIG_ARM=y
24+
+CONFIG_ARCH_SUNXI=y
25+
+CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun50i-h618-longanpi-3h"
26+
+CONFIG_SPL=y
27+
+CONFIG_DRAM_SUNXI_DX_ODT=0x07070707
28+
+CONFIG_DRAM_SUNXI_DX_DRI=0x0e0e0e0e
29+
+CONFIG_DRAM_SUNXI_CA_DRI=0x0e0e
30+
+CONFIG_DRAM_SUNXI_ODT_EN=0xaaaaeeee
31+
+CONFIG_DRAM_SUNXI_TPR6=0x48808080
32+
+CONFIG_DRAM_SUNXI_TPR10=0x402f6663
33+
+CONFIG_DRAM_SUNXI_TPR11=0x26262524
34+
+CONFIG_DRAM_SUNXI_TPR12=0x100f100f
35+
+CONFIG_MACH_SUN50I_H616=y
36+
+CONFIG_SUNXI_DRAM_H616_LPDDR4=y
37+
+CONFIG_DRAM_CLK=792
38+
+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
39+
+CONFIG_SUPPORT_EMMC_BOOT=y
40+
+CONFIG_R_I2C_ENABLE=y
41+
+CONFIG_SPL_SPI_SUNXI=y
42+
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
43+
+CONFIG_SPL_I2C=y
44+
+CONFIG_SPL_SYS_I2C_LEGACY=y
45+
+CONFIG_SYS_I2C_MVTWSI=y
46+
+CONFIG_SYS_I2C_SLAVE=0x7f
47+
+CONFIG_SYS_I2C_SPEED=400000
48+
+CONFIG_MTD=y
49+
+CONFIG_SPI_FLASH_ZBIT=y
50+
+CONFIG_AXP313_POWER=y
51+
+CONFIG_SPI=y
52+
+CONFIG_USB_EHCI_HCD=y
53+
+CONFIG_USB_OHCI_HCD=y
54+
+CONFIG_USB_MUSB_GADGET=y

0 commit comments

Comments
 (0)