Qubot/armbian-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch configs (all): default, but do not overwrite, KERNEL_IMAGE_TYPE/KERNEL_INSTALL_TYPE/etc: allow board/family to set

Browse Source
This commit is contained in:
Ricardo Pardini 2023-04-08 11:00:41 +02:00
parent 1e61b60cf8
commit 871415b7b3
5 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/sources/amd64.conf
View File

@ -15,13 +15,17 @@ declare -g QEMU_BINARY='qemu-x86_64-static' # Hopefully you have this installed.
declare -g MAIN_CMDLINE='' # we set it in common, it was not set before
declare -g KERNEL_COMPILER=' ' # hack: use single space for host gcc. won't work on arm64 hosts
declare -g KERNEL_USE_GCC=' ' # more hacks.
declare -g KERNEL_IMAGE_TYPE='bzImage' # Ubuntu Standard
declare -g KERNEL_INSTALL_TYPE='install' # the only one
declare -g KERNEL_EXTRA_TARGETS='modules' # default is "modules dtb" but x86_64 has no DTB
declare -g KERNEL_BUILD_DTBS="no" # amd64 has no DTBs. that I know of.
declare -g UBOOT_USE_GCC='none' # required by configuration.sh
#declare -g INITRD_ARCH=amd64 # Used by u-boot for mkimage in initramfs. No u-boot for x86 yet.
# Defaults, if not set by board or family.
declare -g KERNEL_IMAGE_TYPE="${KERNEL_IMAGE_TYPE:-"bzImage"}"
declare -g KERNEL_INSTALL_TYPE="${KERNEL_INSTALL_TYPE:-"install"}"
#declare -g NAME_KERNEL="${NAME_KERNEL:-""}"
#declare -g NAME_INITRD="${NAME_INITRD:-""}"
# Default to mainline
[[ -z $KERNELSOURCE ]] && KERNELSOURCE=$MAINLINE_KERNEL_SOURCE

10
config/sources/arm64.conf
View File

@ -12,10 +12,12 @@ declare -g ARCH='arm64'
declare -g ARCHITECTURE='arm64'
declare -g KERNEL_SRC_ARCH='arm64'
declare -g QEMU_BINARY='qemu-aarch64-static'
declare -g KERNEL_IMAGE_TYPE='Image'
declare -g KERNEL_INSTALL_TYPE='install'
declare -g NAME_KERNEL='Image'
declare -g NAME_INITRD='uInitrd'
# Defaults, if not set by board or family.
declare -g KERNEL_IMAGE_TYPE="${KERNEL_IMAGE_TYPE:-"Image"}"
declare -g KERNEL_INSTALL_TYPE="${KERNEL_INSTALL_TYPE:-"install"}"
declare -g NAME_KERNEL="${NAME_KERNEL:-"Image"}"
declare -g NAME_INITRD="${NAME_INITRD:-"uInitrd"}"
[[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER="aarch64-linux-gnu-"
[[ -z $INITRD_ARCH ]] && INITRD_ARCH=arm64

10
config/sources/armhf.conf
View File

@ -12,12 +12,14 @@ declare -g ARCH='armhf'
declare -g ARCHITECTURE='arm'
declare -g KERNEL_SRC_ARCH='arm'
declare -g QEMU_BINARY='qemu-arm-static'
[[ -z $KERNEL_IMAGE_TYPE ]] && declare -g KERNEL_IMAGE_TYPE='zImage'
[[ -z $KERNEL_INSTALL_TYPE ]] && declare -g KERNEL_INSTALL_TYPE='zinstall'
[[ -z $NAME_KERNEL ]] && declare -g NAME_KERNEL='zImage'
declare -g NAME_INITRD='uInitrd'
declare -g INITRD_ARCH='arm'
# Defaults, if not set by board or family.
declare -g KERNEL_IMAGE_TYPE="${KERNEL_IMAGE_TYPE:-"zImage"}"
declare -g KERNEL_INSTALL_TYPE="${KERNEL_INSTALL_TYPE:-"zinstall"}"
declare -g NAME_KERNEL="${NAME_KERNEL:-"zImage"}"
declare -g NAME_INITRD="${NAME_INITRD:-"uInitrd"}"
[[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER='arm-linux-gnueabihf-'
[[ -z $UBOOT_USE_GCC ]] && UBOOT_USE_GCC='> 8.0'

10
config/sources/riscv64.conf
View File

@ -12,13 +12,15 @@ declare -g ARCH='riscv64'
declare -g ARCHITECTURE='riscv'
declare -g KERNEL_SRC_ARCH='riscv'
declare -g QEMU_BINARY='qemu-riscv64-static'
declare -g KERNEL_IMAGE_TYPE='Image'
declare -g KERNEL_INSTALL_TYPE='install'
declare -g NAME_KERNEL='Image'
declare -g NAME_INITRD='uInitrd'
declare -g IMAGE_PARTITION_TABLE='gpt'
declare -g SKIP_EXTERNAL_TOOLCHAINS='yes'
# Defaults, if not set by board or family.
declare -g KERNEL_IMAGE_TYPE="${KERNEL_IMAGE_TYPE:-"Image"}"
declare -g KERNEL_INSTALL_TYPE="${KERNEL_INSTALL_TYPE:-"install"}"
declare -g NAME_KERNEL="${NAME_KERNEL:-"Image"}"
declare -g NAME_INITRD="${NAME_INITRD:-"uInitrd"}"
[[ -z $KERNEL_COMPILER ]] && KERNEL_COMPILER='riscv64-linux-gnu-'
[[ -z $UBOOT_COMPILER ]] && UBOOT_COMPILER='riscv64-linux-gnu-'
[[ -z $KERNEL_USE_GCC ]] && KERNEL_USE_GCC='> 8.0'

1
lib/functions/configuration/main-config.sh
View File

@ -209,7 +209,6 @@ function do_main_configuration() {
# Let's set default data if not defined in board configuration above
[[ -z $OFFSET ]] && OFFSET=4 # offset to 1st partition (we use 4MiB boundaries by default)
[[ -z $ARCH ]] && ARCH=armhf # makes little sense to default to anything...
KERNEL_IMAGE_TYPE=zImage
ATF_COMPILE=yes
[[ -z $WIREGUARD ]] && WIREGUARD="yes"
[[ -z $EXTRAWIFI ]] && EXTRAWIFI="yes"