SOC_FAMILY: add to MACHINE_OVERRIDES locally

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>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>

diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 8fc0903edd2837b1e20fc19ec4bdf9c1406324b8..9cafe852e17b5d5128b4d668d671aa3a3f9d2584 100644 (file)
--- 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 51e4a84b9f7d13823330dda615a1e267e548d228..d8d7e08b407fac712e00daf8d5ea73d0059fca05 100644 (file)
--- 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 4c222753dfa59bc7871332bd578ecc39d0ae7db8..19496424043fcf1b248b23922c60bb437429e610 100644 (file)
--- 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 (file)
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 f9d8f7a7e84bfe4247522239d7888f5f7dff5d6d..550363dd09a20031cd1a5cfaa436553b973621f3 100644 (file)
--- 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 23b6a1d7e7acfd830be6fe797d125162bdd4a215..c53557f4fbf21e4aaac3bdaddeab3be6da276d8f 100644 (file)
--- 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 06cb7c0e2d510d8d92c3fddcba2ae4b0dfe752d1..2fe40067359cccf91463963722d45dac0666cf8e 100644 (file)
--- 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