| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
Add NUM_BOOT_AUX_FILE and BOOT_AUX_FILE[n] so that the user can add a
number of files to the first partition with disk_image. This is useful
for firmware files etc.
Signed-off-by: Víctor Mayoral Vilches <v.mayoralv@gmail.com>
Signed-off-by: Brian Woods <brian.woods@gmail.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
|
|
|
|
|
|
| |
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
|
|
|
|
|
|
|
|
|
| |
There was a problem with delimiters and how it worked for both the uboot
scripts and the edited device trees.
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
|
|
|
|
|
|
|
|
|
| |
Also add "multiboot,module" compatible string for dom0 kernel and
ramdisk, so that Xen can detect it and skip loading the xen.cfg file.
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Device tree overlaps support in u-boot means that adding overlay support
at boot time is easy. Simply loading the files via tftp/scsi/fit etc
and then applying the overlays before the normal imagebuilder fdt edits
at boot time allows for applying overlays without changing the device
tree files.
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
|
|
|
|
|
|
|
|
| |
Add support for signing FIT images.
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add a "fit" option that uses a script rather than a standard FIT format.
This allows traditional imagerbuilder script support to be used with FIT
images. Dom0less and everything else works and is free of the
limitations that the standard FIT format of using configs has.
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Tested-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
|
|
|
|
|
|
|
|
|
|
| |
This allows the creation of a standard fit image without the use of a
script. This also means that supporting dom0less configs is rather
tricky since it uses bootm and not booti.
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
|
|
|
|
|
|
|
|
|
|
| |
Rather than using an uboot script to modify the device tree, allow an
config option to be specified so that a device tree is generated as
well. Making it to see what exactly is given to Xen.
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
|
|
|
|
|
|
|
|
| |
added to each partition.
Signed-off-by: Víctor Mayoral Vilches <v.mayoralv@gmail.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: Brian Woods <brian.woods@xilinx.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
A heuristic was used in the previous implementation for simplicity (*2)
but when using bigger file systems size overflows.
This patch uncompresses the archive in an auxiliary folder and
calculates its total size in bytes instead.
Signed-off-by: Víctor Mayoral Vilches <v.mayoralv@gmail.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: Brian Woods <brian.woods@xilinx.com>
|
|
|
|
|
|
|
|
| |
Also introduce a new DOMU_NOBOOT option to force a domU not to be
started automatically at boot as dom0less guest.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: Brian Woods <brian.woods@xilinx.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
disk_image generates xl config files to start DomUs from Dom0. The files
are added to dom0 rootfs partition under /etc/xen for your convenience.
They refer to kernels and ramdisks stored on the first partition. It is
recommended to mount the first partition under /boot in Dom0 to use
them.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: Brian Woods <brian.woods@xilinx.com>
|
|
|
|
|
| |
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: Brian Woods <brian.woods@xilinx.com>
|
|
|
|
|
| |
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: Brian Woods <brian.woods@xilinx.com>
|
|
|
|
|
|
| |
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Signed-off-by: Víctor Mayoral Vilches <v.mayoralv@gmail.com>
Reviewed-by: Brian Woods <brian.woods@xilinx.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Rootfses that should be written to disk as their own partition are
called *_ROOTFS instead of *_RAMDISK.
This change makes the config file clearer and more consistent. However
it changes the current behavior as the Dom0 RAMDISK (not ROOTFS) was
written to disk as its own partition before, and now it is not.
In the case of uboot-script-gen, dom0less guests cannot access disk
partitions yet (missing PV drivers support). Hence, if one or more domU
ROOTFSes are specified, print an error and exit. For dom0, base the
root= parameter generation on the presence of DOM0_ROOTFS.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Brian Woods <brian.woods@xilinx.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
With the -t option, the "sd" was an alias for the "load scsi 0:1" load
command. Change that to a "load mmc 0:1" alias and then add a "scsi"
alias which is "load scsi 0:1". To make sure these aliases and manually
setting the load command works, a parsing the command and setting the
correct partition and devs was also added.
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
|
|
|
|
|
|
|
|
| |
Add two new config file parameters to configure the amount of memory and
the number of vcpus of dom0less VMs.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: Brian Woods <brian.woods@xilinx.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Both XEN_CMD and DOM0_CMD are optional settings in the config file that
set Xen's and Dom0's command line arguments. If not set, a default
value will be used. Also, for Dom0's command line arguments, if root
isn't set in it, it will determine the best option based on the load
argument.
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
|
|
|
|
|
|
|
|
|
|
| |
Initially ImageBuilder was meant to be mainly invoked from a container
but in practice ImageBuilder's scripts have been called directly.
Remove the old documentation and Dockerfile.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: Brian Woods <brian.woods@xilinx.com>
|
|
|
|
|
|
| |
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The -d option for uboot-script-gen was poorly worded. The -d option
isn't a working directory but rather the "root" directory for where
the tftp or other root directory would be in relation to the files. Any
files generated in the created of the boot.src/source files are in /tmp
and are deleted afterwards.
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
|
|
|
|
|
|
|
|
|
| |
Some build systems like yocto use absolute paths. Add support for them
so they can be used in the config file.
Signed-off-by: Swagath Gadde <swagath.gadde@xilinx.com>
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
|
|
|
|
|
|
|
|
|
|
| |
In some distros (like RHEL 6 and 7), file identifies the device tree
blobs (DTBs) as "data". To make imagebuilder work on these older
distros, change it where DTBs are correctly identified as "Device Tree
Blob" or "data".
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
|
|
|
|
|
|
|
|
|
| |
clk_ignore_unused reduces clock related errors and warning on many
platforms. It looks like a safer default to have.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
CC: woods@xilinx.com
CC: izhar.ameer.shaikh@xilinx.com
|
|
|
|
|
|
|
|
|
|
| |
Use stat -L and file -L so that the two tools follow symlinks correctly.
Also fix an error in check_file_type: the error function is called
cleanup_and_return_err, not clean_up_and_err_out.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: Brian Woods <brian.woods@xilinx.com>
|
|
|
|
|
|
|
|
|
|
| |
Introduce a -o command line option for uboot-script-gen to be able to
easily specify the output filename for the uboot script and the uboot
script source.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
|
|
|
|
|
|
| |
To account for configurations with larger rootfses.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
|
|
|
|
|
|
|
|
|
| |
The boot script files would still be generated even if the files used
in the config don't exist. This checks to make sure the files exist
and if they don't, it exits and errs out.
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Some versions of the file command and Xen will output:
xen: Linux kernel ARM boot executable zImage (little-endian)
and executables that file doesn't recognize are simply classified as
"data." So changing "MS-DOS executable" to "executable" and or'ing that
with "data" should increase coverage without making the check useless.
Suggested-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
|
|
|
|
|
|
|
|
| |
Currently there are tmp files left after the script is run. This keeps
track of the files and deletes them when exiting.
Signed-of-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
|
|
|
|
|
|
|
|
|
|
| |
When the user supplies a relative path to use as a working tmp
directory, the path is broken when a cd occurs in the script. Fix this
by using the absolute path for DESTDIR when we cd.
Fixes: "Fix copying files to boot partition in disk_image"
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
|
|
|
|
|
|
|
|
|
| |
Add some simple command line arguments and some dependency checking that
makes running the script outside of a container much easier.
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
|
|
|
|
|
|
|
|
| |
Convert the indentation of disk_image to 4 space from hard tabs so that
it matches the rest of the Imagebuilder scripts.
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
|
|
|
|
|
|
|
|
|
|
| |
Copy only the files that were used to generate the size of the boot
partition. This fixes a bug where if the Dom0 ramdisk is over ~16M the
boot partition will run out of space since everything in the directory
is copied over.
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
|
|
|
|
|
|
|
|
| |
Get rid of a hardcoded dom0 ramdisk name so that it doesn't err out
when the name is different.
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
|
|
|
|
|
|
|
|
|
| |
There was a mixure of spaces and tabs in the help message of
uboot-script-gen. Fix it to only use tabs like disk_image's help
message.
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
|
|
|
|
| |
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Add some simple command line arguments and some dependency checking that
makes running this outside of a container much easier. The environment
variable LOAD_CMD has been removed and all the config options are done
via command line arguemtnt for consistency.
Signed-off-by: Brian Woods <brian.woods@xilinx.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
|
|
|
|
| |
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
|
|
|
|
| |
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
|
|
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
|