summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-rcar-gen3/conf/machine/salvator-x.conf17
1 files changed, 11 insertions, 6 deletions
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"