aboutsummaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp
diff options
context:
space:
mode:
Diffstat (limited to 'meta-agl-bsp')
-rw-r--r--meta-agl-bsp/conf/include/agl_h3-salvator-x.inc3
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend3
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend3
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bbappend3
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh60
5 files changed, 41 insertions, 31 deletions
diff --git a/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc b/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc
new file mode 100644
index 000000000..74036111d
--- /dev/null
+++ b/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc
@@ -0,0 +1,3 @@
+# The H3-based (as opposed to the M3-based version) salvator-x needs a different
+# MACHINE but otherwise uses the same config as the H3.
+require conf/include/agl_h3ulcb.inc
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend
index 13163e495..5262a9c5d 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend
@@ -1 +1,2 @@
-KERNEL_MODULE_AUTOLOAD = "mmngr"
+KERNEL_MODULE_AUTOLOAD_append = " mmngr"
+KERNEL_MODULE_PACKAGE_SUFFIX = ""
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend
index 1587b25b6..6b935b09e 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend
@@ -1 +1,2 @@
-KERNEL_MODULE_AUTOLOAD = "mmngrbuf"
+KERNEL_MODULE_AUTOLOAD_append = " mmngrbuf"
+KERNEL_MODULE_PACKAGE_SUFFIX = ""
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bbappend
index 098e1b0a9..379797248 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bbappend
@@ -1 +1,2 @@
-KERNEL_MODULE_AUTOLOAD = "vspm_if"
+KERNEL_MODULE_AUTOLOAD_append = " vspm_if"
+KERNEL_MODULE_PACKAGE_SUFFIX = ""
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 242c0f0d5..587569f9e 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
@@ -15,10 +15,14 @@ function color {
[[ $stdout_in_terminal == 0 ]] && return
for k in $*; do
case $k in
- bold) tput bold 2>/dev/null;;
- none) tput sgr0 2>/dev/null;;
- *) tput setaf $k 2>/dev/null;;
+ bold) tput bold;;
+ none) tput sgr0;;
+ *) tput setaf $k;;
esac
+ if [[ $? != 0 ]]; then
+ echo "tput: terminal doesn't support color settings, continuing" >&2
+ true
+ fi
done
}
color_green=$(color bold 2)
@@ -35,30 +39,30 @@ function log() {
}
function copy_mm_packages() {
- if [ -f $DOWNLOAD_DIR/$ZIP_1 -a -f $DOWNLOAD_DIR/$ZIP_2 ]; then
- mkdir -p $EXTRACT_DIR
- cp --update $DOWNLOAD_DIR/$ZIP_1 $EXTRACT_DIR
- cp --update $DOWNLOAD_DIR/$ZIP_2 $EXTRACT_DIR
- else
- error "ERROR: FILES \""+$DOWNLOAD_DIR/$ZIP_1+"\" NOT EXTRACTING CORRECTLY"
- error "ERROR: FILES \""+$DOWNLOAD_DIR/$ZIP_2+"\" NOT EXTRACTING CORRECTLY"
- log "The graphics and multimedia acceleration packages for "
- log "the R-Car Gen3 board BSP 2.19 can be downloaded from:"
- log " <https://www.renesas.com/en-us/solutions/automotive/rcar-demoboard-2.html>"
- log
- error "These 2 files from there should be stored in your"
- error "'$DOWNLOAD_DIR' directory."
- error " $ZIP_1"
- error " $ZIP_2"
- return 1
- fi
+ if [ -f $DOWNLOAD_DIR/$ZIP_1 -a -f $DOWNLOAD_DIR/$ZIP_2 ]; then
+ mkdir -p $EXTRACT_DIR
+ cp --update $DOWNLOAD_DIR/$ZIP_1 $EXTRACT_DIR
+ cp --update $DOWNLOAD_DIR/$ZIP_2 $EXTRACT_DIR
+ else
+ error "ERROR: FILES \""+$DOWNLOAD_DIR/$ZIP_1+"\" NOT EXTRACTING CORRECTLY"
+ error "ERROR: FILES \""+$DOWNLOAD_DIR/$ZIP_2+"\" NOT EXTRACTING CORRECTLY"
+ log "The graphics and multimedia acceleration packages for "
+ log "the R-Car Gen3 board BSP can be downloaded from:"
+ log "<https://www.renesas.com/en-us/solutions/automotive/rcar-demoboard-2.html>"
+ log
+ error "These 2 files from there should be stored in your"
+ error "'$DOWNLOAD_DIR' directory."
+ error " $ZIP_1"
+ error " $ZIP_2"
+ return 1
+ fi
- if [ -f $COPY_SCRIPT ]; then
- cd $METADIR/meta-renesas-rcar-gen3/
- $COPY_SCRIPT -d -f $EXTRACT_DIR
- cd ..
- else
- log "scripts to copy drivers for Gen3 not found."
- return 1
- fi
+ if [ -f $COPY_SCRIPT ]; then
+ cd $METADIR/meta-renesas-rcar-gen3/
+ $COPY_SCRIPT -d -f $EXTRACT_DIR
+ cd ..
+ else
+ log "scripts to copy drivers for Gen3 not found."
+ return 1
+ fi
}