chore(u-boot): bump to version 2024.10
Upgrade U-Boot from 2019.07 to 2024.10 to support firmware handoff boot
tests, as many underlying assumptions have changed. Notably, newer
updates rely on semihosting on FVP instead of the previous approach.
The defconfig used to build the current U-Boot binary in CI was removed
some time ago [1]. Previously, U-Boot scanned DRAM for boot binaries.
This approach was replaced with semihosting, allowing the model to
locate boot images via the host filesystem.
To maintain compatibility and minimize changes in CI scripts, a boot
script [2] is provided to emulate this assumption. All our DTs assume
the root partition is /dev/vda, but the RootFS used in CI uses
/dev/vda2. Update it to avoid having to awkwardly fixup the location in
the DT in CI.
[1] https://lists.denx.de/pipermail/u-boot/2019-August/382053.html
[2] https://downloads.trustedfirmware.org/tf-a/linux_boot/fvp/boot.scr
Signed-off-by: Harrison Mutai <harrison.mutai@arm.com>
Change-Id: I3b05972c1a665bdd30206a7cab22d0ae4a32a8d6
diff --git a/expect-lava/buildrootfs.inc b/expect-lava/buildrootfs.inc
new file mode 100644
index 0000000..c11a4b2
--- /dev/null
+++ b/expect-lava/buildrootfs.inc
@@ -0,0 +1,15 @@
+#
+# Copyright (c) 2021-2022 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Script to interact with an Buildroot file system
+#
+# This script is not standalone and should be sourced by a top expect script.
+#
+
+expect_string+=('i;Run /sbin/init')
+expect_string+=("i;buildroot login:")
+expect_string+=("i;#;;;root")
+expect_string+=('i;(Power down|System halted);;;poweroff')
+expect_string+=('i;;;;@')
diff --git a/expect-lava/linux-oe-rst-bl31.exp b/expect-lava/linux-oe-rst-bl31.exp
index 1c54d71..c7a0eb1 100644
--- a/expect-lava/linux-oe-rst-bl31.exp
+++ b/expect-lava/linux-oe-rst-bl31.exp
@@ -15,4 +15,4 @@
source $ci_root/expect-lava/linux.inc
# OpenEmbedded filesystem section
-source $ci_root/expect-lava/openembedded.inc
+source $ci_root/expect-lava/buildrootfs.inc
diff --git a/expect-lava/linux-oe.exp b/expect-lava/linux-oe.exp
index 1dc8ae4..a7367c6 100644
--- a/expect-lava/linux-oe.exp
+++ b/expect-lava/linux-oe.exp
@@ -14,4 +14,4 @@
source $ci_root/expect-lava/linux.inc
# OpenEmbedded filesystem section
-source $ci_root/expect-lava/openembedded.inc
+source $ci_root/expect-lava/buildrootfs.inc
diff --git a/expect-lava/openembedded.inc b/expect-lava/openembedded.inc
deleted file mode 100644
index 76ac752..0000000
--- a/expect-lava/openembedded.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Copyright (c) 2021-2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-# Script to interact with an OpenEmbedded file system
-#
-# This script is not standalone and should be sourced by a top expect script.
-#
-
-expect_string+=('i;INIT:')
-expect_string+=('i;root@genericarmv8:~#')
-expect_string+=('i;(Power down|System halted);;;shutdown -h now')
-expect_string+=('i;;;;@')
diff --git a/expect/buildrootfs.inc b/expect/buildrootfs.inc
new file mode 100644
index 0000000..828f30b
--- /dev/null
+++ b/expect/buildrootfs.inc
@@ -0,0 +1,18 @@
+#
+# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Script to interact with an Buildroot file system
+#
+# This script is not standalone and should be sourced by a top expect script.
+#
+
+expect_string "Run /sbin/init as init process" "Linux is booting"
+expect_string "buildroot login:" "Linux reached the login prompt"
+send "root\r"
+expect_re "# " "Linux reached the root prompt"
+send "poweroff\r"
+
+expect_re "(Power down|System halted)" "Linux shut down successfully"
+exit_uart 0
diff --git a/expect/linux-oe-rst-bl31.exp b/expect/linux-oe-rst-bl31.exp
index 9cf1278..d5dc695 100644
--- a/expect/linux-oe-rst-bl31.exp
+++ b/expect/linux-oe-rst-bl31.exp
@@ -19,7 +19,7 @@
source [file join [file dirname [info script]] linux.inc]
# OpenEmbedded filesystem section
-source [file join [file dirname [info script]] openembedded.inc]
+source [file join [file dirname [info script]] buildrootfs.inc]
exit_uart -1
diff --git a/expect/linux-oe.exp b/expect/linux-oe.exp
index 658e72d..a7f98bc 100644
--- a/expect/linux-oe.exp
+++ b/expect/linux-oe.exp
@@ -18,6 +18,6 @@
source [file join [file dirname [info script]] linux.inc]
# OpenEmbedded filesystem section
-source [file join [file dirname [info script]] openembedded.inc]
+source [file join [file dirname [info script]] buildrootfs.inc]
exit_uart -1
diff --git a/expect/openembedded.inc b/expect/openembedded.inc
deleted file mode 100644
index fb112e9..0000000
--- a/expect/openembedded.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-# Script to interact with an OpenEmbedded file system
-#
-# This script is not standalone and should be sourced by a top expect script.
-#
-
-expect_string "INIT:" "Linux is booting"
-expect_string "root@genericarmv8:~#" "Linux reached the root prompt"
-send "shutdown -h now\r"
-
-expect_re "(Power down|System halted)" "Linux shut down successfully"
-exit_uart 0
diff --git a/fvp_utils.sh b/fvp_utils.sh
index 7f72c6d..23246b8 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -45,11 +45,11 @@
optee_version="4.5.0"
optee_path=$tfa_downloads/optee/${optee_version}
- uboot_url="$linaro_release/fvp-latest-busybox-uboot/bl33-uboot.bin"
+ uboot_url="${tfa_downloads}/linux_boot/fvp/u-boot.bin"
fi
uboot_script_url="${tfa_downloads}/linux_boot/fvp/boot.scr"
-rootfs_url="$linaro_release/lt-vexpress64-openembedded_minimal-armv8-gcc-5.2_20170127-761.img.gz"
+rootfs_url="${tfa_downloads}/linux_boot/fvp/rootfs.ext4"
# Default FVP model variables
default_model_dtb="dtb.bin"