Skip to content

Commit 76902b5

Browse files
committed
nanopik2-s905: bump u-boot to v2026.04, move eMMC patch
Advance the NanoPi K2 (Amlogic S905) bootloader from v2024.01 to the latest stable u-boot v2026.04. Move the board patch folder to the new version and rebase the eMMC-enable patch onto the relocated device tree: in v2026.04 the DTS moved from arch/arm/dts/ to the synced dts/upstream/ tree. The eMMC node content is unchanged; verified the patch applies (patch --dry-run / git apply --check) and nanopi-k2_defconfig still exists upstream. This also fixes the random MAC address bug: the older u-boot generated a new random ethernet MAC on every boot, so the board appeared as a different device each time. The newer u-boot derives a stable MAC, giving a consistent address across reboots. Tested on hardware (NanoPi K2): boots from eMMC and keeps a stable MAC across reboots. Signed-off-by: Igor Pecovnik <igor@armbian.com>
1 parent 603aa92 commit 76902b5

3 files changed

Lines changed: 32 additions & 24 deletions

File tree

config/boards/nanopik2-s905.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ FULL_DESKTOP="yes"
1111
ASOUND_STATE="asound.state.mesongx"
1212
BOOT_LOGO="desktop"
1313

14-
BOOTBRANCH_BOARD="tag:v2024.01"
15-
BOOTPATCHDIR="v2024.01"
14+
BOOTBRANCH_BOARD="tag:v2026.04"
15+
BOOTPATCHDIR="v2026.04"

patch/u-boot/v2024.01/board_nanopik2-s905/add-emmc-support-for-nanopi-k2.patch

Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From: Armbian
2+
Subject: nanopi-k2: enable eMMC (sd_emmc_c) in u-boot device tree
3+
4+
Upstream leaves the eMMC node disabled and tags it with 1.8V DDR/HS200
5+
modes the NanoPi K2 can't drive in u-boot. Enable the controller and drop
6+
the 1.8V mode flags so u-boot can read/write the on-board eMMC.
7+
8+
In u-boot v2026.04 the device tree moved from arch/arm/dts/ to the synced
9+
dts/upstream/ tree, so this targets the new path.
10+
11+
--- a/dts/upstream/src/arm64/amlogic/meson-gxbb-nanopi-k2.dts
12+
+++ b/dts/upstream/src/arm64/amlogic/meson-gxbb-nanopi-k2.dts
13+
@@ -359,7 +359,7 @@
14+
15+
/* eMMC */
16+
&sd_emmc_c {
17+
- status = "disabled";
18+
+ status = "okay";
19+
pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
20+
pinctrl-1 = <&emmc_clk_gate_pins>;
21+
pinctrl-names = "default", "clk-gate";
22+
@@ -369,8 +369,6 @@
23+
non-removable;
24+
disable-wp;
25+
cap-mmc-highspeed;
26+
- mmc-ddr-1_8v;
27+
- mmc-hs200-1_8v;
28+
29+
mmc-pwrseq = <&emmc_pwrseq>;
30+
vmmc-supply = <&vcc3v3>;

0 commit comments

Comments
 (0)