rcar-gen3: ULCB: Add default SOC_FAMILY for ULCB

The SOC_FAMILY is already different between H3ULCB and M3ULCB:
H3ULCB uses SoC r8a7795.
M3ULCB uses SoC r8a7796.

Hence, setting this value in h3ulcb.conf and m3ulcb.conf to allow
images to be built without setting SOC_FAMILY in local.conf.

Signed-off-by: Thao Nguyen <thao.nguyen.yb@renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>

14 files changed, 4 insertions, 24 deletions

diff --git a/meta-rcar-gen3/conf/machine/h3ulcb.conf b/meta-rcar-gen3/conf/machine/h3ulcb.conf
index 7607a91..4203111 100644
--- a/meta-rcar-gen3/conf/machine/h3ulcb.conf
+++ b/meta-rcar-gen3/conf/machine/h3ulcb.conf
@@ -2,6 +2,8 @@
 #@NAME: H3ULCB machine
 #@DESCRIPTION: Machine configuration for running H3ULCB
 
+SOC_FAMILY = "r8a7795"
+
 DEFAULTTUNE ?= "cortexa57-cortexa53"
 require conf/machine/include/tune-cortexa57-cortexa53.inc
 require conf/machine/include/${SOC_FAMILY}.inc
diff --git a/meta-rcar-gen3/conf/machine/m3ulcb.conf b/meta-rcar-gen3/conf/machine/m3ulcb.conf
index 713fd86..87bc0e7 100644
--- a/meta-rcar-gen3/conf/machine/m3ulcb.conf
+++ b/meta-rcar-gen3/conf/machine/m3ulcb.conf
@@ -2,6 +2,8 @@
 #@NAME: M3ULCB machine
 #@DESCRIPTION: Machine configuration for running M3ULCB
 
+SOC_FAMILY = "r8a7796"
+
 DEFAULTTUNE ?= "cortexa57-cortexa53"
 require conf/machine/include/tune-cortexa57-cortexa53.inc
 require conf/machine/include/${SOC_FAMILY}.inc
diff --git a/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp/local-wayland.conf
index 1f76008..9f9655d 100644
--- a/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp/local-wayland.conf
+++ b/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp/local-wayland.conf
@@ -37,8 +37,6 @@
 # This sets the default machine to be qemux86 if no other machine is selected:
 MACHINE ??= "h3ulcb"
 
-SOC_FAMILY = "r8a7795"
-
 #
 # Where to place downloads
 #
diff --git a/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp/local.conf b/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp/local.conf
index e5e2026..f25fc56 100644
--- a/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp/local.conf
+++ b/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp/local.conf
@@ -37,8 +37,6 @@
 # This sets the default machine to be qemux86 if no other machine is selected:
 MACHINE ??= "h3ulcb"
 
-SOC_FAMILY = "r8a7795"
-
 #
 # Where to place downloads
 #
diff --git a/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/gfx-only/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/gfx-only/local-wayland.conf
index aa63d8e..5e7f6f6 100644
--- a/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/gfx-only/local-wayland.conf
+++ b/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/gfx-only/local-wayland.conf
@@ -37,8 +37,6 @@
 # This sets the default machine to be qemux86 if no other machine is selected:
 MACHINE ??= "h3ulcb"
 
-SOC_FAMILY = "r8a7795"
-
 #
 # Where to place downloads
 #
diff --git a/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/mmp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/mmp/local-wayland.conf
index 3f09147..bfe3fa4 100644
--- a/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/mmp/local-wayland.conf
+++ b/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/mmp/local-wayland.conf
@@ -37,8 +37,6 @@
 # This sets the default machine to be qemux86 if no other machine is selected:
 MACHINE ??= "h3ulcb"
 
-SOC_FAMILY = "r8a7795"
-
 #
 # Where to place downloads
 #
diff --git a/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/bsp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/bsp/local-wayland.conf
index b01fb82..15623f5 100644
--- a/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/bsp/local-wayland.conf
+++ b/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/bsp/local-wayland.conf
@@ -37,8 +37,6 @@
 # This sets the default machine to be qemux86 if no other machine is selected:
 MACHINE ??= "h3ulcb"
 
-SOC_FAMILY = "r8a7795"
-
 #
 # Where to place downloads
 #
diff --git a/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/bsp/local.conf b/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/bsp/local.conf
index c7128c4..cf312b3 100644
--- a/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/bsp/local.conf
+++ b/meta-rcar-gen3/docs/sample/conf/h3ulcb/poky-gcc/bsp/local.conf
@@ -37,8 +37,6 @@
 # This sets the default machine to be qemux86 if no other machine is selected:
 MACHINE ??= "h3ulcb"
 
-SOC_FAMILY = "r8a7795"
-
 #
 # Where to place downloads
 #
diff --git a/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/bsp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/bsp/local-wayland.conf
index 054c44b..8fcdf6f 100644
--- a/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/bsp/local-wayland.conf
+++ b/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/bsp/local-wayland.conf
@@ -37,8 +37,6 @@
 # This sets the default machine to be qemux86 if no other machine is selected:
 MACHINE ??= "m3ulcb"
 
-SOC_FAMILY = "r8a7796"
-
 #
 # Where to place downloads
 #
diff --git a/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/bsp/local.conf b/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/bsp/local.conf
index 9583dd6..74ca621 100644
--- a/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/bsp/local.conf
+++ b/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/bsp/local.conf
@@ -37,8 +37,6 @@
 # This sets the default machine to be qemux86 if no other machine is selected:
 MACHINE ??= "m3ulcb"
 
-SOC_FAMILY = "r8a7796"
-
 #
 # Where to place downloads
 #
diff --git a/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/gfx-only/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/gfx-only/local-wayland.conf
index fdf452c..ba5a64d 100644
--- a/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/gfx-only/local-wayland.conf
+++ b/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/gfx-only/local-wayland.conf
@@ -37,8 +37,6 @@
 # This sets the default machine to be qemux86 if no other machine is selected:
 MACHINE ??= "m3ulcb"
 
-SOC_FAMILY = "r8a7796"
-
 #
 # Where to place downloads
 #
diff --git a/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/mmp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/mmp/local-wayland.conf
index 567529e..8ce2402 100644
--- a/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/mmp/local-wayland.conf
+++ b/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/mmp/local-wayland.conf
@@ -37,8 +37,6 @@
 # This sets the default machine to be qemux86 if no other machine is selected:
 MACHINE ??= "m3ulcb"
 
-SOC_FAMILY = "r8a7796"
-
 #
 # Where to place downloads
 #
diff --git a/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/bsp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/bsp/local-wayland.conf
index 2bd2154..1944e76 100644
--- a/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/bsp/local-wayland.conf
+++ b/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/bsp/local-wayland.conf
@@ -37,8 +37,6 @@
 # This sets the default machine to be qemux86 if no other machine is selected:
 MACHINE ??= "m3ulcb"
 
-SOC_FAMILY = "r8a7796"
-
 #
 # Where to place downloads
 #
diff --git a/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/bsp/local.conf b/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/bsp/local.conf
index f682e03..f067c3e 100644
--- a/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/bsp/local.conf
+++ b/meta-rcar-gen3/docs/sample/conf/m3ulcb/poky-gcc/bsp/local.conf
@@ -37,8 +37,6 @@
 # This sets the default machine to be qemux86 if no other machine is selected:
 MACHINE ??= "m3ulcb"
 
-SOC_FAMILY = "r8a7796"
-
 #
 # Where to place downloads
 #