From 8819c067a2b063267beb3efc98a7027e311206f2 Mon Sep 17 00:00:00 2001 From: Khang Nguyen Date: Sun, 30 Sep 2018 22:36:38 -0400 Subject: rcar-gen3: machine: Update configurations according to u-boot v2018.09 This commit updates machine configurations for the following items: - Upgraded u-boot to v2018.09. - Added supporting Ebisu 4D 2GiB board. - Enabled building multiple u-boot configurations for H3 Salvator-XS, Ebisu and H3ULCB. Signed-off-by: Khang Nguyen Signed-off-by: Takamitsu Honda --- meta-rcar-gen3/conf/machine/ebisu.conf | 11 ++++++++--- meta-rcar-gen3/conf/machine/h3ulcb.conf | 12 ++++++------ meta-rcar-gen3/conf/machine/m3ulcb.conf | 4 ++-- meta-rcar-gen3/conf/machine/salvator-x.conf | 7 +++++-- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/meta-rcar-gen3/conf/machine/ebisu.conf b/meta-rcar-gen3/conf/machine/ebisu.conf index 23ba24b..eb83d95 100644 --- a/meta-rcar-gen3/conf/machine/ebisu.conf +++ b/meta-rcar-gen3/conf/machine/ebisu.conf @@ -24,16 +24,21 @@ SERIAL_CONSOLE = "115200 ttySC0" # Configuration for kernel PREFERRED_PROVIDER_virtual/kernel = "linux-renesas" # Device tree for E3 -KERNEL_DEVICETREE = "renesas/r8a77990-ebisu.dtb" +KERNEL_DEVICETREE = " \ + renesas/r8a77990-ebisu.dtb \ + renesas/r8a77990-ebisu-4d.dtb \ +" # Configuration for ARM Trusted Firmware EXTRA_IMAGEDEPENDS += " arm-trusted-firmware optee-os" # u-boot -PREFERRED_VERSION_u-boot = "v2015.04%" +PREFERRED_VERSION_u-boot = "v2018.09%" EXTRA_IMAGEDEPENDS += " u-boot" # E3 u-boot configure -UBOOT_MACHINE = "r8a77990_ebisu_defconfig" +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.85" diff --git a/meta-rcar-gen3/conf/machine/h3ulcb.conf b/meta-rcar-gen3/conf/machine/h3ulcb.conf index 1e0c57c..fc7123b 100644 --- a/meta-rcar-gen3/conf/machine/h3ulcb.conf +++ b/meta-rcar-gen3/conf/machine/h3ulcb.conf @@ -26,15 +26,19 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-renesas" 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 = "v2015.04%" +PREFERRED_VERSION_u-boot = "v2018.09%" EXTRA_IMAGEDEPENDS += " u-boot" -UBOOT_MACHINE = "h3ulcb_defconfig" +# 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.85" @@ -44,9 +48,5 @@ BUILDCFG_VARS_append = " SOC_FAMILY" MACHINEOVERRIDES .= ":ulcb" -# U-boot/IPL option for H3 (SoC: r8a7795) -# For H3 SiP DDR 4GiB (1GiB x 4ch) -H3_OPTION = "0" - # 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 d6ca753..26e87bf 100644 --- a/meta-rcar-gen3/conf/machine/m3ulcb.conf +++ b/meta-rcar-gen3/conf/machine/m3ulcb.conf @@ -29,9 +29,9 @@ KERNEL_DEVICETREE = "renesas/r8a7796-m3ulcb.dtb" EXTRA_IMAGEDEPENDS += " arm-trusted-firmware optee-os" # u-boot -PREFERRED_VERSION_u-boot = "v2015.04%" +PREFERRED_VERSION_u-boot = "v2018.09%" EXTRA_IMAGEDEPENDS += " u-boot" -UBOOT_MACHINE = "m3ulcb_defconfig" +UBOOT_MACHINE = "r8a7796_ulcb_defconfig" # libdrm PREFERRED_VERSION_libdrm = "2.4.85" diff --git a/meta-rcar-gen3/conf/machine/salvator-x.conf b/meta-rcar-gen3/conf/machine/salvator-x.conf index 0c22e5a..6a51d84 100644 --- a/meta-rcar-gen3/conf/machine/salvator-x.conf +++ b/meta-rcar-gen3/conf/machine/salvator-x.conf @@ -52,10 +52,13 @@ KERNEL_DEVICETREE_r8a77965 = " \ EXTRA_IMAGEDEPENDS += " arm-trusted-firmware optee-os" # u-boot -PREFERRED_VERSION_u-boot = "v2015.04%" +PREFERRED_VERSION_u-boot = "v2018.09%" EXTRA_IMAGEDEPENDS += " u-boot" # H3 u-boot configure -UBOOT_MACHINE_r8a7795 = "r8a7795_salvator-x_defconfig" +UBOOT_CONFIG_r8a7795 ??= "salvator-xs salvator-xs-2x2g salvator-xs-4x2g" +UBOOT_CONFIG[salvator-xs] = "r8a7795_salvator-xs_defconfig" +UBOOT_CONFIG[salvator-xs-2x2g] = "r8a7795_salvator-xs-2x2g_defconfig" +UBOOT_CONFIG[salvator-xs-4x2g] = "r8a7795_salvator-xs-4x2g_defconfig" # M3 u-boot configure UBOOT_MACHINE_r8a7796 = "r8a7796_salvator-x_defconfig" # M3N u-boot configure -- cgit 1.2.3-korg