[meta-ti] [PATCH 1/3] SOC_FAMILY: add to MACHINE_OVERRIDES locally

[Denys Dmytriyenko]

On Sat, Mar 03, 2012 at 11:53:06AM +0100, Koen Kooi wrote:
> This breaks the hard dependency on Angstrom for getting a sane set of 
> recipes.
> 
> The variable name is kept the same and the actual code moved from 
> angstrom.inc to soc-family.inc to make it clear what it is doing and how.

Ah, nice workaround until/if it gets accepted upstream to OE-Core! Thanks, 
Koen.

-- 
Denys


> Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
> ---
>  conf/machine/include/omap3.inc      |    1 +
>  conf/machine/include/omap4.inc      |    1 +
>  conf/machine/include/omapl138.inc   |    1 +
>  conf/machine/include/soc-family.inc |    3 +++
>  conf/machine/include/ti33x.inc      |    1 +
>  conf/machine/include/ti814x.inc     |    1 +
>  conf/machine/include/ti816x.inc     |    1 +
>  7 files changed, 9 insertions(+), 0 deletions(-)
>  create mode 100644 conf/machine/include/soc-family.inc
> 
> diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
> index 8fc0903..9cafe85 100644
> --- a/conf/machine/include/omap3.inc
> +++ b/conf/machine/include/omap3.inc
> @@ -1,4 +1,5 @@
>  SOC_FAMILY = "omap3"
> +require conf/machine/include/soc-family.inc
>  
>  require conf/machine/include/tune-cortexa8.inc
>  PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
> diff --git a/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc
> index 84b7742..a295352 100644
> --- a/conf/machine/include/omap4.inc
> +++ b/conf/machine/include/omap4.inc
> @@ -1,4 +1,5 @@
>  SOC_FAMILY = "omap4"
> +require conf/machine/include/soc-family.inc
>  
>  require conf/machine/include/tune-cortexa8.inc
>  
> diff --git a/conf/machine/include/omapl138.inc b/conf/machine/include/omapl138.inc
> index 4c22275..1949642 100644
> --- a/conf/machine/include/omapl138.inc
> +++ b/conf/machine/include/omapl138.inc
> @@ -1 +1,2 @@
>  SOC_FAMILY = "omapl138"
> +require conf/machine/include/soc-family.inc
> diff --git a/conf/machine/include/soc-family.inc b/conf/machine/include/soc-family.inc
> new file mode 100644
> index 0000000..39ca338
> --- /dev/null
> +++ b/conf/machine/include/soc-family.inc
> @@ -0,0 +1,3 @@
> +# Add SOC_FAMILY to machine overrides so we get access to e.g. 'omap3' and 'ti335x'
> +MACHINEOVERRIDES .= "${@['', ':${SOC_FAMILY}']['${SOC_FAMILY}' != '']}"
> +
> diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc
> index fb8bad3..f4954f5 100644
> --- a/conf/machine/include/ti33x.inc
> +++ b/conf/machine/include/ti33x.inc
> @@ -1,4 +1,5 @@
>  SOC_FAMILY = "ti33x"
> +require conf/machine/include/soc-family.inc
>  
>  require conf/machine/include/tune-cortexa8.inc
>  PREFERRED_PROVIDER_virtual/kernel = "linux-ti33x-psp"
> diff --git a/conf/machine/include/ti814x.inc b/conf/machine/include/ti814x.inc
> index 23b6a1d..c53557f 100644
> --- a/conf/machine/include/ti814x.inc
> +++ b/conf/machine/include/ti814x.inc
> @@ -1,4 +1,5 @@
>  SOC_FAMILY = "ti814x"
> +require conf/machine/include/soc-family.inc
>  
>  require conf/machine/include/tune-cortexa8.inc
>  
> diff --git a/conf/machine/include/ti816x.inc b/conf/machine/include/ti816x.inc
> index 06cb7c0..2fe4006 100644
> --- a/conf/machine/include/ti816x.inc
> +++ b/conf/machine/include/ti816x.inc
> @@ -1,4 +1,5 @@
>  SOC_FAMILY = "ti816x"
> +require conf/machine/include/soc-family.inc
>  
>  require conf/machine/include/tune-cortexa8.inc
>  
> -- 
> 1.7.2.5
> 
> _______________________________________________
> meta-ti mailing list
> meta-ti at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
>