shellfmt: config/sources; no changes

This commit is contained in:
Ricardo Pardini
2024-11-23 10:37:03 +01:00
committed by Igor
parent 6d9a06bf72
commit 2f63a9cd98
4 changed files with 13 additions and 15 deletions

View File

@@ -17,12 +17,12 @@ declare -g QEMU_BINARY='qemu-x86_64-static' # Hopefully you have this installed.
# See https://uapi-group.org/specifications/specs/discoverable_partitions_specification/
declare -g PARTITION_TYPE_UUID_ROOT="4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709" # "Linux root (x86-64)"
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_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 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_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.

View File

@@ -42,7 +42,7 @@ case $BRANCH in
current)
# Branch based on a stable kernel release (will stay on the next LTS kernel release once released, 6.12? LTS)
LINUXFAMILY=rockchip-rk3588
KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
LINUXCONFIG="linux-rockchip-rk3588-${BRANCH}"
# No need to set KERNELPATCHDIR, since default is: KERNELPATCHDIR='archive/rockchip-rk3588-${KERNEL_MAJOR_MINOR}'
;;
@@ -50,7 +50,7 @@ case $BRANCH in
edge)
# Branch based on the latest kernel release including RC releases, to benefit from the latest RK3588 mainline advancements. Might be unstable!
LINUXFAMILY=rockchip-rk3588
KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
LINUXCONFIG="linux-rockchip-rk3588-${BRANCH}"
# No need to set KERNELPATCHDIR, since default is: KERNELPATCHDIR='archive/rockchip-rk3588-${KERNEL_MAJOR_MINOR}'
;;

View File

@@ -97,7 +97,7 @@ if [[ "$BOOT_SOC" == "rk3288" ]]; then
# fi
#
# run_host_command_logged cat spl/u-boot-spl-dtb.bin >> u-boot-rockchip-with-spl.bin
run_host_command_logged cat idbloader.img > u-boot-rockchip-with-spl.bin
run_host_command_logged dd if=u-boot-dtb.img of=u-boot-rockchip-with-spl.bin seek=$((0x200 - 0x40)) conv=notrunc

View File

@@ -76,8 +76,8 @@ write_uboot_platform() {
declare -A d
d=(
[${1}/bootinfo_emmc.bin]="0:$(du -b ${1}/bootinfo_emmc.bin | awk '{print $1}')"
[${1}/FSBL.bin]="512:$(du -b ${1}/FSBL.bin | awk '{print $1}')"
[${1} / bootinfo_emmc.bin]="0:$(du -b ${1}/bootinfo_emmc.bin | awk '{print $1}')"
[${1} / FSBL.bin]="512:$(du -b ${1}/FSBL.bin | awk '{print $1}')"
)
if [ -b ${2}boot0 ]; then
@@ -86,11 +86,9 @@ write_uboot_platform() {
sync
fi
for f in "${!d[@]}"
do
for f in "${!d[@]}"; do
if $(dd if=${device} bs=1 skip="${d[$f]%:*}" count="${d[$f]#*:}" \
conv=notrunc status=noxfer 2>/dev/null | cmp --quiet "${f}")
then
conv=notrunc status=noxfer 2> /dev/null | cmp --quiet "${f}"); then
echo "Skip $(basename $f), it is equal to the existing one"
else
echo "# Write =: $(basename $f) to ${device}"