3 files changed, 8 insertions, 9 deletions
diff --git a/meta-agl/templates/machine/ebisu/50_setup.sh b/meta-agl/templates/machine/ebisu/50_setup.sh
index c8471ae0..502c2275 100644
--- a/meta-agl/templates/machine/ebisu/50_setup.sh
+++ b/meta-agl/templates/machine/ebisu/50_setup.sh
@@ -19,7 +19,10 @@ fi
 if [ -f $COPY_SCRIPT ]; then
 	# Extract the ZIP into the tmp directory
 	mkdir -p $EXTRACT_DIR
-	unzip -q -o $EBISU_BIN_PATH/*.zip -d $EXTRACT_DIR
+	for PROPRIETARY_BIN in `ls -1 $EBISU_BIN_PATH/*.zip`
+	do
+		unzip -q -o $PROPRIETARY_BIN -d $EXTRACT_DIR
+	done
 
 	cd $METADIR/bsp/meta-renesas-rcar-gen3/
 	$COPY_SCRIPT $EXTRACT_DIR
diff --git a/meta-agl/templates/machine/raspberrypi3/50_local.conf.inc b/meta-agl/templates/machine/raspberrypi3/50_local.conf.inc
index dcaf5e9d..e4763717 100644
--- a/meta-agl/templates/machine/raspberrypi3/50_local.conf.inc
+++ b/meta-agl/templates/machine/raspberrypi3/50_local.conf.inc
@@ -1,7 +1,3 @@
 MACHINE = "raspberrypi3"
 #see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
 require conf/include/agl_raspberrypi3.inc
-
-# Set appropriate version of Mesa for Raspberry Pi 3 and
-# ignore the newer version with has been added for Raspberry Pi 4
-PREFERRED_VERSION_mesa_raspberrypi3 = "18.1%"
diff --git a/meta-agl/templates/machine/raspberrypi4/50_local.conf.inc b/meta-agl/templates/machine/raspberrypi4/50_local.conf.inc
index 27a8bf2a..4c14d14b 100644
--- a/meta-agl/templates/machine/raspberrypi4/50_local.conf.inc
+++ b/meta-agl/templates/machine/raspberrypi4/50_local.conf.inc
@@ -2,7 +2,7 @@ MACHINE = "raspberrypi4"
 #see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
 require conf/include/agl_raspberrypi3.inc
 
-PREFERRED_VERSION_linux-raspberrypi_raspberrypi4 = "4.19%"
-
-# Set appropriate version of Mesa for Raspberry Pi 4
-PREFERRED_VERSION_mesa_raspberrypi4 = "19.1%"
+#use the "Image" format for 64-bit AGL image for Raspberry Pi 4
+KERNEL_IMAGETYPE = "Image"
+KERNEL_IMAGETYPE_UBOOT = "Image"
+KERNEL_IMAGETYPE_DIRECT = "Image"