By default, a uboot header is automatically added to the ramdisk image.

For bootloaders without INITRD_ATAG support, the ramdisk needs to be passed on the command line and cannot have the uboot header added.

To enable this feature, add a "ramdisk_raw" option that device files can set so that a uboot header is not added.

Signed-off-by: Kevin Hilman khilman@baylibre.com --- Patch applies on 2016.9

lava_dispatcher/config.py | 1 + lava_dispatcher/device/bootloader.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lava_dispatcher/config.py b/lava_dispatcher/config.py index 66a9e70021fa..c91c5634280d 100644 --- a/lava_dispatcher/config.py +++ b/lava_dispatcher/config.py @@ -312,6 +312,7 @@ class DeviceSchema(schema.Schema): uimage_xip = schema.BoolOption(default=False) append_dtb = schema.BoolOption(default=False) prepend_blob = schema.StringOption(default=None) + ramdisk_raw = schema.BoolOption(default=False)

# for dynamic_vm devices dynamic_vm_backend_device_type = schema.StringOption(default='kvm') diff --git a/lava_dispatcher/device/bootloader.py b/lava_dispatcher/device/bootloader.py index 634d22ef3311..c88fba8937e6 100644 --- a/lava_dispatcher/device/bootloader.py +++ b/lava_dispatcher/device/bootloader.py @@ -208,7 +208,7 @@ class BootloaderTarget(MasterImageTarget): decompress=False) extract_overlay(overlay, ramdisk_dir) ramdisk = create_ramdisk(ramdisk_dir, self._tmpdir) - if self._is_uboot(): + if self._is_uboot() and not self.config.ramdisk_raw: # Ensure ramdisk has u-boot header if not self._is_uboot_ramdisk(ramdisk): ramdisk_uboot = ramdisk + ".uboot"