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

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

[Koen Kooi]

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.

Signed-off-by: Koen Kooi <koen@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

[PATCH 2/3] ti-hw-bringup-image: change require to include to make meta-angstrom a soft dependency

[Koen Kooi]

The image will be non-functional, but parsing completes with only oe-core + meta-ti

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 recipes-misc/images/ti-hw-bringup-image.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/recipes-misc/images/ti-hw-bringup-image.bb b/recipes-misc/images/ti-hw-bringup-image.bb
index 5f7afce..2be8baf 100644
--- a/recipes-misc/images/ti-hw-bringup-image.bb
+++ b/recipes-misc/images/ti-hw-bringup-image.bb
@@ -1,6 +1,6 @@
 # Image for assisting in hardware bringup
 
-require recipes-images/angstrom/systemd-image.bb
+include recipes-images/angstrom/systemd-image.bb
 
 EXTRA_MACHINE_IMAGE_INSTALL ?= ""
 
-- 
1.7.2.5

[PATCH 3/3] README: move meta-angstrom to optional layers

[Koen Kooi]

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 README |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 9bf6154..918c0f1 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This layer depends on:
+This layer hard depends on:
 
 URI: git://git.openembedded.org/openembedded-core
 branch: master
@@ -8,6 +8,8 @@ URI: git://git.openembedded.org/meta-openembedded
 branch: master
 revision: HEAD
 
+And optionally depends on:
+
 URI: git://git.angstrom-distribution.org/meta-angstrom
 branch: master
 revision: HEAD
@@ -24,7 +26,7 @@ Arago.
 Due to the above, it is now recommended to follow the instructions at
 http://www.angstrom-distribution.org/building-angstrom
 
-This will set it up for the OpenEmbedded-core layout instead of the
+This will set it up for the OpenEmbedded-core ('yocto') layout instead of the
 old "Classic" OpenEmbedded-dev layout. You can optionally tweak
 sources/layers.txt and conf/bblayers.conf to (de)select BSP layers.
 
-- 
1.7.2.5

Re: [PATCH 3/3] README: move meta-angstrom to optional layers

[William Mills]

On 03/03/2012 05:53 AM, Koen Kooi wrote:
> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
> ---
>   README |    6 ++++--
>   1 files changed, 4 insertions(+), 2 deletions(-)
>

Thanks Koen!  This really helps us show progress on multiple layer stacks.

I am understand there are still lots of issues to solve.

Re: [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@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@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
> 

Re: [PATCH 1/3] SOC_FAMILY: add to MACHINE_OVERRIDES locally

[Koen Kooi]

Op 3 mrt. 2012, om 14:55 heeft Denys Dmytriyenko het volgende geschreven:

> 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.

The consensus at ELC was that these kind of tweaks should be done at the machine level now that we have MACHINE_OVERRIDES seperated out. If a lot of BSPs are going to use SOC_FAMILY we can try to push it into OE-core again. But currently we wouldn't stand a chance.

regards,

Koen

Re: [PATCH 1/3] SOC_FAMILY: add to MACHINE_OVERRIDES locally

[Richard Purdie]

On Sat, 2012-03-03 at 20:01 +0100, Koen Kooi wrote:
> Op 3 mrt. 2012, om 14:55 heeft Denys Dmytriyenko het volgende geschreven:
> 
> > 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.
> 
> The consensus at ELC was that these kind of tweaks should be done at
> the machine level now that we have MACHINE_OVERRIDES seperated out. If
> a lot of BSPs are going to use SOC_FAMILY we can try to push it into
> OE-core again. But currently we wouldn't stand a chance.

MACHINE_OVERRIDES was added to give people a generic way of extending
overrides from a machine context. This works for various situations such
as the "x86" override that made more sense than the previous 386|486|
586|xxx madness as well as providing a mechanism for SOC_FAMILY and
other uses.

I guess the .inc file could make it into OE-Core but I don't see much
value in adding SOC_FAMILY directly as a standard variable at this
point.

Cheers,

Richard

Re: [PATCH 1/3] SOC_FAMILY: add to MACHINE_OVERRIDES locally

[Denys Dmytriyenko]

On Sat, Mar 03, 2012 at 08:10:20PM -0800, Richard Purdie wrote:
> On Sat, 2012-03-03 at 20:01 +0100, Koen Kooi wrote:
> > Op 3 mrt. 2012, om 14:55 heeft Denys Dmytriyenko het volgende geschreven:
> > 
> > > 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.
> > 
> > The consensus at ELC was that these kind of tweaks should be done at
> > the machine level now that we have MACHINE_OVERRIDES seperated out. If
> > a lot of BSPs are going to use SOC_FAMILY we can try to push it into
> > OE-core again. But currently we wouldn't stand a chance.
> 
> MACHINE_OVERRIDES was added to give people a generic way of extending
> overrides from a machine context. This works for various situations such
> as the "x86" override that made more sense than the previous 386|486|
> 586|xxx madness as well as providing a mechanism for SOC_FAMILY and
> other uses.
> 
> I guess the .inc file could make it into OE-Core but I don't see much
> value in adding SOC_FAMILY directly as a standard variable at this
> point.

Thanks, Richard! That's a suitable compromise. I'll send a patch to OE-Core.

-- 
Denys