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>

4 files changed, 0 insertions, 61 deletions

diff --git a/templates/machine/raspberrypi3/test.disabled/hwtest.enable b/templates/machine/raspberrypi3/test.disabled/hwtest.enable
deleted file mode 100644
index 573541ac9..000000000
--- a/templates/machine/raspberrypi3/test.disabled/hwtest.enable
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/templates/machine/raspberrypi3/test.disabled/hwtest.short.enable b/templates/machine/raspberrypi3/test.disabled/hwtest.short.enable
deleted file mode 100644
index 573541ac9..000000000
--- a/templates/machine/raspberrypi3/test.disabled/hwtest.short.enable
+++ /dev/null
@@ -1 +0,0 @@
-0
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/testjob_short.yaml b/templates/machine/raspberrypi3/test.disabled/testjob_short.yaml
deleted file mode 100644
index 2ff1ac995..000000000
--- a/templates/machine/raspberrypi3/test.disabled/testjob_short.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-# Your first LAVA JOB definition for a porter board
-device_type: @REPLACE_DEVICE_TYPE@
-job_name: AGL-short-smoke
-
-protocols:
-  lava-xnbd:
-    port: auto
-
-timeouts:
-  job:
-    minutes: 30
-  action:
-    minutes: 15
-  connection:
-    minutes: 5
-  bootloader-commands:
-    minutes: 4
-priority: medium
-visibility: public
-
-# ACTION_BLOCK
-actions:
-- deploy:
-    timeout:
-      minutes: 15
-    to: nbd
-    dtb:
-      url: '@REPLACE_URL_PREFIX@/@REPLACE_DTB@'
-    kernel:
-      url: '@REPLACE_URL_PREFIX@/@REPLACE_KERNEL@'
-    initrd:
-      url: '@REPLACE_URL_PREFIX@/@REPLACE_INITRAMFS@'
-      allow_modify: false
-    nbdroot:
-      url: '@REPLACE_URL_PREFIX@/@REPLACE_NBDROOT@'
-      compression: @REPLACE_NBDROOT_COMPRESSION@
-    os: debian
-    failure_retry: 2
-
-# BOOT_BLOCK
-- boot:
-    method: @REPLACE_BOOT_METHOD@
-    commands: nbd
-    type: @REPLACE_BOOT_TYPE@
-    prompts: ["root@@REPLACE_MACHINE@:~"]
-    auto_login:
-      login_prompt: "login:"
-      username: root
-