summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonan Le Martret <ronan.lemartret@iot.bzh>2022-08-10 16:56:03 +0200
committerRonan Le Martret <ronan.lemartret@iot.bzh>2022-08-10 16:56:03 +0200
commit90d4bf4af7b4d04d864315882f2bad6926d2e4b6 (patch)
treeb8ae154cbbb576ee265c5f9d236e1b23b614cef3
parent94062ada71f1e3658dde8ff8758416ec67464016 (diff)
[DRAFT] [RCAR] Add falcon supportsandbox/ronan/DRAFT_falcon
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh> Change-Id: I72676e6ff01d85171ac33aecd8afff24f82d2fc1
-rw-r--r--meta-agl-bsp/conf/include/agl_falcon.inc4
-rw-r--r--meta-agl-bsp/conf/include/agl_spider.inc4
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-falcon.txt18
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-spider.txt18
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend5
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh2
-rw-r--r--templates/machine/falcon/50_bblayers.conf.inc5
-rw-r--r--templates/machine/falcon/50_local.conf.inc4
-rw-r--r--templates/machine/falcon/50_setup.sh10
-rw-r--r--templates/machine/falcon/README_machine_h3ulcb.md11
-rw-r--r--templates/machine/spider/50_bblayers.conf.inc5
-rw-r--r--templates/machine/spider/50_local.conf.inc4
-rw-r--r--templates/machine/spider/50_setup.sh10
-rw-r--r--templates/machine/spider/README_machine_h3ulcb.md11
14 files changed, 105 insertions, 6 deletions
diff --git a/meta-agl-bsp/conf/include/agl_falcon.inc b/meta-agl-bsp/conf/include/agl_falcon.inc
new file mode 100644
index 000000000..229df28e6
--- /dev/null
+++ b/meta-agl-bsp/conf/include/agl_falcon.inc
@@ -0,0 +1,4 @@
+require conf/include/agl_rcar.inc
+SOC_FAMILY = "r8a779a0"
+BOARD_NAME = "falcon"
+DTB_SUFFIX = "r8a779f0-spider"
diff --git a/meta-agl-bsp/conf/include/agl_spider.inc b/meta-agl-bsp/conf/include/agl_spider.inc
new file mode 100644
index 000000000..f304c391a
--- /dev/null
+++ b/meta-agl-bsp/conf/include/agl_spider.inc
@@ -0,0 +1,4 @@
+require conf/include/agl_rcar.inc
+SOC_FAMILY = "rcar-gateway:r8a779f0"
+BOARD_NAME = "spider"
+DTB_SUFFIX = "r8a779f0-spider"
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-falcon.txt b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-falcon.txt
new file mode 100644
index 000000000..9cc3eb9d2
--- /dev/null
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-falcon.txt
@@ -0,0 +1,18 @@
+bootkaddr=0x49090000
+bootdaddr=0x48000000
+bootiaddr=0x5C3F9520
+
+bootargs_console=console=ttySC0,115200 ignore_loglevel
+bootargs_extra=rw rootfstype=ext4 rootwait rootdelay=2
+bootargs_root=ostree_root=/dev/mmcblk1p2 root=/dev/ram0 ramdisk_size=16384
+
+bootmmc=0:1
+rootmmc=0:2
+
+booteload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/loader/uEnv.txt; env import -t ${bootkaddr} ${filesize}
+bootkload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/${kernel_image}
+bootiload_sd=ext4load mmc ${rootmmc} ${bootiaddr} boot/${ramdisk_image}; setenv ramdisk_size ${filesize}
+bootdload_sd=fatload mmc ${bootmmc} ${bootdaddr} r8a77951-ulcb.dtb
+
+bootcmd=run booteload_sd; setenv bootargs ${bootargs} ${bootargs_console} ${bootargs_root} ${bootargs_extra}; run bootkload_sd; run bootiload_sd; run bootdload_sd; booti ${bootkaddr} ${bootiaddr}:${ramdisk_size} ${bootdaddr}
+
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-spider.txt b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-spider.txt
new file mode 100644
index 000000000..9cc3eb9d2
--- /dev/null
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-spider.txt
@@ -0,0 +1,18 @@
+bootkaddr=0x49090000
+bootdaddr=0x48000000
+bootiaddr=0x5C3F9520
+
+bootargs_console=console=ttySC0,115200 ignore_loglevel
+bootargs_extra=rw rootfstype=ext4 rootwait rootdelay=2
+bootargs_root=ostree_root=/dev/mmcblk1p2 root=/dev/ram0 ramdisk_size=16384
+
+bootmmc=0:1
+rootmmc=0:2
+
+booteload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/loader/uEnv.txt; env import -t ${bootkaddr} ${filesize}
+bootkload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/${kernel_image}
+bootiload_sd=ext4load mmc ${rootmmc} ${bootiaddr} boot/${ramdisk_image}; setenv ramdisk_size ${filesize}
+bootdload_sd=fatload mmc ${bootmmc} ${bootdaddr} r8a77951-ulcb.dtb
+
+bootcmd=run booteload_sd; setenv bootargs ${bootargs} ${bootargs_console} ${bootargs_root} ${bootargs_extra}; run bootkload_sd; run bootiload_sd; run bootdload_sd; booti ${bootkaddr} ${bootiaddr}:${ramdisk_size} ${bootdaddr}
+
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend
index 12054df86..6540e5229 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend
@@ -5,11 +5,6 @@ require recipes-kernel/linux/linux-agl.inc
SRC_URI_append = " file://namespace_fix.cfg \
"
-# Add ADSP patch to enable and add sound hardware abstraction
-SRC_URI_append = " \
- file://0004-ADSP-enable-and-add-sound-hardware-abstraction.patch \
-"
-
# For Xen
SRC_URI_append = " \
${@bb.utils.contains('AGL_XEN_WANTED','1','file://xen-be.cfg','',d)} \
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 89238e5b0..82e921285 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
@@ -6,7 +6,7 @@ ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-weston8-20
COPY_SCRIPT="$METADIR/bsp/meta-renesas/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
-DOWNLOAD_DIR=${XDG_DOWNLOAD_DIR:-$HOME/Downloads}
+DOWNLOAD_DIR=${XDG_DOWNLOAD_CUSTOM_DIR}
EXTRACT_DIR=$METADIR/binary-tmp
stdout_in_terminal=1
diff --git a/templates/machine/falcon/50_bblayers.conf.inc b/templates/machine/falcon/50_bblayers.conf.inc
new file mode 100644
index 000000000..4c088e18e
--- /dev/null
+++ b/templates/machine/falcon/50_bblayers.conf.inc
@@ -0,0 +1,5 @@
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas/meta-rcar-bsp \
+ ${METADIR}/external/poky/meta-yocto-bsp \
+ "
diff --git a/templates/machine/falcon/50_local.conf.inc b/templates/machine/falcon/50_local.conf.inc
new file mode 100644
index 000000000..475aaf2b2
--- /dev/null
+++ b/templates/machine/falcon/50_local.conf.inc
@@ -0,0 +1,4 @@
+MACHINE = "falcon"
+#see meta-agl/meta-agl-bsp/conf/include/agl_falcon.inc
+require conf/include/agl_falcon.inc
+
diff --git a/templates/machine/falcon/50_setup.sh b/templates/machine/falcon/50_setup.sh
new file mode 100644
index 000000000..abd2a33af
--- /dev/null
+++ b/templates/machine/falcon/50_setup.sh
@@ -0,0 +1,10 @@
+# setup proprietary gfx drivers and multimedia packages
+pushd $METADIR 2>/dev/null
+
+SETUP_MM_SCRIPT=$METADIR/meta-agl/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh
+if [ -f $SETUP_MM_SCRIPT ]; then
+ . $SETUP_MM_SCRIPT
+ copy_mm_packages
+fi
+
+popd 2>/dev/null
diff --git a/templates/machine/falcon/README_machine_h3ulcb.md b/templates/machine/falcon/README_machine_h3ulcb.md
new file mode 100644
index 000000000..a23b3cd32
--- /dev/null
+++ b/templates/machine/falcon/README_machine_h3ulcb.md
@@ -0,0 +1,11 @@
+---
+description: Machine falcon
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Ronan Le Martret <ronan.lemartret@iot.bzh>
+---
+
+### Machine falcon
+
+Renesas RCar Gen3 "h3ulcb" board.
+
+* [R-Car H3 and M3 Starter Kit website](https://www.renesas.com/br/en/solutions/automotive/adas/solution-kits/r-car-starter-kit.html)
+* [elinux H3 Starter Kit](https://elinux.org/R-Car/Boards/H3SK)
diff --git a/templates/machine/spider/50_bblayers.conf.inc b/templates/machine/spider/50_bblayers.conf.inc
new file mode 100644
index 000000000..c5fa5f4c6
--- /dev/null
+++ b/templates/machine/spider/50_bblayers.conf.inc
@@ -0,0 +1,5 @@
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas/meta-rcar-gateway \
+ ${METADIR}/external/poky/meta-yocto-bsp \
+ "
diff --git a/templates/machine/spider/50_local.conf.inc b/templates/machine/spider/50_local.conf.inc
new file mode 100644
index 000000000..a3be7cc05
--- /dev/null
+++ b/templates/machine/spider/50_local.conf.inc
@@ -0,0 +1,4 @@
+MACHINE = "spider"
+#see meta-agl/meta-agl-bsp/conf/include/agl_spider.inc
+require conf/include/agl_spider.inc
+
diff --git a/templates/machine/spider/50_setup.sh b/templates/machine/spider/50_setup.sh
new file mode 100644
index 000000000..abd2a33af
--- /dev/null
+++ b/templates/machine/spider/50_setup.sh
@@ -0,0 +1,10 @@
+# setup proprietary gfx drivers and multimedia packages
+pushd $METADIR 2>/dev/null
+
+SETUP_MM_SCRIPT=$METADIR/meta-agl/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh
+if [ -f $SETUP_MM_SCRIPT ]; then
+ . $SETUP_MM_SCRIPT
+ copy_mm_packages
+fi
+
+popd 2>/dev/null
diff --git a/templates/machine/spider/README_machine_h3ulcb.md b/templates/machine/spider/README_machine_h3ulcb.md
new file mode 100644
index 000000000..3bc40c913
--- /dev/null
+++ b/templates/machine/spider/README_machine_h3ulcb.md
@@ -0,0 +1,11 @@
+---
+description: Machine spider
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Ronan Le Martret <ronan.lemartret@iot.bzh>
+---
+
+### Machine spider
+
+Renesas RCar Gen3 "spider" board.
+
+* [R-Car H3 and M3 Starter Kit website](https://www.renesas.com/br/en/solutions/automotive/adas/solution-kits/r-car-starter-kit.html)
+* [elinux H3 Starter Kit](https://elinux.org/R-Car/Boards/H3SK)