diff options
| author |   Tom Rini <trini@konsulko.com> | 2017-08-02 17:27:25 -0400 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-08-04 17:24:27 +0000 |
| commit | 3ca6c578c302e5658ea78f6eed216188b50ed906 (patch) | |
| tree | 62932bd51bb8fcbdfb710d71877551af5ecc7682 /templates/machine | |
| parent | 019c73818e94f79d75f2bc5893fd57a3d011e24a (diff) | |
raspberrypi: Fix U-Boot support
In order to use U-Boot on the raspberrypi3 we need to have the equivalent
of the following commit from upstream meta-raspberrypi:
commit 67e02164929a7d8cc187315aaaab60f6f3aaf422
Author: Paul Barker <paul@paulbarker.me.uk>
Date: Mon Feb 13 23:32:43 2017 +0000
u-boot: Fix boot on rpi3
With that done, we can re-enable U-Boot support for raspberrypi3. With
this done we can also now re-enable testing, so do so. For consistency we
can now switch raspberrypi2 over to U-Boot as well.
Change-Id: I9c96a66bf5644bf63f2566559ab7d9c4101b7a55
Bug-AGL: SPEC-409
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10491
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'templates/machine')
| -rw-r--r-- | templates/machine/raspberrypi3/test.disabled/hwtest.short.environment | 10 | ||||
| -rw-r--r-- | templates/machine/raspberrypi3/test/hwtest.enable (renamed from templates/machine/raspberrypi3/test.disabled/hwtest.enable) | 0 | ||||
| -rw-r--r-- | templates/machine/raspberrypi3/test/hwtest.short.enable (renamed from templates/machine/raspberrypi3/test.disabled/hwtest.short.enable) | 0 | ||||
| -rw-r--r-- | templates/machine/raspberrypi3/test/hwtest.short.environment | 10 | ||||
| -rw-r--r-- | templates/machine/raspberrypi3/test/testjob_short.yaml (renamed from templates/machine/raspberrypi3/test.disabled/testjob_short.yaml) | 0 |
5 files changed, 10 insertions, 10 deletions
diff --git a/templates/machine/raspberrypi3/test.disabled/hwtest.short.environment b/templates/machine/raspberrypi3/test.disabled/hwtest.short.environment deleted file mode 100644 index db4a5a044..000000000 --- a/templates/machine/raspberrypi3/test.disabled/hwtest.short.environment +++ /dev/null @@ -1,10 +0,0 @@ -DEVICE_TYPE=raspberrypi3-uboot -DEVICE_NAME=raspberrypi3 -DEVICE_DTB=Image-bcm2710-rpi-3-b.dtb -DEVICE_KERNEL=Image -DEVICE_INITRAMFS=initramfs-netboot-image-raspberrypi3.ext4.gz -DEVICE_NBDROOT=agl-demo-platform-raspberrypi3.ext4.xz -DEVICE_NBDROOT_COMPRESSION=xz -DEVICE_BOOT_METHOD=u-boot -DEVICE_BOOT_TYPE=booti -#DEVICE_URL_PREFIX=https://download.automotivelinux.org/AGL
\ No newline at end of file diff --git a/templates/machine/raspberrypi3/test.disabled/hwtest.enable b/templates/machine/raspberrypi3/test/hwtest.enable index 573541ac9..573541ac9 100644 --- a/templates/machine/raspberrypi3/test.disabled/hwtest.enable +++ b/templates/machine/raspberrypi3/test/hwtest.enable diff --git a/templates/machine/raspberrypi3/test.disabled/hwtest.short.enable b/templates/machine/raspberrypi3/test/hwtest.short.enable index 573541ac9..573541ac9 100644 --- a/templates/machine/raspberrypi3/test.disabled/hwtest.short.enable +++ b/templates/machine/raspberrypi3/test/hwtest.short.enable diff --git a/templates/machine/raspberrypi3/test/hwtest.short.environment b/templates/machine/raspberrypi3/test/hwtest.short.environment new file mode 100644 index 000000000..2f084f8ff --- /dev/null +++ b/templates/machine/raspberrypi3/test/hwtest.short.environment @@ -0,0 +1,10 @@ +DEVICE_TYPE=raspberrypi3-uboot +DEVICE_NAME=raspberrypi3 +DEVICE_DTB=uImage-bcm2710-rpi-3-b.dtb +DEVICE_KERNEL=uImage +DEVICE_INITRAMFS=initramfs-netboot-image-raspberrypi3.ext4.gz.u-boot +DEVICE_NBDROOT=agl-demo-platform-raspberrypi3.ext4.xz +DEVICE_NBDROOT_COMPRESSION=xz +DEVICE_BOOT_METHOD=u-boot +DEVICE_BOOT_TYPE=bootm +#DEVICE_URL_PREFIX=https://download.automotivelinux.org/AGL diff --git a/templates/machine/raspberrypi3/test.disabled/testjob_short.yaml b/templates/machine/raspberrypi3/test/testjob_short.yaml index 2ff1ac995..2ff1ac995 100644 --- a/templates/machine/raspberrypi3/test.disabled/testjob_short.yaml +++ b/templates/machine/raspberrypi3/test/testjob_short.yaml |