All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] ipc-ust: move SOC specific variables to qoriq-base.inc
@ 2015-09-01  8:28 Zhenhua Luo
  2015-09-01  8:28 ` [PATCH 2/2] hv-cfg: " Zhenhua Luo
  2015-09-01 20:12 ` [PATCH 1/2] ipc-ust: " Otavio Salvador
  0 siblings, 2 replies; 4+ messages in thread
From: Zhenhua Luo @ 2015-09-01  8:28 UTC (permalink / raw)
  To: meta-freescale

* Add IPC_UST_SOC variables in qoriq-base.inc to define SOC type for ipc-ust
* Use IPC_UST_SOC in ipc-ust bb file

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
---
 conf/machine/include/qoriq-base.inc     |  4 ++++
 recipes-extended/ipc-ust/ipc-ust_git.bb | 10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
index 1b49cc4..f85f18e 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -20,4 +20,8 @@ MACHINE_EXTRA_RRECOMMENDS ?= "udev-rules-qoriq"
 
 EXTRA_IMAGEDEPENDS += "u-boot cst-native"
 
+IPC_UST_SOC_bsc9131 = "B913x"
+IPC_UST_SOC_bsc9132 = "B913x"
+IPC_UST_SOC_b4 = "B4860"
+
 MACHINEOVERRIDES .= ":qoriq"
diff --git a/recipes-extended/ipc-ust/ipc-ust_git.bb b/recipes-extended/ipc-ust/ipc-ust_git.bb
index 5ba3411..5012bfa 100644
--- a/recipes-extended/ipc-ust/ipc-ust_git.bb
+++ b/recipes-extended/ipc-ust/ipc-ust_git.bb
@@ -13,10 +13,12 @@ PARALLEL_MAKE = ""
 EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC}" AR="${AR}"'
 
 do_compile () {
-    case ${MACHINE} in
-        bsc9132qds|bsc9131rdb) SOC=B913x;;
-        b4860qds|b4420qds|b4860qds-64b) SOC=B4860;;
-    esac
+    if [ "${IPC_UST_SOC}" == "" ]; then
+        echo "WARNING: IPC_UST_SOC is not defined in qoriq-base.inc."
+        continue
+    fi
+
+    SOC="${IPC_UST_SOC}"
     oe_runmake ${SOC}=1
 }
 
-- 
2.4.3



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] hv-cfg: move SOC specific variables to qoriq-base.inc
  2015-09-01  8:28 [PATCH 1/2] ipc-ust: move SOC specific variables to qoriq-base.inc Zhenhua Luo
@ 2015-09-01  8:28 ` Zhenhua Luo
  2015-09-01 20:15   ` Otavio Salvador
  2015-09-01 20:12 ` [PATCH 1/2] ipc-ust: " Otavio Salvador
  1 sibling, 1 reply; 4+ messages in thread
From: Zhenhua Luo @ 2015-09-01  8:28 UTC (permalink / raw)
  To: meta-freescale

* Add HV_CFG_M variables in qoriq-base.inc
* Use HV_CFG_M in hv-cfg bb file

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
---
 conf/machine/include/qoriq-base.inc         |  4 ++++
 recipes-virtualization/hv-cfg/hv-cfg_git.bb | 10 ++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
index f85f18e..aef892f 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -24,4 +24,8 @@ IPC_UST_SOC_bsc9131 = "B913x"
 IPC_UST_SOC_bsc9132 = "B913x"
 IPC_UST_SOC_b4 = "B4860"
 
+HV_CFG_M = "${MACHINE}"
+HV_CFG_M_t1040d4rdb = "t1040rdb"
+HV_CFG_M_t1042d4rdb = "t1040rdb"
+
 MACHINEOVERRIDES .= ":qoriq"
diff --git a/recipes-virtualization/hv-cfg/hv-cfg_git.bb b/recipes-virtualization/hv-cfg/hv-cfg_git.bb
index e4f18e0..8656c02 100644
--- a/recipes-virtualization/hv-cfg/hv-cfg_git.bb
+++ b/recipes-virtualization/hv-cfg/hv-cfg_git.bb
@@ -26,19 +26,13 @@ S = "${WORKDIR}/git"
 do_install () {
 	make install
 
-	M=`echo ${MACHINE} | sed s/-64b//g`
-	if [ "t1042d4rdb" = "${M}" ] || [ "t1040d4rdb" = "${M}" ];then
-		M=t1040rdb
-	fi
+	M=`echo ${HV_CFG_M} | sed s/-64b//g`
 	install -d ${D}/boot/hv-cfg
 	cp -r ${S}/${M}/${M}/* ${D}/boot/hv-cfg
 }
 
 do_deploy () {
-	M=`echo ${MACHINE} | sed s/-64b//g`
-	if [ "t1042d4rdb" = "${M}" ] || [ "t1040d4rdb" = "${M}" ];then
-		M=t1040rdb
-	fi
+	M=`echo ${HV_CFG_M} | sed s/-64b//g`
 	install -d ${DEPLOYDIR}/hv-cfg
 	cp -r ${S}/${M}/${M}/* ${DEPLOYDIR}/hv-cfg
 }
-- 
2.4.3



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] ipc-ust: move SOC specific variables to qoriq-base.inc
  2015-09-01  8:28 [PATCH 1/2] ipc-ust: move SOC specific variables to qoriq-base.inc Zhenhua Luo
  2015-09-01  8:28 ` [PATCH 2/2] hv-cfg: " Zhenhua Luo
@ 2015-09-01 20:12 ` Otavio Salvador
  1 sibling, 0 replies; 4+ messages in thread
From: Otavio Salvador @ 2015-09-01 20:12 UTC (permalink / raw)
  To: Zhenhua Luo; +Cc: meta-freescale

On Tue, Sep 1, 2015 at 5:28 AM, Zhenhua Luo <zhenhua.luo@freescale.com> wrote:
> * Add IPC_UST_SOC variables in qoriq-base.inc to define SOC type for ipc-ust
> * Use IPC_UST_SOC in ipc-ust bb file
>
> Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>

This is closer :-) but ...

> ---
>  conf/machine/include/qoriq-base.inc     |  4 ++++
>  recipes-extended/ipc-ust/ipc-ust_git.bb | 10 ++++++----
>  2 files changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
> index 1b49cc4..f85f18e 100644
> --- a/conf/machine/include/qoriq-base.inc
> +++ b/conf/machine/include/qoriq-base.inc
> @@ -20,4 +20,8 @@ MACHINE_EXTRA_RRECOMMENDS ?= "udev-rules-qoriq"
>
>  EXTRA_IMAGEDEPENDS += "u-boot cst-native"
>
> +IPC_UST_SOC_bsc9131 = "B913x"
> +IPC_UST_SOC_bsc9132 = "B913x"
> +IPC_UST_SOC_b4 = "B4860"
> +
>  MACHINEOVERRIDES .= ":qoriq"

Good.

> diff --git a/recipes-extended/ipc-ust/ipc-ust_git.bb b/recipes-extended/ipc-ust/ipc-ust_git.bb
> index 5ba3411..5012bfa 100644
> --- a/recipes-extended/ipc-ust/ipc-ust_git.bb
> +++ b/recipes-extended/ipc-ust/ipc-ust_git.bb
> @@ -13,10 +13,12 @@ PARALLEL_MAKE = ""
>  EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC}" AR="${AR}"'
>
>  do_compile () {
> -    case ${MACHINE} in
> -        bsc9132qds|bsc9131rdb) SOC=B913x;;
> -        b4860qds|b4420qds|b4860qds-64b) SOC=B4860;;
> -    esac
> +    if [ "${IPC_UST_SOC}" == "" ]; then
> +        echo "WARNING: IPC_UST_SOC is not defined in qoriq-base.inc."
> +        continue
> +    fi

This should be an anonymous python code to check the recipe at parsing
time. See:

http://git.openembedded.org/openembedded-core/tree/meta/classes/uboot-config.bbclass#n14

> +    SOC="${IPC_UST_SOC}"
>      oe_runmake ${SOC}=1

Use:

     oe_runmake ${IPC_UST_SOC}=1

So we avoid one indirection :)

>  }

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] hv-cfg: move SOC specific variables to qoriq-base.inc
  2015-09-01  8:28 ` [PATCH 2/2] hv-cfg: " Zhenhua Luo
@ 2015-09-01 20:15   ` Otavio Salvador
  0 siblings, 0 replies; 4+ messages in thread
From: Otavio Salvador @ 2015-09-01 20:15 UTC (permalink / raw)
  To: Zhenhua Luo; +Cc: meta-freescale

On Tue, Sep 1, 2015 at 5:28 AM, Zhenhua Luo <zhenhua.luo@freescale.com> wrote:
> * Add HV_CFG_M variables in qoriq-base.inc
> * Use HV_CFG_M in hv-cfg bb file
>
> Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
> ---
>  conf/machine/include/qoriq-base.inc         |  4 ++++
>  recipes-virtualization/hv-cfg/hv-cfg_git.bb | 10 ++--------
>  2 files changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
> index f85f18e..aef892f 100644
> --- a/conf/machine/include/qoriq-base.inc
> +++ b/conf/machine/include/qoriq-base.inc
> @@ -24,4 +24,8 @@ IPC_UST_SOC_bsc9131 = "B913x"
>  IPC_UST_SOC_bsc9132 = "B913x"
>  IPC_UST_SOC_b4 = "B4860"
>
> +HV_CFG_M = "${MACHINE}"
> +HV_CFG_M_t1040d4rdb = "t1040rdb"
> +HV_CFG_M_t1042d4rdb = "t1040rdb"
> +

This is hackish...

>  MACHINEOVERRIDES .= ":qoriq"
> diff --git a/recipes-virtualization/hv-cfg/hv-cfg_git.bb b/recipes-virtualization/hv-cfg/hv-cfg_git.bb
> index e4f18e0..8656c02 100644
> --- a/recipes-virtualization/hv-cfg/hv-cfg_git.bb
> +++ b/recipes-virtualization/hv-cfg/hv-cfg_git.bb
> @@ -26,19 +26,13 @@ S = "${WORKDIR}/git"
>  do_install () {
>         make install
>
> -       M=`echo ${MACHINE} | sed s/-64b//g`
> -       if [ "t1042d4rdb" = "${M}" ] || [ "t1040d4rdb" = "${M}" ];then
> -               M=t1040rdb
> -       fi
> +       M=`echo ${HV_CFG_M} | sed s/-64b//g`
>         install -d ${D}/boot/hv-cfg
>         cp -r ${S}/${M}/${M}/* ${D}/boot/hv-cfg
>  }
>
>  do_deploy () {
> -       M=`echo ${MACHINE} | sed s/-64b//g`
> -       if [ "t1042d4rdb" = "${M}" ] || [ "t1040d4rdb" = "${M}" ];then
> -               M=t1040rdb
> -       fi
> +       M=`echo ${HV_CFG_M} | sed s/-64b//g`
>         install -d ${DEPLOYDIR}/hv-cfg
>         cp -r ${S}/${M}/${M}/* ${DEPLOYDIR}/hv-cfg
>  }

This is board specific? how a custom design can enable virtualization?

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2015-09-01 20:15 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-01  8:28 [PATCH 1/2] ipc-ust: move SOC specific variables to qoriq-base.inc Zhenhua Luo
2015-09-01  8:28 ` [PATCH 2/2] hv-cfg: " Zhenhua Luo
2015-09-01 20:15   ` Otavio Salvador
2015-09-01 20:12 ` [PATCH 1/2] ipc-ust: " Otavio Salvador

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.