rcar-gen3: conf: Add u-boot/IPL build option for H3

From Yv3.7.0, there are 03 options to build u-boot/IPL for H3:

- For R-Car H3 SiP DDR 8GiB (2GiB x 4ch) [1]
- For R-Car H3 SiP DDR 4GiB (2GiB x 2ch) [2]
- For R-Car H3 SiP DDR 4GiB (1GiB x 4ch) [3]

This commit adds a variable into sample configurations to control the
build option:

- For [1]: H3_OPTION = "1" (default)
- For [2]: H3_OPTION = "2"
- For [3]: H3_OPTION = "0"

It also adds H3_OPTION = "0" for H3ULCB by default.

Signed-off-by: Khang Nguyen <khang.nguyen.xv@rvc.renesas.com>
Signed-off-by: Thuy Tran <thuy.tran.xh@rvc.renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>

9 files changed, 68 insertions, 0 deletions

diff --git a/meta-rcar-gen3/conf/machine/h3ulcb.conf b/meta-rcar-gen3/conf/machine/h3ulcb.conf
index bb01294..8e1c3fd 100644
--- a/meta-rcar-gen3/conf/machine/h3ulcb.conf
+++ b/meta-rcar-gen3/conf/machine/h3ulcb.conf
@@ -43,3 +43,7 @@ PREFERRED_VERSION_libdrm = "2.4.85"
 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"
diff --git a/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/bsp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/bsp/local-wayland.conf
index ab2e815..b54c5f6 100644
--- a/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/bsp/local-wayland.conf
+++ b/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/bsp/local-wayland.conf
@@ -278,3 +278,11 @@ LICENSE_FLAGS_WHITELIST = "commercial"
 
 # Add Capacity Aware migration Strategy (CAS)
 MACHINE_FEATURES_append = " cas"
+
+# U-boot/IPL option for H3 (SoC: r8a7795)
+# For H3 SiP DDR 4GiB (1GiB x 4ch)
+#H3_OPTION = "0"
+# For H3 SiP DDR 8GiB (2GiB x 4ch)
+H3_OPTION = "1"
+# For H3 SiP DDR 4GiB (2GiB x 2ch)
+#H3_OPTION = "2"
diff --git a/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/bsp/local.conf b/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/bsp/local.conf
index 49cbb22..df296f9 100644
--- a/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/bsp/local.conf
+++ b/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/bsp/local.conf
@@ -268,3 +268,11 @@ BBMASK .= "|kernel-module-uvcs-drv|omx-user-module"
 
 # Add Capacity Aware migration Strategy (CAS)
 MACHINE_FEATURES_append = " cas"
+
+# U-boot/IPL option for H3 (SoC: r8a7795)
+# For H3 SiP DDR 4GiB (1GiB x 4ch)
+#H3_OPTION = "0"
+# For H3 SiP DDR 8GiB (2GiB x 4ch)
+H3_OPTION = "1"
+# For H3 SiP DDR 4GiB (2GiB x 2ch)
+#H3_OPTION = "2"
diff --git a/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/gfx-only/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/gfx-only/local-wayland.conf
index f25e34c..318f7d1 100644
--- a/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/gfx-only/local-wayland.conf
+++ b/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/gfx-only/local-wayland.conf
@@ -287,3 +287,11 @@ RDEPENDS_gstreamer1.0-plugins-bad = "libwayland-egl"
 
 # Add Capacity Aware migration Strategy (CAS)
 MACHINE_FEATURES_append = " cas"
+
+# U-boot/IPL option for H3 (SoC: r8a7795)
+# For H3 SiP DDR 4GiB (1GiB x 4ch)
+#H3_OPTION = "0"
+# For H3 SiP DDR 8GiB (2GiB x 4ch)
+H3_OPTION = "1"
+# For H3 SiP DDR 4GiB (2GiB x 2ch)
+#H3_OPTION = "2"
diff --git a/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/mmp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/mmp/local-wayland.conf
index f3fc92f..0135f92 100644
--- a/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/mmp/local-wayland.conf
+++ b/meta-rcar-gen3/docs/sample/conf/salvator-x/linaro-gcc/mmp/local-wayland.conf
@@ -391,3 +391,11 @@ DISTRO_FEATURES_append = " aaclcdec_mdw"
 
 # Add Capacity Aware migration Strategy (CAS)
 MACHINE_FEATURES_append = " cas"
+
+# U-boot/IPL option for H3 (SoC: r8a7795)
+# For H3 SiP DDR 4GiB (1GiB x 4ch)
+#H3_OPTION = "0"
+# For H3 SiP DDR 8GiB (2GiB x 4ch)
+H3_OPTION = "1"
+# For H3 SiP DDR 4GiB (2GiB x 2ch)
+#H3_OPTION = "2"
diff --git a/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/bsp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/bsp/local-wayland.conf
index 5603065..61dd3b6 100644
--- a/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/bsp/local-wayland.conf
+++ b/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/bsp/local-wayland.conf
@@ -275,3 +275,11 @@ LICENSE_FLAGS_WHITELIST = "commercial"
 
 # Add Capacity Aware migration Strategy (CAS)
 MACHINE_FEATURES_append = " cas"
+
+# U-boot/IPL option for H3 (SoC: r8a7795)
+# For H3 SiP DDR 4GiB (1GiB x 4ch)
+#H3_OPTION = "0"
+# For H3 SiP DDR 8GiB (2GiB x 4ch)
+H3_OPTION = "1"
+# For H3 SiP DDR 4GiB (2GiB x 2ch)
+#H3_OPTION = "2"
diff --git a/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/bsp/local.conf b/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/bsp/local.conf
index 7b989d5..43f4f8c 100644
--- a/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/bsp/local.conf
+++ b/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/bsp/local.conf
@@ -265,3 +265,11 @@ BBMASK .= "|kernel-module-uvcs-drv|omx-user-module"
 
 # Add Capacity Aware migration Strategy (CAS)
 MACHINE_FEATURES_append = " cas"
+
+# U-boot/IPL option for H3 (SoC: r8a7795)
+# For H3 SiP DDR 4GiB (1GiB x 4ch)
+#H3_OPTION = "0"
+# For H3 SiP DDR 8GiB (2GiB x 4ch)
+H3_OPTION = "1"
+# For H3 SiP DDR 4GiB (2GiB x 2ch)
+#H3_OPTION = "2"
diff --git a/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/gfx-only/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/gfx-only/local-wayland.conf
index 1932668..b07c28d 100644
--- a/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/gfx-only/local-wayland.conf
+++ b/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/gfx-only/local-wayland.conf
@@ -284,3 +284,11 @@ RDEPENDS_gstreamer1.0-plugins-bad = "libwayland-egl"
 
 # Add Capacity Aware migration Strategy (CAS)
 MACHINE_FEATURES_append = " cas"
+
+# U-boot/IPL option for H3 (SoC: r8a7795)
+# For H3 SiP DDR 4GiB (1GiB x 4ch)
+#H3_OPTION = "0"
+# For H3 SiP DDR 8GiB (2GiB x 4ch)
+H3_OPTION = "1"
+# For H3 SiP DDR 4GiB (2GiB x 2ch)
+#H3_OPTION = "2"
diff --git a/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/mmp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/mmp/local-wayland.conf
index 6daac62..3fe07f5 100644
--- a/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/mmp/local-wayland.conf
+++ b/meta-rcar-gen3/docs/sample/conf/salvator-x/poky-gcc/mmp/local-wayland.conf
@@ -388,3 +388,11 @@ DISTRO_FEATURES_append = " aaclcdec_mdw"
 
 # Add Capacity Aware migration Strategy (CAS)
 MACHINE_FEATURES_append = " cas"
+
+# U-boot/IPL option for H3 (SoC: r8a7795)
+# For H3 SiP DDR 4GiB (1GiB x 4ch)
+#H3_OPTION = "0"
+# For H3 SiP DDR 8GiB (2GiB x 4ch)
+H3_OPTION = "1"
+# For H3 SiP DDR 4GiB (2GiB x 2ch)
+#H3_OPTION = "2"