diff options
6 files changed, 54 insertions, 35 deletions
diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc deleted file mode 100644 index f6801352c..000000000 --- a/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc +++ /dev/null @@ -1,25 +0,0 @@ -# Maximum memory allowed to be assigned -GPU_MEM = "255" - -ENABLE_CMA = "1" -CMA_LWM = "16" -CMA_HWM = "32" - -KERNEL_IMAGETYPE = "Image" -KERNEL_DEVICETREE_append = " overlays/vc4-kms-v3d-overlay.dtb" - -MACHINE_FEATURES += "vc4graphics" - -# For libomxil -#LICENSE_FLAGS_WHITELIST = "commercial" - -IMAGE_INSTALL_append = " kernel-modules linux-firmware " - -# Psplash causes crash on first boot on RPi -IMAGE_FEATURES_remove = "splash" - -# Add the custom rpi-sdimg output format -AGL_EXTRA_IMAGE_FSTYPES = " rpi-sdimg.xz" - -# Use the AGL default ext4.xz to generate the rpi-sdimg -SDIMG_ROOTFS_TYPE = "ext4.xz" 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." } diff --git a/meta-agl-profile-core/recipes-test/afb-test/afb-test_git.bb b/meta-agl-profile-core/recipes-test/afb-test/afb-test_git.bb index 7d030de66..15fbb6f1c 100644 --- a/meta-agl-profile-core/recipes-test/afb-test/afb-test_git.bb +++ b/meta-agl-profile-core/recipes-test/afb-test/afb-test_git.bb @@ -6,10 +6,10 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" SECTION = "apps" -SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/apps/app-afb-test;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "cdaad5dbef30d989fab207324ec3c37d6e50c5a0" +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/app-afb-test;protocol=https;branch=${AGL_BRANCH}" +SRCREV = "3605fd31f04a9198402a687b1a3242835b27cff0" -DEPENDS += "lua" +DEPENDS += "lua libafb-helpers libappcontroller" RDEPENDS_${PN} += "lua bash" RDEPENDS_${PN}-ptest += "af-binder" diff --git a/templates/machine/raspberrypi3-64/50_bblayers.conf.inc b/templates/machine/raspberrypi3-64/50_bblayers.conf.inc deleted file mode 120000 index 653316c5c..000000000 --- a/templates/machine/raspberrypi3-64/50_bblayers.conf.inc +++ /dev/null @@ -1 +0,0 @@ -../raspberrypi3/50_bblayers.conf.inc
\ No newline at end of file diff --git a/templates/machine/raspberrypi3-64/50_local.conf.inc b/templates/machine/raspberrypi3-64/50_local.conf.inc deleted file mode 100644 index 74d952ed9..000000000 --- a/templates/machine/raspberrypi3-64/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "raspberrypi3-64" -#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc -require conf/include/agl_raspberrypi3-64.inc |