Commit 5236139
committed
sunxi: mellowflyc5: port U-Boot to v2026.07
This commit ports the Mellow Fly-C5 board support in U-Boot to the newer
v2026.07 branch.
What was done:
1. Removed `BOOTPATCHDIR="u-boot-sunxi"` from the board configuration file
`config/boards/mellowflyc5.csc` to inherit the family default U-Boot
directory `v2026.07-sunxi64`.
2. Deleted the legacy and incompatible U-Boot patches under
`patch/u-boot/u-boot-sunxi/board_mellowflyc5/`.
3. Created a new porting patch `001-mellowflyc5-dts-and-defconfig.patch`
under `patch/u-boot/v2026.07-sunxi64/board_mellowflyc5/` supporting
OF_UPSTREAM:
- Added the upstream-aligned device tree under
`dts/upstream/src/arm64/allwinner/sun50i-h618-mellow-fly-c5.dts`.
- Updated `configs/mellow_fly_c5_defconfig` to map all DRAM configuration
variables to the newer `DRAM_SUNXI_*` names (e.g. DRAM_SUNXI_TPR0,
DRAM_SUNXI_TPR10, etc.) and set the default device tree to
`allwinner/sun50i-h618-mellow-fly-c5`.
Why it was done:
U-Boot for the sunxi64 family has moved to `v2026.07`, which uses the
`v2026.07-sunxi64` patch directory. Keeping legacy patches in the old
`u-boot-sunxi` directory was causing build failures because the old patches
were incompatible with the newer U-Boot structure.
Captured boot serial log (compiled with uboot-swig-fix):
```
U-Boot SPL 2026.07-rc4_armbian-2026.07-rc4-S1296-P5b04-H1daf-V0a73-Bb190-R448a (Jul 12 2026 - 16:57:38 +1000)
DRAM: 1024 MiB
Trying to boot from MMC2
NOTICE: BL31: v2.12.9(debug):armbian
NOTICE: BL31: Built : 02:30:58, Jul 12 2026
NOTICE: BL31: Detected Allwinner H616 SoC (1823)
NOTICE: BL31: Found U-Boot DTB at 0x4a0b4fc8, model: Mellow Fly-C5
INFO: ARM GICv2 driver initialized
INFO: Configuring SPC Controller
INFO: Probing for PMIC on I2C:
INFO: PMIC: found AXP313
INFO: BL31: Platform setup done
INFO: BL31: Initializing runtime services
INFO: BL31: cortex_a53: CPU workaround for erratum 855873 was applied
INFO: BL31: cortex_a53: CPU workaround for erratum 1530924 was applied
INFO: PSCI: Suspend is unavailable
INFO: BL31: Preparing for EL3 exit to normal world
INFO: Entry point address = 0x4a000000
INFO: SPSR = 0x3c9
INFO: Changed devicetree.
U-Boot 2026.07-rc4_armbian-2026.07-rc4-S1296-P5b04-H1daf-V0a73-Bb190-R448a (Jul 12 2026 - 16:57:38 +1000) Allwinner Technology
CPU: Allwinner H616 (SUN50I)
Model: Mellow Fly-C5
DRAM: 1 GiB
Core: 71 devices, 23 uclasses, devicetree: separate
WDT: Not starting watchdog@30090a0
MMC: mmc@4020000: 0, mmc@4022000: 1
Loading Environment from FAT... Unable to use mmc 1:1...
In: serial
Out: serial
Err: serial
Allwinner mUSB OTG (Peripheral)
Net: using musb-hdrc, OUT ep1out IN ep1in STATUS ep2in
MAC de:ad:be:ef:00:01
HOST MAC de:ad:be:ef:00:00
RNDIS ready
eth1: usb_ether
```
Signed-off-by: Alastair D'Silva <alastair@d-silva.org>
Assisted-by: Antigravity <antigravity-ai@google.com>1 parent 815a50b commit 5236139
4 files changed
Lines changed: 53 additions & 179 deletions
File tree
- config/boards
- patch/u-boot
- u-boot-sunxi/board_mellowflyc5
- v2026.07-sunxi64/board_mellowflyc5
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | 3 | | |
5 | 4 | | |
6 | 5 | | |
| |||
Lines changed: 0 additions & 50 deletions
This file was deleted.
Lines changed: 0 additions & 114 deletions
This file was deleted.
Lines changed: 53 additions & 14 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
| 1 | + | |
12 | 2 | | |
13 | | - | |
| 3 | + | |
14 | 4 | | |
15 | | - | |
16 | | - | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
17 | 56 | | |
18 | 57 | | |
19 | 58 | | |
| |||
0 commit comments