From a1897fa7218c4e99e436a3c24d486efd6db56975 Mon Sep 17 00:00:00 2001 From: Duy Dang Date: Fri, 9 Nov 2018 10:52:56 +0700 Subject: rcar-gen3: machine: Build multiple U-Boot binaries for Salvator-X/XS This commit enables U-Boot configuration to build all binaries for Salvator-X and Salvator-XS boards. Signed-off-by: Duy Dang Signed-off-by: Thuy Tran Signed-off-by: Khang Nguyen Signed-off-by: Takamitsu Honda --- meta-rcar-gen3/conf/machine/salvator-x.conf | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'meta-rcar-gen3/conf/machine/salvator-x.conf') diff --git a/meta-rcar-gen3/conf/machine/salvator-x.conf b/meta-rcar-gen3/conf/machine/salvator-x.conf index 6a51d84..7942762 100644 --- a/meta-rcar-gen3/conf/machine/salvator-x.conf +++ b/meta-rcar-gen3/conf/machine/salvator-x.conf @@ -55,14 +55,19 @@ EXTRA_IMAGEDEPENDS += " arm-trusted-firmware optee-os" PREFERRED_VERSION_u-boot = "v2018.09%" EXTRA_IMAGEDEPENDS += " u-boot" # H3 u-boot configure -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" +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_MACHINE_r8a7796 = "r8a7796_salvator-x_defconfig" +UBOOT_CONFIG_r8a7796 ??= "r8a7796_salvator-x r8a7796_salvator-xs" +UBOOT_CONFIG[r8a7796_salvator-x] = "r8a7796_salvator-x_defconfig" +UBOOT_CONFIG[r8a7796_salvator-xs] = "r8a7796_salvator-xs_defconfig" # M3N u-boot configure -UBOOT_MACHINE_r8a77965 = "r8a77965_salvator-x_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.85" -- cgit 1.2.3-korg