Skip to content

Commit 75ce67f

Browse files
committed
Run shellfmt to complete code
1 parent 1341c19 commit 75ce67f

32 files changed

+87
-103
lines changed

config/sources/families/imx8m.conf

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ case $BOARD in
3030
esac
3131

3232
# bootloader releated
33-
pre_config_uboot_target()
34-
{
33+
pre_config_uboot_target() {
3534
# get the firmware
3635
rm -rf ${IMX_FIRMWARE}*
3736
wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/${IMX_FIRMWARE}.bin -O ${IMX_FIRMWARE}.bin
@@ -46,8 +45,7 @@ pre_config_uboot_target()
4645
export ATF_LOAD_ADDR=${ATF_ADDR}
4746
}
4847

49-
write_uboot_platform()
50-
{
48+
write_uboot_platform() {
5149
echo ${OFFSET}
5250
dd if=$1/flash.bin of=$2 bs=1K seek=${OFFSET} status=noxfer conv=fsync > /dev/null 2>&1
5351
}

config/sources/families/include/imx8_common.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ case $BOARD in
2525
LINUXCONFIG='linux-tqma-'$BRANCH # one config for "tq arm modules"
2626
case $BRANCH in
2727

28-
current) # active lts mainline kernel
28+
current) # active lts mainline kernel
2929
KERNEL_MAJOR_MINOR="6.6"
3030
KERNELBRANCH='branch:linux-6.6.y'
3131
KERNELPATCHDIR="archive/imx8m-6.6"
3232
;;
3333

34-
edge|default) # use for tests with recent mainline kernels
34+
edge | default) # use for tests with recent mainline kernels
3535
;;
3636

3737
esac

config/sources/families/include/meson_common.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ esac
4242

4343
case $BRANCH in
4444

45-
legacy)
46-
declare -g KERNEL_MAJOR_MINOR="6.1"
47-
;;
45+
legacy)
46+
declare -g KERNEL_MAJOR_MINOR="6.1"
47+
;;
4848

4949
current)
5050
declare -g KERNEL_MAJOR_MINOR="6.6"

config/sources/families/jethub.conf

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@ elif [[ "$BOARD" == "jethubj200" ]]; then
3535
BOOTPATCHDIR="v2024.01"
3636
fi
3737

38-
3938
########
4039
# @TODO: Put this in the board configs of the respective boards
4140
########
42-
if [[ "$BOARD" == "jethubj80" ]] || [[ "$BOARD" == "jethubj100" ]] ; then
41+
if [[ "$BOARD" == "jethubj80" ]] || [[ "$BOARD" == "jethubj100" ]]; then
4342
function family_tweaks__blacklistrtw88() {
4443
if [[ "$BOARD" == jethubj80 ]] || [[ "$BOARD" == jethubj100 ]]; then
4544
mkdir -p "${destination}"/etc/modprobe.d
@@ -49,19 +48,16 @@ if [[ "$BOARD" == "jethubj80" ]] || [[ "$BOARD" == "jethubj100" ]] ; then
4948
}
5049
fi
5150

52-
5351
# JetHub builds userspace tooling with c++ (gpp) toolchain in buildjethomecmds() below.
5452
# The C++ compiler is no longer included by default in the Armbian build system.
5553
# Enable the extension that brings includes it. It could've been an inline extension (eg: the function right here),
5654
# but having a core extension allows it to be pre-included in the Dockerfile generation and thus in the Docker images.
5755
enable_extension "c-plus-plus-compiler"
5856

59-
6057
function fetch_sources_tools__jethub_amlogic_fip() {
61-
fetch_from_repo "https://github.com/adeepn/amlogic-boot-fip" "amlogic-boot-fip-jethub" "branch:add_jethub_j200"
58+
fetch_from_repo "https://github.com/adeepn/amlogic-boot-fip" "amlogic-boot-fip-jethub" "branch:add_jethub_j200"
6259
}
6360

64-
6561
uboot_custom_postprocess() {
6662
if [[ "$BOARD" == "jethubj80" ]]; then
6763
uboot_gxl_postprocess_ng "$SRC/cache/sources/amlogic-boot-fip/jethub-j80"

config/sources/families/meson-s4t7.conf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ enable_extension "bluetooth-hciattach" # E
1515
case $BRANCH in
1616

1717
legacy)
18-
declare -g KERNEL_MAJOR_MINOR="5.15" # Major and minor versions of this kernel. For mainline caching.
18+
declare -g KERNEL_MAJOR_MINOR="5.15" # Major and minor versions of this kernel. For mainline caching.
1919
declare -g KERNELSOURCE="${GITHUB_SOURCE}/khadas/linux.git" # Khadas kernel
20-
declare -g KERNELBRANCH="branch:khadas-vims-5.15.y" # Branch or tag to build from. It should match MAJOR_MINOR
20+
declare -g KERNELBRANCH="branch:khadas-vims-5.15.y" # Branch or tag to build from. It should match MAJOR_MINOR
2121
declare -g KERNELPATCHDIR="archive/meson-s4t7-5.15"
2222
declare -g COMMON_DRIVERS_SOURCE="${GITHUB_SOURCE}/khadas/common_drivers"
2323
declare -g EXTRAWIFI=no
@@ -128,7 +128,7 @@ function custom_kernel_config__add_khadas_common_drivers() {
128128
memoize_cache_ttl=$common_drivers_cache_ttl_seconds run_memoized GIT_INFO_COMMON_DRIVERS "git2info" memoized_git_ref_to_info
129129

130130
# Hack to ensure that we will recreate kernel if common_drivers source changes
131-
kernel_config_modifying_hashes+=( "khadas_common_drivers=${GIT_INFO_COMMON_DRIVERS[SHA1]}" )
131+
kernel_config_modifying_hashes+=("khadas_common_drivers=${GIT_INFO_COMMON_DRIVERS[SHA1]}")
132132

133133
# viraniac: kernel_config_modifying_hashes is only needed during first call of this function to calculate kernel artifact version string. It serves no purpose whatsoever during second call.
134134
kernel_config_modifying_hashes+=("CONFIG_DEBUG_KERNEL=y" "CONFIG_EXPERT=y" "CONFIG_EMBEDDED=y")
@@ -152,7 +152,7 @@ function kernel_copy_extra_sources__khadas_common_drivers() {
152152
rm -rf "${common_drivers_git_bare_tree}"
153153
fi
154154

155-
run_host_command_logged git clone --tags --no-checkout \
155+
run_host_command_logged git clone --tags --no-checkout \
156156
"${COMMON_DRIVERS_SOURCE}" "${common_drivers_git_bare_tree}"
157157

158158
touch "${common_drivers_git_bare_tree_done_marker}"
@@ -196,8 +196,8 @@ function post_family_tweaks_bsp__disable_uinitrd_generation() {
196196
}
197197

198198
function image_specific_armbian_env_ready__enable_earlycon() {
199-
display_alert "Enabling earlycon"
200-
run_host_command_logged echo "earlycon=on" >>${SDCARD}/boot/armbianEnv.txt
199+
display_alert "Enabling earlycon"
200+
run_host_command_logged echo "earlycon=on" >> ${SDCARD}/boot/armbianEnv.txt
201201
}
202202

203203
function post_family_tweaks_bsp__add_fan_service() {

config/sources/families/mt7623.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ GOVERNOR="ondemand"
3333
function pre_install_kernel_debs__network_manager_ignore_devices() {
3434
display_alert "Board: ${BOARD}: Disabling Network-Manager for all devices" "interface-name:eth*,interface-name:wan*,interface-name:lan*,interface-name:br*" "info"
3535

36-
3736
mkdir -p "${SDCARD}"/etc/NetworkManager/conf.d/
3837
cat <<- EOF > "${SDCARD}"/etc/NetworkManager/conf.d/99-ignore-interfaces.conf
3938
[keyfile]

config/sources/families/mvebu64.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ GOVERNOR=ondemand
7575
function pre_install_kernel_debs__network_manager_ignore_devices() {
7676
display_alert "Board: ${BOARD}: Disabling Network-Manager for all devices" "interface-name:eth*,interface-name:wan*,interface-name:lan*,interface-name:br*" "info"
7777

78-
7978
mkdir -p "${SDCARD}"/etc/NetworkManager/conf.d/
8079
cat <<- EOF > "${SDCARD}"/etc/NetworkManager/conf.d/99-ignore-interfaces.conf
8180
[keyfile]

config/sources/families/phytium-embedded.conf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ case "${BRANCH}" in
2222
EXTRAWIFI="no"
2323

2424
;;
25-
25+
2626
current)
2727
KERNELSOURCE='https://github.com/chainsx/phytium-linux-kernel'
2828
KERNELBRANCH="branch:linux-6.6"
@@ -38,11 +38,11 @@ esac
3838
write_uboot_platform() {
3939
declare ptuboot_cache_dir="${SRC}/cache/phytiumpi-uboot"
4040
mkdir -p "${ptuboot_cache_dir}"
41-
42-
sfdisk --dump "$2" > "${ptuboot_cache_dir}/part.txt" # Backup partition table, command sfdisk is belong to util-linux
43-
dd if="${SRC}/packages/blobs/phytiumpi/fip-all-sd-boot.bin" of="$2" conv=notrunc # Write non-free u-boot file
44-
sfdisk --no-reread "$2" < "${ptuboot_cache_dir}/part.txt" # Recover partition table
45-
41+
42+
sfdisk --dump "$2" > "${ptuboot_cache_dir}/part.txt" # Backup partition table, command sfdisk is belong to util-linux
43+
dd if="${SRC}/packages/blobs/phytiumpi/fip-all-sd-boot.bin" of="$2" conv=notrunc # Write non-free u-boot file
44+
sfdisk --no-reread "$2" < "${ptuboot_cache_dir}/part.txt" # Recover partition table
45+
4646
# Update u-boot env
4747
mkenvimage -s 0x1000 -o "${ptuboot_cache_dir}/env.bin" "${SRC}/packages/blobs/phytiumpi/env.txt"
4848
dd if="${ptuboot_cache_dir}/env.bin" of="$2" bs=1k seek=1472 conv=notrunc

config/sources/families/rock-s0.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ IDBLOADER_BLOB=$SRC/packages/blobs/rockchip/rk3308_idbloader_ddr589MHz_uart0_m0_
3232

3333
case $BRANCH in
3434
legacy)
35-
echo "Legacy not supported for rock-s0 board"
36-
exit 99
35+
echo "Legacy not supported for rock-s0 board"
36+
exit 99
3737
;;
3838
esac
3939

config/sources/families/rockchip-rk3588.conf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,24 +42,24 @@ case $BRANCH in
4242
current)
4343
# Branch based on a stable kernel release (will stay on the next LTS kernel release once released, 6.12? LTS)
4444
LINUXFAMILY=rockchip-rk3588
45-
KERNEL_MAJOR_MINOR="6.8" # Major and minor versions of this kernel.
46-
LINUXCONFIG="linux-rockchip-rk3588-${KERNEL_MAJOR_MINOR}" # Attention: not -${BRANCH} (edge/current/legacy), but -${KERNEL_MAJOR_MINOR} thus 6.6 / 6.12 etc
45+
KERNEL_MAJOR_MINOR="6.8" # Major and minor versions of this kernel.
46+
LINUXCONFIG="linux-rockchip-rk3588-${KERNEL_MAJOR_MINOR}" # Attention: not -${BRANCH} (edge/current/legacy), but -${KERNEL_MAJOR_MINOR} thus 6.6 / 6.12 etc
4747
# No need to set KERNELPATCHDIR, since default is: KERNELPATCHDIR='archive/rockchip-rk3588-${KERNEL_MAJOR_MINOR}'
4848
;;
4949

5050
edge)
5151
# Branch based on the latest kernel release including RC releases, to benefit from the latest RK3588 mainline advancements. Might be unstable!
5252
LINUXFAMILY=rockchip-rk3588
53-
KERNEL_MAJOR_MINOR="6.10" # Major and minor versions of this kernel.
54-
LINUXCONFIG="linux-rockchip-rk3588-${KERNEL_MAJOR_MINOR}" # Attention: not -${BRANCH} (edge/current/legacy), but -${KERNEL_MAJOR_MINOR} thus 6.8 / 6.10 etc
53+
KERNEL_MAJOR_MINOR="6.10" # Major and minor versions of this kernel.
54+
LINUXCONFIG="linux-rockchip-rk3588-${KERNEL_MAJOR_MINOR}" # Attention: not -${BRANCH} (edge/current/legacy), but -${KERNEL_MAJOR_MINOR} thus 6.8 / 6.10 etc
5555
# No need to set KERNELPATCHDIR, since default is: KERNELPATCHDIR='archive/rockchip-rk3588-${KERNEL_MAJOR_MINOR}'
5656
;;
5757

5858
collabora)
5959
# Collabora's rk3588, where the action is these days
6060
LINUXFAMILY=rockchip-rk3588
6161
LINUXCONFIG='linux-rockchip-rk3588-'$BRANCH
62-
KERNEL_MAJOR_MINOR="6.9" # Major and minor versions of this kernel.
62+
KERNEL_MAJOR_MINOR="6.9" # Major and minor versions of this kernel.
6363
KERNELPATCHDIR='rockchip-rk3588-collabora' # Try to keep this as empty as possible. We won't work on top of Collabora's branch, they rebase all the time. New DTs are ok.
6464
KERNELSOURCE='https://gitlab.collabora.com/hardware-enablement/rockchip-3588/linux.git' # Directly from Collabora...
6565
KERNELBRANCH='branch:rk3588-v6.9' # Rolling kernel branch, will be rebased

0 commit comments

Comments
 (0)