summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/imx6dlsabreauto.conf19
-rw-r--r--conf/machine/imx6dlsabresd.conf19
-rw-r--r--conf/machine/imx6qdlsabreauto.conf39
-rw-r--r--conf/machine/imx6qdlsabresd.conf39
-rw-r--r--conf/machine/imx6qpsabreauto.conf24
-rw-r--r--conf/machine/imx6qpsabresd.conf20
-rw-r--r--conf/machine/imx6qsabreauto.conf20
-rw-r--r--conf/machine/imx6qsabresd.conf17
-rw-r--r--conf/machine/imx6solosabreauto.conf21
-rw-r--r--conf/machine/imx6solosabresd.conf19
-rw-r--r--conf/machine/imx6sxsabreauto.conf9
-rw-r--r--conf/machine/imx6sxsabresd.conf9
-rw-r--r--conf/machine/include/imx-base.inc2
-rw-r--r--conf/machine/include/imx6sabreauto-common.inc10
-rw-r--r--conf/machine/include/imx6sabresd-common.inc10
15 files changed, 95 insertions, 182 deletions
diff --git a/conf/machine/imx6dlsabreauto.conf b/conf/machine/imx6dlsabreauto.conf
deleted file mode 100644
index 51fb7028..00000000
--- a/conf/machine/imx6dlsabreauto.conf
+++ /dev/null
@@ -1,19 +0,0 @@
1#@TYPE: Machine
2#@NAME: NXP i.MX6DL SABRE Automotive
3#@SOC: i.MX6DL
4#@DESCRIPTION: Machine configuration for NXP i.MX6DL SABRE Automotive
5#@MAINTAINER: Daiane Angolini <daiane.angolini@nxp.com>
6
7MACHINEOVERRIDES =. "mx6:mx6dl:"
8
9require conf/machine/include/imx6sabreauto-common.inc
10
11KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb \
12 imx6dl-sabreauto-flexcan1.dtb imx6dl-sabreauto-enetirq.dtb"
13
14UBOOT_CONFIG ??= "sd"
15UBOOT_CONFIG[sd] = "mx6dlsabreauto_config,sdcard"
16UBOOT_CONFIG[eimnor] = "mx6dlsabreauto_eimnor_config"
17UBOOT_CONFIG[nand] = "mx6dlsabreauto_nand_config,ubifs"
18UBOOT_CONFIG[spinor] = "mx6dlsabreauto_spinor_config"
19UBOOT_CONFIG[mfgtool] = "mx6dlsabreauto_config"
diff --git a/conf/machine/imx6dlsabresd.conf b/conf/machine/imx6dlsabresd.conf
deleted file mode 100644
index 27b8391c..00000000
--- a/conf/machine/imx6dlsabresd.conf
+++ /dev/null
@@ -1,19 +0,0 @@
1#@TYPE: Machine
2#@NAME: NXP i.MX6DL SABRE Smart Device
3#@SOC: i.MX6DL
4#@DESCRIPTION: Machine configuration for NXP i.MX6DL SABRE Smart Device
5#@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
6
7MACHINEOVERRIDES =. "mx6:mx6dl:"
8
9require conf/machine/include/imx6sabresd-common.inc
10
11KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
12 imx6dl-sabresd-enetirq.dtb imx6dl-sabresd-btwifi.dtb"
13
14UBOOT_CONFIG ??= "sd"
15UBOOT_CONFIG[sd] = "mx6dlsabresd_config,sdcard"
16UBOOT_CONFIG[epdc] = "mx6dlsabresd_epdc_config"
17UBOOT_CONFIG[mfgtool] = "mx6dlsabresd_config"
18
19MACHINE_FIRMWARE += "firmware-imx-epdc"
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
new file mode 100644
index 00000000..8967c150
--- /dev/null
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -0,0 +1,39 @@
1#@TYPE: Machine
2#@NAME: NXP i.MX6QP/Q/DL SABRE Automotive
3#@SOC: i.MX6QP/Q/DL
4#@DESCRIPTION: Machine configuration for NXP i.MX6QP/Q/DL SABRE Automotive
5#@MAINTAINER: Daiane Angolini <daiane.angolini@nxp.com>
6#
7# This machine replaces the following machines:
8# * imx6qpsabreauto
9# * imx6qsabreauto
10# * imx6dlsabreauto
11# * imx6solosabreauto
12# and is able to work for all the machines.
13
14MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:"
15
16require conf/machine/include/imx-base.inc
17require conf/machine/include/tune-cortexa9.inc
18
19KERNEL_DEVICETREE = " \
20 imx6qp-sabreauto.dtb imx6qp-sabreauto-ecspi.dtb imx6qp-sabreauto-flexcan1.dtb \
21 imx6qp-sabreauto-gpmi-weim.dtb \
22 \
23 imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb imx6q-sabreauto-ecspi.dtb \
24 imx6q-sabreauto-flexcan1.dtb imx6q-sabreauto-enetirq.dtb \
25 \
26 imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb \
27 imx6dl-sabreauto-flexcan1.dtb imx6dl-sabreauto-enetirq.dtb \
28"
29
30UBOOT_MACHINE ?= "mx6sabreauto_defconfig"
31UBOOT_MAKE_TARGET = "all"
32UBOOT_SUFFIX = "img"
33SPL_BINARY = "SPL"
34
35SERIAL_CONSOLE = "115200 ttymxc3"
36
37MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
38
39MACHINE_FEATURES += " pci wifi bluetooth"
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
new file mode 100644
index 00000000..92c92884
--- /dev/null
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -0,0 +1,39 @@
1#@TYPE: Machine
2#@NAME: NXP i.MX6QP/Q/DL SABRE Smart Device
3#@SOC: i.MX6QP/Q/DL
4#@DESCRIPTION: Machine configuration for NXP i.MX6QP/Q/DL SABRE Smart Device
5#@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
6#
7# This machine replaces the following machines:
8# * imx6qpsabresd
9# * imx6qsabresd
10# * imx6dlsabresd
11# * imx6solosabresd
12# and is able to work for all the machines.
13
14MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:"
15
16require conf/machine/include/imx-base.inc
17require conf/machine/include/tune-cortexa9.inc
18
19KERNEL_DEVICETREE = " \
20 imx6qp-sabresd.dtb imx6qp-sabresd-btwifi.dtb imx6qp-sabresd-hdcp.dtb \
21 imx6qp-sabresd-ldo.dtb imx6qp-sabresd-ldo-pcie-cert.dtb \
22 \
23 imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \
24 imx6q-sabresd-enetirq.dtb imx6q-sabresd-btwifi.dtb \
25 \
26 imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
27 imx6dl-sabresd-enetirq.dtb imx6dl-sabresd-btwifi.dtb \
28"
29
30UBOOT_MACHINE ?= "mx6sabresd_defconfig"
31UBOOT_MAKE_TARGET = "all"
32UBOOT_SUFFIX = "img"
33SPL_BINARY = "SPL"
34
35SERIAL_CONSOLE = "115200 ttymxc0"
36
37MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
38
39MACHINE_FEATURES += " pci wifi bluetooth"
diff --git a/conf/machine/imx6qpsabreauto.conf b/conf/machine/imx6qpsabreauto.conf
deleted file mode 100644
index 505d341c..00000000
--- a/conf/machine/imx6qpsabreauto.conf
+++ /dev/null
@@ -1,24 +0,0 @@
1#@TYPE: Machine
2#@NAME: NXP i.MX6Q Plus SABRE Automotive
3#@SOC: i.MX6QP
4#@DESCRIPTION: Machine configuration for NXP i.MX6QP SABRE Automotive
5#@MAINTAINER: Lauren Post <lauren.post@nxp.com>
6
7MACHINEOVERRIDES =. "mx6:mx6q:"
8
9require conf/machine/include/imx6sabreauto-common.inc
10
11KERNEL_DEVICETREE = "imx6qp-sabreauto.dtb imx6qp-sabreauto-ecspi.dtb imx6qp-sabreauto-flexcan1.dtb \
12 imx6qp-sabreauto-gpmi-weim.dtb"
13
14PREFERRED_PROVIDER_u-boot = "u-boot-imx"
15PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
16PREFERRED_PROVIDER_virtual/kernel = "linux-imx"
17
18UBOOT_CONFIG ??= "sd"
19UBOOT_CONFIG[sd] = "mx6qpsabreauto_config,sdcard"
20UBOOT_CONFIG[eimnor] = "mx6qpsabreauto_eimnor_config"
21UBOOT_CONFIG[nand] = "mx6qpsabreauto_nand_config,ubifs"
22UBOOT_CONFIG[spinor] = "mx6qpsabreauto_spinor_config"
23UBOOT_CONFIG[sata] = "mx6qpsabreauto_sata_config"
24UBOOT_CONFIG[mfgtool] = "mx6qpsabreauto_config"
diff --git a/conf/machine/imx6qpsabresd.conf b/conf/machine/imx6qpsabresd.conf
deleted file mode 100644
index 369d5b7d..00000000
--- a/conf/machine/imx6qpsabresd.conf
+++ /dev/null
@@ -1,20 +0,0 @@
1#@TYPE: Machine
2#@NAME: NXP i.MX6Q Plus SABRE Smart Device
3#@SOC: i.MX6QP
4#@DESCRIPTION: Machine configuration for NXP i.MX6QP SABRE Smart Device
5#@MAINTAINER: Lauren Post <lauren.post@nxp.com>
6
7MACHINEOVERRIDES =. "mx6:mx6q:"
8
9require conf/machine/include/imx6sabresd-common.inc
10
11KERNEL_DEVICETREE = "imx6qp-sabresd.dtb imx6qp-sabresd-btwifi.dtb imx6qp-sabresd-hdcp.dtb \
12 imx6qp-sabresd-ldo.dtb imx6qp-sabresd-ldo-pcie-cert.dtb"
13
14PREFERRED_PROVIDER_u-boot = "u-boot-imx"
15PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
16
17UBOOT_CONFIG ??= "sd"
18UBOOT_CONFIG[sd] = "mx6qpsabresd_config,sdcard"
19UBOOT_CONFIG[sata] = "mx6qpsabresd_sata_config"
20UBOOT_CONFIG[mfgtool] = "mx6qpsabresd_config"
diff --git a/conf/machine/imx6qsabreauto.conf b/conf/machine/imx6qsabreauto.conf
deleted file mode 100644
index e419c5d4..00000000
--- a/conf/machine/imx6qsabreauto.conf
+++ /dev/null
@@ -1,20 +0,0 @@
1#@TYPE: Machine
2#@NAME: NXP i.MX6Q SABRE Automotive
3#@SOC: i.MX6Q
4#@DESCRIPTION: Machine configuration for NXP i.MX6Q SABRE Automotive
5#@MAINTAINER: Daiane Angolini <daiane.angolini@nxp.com>
6
7MACHINEOVERRIDES =. "mx6:mx6q:"
8
9require conf/machine/include/imx6sabreauto-common.inc
10
11KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb imx6q-sabreauto-ecspi.dtb \
12 imx6q-sabreauto-flexcan1.dtb imx6q-sabreauto-enetirq.dtb"
13
14UBOOT_CONFIG ??= "sd"
15UBOOT_CONFIG[sd] = "mx6qsabreauto_config,sdcard"
16UBOOT_CONFIG[eimnor] = "mx6qsabreauto_eimnor_config"
17UBOOT_CONFIG[nand] = "mx6qsabreauto_nand_config,ubifs"
18UBOOT_CONFIG[spinor] = "mx6qsabreauto_spinor_config"
19UBOOT_CONFIG[sata] = "mx6qsabreauto_sata_config"
20UBOOT_CONFIG[mfgtool] = "mx6qsabreauto_config"
diff --git a/conf/machine/imx6qsabresd.conf b/conf/machine/imx6qsabresd.conf
deleted file mode 100644
index ea9119a9..00000000
--- a/conf/machine/imx6qsabresd.conf
+++ /dev/null
@@ -1,17 +0,0 @@
1#@TYPE: Machine
2#@NAME: NXP i.MX6Q SABRE Smart Device
3#@SOC: i.MX6Q
4#@DESCRIPTION: Machine configuration for NXP i.MX6Q SABRE Smart Device
5#@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
6
7MACHINEOVERRIDES =. "mx6:mx6q:"
8
9require conf/machine/include/imx6sabresd-common.inc
10
11KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \
12 imx6q-sabresd-enetirq.dtb imx6q-sabresd-btwifi.dtb"
13
14UBOOT_CONFIG ??= "sd"
15UBOOT_CONFIG[sd] = "mx6qsabresd_config,sdcard"
16UBOOT_CONFIG[sata] = "mx6qsabresd_sata_config"
17UBOOT_CONFIG[mfgtool] = "mx6qsabresd_config"
diff --git a/conf/machine/imx6solosabreauto.conf b/conf/machine/imx6solosabreauto.conf
deleted file mode 100644
index 09997c33..00000000
--- a/conf/machine/imx6solosabreauto.conf
+++ /dev/null
@@ -1,21 +0,0 @@
1#@TYPE: Machine
2#@NAME: NXP i.MX6Solo SABRE Automotive
3#@SOC: i.MX6S
4#@DESCRIPTION: Machine configuration for NXP i.MX6Solo SABRE Automotive
5
6MACHINEOVERRIDES =. "mx6:mx6dl:"
7
8require conf/machine/include/imx6sabresd-common.inc
9
10KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb"
11
12PREFERRED_PROVIDER_u-boot = "u-boot-imx"
13PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
14KERNEL_IMAGETYPE = "zImage"
15
16UBOOT_CONFIG ??= "sd"
17UBOOT_CONFIG[sd] = "mx6solosabreauto_config,sdcard"
18UBOOT_CONFIG[eimnor] = "mx6solosabreauto_eimnor_config"
19UBOOT_CONFIG[nand] = "mx6solosabreauto_nand_config,ubifs"
20UBOOT_CONFIG[spinor] = "mx6solosabreauto_spinor_config"
21UBOOT_CONFIG[mfgtool] = "mx6solosabreauto_config"
diff --git a/conf/machine/imx6solosabresd.conf b/conf/machine/imx6solosabresd.conf
deleted file mode 100644
index 65155bcc..00000000
--- a/conf/machine/imx6solosabresd.conf
+++ /dev/null
@@ -1,19 +0,0 @@
1#@TYPE: Machine
2#@NAME: NXP i.MX6Solo SABRE Smart Device
3#@SOC: i.MX6S
4#@DESCRIPTION: Machine configuration for NXP i.MX6Solo SABRE Smart Device
5#@MAINTAINER: Otavio Salvador <otavio@ossystems.com.br>
6
7MACHINEOVERRIDES =. "mx6:mx6dl:"
8
9require conf/machine/include/imx6sabresd-common.inc
10
11KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb"
12
13PREFERRED_PROVIDER_u-boot = "u-boot-imx"
14PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
15KERNEL_IMAGETYPE = "zImage"
16
17UBOOT_CONFIG ??= "sd"
18UBOOT_CONFIG[sd] = "mx6solosabresd_config,sdcard"
19UBOOT_CONFIG[mfgtool] = "mx6solosabresd_config"
diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
index b3bae2a4..19a8d9f8 100644
--- a/conf/machine/imx6sxsabreauto.conf
+++ b/conf/machine/imx6sxsabreauto.conf
@@ -6,7 +6,8 @@
6 6
7MACHINEOVERRIDES =. "mx6:mx6sx:" 7MACHINEOVERRIDES =. "mx6:mx6sx:"
8 8
9require conf/machine/include/imx6sabreauto-common.inc 9require conf/machine/include/imx-base.inc
10require conf/machine/include/tune-cortexa9.inc
10 11
11KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb imx6sx-sabreauto-m4.dtb" 12KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb imx6sx-sabreauto-m4.dtb"
12 13
@@ -18,3 +19,9 @@ UBOOT_CONFIG[sd] = "mx6sxsabreauto_config,sdcard"
18UBOOT_CONFIG[qspi1] = "mx6sxsabreauto_qspi1_config" 19UBOOT_CONFIG[qspi1] = "mx6sxsabreauto_qspi1_config"
19UBOOT_CONFIG[nand] = "mx6sxsabreauto_nand_config,ubifs" 20UBOOT_CONFIG[nand] = "mx6sxsabreauto_nand_config,ubifs"
20UBOOT_CONFIG[mfgtool] = "mx6sxsabreauto_config" 21UBOOT_CONFIG[mfgtool] = "mx6sxsabreauto_config"
22
23SERIAL_CONSOLE = "115200 ttymxc3"
24
25MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
26
27MACHINE_FEATURES += " pci wifi bluetooth"
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index d702bed7..f7946361 100644
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -6,7 +6,8 @@
6 6
7MACHINEOVERRIDES =. "mx6:mx6sx:" 7MACHINEOVERRIDES =. "mx6:mx6sx:"
8 8
9require conf/machine/include/imx6sabresd-common.inc 9require conf/machine/include/imx-base.inc
10require conf/machine/include/tune-cortexa9.inc
10 11
11KERNEL_DEVICETREE = "imx6sx-sdb.dtb imx6sx-sdb-emmc.dtb imx6sx-sdb-m4.dtb \ 12KERNEL_DEVICETREE = "imx6sx-sdb.dtb imx6sx-sdb-emmc.dtb imx6sx-sdb-m4.dtb \
12 imx6sx-sdb-sai.dtb imx6sx-sdb-lcdif1.dtb imx6sx-sdb-ldo.dtb \ 13 imx6sx-sdb-sai.dtb imx6sx-sdb-lcdif1.dtb imx6sx-sdb-ldo.dtb \
@@ -19,3 +20,9 @@ UBOOT_CONFIG[emmc] = "mx6sxsabresd_emmc_config,sdcard"
19UBOOT_CONFIG[qspi2] = "mx6sxsabresd_qspi2_config" 20UBOOT_CONFIG[qspi2] = "mx6sxsabresd_qspi2_config"
20UBOOT_CONFIG[m4fastup] = "mx6sxsabresd_m4fastup_config" 21UBOOT_CONFIG[m4fastup] = "mx6sxsabresd_m4fastup_config"
21UBOOT_CONFIG[mfgtool] = "mx6sxsabresd_config" 22UBOOT_CONFIG[mfgtool] = "mx6sxsabresd_config"
23
24SERIAL_CONSOLE = "115200 ttymxc0"
25
26MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
27
28MACHINE_FEATURES += " pci wifi bluetooth"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 6c7e494e..6c54d232 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -93,7 +93,7 @@ MACHINE_SOCARCH_SUFFIX_use-mainline-bsp = "-imx"
93MACHINE_ARCH_FILTER = "virtual/kernel" 93MACHINE_ARCH_FILTER = "virtual/kernel"
94MACHINE_SOCARCH_FILTER_append_imx = " alsa-lib" 94MACHINE_SOCARCH_FILTER_append_imx = " alsa-lib"
95MACHINE_SOCARCH_FILTER_append_imxvpu = " imx-vpu libimxvpuapi imx-codec imx-vpuwrap imx-parser" 95MACHINE_SOCARCH_FILTER_append_imxvpu = " imx-vpu libimxvpuapi imx-codec imx-vpuwrap imx-parser"
96MACHINE_SOCARCH_FILTER_append_imxgpu2d = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d cairo pango weston" 96MACHINE_SOCARCH_FILTER_append_imxgpu2d = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d cairo pango weston gstreamer1.0-plugins-bad"
97MACHINE_SOCARCH_FILTER_append_imxpxp = " imx-codec imx-parser" 97MACHINE_SOCARCH_FILTER_append_imxpxp = " imx-codec imx-parser"
98MACHINE_SOCARCH_FILTER_append_use-mainline-bsp = " \ 98MACHINE_SOCARCH_FILTER_append_use-mainline-bsp = " \
99 qtbase \ 99 qtbase \
diff --git a/conf/machine/include/imx6sabreauto-common.inc b/conf/machine/include/imx6sabreauto-common.inc
deleted file mode 100644
index b4f37b3c..00000000
--- a/conf/machine/include/imx6sabreauto-common.inc
+++ /dev/null
@@ -1,10 +0,0 @@
1# Provides the i.MX6 SABRE AUTO common settings
2
3require conf/machine/include/imx-base.inc
4require conf/machine/include/tune-cortexa9.inc
5
6SERIAL_CONSOLE = "115200 ttymxc3"
7
8MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
9
10MACHINE_FEATURES += " pci wifi bluetooth"
diff --git a/conf/machine/include/imx6sabresd-common.inc b/conf/machine/include/imx6sabresd-common.inc
deleted file mode 100644
index 40e3cde6..00000000
--- a/conf/machine/include/imx6sabresd-common.inc
+++ /dev/null
@@ -1,10 +0,0 @@
1# Provides the i.MX6 SABRE SD common settings
2
3require conf/machine/include/imx-base.inc
4require conf/machine/include/tune-cortexa9.inc
5
6SERIAL_CONSOLE = "115200 ttymxc0"
7
8MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
9
10MACHINE_FEATURES += " pci wifi bluetooth"