7 files changed, 189 insertions, 0 deletions
diff --git a/meta-rcar-gen3/conf/machine/h3ulcb.conf b/meta-rcar-gen3/conf/machine/h3ulcb.conf
new file mode 100644
index 0000000..8585364
--- /dev/null
+++ b/meta-rcar-gen3/conf/machine/h3ulcb.conf
@@ -0,0 +1,48 @@
+#@TYPE: Machine
+#@NAME: H3ULCB machine
+#@DESCRIPTION: Machine configuration for running H3ULCB
+
+SOC_FAMILY = "r8a7795"
+
+DEFAULTTUNE ?= "cortexa57-cortexa53"
+require conf/machine/include/tune-cortexa57-cortexa53.inc
+require conf/machine/include/${SOC_FAMILY}.inc
+
+# 32BIT package install (default is disable)
+# This variables can be used only in multilib.
+USE_32BIT_PKGS ?= "0"
+USE_32BIT_WAYLAND ?= "0"
+USE_32BIT_MMP ?= "0"
+
+MACHINE_FEATURES = ""
+
+KERNEL_IMAGETYPE = "Image"
+
+# only if not already defined by distro or user!
+IMAGE_FSTYPES ?= " tar.bz2 ext4 cpio.gz"
+
+SERIAL_CONSOLE = "115200 ttySC0"
+
+# Configuration for kernel
+PREFERRED_PROVIDER_virtual/kernel = "linux-renesas"
+KERNEL_DEVICETREE = " \
+    renesas/r8a7795-h3ulcb.dtb \
+    renesas/r8a7795-es1-h3ulcb.dtb \
+"
+
+# Configuration for ARM Trusted Firmware
+EXTRA_IMAGEDEPENDS += " arm-trusted-firmware optee-os"
+
+# u-boot
+PREFERRED_VERSION_u-boot = "v2015.04%"
+EXTRA_IMAGEDEPENDS += " u-boot"
+UBOOT_MACHINE = "h3ulcb_defconfig"
+
+# libdrm + mesa
+PREFERRED_VERSION_libdrm = "2.4.68"
+PREFERRED_VERSION_mesa = "17.%"
+
+# Add variable to Build Configuration in build log
+BUILDCFG_VARS_append = " SOC_FAMILY"
+
+MACHINEOVERRIDES .= ":ulcb"
diff --git a/meta-rcar-gen3/conf/machine/include/r8a7795.inc b/meta-rcar-gen3/conf/machine/include/r8a7795.inc
new file mode 100644
index 0000000..e2cc4ac
--- /dev/null
+++ b/meta-rcar-gen3/conf/machine/include/r8a7795.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/include/r8a7796.inc b/meta-rcar-gen3/conf/machine/include/r8a7796.inc
new file mode 100644
index 0000000..e2cc4ac
--- /dev/null
+++ b/meta-rcar-gen3/conf/machine/include/r8a7796.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/include/tune-cortexa57-cortexa53.inc b/meta-rcar-gen3/conf/machine/include/tune-cortexa57-cortexa53.inc
new file mode 100644
index 0000000..17f1f25
--- /dev/null
+++ b/meta-rcar-gen3/conf/machine/include/tune-cortexa57-cortexa53.inc
@@ -0,0 +1,18 @@
+DEFAULTTUNE ?= "cortexa57-cortexa53"
+require conf/machine/include/arm/arch-armv8.inc
+
+TUNEVALID[cortexa57-cortexa53] = "Enable big.LITTLE Cortex-A57.Cortex-A53 specific processor optimizations"
+TUNECONFLICTS[aarch64] = "armv4 armv5 armv6 armv7 armv7a"
+
+TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "aarch64", " -march=armv8-a", "" ,d)}"
+
+MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "cortexa57-cortexa53", "cortexa57-cortexa53:", "" ,d)}"
+
+TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "cortexa57-cortexa53", " -mtune=cortex-a57.cortex-a53", "", d)}"
+
+# Little Endian base configs
+AVAILTUNES += "cortexa57-cortexa53"
+ARMPKGARCH_tune-cortexa57-cortexa53 = "cortexa57-cortexa53"
+TUNE_FEATURES_tune-cortexa57-cortexa53 = "${TUNE_FEATURES_tune-aarch64} cortexa57-cortexa53"
+PACKAGE_EXTRA_ARCHS_tune-cortexa57-cortexa53 = "${PACKAGE_EXTRA_ARCHS_tune-aarch64} cortexa57-cortexa53"
+BASE_LIB_tune-cortexa57-cortexa53 = "lib64"
diff --git a/meta-rcar-gen3/conf/machine/include/tune-cortexa57.inc b/meta-rcar-gen3/conf/machine/include/tune-cortexa57.inc
new file mode 100644
index 0000000..509aee4
--- /dev/null
+++ b/meta-rcar-gen3/conf/machine/include/tune-cortexa57.inc
@@ -0,0 +1,18 @@
+DEFAULTTUNE ?= "cortexa57"
+require conf/machine/include/arm/arch-armv8.inc
+
+TUNEVALID[cortexa57] = "Enable Cortex-A57 specific processor optimizations"
+TUNECONFLICTS[aarch64] = "armv4 armv5 armv6 armv7 armv7a"
+
+TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "aarch64", " -march=armv8-a", "" ,d)}"
+
+MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "cortexa57", "cortexa57:", "" ,d)}"
+
+TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "cortexa57", " -mtune=cortex-a57", "", d)}"
+
+# Little Endian base configs
+AVAILTUNES += "cortexa57"
+ARMPKGARCH_tune-cortexa57 = "cortexa57"
+TUNE_FEATURES_tune-cortexa57 = "${TUNE_FEATURES_tune-aarch64} cortexa57"
+PACKAGE_EXTRA_ARCHS_tune-cortexa57 = "${PACKAGE_EXTRA_ARCHS_tune-aarch64} cortexa57"
+BASE_LIB_tune-cortexa57 = "lib64"
diff --git a/meta-rcar-gen3/conf/machine/m3ulcb.conf b/meta-rcar-gen3/conf/machine/m3ulcb.conf
new file mode 100644
index 0000000..0d792c6
--- /dev/null
+++ b/meta-rcar-gen3/conf/machine/m3ulcb.conf
@@ -0,0 +1,45 @@
+#@TYPE: Machine
+#@NAME: M3ULCB machine
+#@DESCRIPTION: Machine configuration for running M3ULCB
+
+SOC_FAMILY = "r8a7796"
+
+DEFAULTTUNE ?= "cortexa57-cortexa53"
+require conf/machine/include/tune-cortexa57-cortexa53.inc
+require conf/machine/include/${SOC_FAMILY}.inc
+
+# 32BIT package install (default is disable)
+# This variables can be used only in multilib.
+USE_32BIT_PKGS ?= "0"
+USE_32BIT_WAYLAND ?= "0"
+USE_32BIT_MMP ?= "0"
+
+MACHINE_FEATURES = ""
+
+KERNEL_IMAGETYPE = "Image"
+
+# only if not already defined by distro or user!
+IMAGE_FSTYPES ?= " tar.bz2 ext4 cpio.gz"
+
+SERIAL_CONSOLE = "115200 ttySC0"
+
+# Configuration for kernel
+PREFERRED_PROVIDER_virtual/kernel = "linux-renesas"
+KERNEL_DEVICETREE = "renesas/r8a7796-m3ulcb.dtb"
+
+# Configuration for ARM Trusted Firmware
+EXTRA_IMAGEDEPENDS += " arm-trusted-firmware optee-os"
+
+# u-boot
+PREFERRED_VERSION_u-boot = "v2015.04%"
+EXTRA_IMAGEDEPENDS += " u-boot"
+UBOOT_MACHINE = "m3ulcb_defconfig"
+
+# libdrm + mesa
+PREFERRED_VERSION_libdrm = "2.4.68"
+PREFERRED_VERSION_mesa = "17.%"
+
+# Add variable to Build Configuration in build log
+BUILDCFG_VARS_append = " SOC_FAMILY"
+
+MACHINEOVERRIDES .= ":ulcb"
diff --git a/meta-rcar-gen3/conf/machine/salvator-x.conf b/meta-rcar-gen3/conf/machine/salvator-x.conf
new file mode 100644
index 0000000..65212d7
--- /dev/null
+++ b/meta-rcar-gen3/conf/machine/salvator-x.conf
@@ -0,0 +1,54 @@
+#@TYPE: Machine
+#@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
+
+# 32BIT package install (default is disable)
+# This variables can be used only in multilib.
+USE_32BIT_PKGS ?= "0"
+USE_32BIT_WAYLAND ?= "0"
+USE_32BIT_MMP ?= "0"
+
+MACHINE_FEATURES = ""
+
+KERNEL_IMAGETYPE = "Image"
+
+# only if not already defined by distro or user!
+IMAGE_FSTYPES ?= " tar.bz2 ext4 cpio.gz"
+
+SERIAL_CONSOLE = "115200 ttySC0"
+
+# Configuration for kernel
+PREFERRED_PROVIDER_virtual/kernel = "linux-renesas"
+# Device tree for H3
+KERNEL_DEVICETREE_r8a7795 = " \
+    renesas/r8a7795-es1-salvator-x.dtb \
+    renesas/r8a7795-salvator-x.dtb \
+    renesas/r8a7795-salvator-xs.dtb \
+"
+# Device tree for M3
+KERNEL_DEVICETREE_r8a7796 = " \
+    renesas/r8a7796-salvator-x.dtb \
+    renesas/r8a7796-salvator-xs.dtb \
+"
+
+# Configuration for ARM Trusted Firmware
+EXTRA_IMAGEDEPENDS += " arm-trusted-firmware optee-os"
+
+# u-boot
+PREFERRED_VERSION_u-boot = "v2015.04%"
+EXTRA_IMAGEDEPENDS += " u-boot"
+# H3 u-boot configure
+UBOOT_MACHINE_r8a7795 = "r8a7795_salvator-x_defconfig"
+# M3 u-boot configure
+UBOOT_MACHINE_r8a7796 = "r8a7796_salvator-x_defconfig"
+
+# libdrm + mesa
+PREFERRED_VERSION_libdrm = "2.4.68"
+PREFERRED_VERSION_mesa = "17.%"
+
+# Add variable to Build Configuration in build log
+BUILDCFG_VARS_append = " SOC_FAMILY"