summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp
diff options
context:
space:
mode:
Diffstat (limited to 'meta-agl-bsp')
-rw-r--r--meta-agl-bsp/meta-core/recipes-kernel/linux/linux-yocto/virtio.cfg4
-rw-r--r--meta-agl-bsp/meta-core/recipes-kernel/linux/linux-yocto_%.bbappend1
-rw-r--r--meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi/raspberrypi_network.cfg6
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh48
4 files changed, 56 insertions, 3 deletions
diff --git a/meta-agl-bsp/meta-core/recipes-kernel/linux/linux-yocto/virtio.cfg b/meta-agl-bsp/meta-core/recipes-kernel/linux/linux-yocto/virtio.cfg
new file mode 100644
index 000000000..9bdc2c64e
--- /dev/null
+++ b/meta-agl-bsp/meta-core/recipes-kernel/linux/linux-yocto/virtio.cfg
@@ -0,0 +1,4 @@
+# qemu need a virtio storage for rootfs
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_BLK=y
diff --git a/meta-agl-bsp/meta-core/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-agl-bsp/meta-core/recipes-kernel/linux/linux-yocto_%.bbappend
index bfb0d323d..d8a583926 100644
--- a/meta-agl-bsp/meta-core/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/meta-agl-bsp/meta-core/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -2,6 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
# Extra configuration options for the QEMU kernel
SRC_URI += "file://hciattach.cfg \
+ file://virtio.cfg \
"
# Enable some things on qemuarm64 so MOST drivers will build and load.
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi/raspberrypi_network.cfg b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi/raspberrypi_network.cfg
index aa9649050..993d15084 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi/raspberrypi_network.cfg
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi/raspberrypi_network.cfg
@@ -1,5 +1,5 @@
-
-CONFIG_USB_NET_SMSC95XX=y
CONFIG_NETDEVICES=y
-CONFIG_USB_NET_DRIVERS=y
CONFIG_USB_USBNET=y
+CONFIG_USB_NET_DRIVERS=y
+CONFIG_USB_NET_SMSC95XX=y
+CONFIG_USB_NET_SMSC75XX=y
diff --git a/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh b/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh
index a957e516f..739a5c6d9 100644
--- a/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh
+++ b/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh
@@ -3,6 +3,11 @@
ZIP_1="R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux-weston5-20190212.zip"
ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-weston5-20190212.zip"
+#BUG FIX PART (AGL JIRA SPEC-2253)
+ARCHIVE_PREFIX_NAME="R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux"
+ZIP_BUGFIX=$ARCHIVE_PREFIX_NAME"-weston5-20190516.zip"
+TAR_BUGFIX=$ARCHIVE_PREFIX_NAME"-20190516.tar.gz"
+
COPY_SCRIPT="$METADIR/meta-renesas-rcar-gen3/meta-rcar-gen3/docs/sample/copyscript/copy_evaproprietary_softwares.sh"
test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && source ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs
@@ -65,4 +70,47 @@ function copy_mm_packages() {
log "scripts to copy drivers for Gen3 not found."
return 1
fi
+
+ #BUG FIX PART (AGL JIRA SPEC-2253)
+ #Detect supported machine
+ if [ $MACHINE == "m3ulcb" ] || [ $MACHINE == "h3ulcb" ]
+ then
+ GFX_ARCHIVE_NAME="EVARTM0RC779*GLPG0001SL41C_2_0_8_C";
+ GFX_BINARIES_NAME="EVA_r8a*_linux_gsx_binaries_gles.tar.bz2";
+ else
+ log "Note: graphics bug (SPEC-2253) will not be fixed for the requested machine ($MACHINE)."
+ fi
+
+ #Get binary file
+ if [ -f $DOWNLOAD_DIR/$ZIP_BUGFIX ]; then
+ cp --update $DOWNLOAD_DIR/$ZIP_BUGFIX $EXTRACT_DIR
+ else
+ error "ERROR: FILE '$DOWNLOAD_DIR/$ZIP_BUGFIX' NOT FOUND."
+ log "The graphics and multimedia acceleration packages for "
+ log "the R-Car Gen3 board BSP can be downloaded from:"
+ log "<https://www.renesas.com/us/en/solutions/automotive/rcar-download/rcar-demoboard-2.html>"
+ log
+ error "This archive should be stored in your '$DOWNLOAD_DIR' directory."
+ error "Requested archive name: '$ZIP_BUGFIX'"
+ return 1
+ fi
+
+ #Extract the only the needed GFX binaries
+ unzip -d $EXTRACT_DIR -oq $EXTRACT_DIR/$ZIP_BUGFIX
+ tar -C $EXTRACT_DIR -zxf $EXTRACT_DIR/$TAR_BUGFIX
+ mv $EXTRACT_DIR/$ARCHIVE_PREFIX_NAME/*/*.zip $EXTRACT_DIR
+
+ #Manage the needed GFX binaries
+ find $EXTRACT_DIR -name "$GFX_ARCHIVE_NAME.zip" -exec unzip -d $EXTRACT_DIR -oq {} \;
+ find $EXTRACT_DIR -name "$GFX_BINARIES_NAME" -exec mv -t $EXTRACT_DIR {} \;
+ for f in `find $EXTRACT_DIR -name "$GFX_BINARIES_NAME" -exec basename {} \;`
+ do
+ mv $EXTRACT_DIR/${f} "$METADIR/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module"/${f:4}
+ done;
+
+ #Clean
+ rm -r $EXTRACT_DIR/$ARCHIVE_PREFIX_NAME
+ rm -r $EXTRACT_DIR/$GFX_ARCHIVE_NAME
+
+ log "The graphics hotfix for BUG SPEC-2253 has been successfully applied."
}