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

khadas-vim3: bump u-boot to 2023.07-rc4, add KBI support for easy PCI/USB3 switching

Browse Source 
- this introduces the `v2023.07` u-boot patch directory, with the boot-usb-nvme-scsi-first patch rebased
- add myself as BOARD_MAINTAINER
This commit is contained in:
Ricardo Pardini
2023-05-18 11:11:17 +02:00
committed by Igor
parent 084fba8524
commit 9aca4e549a
3 changed files with 1163 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/boards/khadas-vim3.conf
View File

@@ -1,7 +1,7 @@
# Amlogic A311D 2/4GB RAM eMMC GBE USB3 M.2
BOARD_NAME="Khadas VIM3"
BOARDFAMILY="meson-g12b"
BOARD_MAINTAINER="NicoD-SBC"
BOARD_MAINTAINER="NicoD-SBC,rpardini"
BOOTCONFIG="khadas-vim3_defconfig"
KERNEL_TARGET="current,edge"
FULL_DESKTOP="yes"
@@ -9,3 +9,13 @@ SERIALCON="ttyAML0"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="amlogic/meson-g12b-a311d-khadas-vim3.dtb" # there is also a s922x dtb, but vim3 is a311d only
ASOUND_STATE="asound.state.khadas-vim3"
BOOTBRANCH_BOARD="tag:v2023.07-rc4"
BOOTPATCHDIR="v2023.07"
# To enable the SPI NOR the -spi .dtb is required, because eMMC shares a pin with SPI on the VIM3. To use it:
# fdtfile=amlogic/meson-g12b-a311d-khadas-vim3-spinor.dtb # in armbianEnv.txt and reboot, then run nand-sata-install
UBOOT_TARGET_MAP="u-boot-dtb.img;;u-boot.bin.sd.bin:u-boot.bin u-boot-dtb.img u-boot.bin:u-boot-spi.bin"
write_uboot_platform_mtd() {
dd if=$1/u-boot-spi.bin of=/dev/mtdblock0
}

1118
patch/u-boot/v2023.07/board_khadas-vim3/khadas-kbi.patch Normal file
View File

File diff suppressed because it is too large Load Diff

34
patch/u-boot/v2023.07/meson64-boot-usb-nvme-scsi-first.patch Normal file
View File

@@ -0,0 +1,34 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Mon, 14 Nov 2022 14:59:45 +0100
Subject: meson64: change `BOOT_TARGET_DEVICES` to try to boot USB, NVME and
SCSI before SD, MMC, PXE, DHCP
meson64: change `BOOT_TARGET_DEVICES` to try to boot USB, NVME and SCSI before SD, MMC, PXE, DHCP
---
include/configs/meson64.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/configs/meson64.h b/include/configs/meson64.h
index 9244601284..c0e53139e3 100644
--- a/include/configs/meson64.h
+++ b/include/configs/meson64.h
@@ -71,12 +71,12 @@
#ifndef BOOT_TARGET_DEVICES
#define BOOT_TARGET_DEVICES(func) \
func(ROMUSB, romusb, na) \
- func(MMC, mmc, 0) \
- func(MMC, mmc, 1) \
- func(MMC, mmc, 2) \
BOOT_TARGET_DEVICES_USB(func) \
BOOT_TARGET_NVME(func) \
BOOT_TARGET_SCSI(func) \
+ func(MMC, mmc, 0) \
+ func(MMC, mmc, 1) \
+ func(MMC, mmc, 2) \
func(PXE, pxe, na) \
func(DHCP, dhcp, na)
#endif
--
Armbian