aboutsummaryrefslogtreecommitdiffstats
path: root/meta-rcar-gen3/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'meta-rcar-gen3/conf/machine')
-rw-r--r--meta-rcar-gen3/conf/machine/include/r8a77965.inc3
-rw-r--r--meta-rcar-gen3/conf/machine/salvator-x.conf19
2 files changed, 20 insertions, 2 deletions
diff --git a/meta-rcar-gen3/conf/machine/include/r8a77965.inc b/meta-rcar-gen3/conf/machine/include/r8a77965.inc
new file mode 100644
index 0000000..e2cc4ac
--- /dev/null
+++ b/meta-rcar-gen3/conf/machine/include/r8a77965.inc
@@ -0,0 +1,3 @@
+SOC_FAMILY =. "rcar-gen3:"
+require conf/machine/include/soc-family.inc
+LINUXLIBCVERSION = "4.9"
diff --git a/meta-rcar-gen3/conf/machine/salvator-x.conf b/meta-rcar-gen3/conf/machine/salvator-x.conf
index 57ffc9c..f32ce7c 100644
--- a/meta-rcar-gen3/conf/machine/salvator-x.conf
+++ b/meta-rcar-gen3/conf/machine/salvator-x.conf
@@ -2,9 +2,17 @@
#@NAME: Salvator-X machine
#@DESCRIPTION: Machine configuration for running Salvator-X
-DEFAULTTUNE ?= "cortexa57-cortexa53"
-require conf/machine/include/tune-cortexa57-cortexa53.inc
require conf/machine/include/${SOC_FAMILY}.inc
+# Add default tune for H3/M3
+DEFAULTTUNE ?= "cortexa57-cortexa53"
+# Add default tune for M3N
+DEFAULTTUNE_r8a77965 = "cortexa57"
+
+# Add tune configure file for M3N
+TUNE_CONF ?= "conf/machine/include/tune-cortexa57-cortexa53.inc"
+TUNE_CONF_r8a77965 = "conf/machine/include/tune-cortexa57.inc"
+
+require ${TUNE_CONF}
# 32BIT package install (default is disable)
# This variables can be used only in multilib.
@@ -32,6 +40,11 @@ KERNEL_DEVICETREE_r8a7796 = " \
renesas/r8a7796-salvator-x.dtb \
renesas/r8a7796-salvator-xs.dtb \
"
+# Device tree for M3N
+KERNEL_DEVICETREE_r8a77965 = " \
+ renesas/r8a77965-salvator-x.dtb \
+ renesas/r8a77965-salvator-xs.dtb \
+"
# Configuration for ARM Trusted Firmware
EXTRA_IMAGEDEPENDS += " arm-trusted-firmware optee-os"
@@ -43,6 +56,8 @@ EXTRA_IMAGEDEPENDS += " u-boot"
UBOOT_MACHINE_r8a7795 = "r8a7795_salvator-x_defconfig"
# M3 u-boot configure
UBOOT_MACHINE_r8a7796 = "r8a7796_salvator-x_defconfig"
+# M3N u-boot configure
+UBOOT_MACHINE_r8a77965 = "r8a77965_salvator-x_defconfig"
# libdrm
PREFERRED_VERSION_libdrm = "2.4.68"