diff options
author | Daiane Angolini <daiane.angolini@freescale.com> | 2013-08-01 10:17:02 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2013-08-07 10:48:21 -0300 |
commit | f62f8ae5cce26a2df6c205e4e2118a1a2aed7cec (patch) | |
tree | 9a3b3fe84194bcda047133a69ac29a3180dd4d90 | |
parent | 51505c0154f618e5c38cc4d9220cbf3ed90caf5c (diff) | |
download | meta-fsl-arm-f62f8ae5cce26a2df6c205e4e2118a1a2aed7cec.tar.gz |
imx6sabresd-common.inc: Create file for SABRE SD common
Freescale i.MX6 SABRE SD machines have some common
configuration. This file is used in order to avoid
duplicating in all SABRE SD boards.
Replace any 'include' to 'require' to make sure an
error is launched in case the file is missing.
Change-Id: Ic50956c49a35c2e4f0af6c21e7495cce42698b56
Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
-rw-r--r-- | conf/machine/imx6dlsabresd.conf | 7 | ||||
-rw-r--r-- | conf/machine/imx6qsabresd.conf | 7 | ||||
-rw-r--r-- | conf/machine/include/imx6sabresd-common.inc | 8 |
3 files changed, 10 insertions, 12 deletions
diff --git a/conf/machine/imx6dlsabresd.conf b/conf/machine/imx6dlsabresd.conf index ff92d59..c56d0d7 100644 --- a/conf/machine/imx6dlsabresd.conf +++ b/conf/machine/imx6dlsabresd.conf | |||
@@ -3,15 +3,10 @@ | |||
3 | #@SOC: i.MX6DL | 3 | #@SOC: i.MX6DL |
4 | #@DESCRIPTION: Machine configuration for Freescale i.MX6DL SABRE Smart Device | 4 | #@DESCRIPTION: Machine configuration for Freescale i.MX6DL SABRE Smart Device |
5 | 5 | ||
6 | include conf/machine/include/imx-base.inc | 6 | require conf/machine/include/imx6sabresd-common.inc |
7 | include conf/machine/include/tune-cortexa9.inc | ||
8 | 7 | ||
9 | SOC_FAMILY = "mx6:mx6dl" | 8 | SOC_FAMILY = "mx6:mx6dl" |
10 | 9 | ||
11 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-sabresd.dts" | 10 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-sabresd.dts" |
12 | 11 | ||
13 | UBOOT_MACHINE = "mx6dlsabresd_config" | 12 | UBOOT_MACHINE = "mx6dlsabresd_config" |
14 | |||
15 | SERIAL_CONSOLE = "115200 ttymxc0" | ||
16 | |||
17 | MACHINE_FEATURES += " pci wifi bluetooth" | ||
diff --git a/conf/machine/imx6qsabresd.conf b/conf/machine/imx6qsabresd.conf index eb753ef..d5c200f 100644 --- a/conf/machine/imx6qsabresd.conf +++ b/conf/machine/imx6qsabresd.conf | |||
@@ -3,15 +3,10 @@ | |||
3 | #@SOC: i.MX6Q | 3 | #@SOC: i.MX6Q |
4 | #@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE Smart Device | 4 | #@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE Smart Device |
5 | 5 | ||
6 | include conf/machine/include/imx-base.inc | 6 | require conf/machine/include/imx6sabresd-common.inc |
7 | include conf/machine/include/tune-cortexa9.inc | ||
8 | 7 | ||
9 | SOC_FAMILY = "mx6:mx6q" | 8 | SOC_FAMILY = "mx6:mx6q" |
10 | 9 | ||
11 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabresd.dts" | 10 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabresd.dts" |
12 | 11 | ||
13 | UBOOT_MACHINE = "mx6qsabresd_config" | 12 | UBOOT_MACHINE = "mx6qsabresd_config" |
14 | |||
15 | SERIAL_CONSOLE = "115200 ttymxc0" | ||
16 | |||
17 | MACHINE_FEATURES += " pci wifi bluetooth" | ||
diff --git a/conf/machine/include/imx6sabresd-common.inc b/conf/machine/include/imx6sabresd-common.inc new file mode 100644 index 0000000..96c9714 --- /dev/null +++ b/conf/machine/include/imx6sabresd-common.inc | |||
@@ -0,0 +1,8 @@ | |||
1 | # Provides the i.MX6 SABRE SD common settings | ||
2 | |||
3 | require conf/machine/include/imx-base.inc | ||
4 | require conf/machine/include/tune-cortexa9.inc | ||
5 | |||
6 | SERIAL_CONSOLE = "115200 ttymxc0" | ||
7 | |||
8 | MACHINE_FEATURES += " pci wifi bluetooth" | ||