From 0d4418518a05b8f47697aa69a18a832d90eb8d87 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 3 Mar 2012 11:53:06 +0100 Subject: [PATCH] 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 Signed-off-by: Denys Dmytriyenko --- 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(+) create mode 100644 conf/machine/include/soc-family.inc diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 8fc0903e..9cafe852 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 51e4a84b..d8d7e08b 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 4c222753..19496424 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 00000000..39ca338f --- /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 f9d8f7a7..550363dd 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 23b6a1d7..c53557f4 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 06cb7c0e..2fe40067 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