Skip to content

Commit

Permalink
armbian-config: store overlay folder definition to /etc/armbian-release
Browse files Browse the repository at this point in the history
This way we don't need to calculate yet again
  • Loading branch information
igorpecovnik committed Sep 15, 2024
1 parent f145fc2 commit 4a1e102
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 2 deletions.
1 change: 1 addition & 0 deletions config/sources/families/bcm2711.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# https://github.com/armbian/build/
#
declare -g LINUXFAMILY=bcm2711
declare -g OVERLAY_DIR="/boot/dtb/broadcom/overlay"
declare -g ARCH=arm64
declare -g UEFI_FS_LABEL="RPICFG" # Windows/Mac users will see this if they mount the SD card. Configurable, but should be uppercase always
declare -g CPUMIN=500000
Expand Down
1 change: 1 addition & 0 deletions config/sources/families/include/imx8_common.inc
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

ARCH="arm64"
KERNEL_IMAGE_TYPE="Image"
OVERLAY_DIR="/boot/dtb/freescale/overlay"
SRC_EXTLINUX="yes" # use extlinux as default
IMX_FIRMWARE="${IMX_FIRMWARE:-"firmware-imx-8.12"}"
# ATF_PLAT musst set in board
Expand Down
1 change: 1 addition & 0 deletions config/sources/families/include/meson64_common.inc
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ SRC_LOADADDR='LOADADDR=0x1080000'
BOOTBRANCH="${BOOTBRANCH_BOARD:-"tag:v2022.07"}"
BOOTPATCHDIR="${BOOTPATCHDIR:-"v2022.07"}"
OVERLAY_PREFIX='meson'
OVERLAYDIR="/boot/dtb/amlogic/overlay"

# This is an extension method, put directly in meson64_common. A "built-in" extension if you will.
# Bring in LibreELEC's amlogic-boot-fip repo, which is the authoritative source for FIP blobs.
Expand Down
1 change: 1 addition & 0 deletions config/sources/families/include/rockchip64_common.inc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ BOOTENV_FILE='rockchip64.txt'
UBOOT_TARGET_MAP=";;idbloader.bin uboot.img trust.bin"
BOOTDELAY=0
OVERLAY_PREFIX="${OVERLAY_PREFIX:-"rockchip"}" # default to 'rockchip' if not set by board
OVERLAY_DIR="/boot/dtb/rockchip/overlay"
# SERIALCON is handled/defaulted in hook post_family_config__900_late_default_serial_console_by_branch at end of this file
GOVERNOR="ondemand"
ATFPATCHDIR='atf-rockchip64'
Expand Down
3 changes: 2 additions & 1 deletion config/sources/families/include/sunxi64_common.inc
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ declare -g BOOTDELAY=1
declare -g BOOTPATCHDIR="${BOOTPATCHDIR:-"u-boot-sunxi"}"
declare -g BOOTBRANCH="${BOOTBRANCH:-"tag:v2024.01"}"
declare -g BOOTENV_FILE='sunxi.txt'
UBOOT_TARGET_MAP="${UBOOT_TARGET_MAP:-BINMAN_ALLOW_MISSING=1;;u-boot-sunxi-with-spl.bin}"
declare -g UBOOT_TARGET_MAP="${UBOOT_TARGET_MAP:-BINMAN_ALLOW_MISSING=1;;u-boot-sunxi-with-spl.bin}"
declare -g BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'
declare -g OVERLAYDIR="/boot/dtb/allwinner/overlay"
declare -g LINUXFAMILY=sunxi64

# shellcheck source=config/sources/families/include/crust_firmware.inc
Expand Down
2 changes: 1 addition & 1 deletion config/sources/families/k3.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

declare -g ARCH="arm64"
declare -g LINUXFAMILY="k3"

declare -g OVERLAY_DIR="/boot/dtb/ti/overlay"
declare -g ATFBRANCH="tag:v2.10.0"

declare -g BOOTBRANCH="tag:v2023.10-rc3"
Expand Down
1 change: 1 addition & 0 deletions config/sources/families/mvebu64.conf
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ BOOTBRANCH='tag:v2023.01'
BOOTPATCHDIR='v2023.01'
BOOTENV_FILE='mvebu64.txt'
BOOTSCRIPT_OUTPUT='boot.scr'
OVERLAY_DIR="/boot/dtb/marvell/overlay"
ATFSOURCE='https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git'
ATFDIR='arm-trusted-firmware-espressobin'
ATFBRANCH='tag:v2.8'
Expand Down
1 change: 1 addition & 0 deletions config/sources/families/sm8250.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#

declare -g LINUXFAMILY="sm8250"
declare -g OVERLAY_DIR="/boot/dtb/qcom/overlay"
declare -g ARCH="arm64"
declare -g BOOTENV_FILE="qcom-abl.txt"
enable_extension "image-output-abl"
Expand Down
1 change: 1 addition & 0 deletions lib/functions/bsp/armbian-bsp-cli-deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ function compile_armbian-bsp-cli() {
KERNEL_IMAGE_TYPE=$KERNEL_IMAGE_TYPE
FORCE_BOOTSCRIPT_UPDATE=$FORCE_BOOTSCRIPT_UPDATE
FORCE_UBOOT_UPDATE=$FORCE_UBOOT_UPDATE
OVERLAYDIR="$OVERLAYDIR"
VENDOR="$VENDOR"
VENDORDOCS="$VENDORDOCS"
VENDORURL="$VENDORURL"
Expand Down

0 comments on commit 4a1e102

Please sign in to comment.