Skip to content

Commit 88ddcb4

Browse files
EvilOlafigorpecovnik
authored andcommitted
sunxi: fix Unhandled Exception in EL3. and/causing secondary cpus not coming online
1 parent 527c94d commit 88ddcb4

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

config/sources/families/include/sunxi64_common.inc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
enable_extension "sunxi-tools"
1010
declare -g ARCH=arm64
1111
declare -g ATF_TARGET_MAP="PLAT=$ATF_PLAT DEBUG=1 bl31;;build/$ATF_PLAT/debug/bl31.bin"
12-
declare -g ATFBRANCH="tag:lts-v2.12.4"
12+
declare -g ATFBRANCH="tag:lts-v2.12.9"
1313
declare -g BOOTDELAY=1
1414
declare -g BOOTPATCHDIR="${BOOTPATCHDIR:-"u-boot-sunxi"}"
1515
declare -g BOOTBRANCH="${BOOTBRANCH:-"tag:v2024.01"}"
@@ -46,8 +46,7 @@ family_tweaks() {
4646
}
4747

4848
write_uboot_platform() {
49-
dd if=/dev/zero of=$2 bs=1k count=1023 seek=1 status=noxfer > /dev/null 2>&1
50-
dd if=$1/u-boot-sunxi-with-spl.bin of=$2 bs=1024 seek=8 status=noxfer > /dev/null 2>&1
49+
dd if=$1/u-boot-sunxi-with-spl.bin of=$2 conv=fsync bs=1024 seek=8
5150
}
5251

5352
setup_write_uboot_platform() {

lib/functions/compilation/uboot.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,6 @@ function compile_uboot_target() {
149149
run_host_command_logged scripts/config --set-val CONFIG_BOOTDELAY "${BOOTDELAY}"
150150
fi
151151

152-
# Hack, up the log level to 6: "info" (default is 4: "warning")
153-
display_alert "Hacking log level in u-boot config" "LOGLEVEL=${uboot_loglevel} for ${target}" "info"
154-
run_host_command_logged scripts/config --enable CONFIG_LOG
155-
run_host_command_logged scripts/config --set-val CONFIG_LOGLEVEL ${uboot_loglevel}
156-
run_host_command_logged scripts/config --set-val CONFIG_LOG_MAX_LEVEL ${uboot_loglevel}
157-
158152
# Include Armbian version so UART bootlogs are drastically more useful
159153
run_host_command_logged ./scripts/config --disable "LOCALVERSION_AUTO"
160154
run_host_command_logged ./scripts/config --set-str "LOCALVERSION" "_armbian-${artifact_version}" # crazy quotes!

0 commit comments

Comments
 (0)