ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-05-07 19:18:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

run: remove argument from 'run_image' function

Browse Source 
The argument is superfluous because only run/image/uboot evaluated it
anyway, and the argument is always boot/image.elf. With this change, the
official semantics of run_image become: "replace the boot/image.elf file
by platform-specific file(s) at boot/ that can actually be booted".

Issue #4730
This commit is contained in:
Norman Feske 2023-01-18 16:56:28 +01:00 committed by Christian Helmuth
parent eba22b7551
commit 41ebf3bd94
8 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tool/run/boot_dir/foc
View File

@ -187,7 +187,7 @@ proc run_boot_dir_arm { binaries } {
exec mkdir -p [run_dir]/boot exec mkdir -p [run_dir]/boot
exec mv [run_dir]/image.elf [run_dir]/boot/core.elf exec mv [run_dir]/image.elf [run_dir]/boot/core.elf
exec cp [l4_bin_dir]/bootstrap.elf [run_dir]/boot/image.elf exec cp [l4_bin_dir]/bootstrap.elf [run_dir]/boot/image.elf
run_image [run_dir]/boot/image.elf run_image
puts "\nboot image: [run_dir]/image.elf\n" puts "\nboot image: [run_dir]/image.elf\n"

2
tool/run/boot_dir/hw
View File

@ -143,7 +143,7 @@ proc run_boot_dir {binaries} {
close $fh close $fh
} }
run_image [run_dir]/boot/image.elf run_image
# install image.elf file in TFTP directory for PXE boot # install image.elf file in TFTP directory for PXE boot
if {[expr [have_spec arm] || [have_spec arm_64]] && [have_include "load/tftp"]} { if {[expr [have_spec arm] || [have_spec arm_64]] && [have_include "load/tftp"]} {

2
tool/run/boot_dir/sel4
View File

@ -117,7 +117,7 @@ proc run_boot_dir {binaries} {
exec [sel4_elfloader_dir]/gen_boot_image.sh [pwd]/[run_dir]/boot/kernel.elf [pwd]/[run_dir]/boot/genode.elf [pwd]/[run_dir]/boot/image.elf exec [sel4_elfloader_dir]/gen_boot_image.sh [pwd]/[run_dir]/boot/kernel.elf [pwd]/[run_dir]/boot/genode.elf [pwd]/[run_dir]/boot/image.elf
} }
run_image [run_dir]/boot/image.elf run_image
# install image.elf file in TFTP directory for PXE boot # install image.elf file in TFTP directory for PXE boot
if {[have_spec arm] && [have_include "load/tftp"]} { if {[have_spec arm] && [have_include "load/tftp"]} {

2
tool/run/image/disk
View File

@ -13,7 +13,7 @@ proc image_disk_size { } { return [get_cmd_arg --image-disk-size 0] }
## ##
# Create disk image with the content of the run directory # Create disk image with the content of the run directory
# #
proc run_image { {unused ""} } { proc run_image { } {
set sgdisk [installed_command sgdisk] set sgdisk [installed_command sgdisk]

2
tool/run/image/iso
View File

@ -4,7 +4,7 @@ source [genode_dir]/tool/run/iso.inc
## ##
# Create ISO image with the content of the run directory # Create ISO image with the content of the run directory
# #
proc run_image { {unused ""} } { proc run_image { } {
puts "creating ISO image..." puts "creating ISO image..."
exec rm -f "[run_dir].iso" exec rm -f "[run_dir].iso"

6
tool/run/image/uboot
View File

@ -35,9 +35,9 @@ proc image_uboot_gzip_opt { } {
## ##
# Build U-boot bootloader specific uImage # Build U-boot bootloader specific uImage
# #
# \param elf_img ELF binary to build uImage from proc run_image { } {
#
proc run_image {elf_img} { set elf_img [file join [run_dir] boot image.elf]
# parse ELF entrypoint and load address # parse ELF entrypoint and load address
set entrypoint [exec [cross_dev_prefix]readelf -h $elf_img | \ set entrypoint [exec [cross_dev_prefix]readelf -h $elf_img | \

2
tool/run/image/uefi
View File

@ -12,7 +12,7 @@ proc image_uefi_size { } { return [get_cmd_arg --image-uefi_size 0] }
## ##
# Create uefi image # Create uefi image
# #
proc run_image { {unused ""} } { proc run_image { } {
set run_size [expr [regsub {\s.*} [exec du -smL [run_dir]] {}]] set run_size [expr [regsub {\s.*} [exec du -smL [run_dir]] {}]]

8
tool/run/run
View File

@ -834,9 +834,13 @@ proc run_boot_dir { binaries } {
## ##
# Dummy image build module # Bring the boot-directory content into a form that can actually be booted
# #
proc run_image { {image "" } } { return true; } # The form suitable for booting depends on the platform and the used boot
# loader. By convention, this function can expect the presence of the boot
# image in the form of an [run_dir]/boot/image.elf file.
#
proc run_image { } { return true; }
## ##