From 28c0c0cadf66cd73c42506112c2b3f9700f890fe Mon Sep 17 00:00:00 2001 From: Khang Nguyen Date: Mon, 11 May 2020 17:31:46 +0900 Subject: rcar-gen3: machine: Reconstruct machine configurations This reconstructs machine configurations to reduce duplicate codes: - rcar_common.inc: General configuration for R-Car SoCs. - rcar_ulcb.inc: Specific configuration for ULCB. Signed-off-by: Khang Nguyen Signed-off-by: Takamitsu Honda Change-Id: Ide5e459e75ddb9309e07e20ee6331e92b3537a63 --- meta-rcar-gen3/conf/machine/ebisu.conf | 32 +------------------ meta-rcar-gen3/conf/machine/h3ulcb.conf | 35 ++------------------- .../conf/machine/include/rcar_common.inc | 33 ++++++++++++++++++++ meta-rcar-gen3/conf/machine/include/rcar_ulcb.inc | 3 ++ meta-rcar-gen3/conf/machine/m3nulcb.conf | 36 ++-------------------- meta-rcar-gen3/conf/machine/m3ulcb.conf | 36 ++-------------------- meta-rcar-gen3/conf/machine/salvator-x.conf | 30 ++---------------- 7 files changed, 47 insertions(+), 158 deletions(-) create mode 100644 meta-rcar-gen3/conf/machine/include/rcar_common.inc create mode 100644 meta-rcar-gen3/conf/machine/include/rcar_ulcb.inc diff --git a/meta-rcar-gen3/conf/machine/ebisu.conf b/meta-rcar-gen3/conf/machine/ebisu.conf index fe883e3..59ded18 100644 --- a/meta-rcar-gen3/conf/machine/ebisu.conf +++ b/meta-rcar-gen3/conf/machine/ebisu.conf @@ -6,23 +6,8 @@ SOC_FAMILY = "r8a77990" DEFAULTTUNE ?= "cortexa53" require conf/machine/include/tune-cortexa53.inc -require conf/machine/include/${SOC_FAMILY}.inc +require conf/machine/include/rcar_common.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" -IMAGE_FSTYPES_append = " tar.bz2 ext4" - -SERIAL_CONSOLES = "115200;ttySC0" - -# Configuration for kernel -PREFERRED_PROVIDER_virtual/kernel = "linux-renesas" # Device tree for E3 KERNEL_DEVICETREE = " \ renesas/r8a77990-ebisu.dtb \ @@ -31,22 +16,7 @@ KERNEL_DEVICETREE = " \ renesas/r8a77990-es10-ebisu-4d.dtb \ " -# Configuration for ARM Trusted Firmware -EXTRA_IMAGEDEPENDS += " arm-trusted-firmware optee-os" - -# u-boot -PREFERRED_VERSION_u-boot = "v2018.09%" -EXTRA_IMAGEDEPENDS += " u-boot" # E3 u-boot configure UBOOT_CONFIG ??= "ebisu ebisu-4d" UBOOT_CONFIG[ebisu] = "r8a77990_ebisu_defconfig" UBOOT_CONFIG[ebisu-4d] = "r8a77990_ebisu-4d_defconfig" - -# libdrm -PREFERRED_VERSION_libdrm = "2.4.100" - -# Add variable to Build Configuration in build log -BUILDCFG_VARS_append = " SOC_FAMILY" - -# Command using to build kernel-module-gles -HOSTTOOLS += "sync" diff --git a/meta-rcar-gen3/conf/machine/h3ulcb.conf b/meta-rcar-gen3/conf/machine/h3ulcb.conf index 134bf82..78e6e4f 100644 --- a/meta-rcar-gen3/conf/machine/h3ulcb.conf +++ b/meta-rcar-gen3/conf/machine/h3ulcb.conf @@ -6,47 +6,16 @@ SOC_FAMILY = "r8a7795" DEFAULTTUNE ?= "cortexa57-cortexa53" require conf/machine/include/tune-cortexa57-cortexa53.inc -require conf/machine/include/${SOC_FAMILY}.inc +require conf/machine/include/rcar_ulcb.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" -IMAGE_FSTYPES_append = " tar.bz2 ext4" - -SERIAL_CONSOLES = "115200;ttySC0" - -# Configuration for kernel -PREFERRED_PROVIDER_virtual/kernel = "linux-renesas" +# Device tree for H3ULCB KERNEL_DEVICETREE = " \ renesas/r8a7795-h3ulcb.dtb \ renesas/r8a7795-es1-h3ulcb.dtb \ renesas/r8a7795-h3ulcb-4x2g.dtb \ " -# Configuration for ARM Trusted Firmware -EXTRA_IMAGEDEPENDS += " arm-trusted-firmware optee-os" - -# u-boot -PREFERRED_VERSION_u-boot = "v2018.09%" -EXTRA_IMAGEDEPENDS += " u-boot" # H3ULCB u-boot configure UBOOT_CONFIG ??= "h3ulcb h3ulcb-4x2g" UBOOT_CONFIG[h3ulcb] = "r8a7795_ulcb_defconfig" UBOOT_CONFIG[h3ulcb-4x2g] = "r8a7795_ulcb-4x2g_defconfig" - -# libdrm -PREFERRED_VERSION_libdrm = "2.4.100" - -# Add variable to Build Configuration in build log -BUILDCFG_VARS_append = " SOC_FAMILY" - -MACHINEOVERRIDES .= ":ulcb" - -# Command using to build kernel-module-gles -HOSTTOOLS += "sync" diff --git a/meta-rcar-gen3/conf/machine/include/rcar_common.inc b/meta-rcar-gen3/conf/machine/include/rcar_common.inc new file mode 100644 index 0000000..90b385c --- /dev/null +++ b/meta-rcar-gen3/conf/machine/include/rcar_common.inc @@ -0,0 +1,33 @@ +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" +IMAGE_FSTYPES_append = " tar.bz2 ext4" + +SERIAL_CONSOLES = "115200;ttySC0" + +# Configuration for kernel +PREFERRED_PROVIDER_virtual/kernel = "linux-renesas" + +# Configuration for ARM Trusted Firmware +EXTRA_IMAGEDEPENDS += " arm-trusted-firmware optee-os" + +# u-boot +PREFERRED_VERSION_u-boot = "v2018.09%" +EXTRA_IMAGEDEPENDS += " u-boot" + +# libdrm +PREFERRED_VERSION_libdrm = "2.4.100" + +# Add variable to Build Configuration in build log +BUILDCFG_VARS_append = " SOC_FAMILY" + +# Command using to build kernel-module-gles +HOSTTOOLS += "sync" diff --git a/meta-rcar-gen3/conf/machine/include/rcar_ulcb.inc b/meta-rcar-gen3/conf/machine/include/rcar_ulcb.inc new file mode 100644 index 0000000..1c107ef --- /dev/null +++ b/meta-rcar-gen3/conf/machine/include/rcar_ulcb.inc @@ -0,0 +1,3 @@ +require conf/machine/include/rcar_common.inc + +MACHINEOVERRIDES .= ":ulcb" diff --git a/meta-rcar-gen3/conf/machine/m3nulcb.conf b/meta-rcar-gen3/conf/machine/m3nulcb.conf index 0e3f6af..a6054d7 100644 --- a/meta-rcar-gen3/conf/machine/m3nulcb.conf +++ b/meta-rcar-gen3/conf/machine/m3nulcb.conf @@ -6,40 +6,10 @@ SOC_FAMILY = "r8a77965" DEFAULTTUNE ?= "cortexa57" require conf/machine/include/tune-cortexa57.inc -require conf/machine/include/${SOC_FAMILY}.inc +require conf/machine/include/rcar_ulcb.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" -IMAGE_FSTYPES_append = " tar.bz2 ext4" - -SERIAL_CONSOLES = "115200;ttySC0" - -# Configuration for kernel -PREFERRED_PROVIDER_virtual/kernel = "linux-renesas" +# Device tree for M3NULCB KERNEL_DEVICETREE = "renesas/r8a77965-m3nulcb.dtb" -# Configuration for ARM Trusted Firmware -EXTRA_IMAGEDEPENDS += " arm-trusted-firmware optee-os" - -# u-boot -PREFERRED_VERSION_u-boot = "v2018.09%" -EXTRA_IMAGEDEPENDS += " u-boot" +# M3NULCB u-boot configure UBOOT_MACHINE = "r8a77965_ulcb_defconfig" - -# libdrm -PREFERRED_VERSION_libdrm = "2.4.100" - -# Add variable to Build Configuration in build log -BUILDCFG_VARS_append = " SOC_FAMILY" - -MACHINEOVERRIDES .= ":ulcb" - -# Command using to build kernel-module-gles -HOSTTOOLS += "sync" diff --git a/meta-rcar-gen3/conf/machine/m3ulcb.conf b/meta-rcar-gen3/conf/machine/m3ulcb.conf index 8284c9a..af4af81 100644 --- a/meta-rcar-gen3/conf/machine/m3ulcb.conf +++ b/meta-rcar-gen3/conf/machine/m3ulcb.conf @@ -6,40 +6,10 @@ SOC_FAMILY = "r8a7796" DEFAULTTUNE ?= "cortexa57-cortexa53" require conf/machine/include/tune-cortexa57-cortexa53.inc -require conf/machine/include/${SOC_FAMILY}.inc +require conf/machine/include/rcar_ulcb.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" -IMAGE_FSTYPES_append = " tar.bz2 ext4" - -SERIAL_CONSOLES = "115200;ttySC0" - -# Configuration for kernel -PREFERRED_PROVIDER_virtual/kernel = "linux-renesas" +# Device tree for M3ULCB KERNEL_DEVICETREE = "renesas/r8a7796-m3ulcb.dtb" -# Configuration for ARM Trusted Firmware -EXTRA_IMAGEDEPENDS += " arm-trusted-firmware optee-os" - -# u-boot -PREFERRED_VERSION_u-boot = "v2018.09%" -EXTRA_IMAGEDEPENDS += " u-boot" +# M3ULCB u-boot configure UBOOT_MACHINE = "r8a7796_ulcb_defconfig" - -# libdrm -PREFERRED_VERSION_libdrm = "2.4.100" - -# Add variable to Build Configuration in build log -BUILDCFG_VARS_append = " SOC_FAMILY" - -MACHINEOVERRIDES .= ":ulcb" - -# Command using to build kernel-module-gles -HOSTTOOLS += "sync" diff --git a/meta-rcar-gen3/conf/machine/salvator-x.conf b/meta-rcar-gen3/conf/machine/salvator-x.conf index 95e0471..f18af18 100644 --- a/meta-rcar-gen3/conf/machine/salvator-x.conf +++ b/meta-rcar-gen3/conf/machine/salvator-x.conf @@ -2,7 +2,8 @@ #@NAME: Salvator-X machine #@DESCRIPTION: Machine configuration for running Salvator-X -require conf/machine/include/${SOC_FAMILY}.inc +require conf/machine/include/rcar_common.inc + # Add default tune for H3/M3 DEFAULTTUNE ?= "cortexa57-cortexa53" # Add default tune for M3N @@ -14,21 +15,6 @@ 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. -USE_32BIT_PKGS ?= "0" -USE_32BIT_WAYLAND ?= "0" -USE_32BIT_MMP ?= "0" - -MACHINE_FEATURES = "" - -KERNEL_IMAGETYPE = "Image" -IMAGE_FSTYPES_append = " tar.bz2 ext4" - -SERIAL_CONSOLES = "115200;ttySC0" - -# Configuration for kernel -PREFERRED_PROVIDER_virtual/kernel = "linux-renesas" # Device tree for H3 KERNEL_DEVICETREE_r8a7795 = " \ renesas/r8a7795-es1-salvator-x.dtb \ @@ -49,9 +35,6 @@ KERNEL_DEVICETREE_r8a77965 = " \ renesas/r8a77965-salvator-xs.dtb \ " -# Configuration for ARM Trusted Firmware -EXTRA_IMAGEDEPENDS += " arm-trusted-firmware optee-os" - # u-boot PREFERRED_VERSION_u-boot = "v2018.09%" EXTRA_IMAGEDEPENDS += " u-boot" @@ -70,12 +53,3 @@ UBOOT_CONFIG[r8a7796_salvator-xs-2x4g] = "r8a7796_salvator-xs-2x4g_defconfig" 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" - -# libdrm -PREFERRED_VERSION_libdrm = "2.4.100" - -# Add variable to Build Configuration in build log -BUILDCFG_VARS_append = " SOC_FAMILY" - -# Command using to build kernel-module-gles -HOSTTOOLS += "sync" -- cgit 1.2.3-korg