1 files changed, 52 insertions, 0 deletions
diff --git a/bsp/meta-renesas/meta-rcar-gen3/conf/machine/salvator-x.conf b/bsp/meta-renesas/meta-rcar-gen3/conf/machine/salvator-x.conf
new file mode 100644
index 00000000..92a4f8d6
--- /dev/null
+++ b/bsp/meta-renesas/meta-rcar-gen3/conf/machine/salvator-x.conf
@@ -0,0 +1,52 @@
+#@TYPE: Machine
+#@NAME: Salvator-X machine
+#@DESCRIPTION: Machine configuration for running Salvator-X
+
+require conf/machine/include/rcar_common.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}
+
+# Device tree for H3
+KERNEL_DEVICETREE_r8a7795 = " \
+    renesas/r8a7795-es1-salvator-x.dtb \
+    renesas/r8a7795-salvator-x.dtb \
+    renesas/r8a7795-salvator-xs.dtb \
+    renesas/r8a7795-salvator-xs-2x2g.dtb \
+    renesas/r8a7795-salvator-xs-4x2g.dtb \
+"
+# Device tree for M3
+KERNEL_DEVICETREE_r8a7796 = " \
+    renesas/r8a7796-salvator-x.dtb \
+    renesas/r8a7796-salvator-xs.dtb \
+    renesas/r8a7796-salvator-xs-2x4g.dtb \
+"
+# Device tree for M3N
+KERNEL_DEVICETREE_r8a77965 = " \
+    renesas/r8a77965-salvator-x.dtb \
+    renesas/r8a77965-salvator-xs.dtb \
+"
+
+# H3 u-boot configure
+UBOOT_CONFIG_r8a7795 ??= "r8a7795_salvator-x r8a7795_salvator-xs r8a7795_salvator-xs-2x2g r8a7795_salvator-xs-4x2g"
+UBOOT_CONFIG[r8a7795_salvator-x] = "r8a7795_salvator-x_defconfig"
+UBOOT_CONFIG[r8a7795_salvator-xs] = "r8a7795_salvator-xs_defconfig"
+UBOOT_CONFIG[r8a7795_salvator-xs-2x2g] = "r8a7795_salvator-xs-2x2g_defconfig"
+UBOOT_CONFIG[r8a7795_salvator-xs-4x2g] = "r8a7795_salvator-xs-4x2g_defconfig"
+# M3 u-boot configure
+UBOOT_CONFIG_r8a7796 ??= "r8a7796_salvator-x r8a7796_salvator-xs r8a7796_salvator-xs-2x4g"
+UBOOT_CONFIG[r8a7796_salvator-x] = "r8a7796_salvator-x_defconfig"
+UBOOT_CONFIG[r8a7796_salvator-xs] = "r8a7796_salvator-xs_defconfig"
+UBOOT_CONFIG[r8a7796_salvator-xs-2x4g] = "r8a7796_salvator-xs-2x4g_defconfig"
+# M3N u-boot configure
+UBOOT_CONFIG_r8a77965 ??= "r8a77965_salvator-x r8a77965_salvator-xs"
+UBOOT_CONFIG[r8a77965_salvator-x] = "r8a77965_salvator-x_defconfig"
+UBOOT_CONFIG[r8a77965_salvator-xs] = "r8a77965_salvator-xs_defconfig"