diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2012-09-18 11:56:23 -0300 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2012-09-18 11:56:23 -0300 |
| commit | b6ea5761eea51bdabafd5be7af6136126ff025d1 (patch) | |
| tree | 36ac97d65dd48a107b50e04496533c08b80570c0 /conf | |
| parent | 6bf65168e8f50818e1910253e7fd11666b9cb330 (diff) | |
| parent | 8e96b7e39cdb30ccdaf402a04b7ff4cec7414611 (diff) | |
| download | meta-fsl-arm-b6ea5761eea51bdabafd5be7af6136126ff025d1.tar.gz | |
Merge remote branch 'freescale/denzil'
* freescale/denzil:
Move fsl-default*.inc from distro to machine
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/include/fsl-default-providers.inc (renamed from conf/distro/include/fsl-default-providers.inc) | 0 | ||||
| -rw-r--r-- | conf/machine/include/fsl-default-settings.inc (renamed from conf/distro/include/fsl-default-settings.inc) | 0 | ||||
| -rw-r--r-- | conf/machine/include/fsl-default-versions.inc (renamed from conf/distro/include/fsl-default-versions.inc) | 0 | ||||
| -rw-r--r-- | conf/machine/include/imx-base.inc | 6 | ||||
| -rw-r--r-- | conf/machine/include/mxs-base.inc | 6 |
5 files changed, 6 insertions, 6 deletions
diff --git a/conf/distro/include/fsl-default-providers.inc b/conf/machine/include/fsl-default-providers.inc index ef0805c..ef0805c 100644 --- a/conf/distro/include/fsl-default-providers.inc +++ b/conf/machine/include/fsl-default-providers.inc | |||
diff --git a/conf/distro/include/fsl-default-settings.inc b/conf/machine/include/fsl-default-settings.inc index b36e75a..b36e75a 100644 --- a/conf/distro/include/fsl-default-settings.inc +++ b/conf/machine/include/fsl-default-settings.inc | |||
diff --git a/conf/distro/include/fsl-default-versions.inc b/conf/machine/include/fsl-default-versions.inc index 5319f34..5319f34 100644 --- a/conf/distro/include/fsl-default-versions.inc +++ b/conf/machine/include/fsl-default-versions.inc | |||
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 1145709..4639430 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | # Provides the i.MX common settings | 1 | # Provides the i.MX common settings |
| 2 | 2 | ||
| 3 | include conf/distro/include/fsl-default-settings.inc | 3 | include conf/machine/include/fsl-default-settings.inc |
| 4 | include conf/distro/include/fsl-default-versions.inc | 4 | include conf/machine/include/fsl-default-versions.inc |
| 5 | include conf/distro/include/fsl-default-providers.inc | 5 | include conf/machine/include/fsl-default-providers.inc |
| 6 | 6 | ||
| 7 | # Disable perf features as 2.6.35.3 fail to build otherwise | 7 | # Disable perf features as 2.6.35.3 fail to build otherwise |
| 8 | PERF_FEATURES_ENABLE = "" | 8 | PERF_FEATURES_ENABLE = "" |
diff --git a/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc index c92c25e..74f839b 100644 --- a/conf/machine/include/mxs-base.inc +++ b/conf/machine/include/mxs-base.inc | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | # Provides the i.MXS common settings | 1 | # Provides the i.MXS common settings |
| 2 | 2 | ||
| 3 | include conf/distro/include/fsl-default-settings.inc | 3 | include conf/machine/include/fsl-default-settings.inc |
| 4 | include conf/distro/include/fsl-default-versions.inc | 4 | include conf/machine/include/fsl-default-versions.inc |
| 5 | include conf/distro/include/fsl-default-providers.inc | 5 | include conf/machine/include/fsl-default-providers.inc |
| 6 | 6 | ||
| 7 | include conf/machine/include/soc-family.inc | 7 | include conf/machine/include/soc-family.inc |
| 8 | include conf/machine/include/tune-arm926ejs.inc | 8 | include conf/machine/include/tune-arm926ejs.inc |