Skip to content

Commit

Permalink
Load kernel from USB, use ATF v2.8
Browse files Browse the repository at this point in the history
  • Loading branch information
eliasbakken committed Nov 27, 2023
1 parent 4360144 commit 9996452
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
3 changes: 3 additions & 0 deletions armbian/recore.csc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ MODULES="g_serial"
BOOT_LOGO="yes"

function post_family_config__shrink_atf() {
echo "🍰CHoose ATF branch"
declare -g ATFBRANCH="tag:v2.8.0"

echo "🍰Shrink ATF"
declare -g ATF_TARGET_MAP="PLAT=$ATF_PLAT DEBUG=0 SUNXI_PSCI_USE_SCPI=0 bl31;;build/$ATF_PLAT/release/bl31.bin"

Expand Down
2 changes: 1 addition & 1 deletion rebuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ NAME="rebuild-${VERSION}-${TAG}"
cd $BUILD_DIR
git reset --hard
git pull
git checkout main
git checkout v23.08
rm -rf "userpatches"

cd "$ROOT_DIR"
Expand Down
10 changes: 9 additions & 1 deletion userpatches/bootscripts/boot-sun50i-next.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ setenv rootdev "/dev/mmcblk0p1"
setenv verbosity "1"
setenv rootfstype "ext4"
setenv console "both"
setenv docker_optimizations "on"
setenv docker_optimizations "off"
setenv bootlogo "false"

# Print boot source
Expand All @@ -25,6 +25,14 @@ if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then
env import -t ${load_addr} ${filesize}
fi

if test "${rootdev}" = "/dev/sda2"; then
echo "Booting from USB"
regulator status
usb reset
setenv devtype "usb"
setenv devnum 0
fi

if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=ttyS0,115200 console=tty1"; fi
if test "${console}" = "serial"; then setenv consoleargs "console=ttyS0,115200"; fi
if test "${bootlogo}" = "true"; then
Expand Down
2 changes: 0 additions & 2 deletions userpatches/config-rebuild.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
ATFBRANCH='tag:v2.8'

# Read build script documentation https://docs.armbian.com/Developer-Guide_Build-Options/
# for detailed explanation of these options and for additional options not listed here

Expand Down

0 comments on commit 9996452

Please sign in to comment.