Why not rename machine file to imx6sabresd and imx6sabreauto, once these machine are for solo, dual, quad and quad plus, or "qdl" doesn't mean that the machine configuration is only for quad and dual?

Fabio Berton

On 07/12/2017 09:15 AM, Otavio Salvador wrote:
This release provides a huge improvement regarding the support for SPL
to more boards.

We now uses this and migrated following boards:

  - imx6qpsabresd -> imx6qdlsabresd
  - imx6qsabresd -> imx6qdlsabresd
  - imx6dlsabresd -> imx6qdlsabresd
  - imx6solosabresd -> imx6qdlsabresd
  - imx6qpsabreauto -> imx6qdlsabreauto
  - imx6qsabreauto -> imx6qdlsabreauto
  - imx6dlsabreauto -> imx6qdlsabreauto
  - imx6solosabreauto -> imx6qdlsabreauto

So now, the 8 boards are covered by 2 machine files. This drastically
reduces the build time and allow for a better user experience as we
can use the same image to test different boards.

In summary an image built for imx6qdlsabresd or imx6qdlsabreauto is
capable of run on a its respective board which contains a i.MX6
QuadPlus, Quad, Dual, DualLite or Solo SoC removing the need of a
specific image for each SoC type.

On top of the official 2017.07 release, following patches are
included:

8ccb1970b8 wandboard: Set fdt based on board_rev and board_name
e6605743e5 mx6sabresd: Enable video interfaces in bootargs
e50a2475d4 mx6sabresd: Use LDO dtb file until LDO bypass support is added
b1a4715311 mx6slevk: Use LDO dtb file until LDO bypass support is added
957409876b imx: cx9020: try pxe boot, if no vmlinuz on mmc
3608315bf1 imx: cx9020: use fdt_addr_r and ramdisk_addr_r
9a1c960516 mx6sabreauto: Add Falcon mode support
3a279e5fe8 warp: Use PARTUUID to specify the rootfs location
0f9a6703e7 embestmx6boards: Use PARTUUID to specify the rootfs location
c877510614 mx6cuboxi: Use PARTUUID to specify the rootfs location
0ada2d6caf wandboard: Use PARTUUID to specify the rootfs location
eee442362c mx6sabre: Use PARTUUID to specify the rootfs location
80a56615fa mx6sabreauto: Do not enable WEIM by default
321339efd7 imx: reorganize IMX code as other SOCs
1567ce3edc mmc: fsl_esdhc: drop CONFIG_SYS_FSL_ESDHC_FORCE_VSELECT
40294f880d dm: mmc: fsl_esdhc: handle vqmmc supply
0378edcd02 mmc: fsl_esdhc: introduce vs18_enable for 1.8V fix I/O
3657cae890 mmc: fsl_esdhc: correct type of wp_enable
45103e1030 imx6_spl: Add u-boot-dtb.img for SPL payload
61131fa4b5 mx6sabreauto: Update to SPL only mode
07a667be9b mx6qsabreauto: Add SPL support
4506c859ee mx6cuboxi: Add support for sata
a5c5962327 mx7dsabresd: Set VLD04 output to 2.8V in PMIC initialization.
4590f11b61 mx6: soc: Move mxs_dma_init() into the mxs nand driver
10d185960e net: fec_mxc: fix PHY initialization bug with CONFIG_DM_ETH
b2d4bf303e icorem6_rqs: Rename icorem6_rqs config file
af34708e1e dt-bindings: Document the Broadcom STB wake-up timer node
3e92667cfe serial: mxc: Add debug uart support
4e2b31a5c5 serial: mxc: Code cleanup
27835dae1a serial: mxc: Move common baud gen into _mxc_serial_setbrg
1ca9fe11fd serial: mxc: Move common init into _mxc_serial_init
14ac9d06be serial: mxc: Move cr1 and cr2 write to mxc_serial_setbrg
fdd1f0debc serial: mxc: Use RFDIV in dm-code
fd008b0569 serial: mxc: Add common mxc_uart reg space
2fd7878124 imx: mx6ull: fix USB bmode for i.MX 6UL and 6ULL
5c72de6152 ot1200: enable CONFIG_IMX_THERMAL for detailed thermal information
8e38f54c56 mx6sabresd: Fix guard file symbol
3320a872b0 wandboard: Remove unnecessary delay
d5ae3ce6dd cm_fx6: Remove SPL entry from CONFIG_SYS_EXTRA_OPTIONS
1325b822da cgtqmx6eval: Remove SPL entry from CONFIG_SYS_EXTRA_OPTIONS
844365a5a0 mx6slevk_spl: Remove SPL entry from CONFIG_SYS_EXTRA_OPTIONS
ff9e6d62ed mx6sabresd: Remove SPL entry from CONFIG_SYS_EXTRA_OPTIONS

Signed-off-by: Otavio Salvador <ota...@ossystems.com.br>
Acked-by: Daiane Angolini <daiane.angol...@nxp.com>
---

Changes in v6:
- cherry-pick patches from i.MX tree

Changes in v5:
- add comment inside machine file so users can find old machine
   reference (Daiane)

Changes in v4:
- replace warp patch with the PARTUUID from Fabio Estevam

Changes in v3:
- add mx6sabre: Use PARTUUID to specify the rootfs location
- add mx6sabreauto: Do not enable WEIM by default
- improve machine description to mention QP support as  well (Daiane)
- improve commit log to make it clear that same image can be used
   across different boards (Daiane)

Changes in v2:
- include fslc specific patches
- fix typo on commit log (Fabio Estevam)
- improve log to mention specific patches

  conf/machine/imx6dlsabreauto.conf                  | 19 -----------
  conf/machine/imx6dlsabresd.conf                    | 19 -----------
  conf/machine/imx6qdlsabreauto.conf                 | 39 ++++++++++++++++++++++
  conf/machine/imx6qdlsabresd.conf                   | 39 ++++++++++++++++++++++
  conf/machine/imx6qpsabreauto.conf                  | 24 -------------
  conf/machine/imx6qpsabresd.conf                    | 20 -----------
  conf/machine/imx6qsabreauto.conf                   | 20 -----------
  conf/machine/imx6qsabresd.conf                     | 17 ----------
  conf/machine/imx6solosabreauto.conf                | 21 ------------
  conf/machine/imx6solosabresd.conf                  | 19 -----------
  conf/machine/imx6sxsabreauto.conf                  |  9 ++++-
  conf/machine/imx6sxsabresd.conf                    |  9 ++++-
  conf/machine/include/imx6sabreauto-common.inc      | 10 ------
  conf/machine/include/imx6sabresd-common.inc        | 10 ------
  ...t_2016.09.bb => u-boot-fslc-mxsboot_2017.07.bb} |  6 ++--
  recipes-bsp/u-boot/u-boot-fslc_2017.03.bb          |  6 ----
  recipes-bsp/u-boot/u-boot-fslc_2017.07.bb          |  6 ++++
  17 files changed, 103 insertions(+), 190 deletions(-)
  delete mode 100644 conf/machine/imx6dlsabreauto.conf
  delete mode 100644 conf/machine/imx6dlsabresd.conf
  create mode 100644 conf/machine/imx6qdlsabreauto.conf
  create mode 100644 conf/machine/imx6qdlsabresd.conf
  delete mode 100644 conf/machine/imx6qpsabreauto.conf
  delete mode 100644 conf/machine/imx6qpsabresd.conf
  delete mode 100644 conf/machine/imx6qsabreauto.conf
  delete mode 100644 conf/machine/imx6qsabresd.conf
  delete mode 100644 conf/machine/imx6solosabreauto.conf
  delete mode 100644 conf/machine/imx6solosabresd.conf
  delete mode 100644 conf/machine/include/imx6sabreauto-common.inc
  delete mode 100644 conf/machine/include/imx6sabresd-common.inc
  rename recipes-bsp/u-boot/{u-boot-fslc-mxsboot_2016.09.bb => 
u-boot-fslc-mxsboot_2017.07.bb} (87%)
  delete mode 100644 recipes-bsp/u-boot/u-boot-fslc_2017.03.bb
  create mode 100644 recipes-bsp/u-boot/u-boot-fslc_2017.07.bb

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 @@
-#@TYPE: Machine
-#@NAME: NXP i.MX6DL SABRE Automotive
-#@SOC: i.MX6DL
-#@DESCRIPTION: Machine configuration for NXP i.MX6DL SABRE Automotive
-#@MAINTAINER: Daiane Angolini <daiane.angol...@nxp.com>
-
-MACHINEOVERRIDES =. "mx6:mx6dl:"
-
-require conf/machine/include/imx6sabreauto-common.inc
-
-KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb 
imx6dl-sabreauto-ecspi.dtb \
-                     imx6dl-sabreauto-flexcan1.dtb 
imx6dl-sabreauto-enetirq.dtb"
-
-UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "mx6dlsabreauto_config,sdcard"
-UBOOT_CONFIG[eimnor] = "mx6dlsabreauto_eimnor_config"
-UBOOT_CONFIG[nand] = "mx6dlsabreauto_nand_config,ubifs"
-UBOOT_CONFIG[spinor] = "mx6dlsabreauto_spinor_config"
-UBOOT_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 @@
-#@TYPE: Machine
-#@NAME: NXP i.MX6DL SABRE Smart Device
-#@SOC: i.MX6DL
-#@DESCRIPTION: Machine configuration for NXP i.MX6DL SABRE Smart Device
-#@MAINTAINER: Otavio Salvador <ota...@ossystems.com.br>
-
-MACHINEOVERRIDES =. "mx6:mx6dl:"
-
-require conf/machine/include/imx6sabresd-common.inc
-
-KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb 
imx6dl-sabresd-hdcp.dtb \
-                     imx6dl-sabresd-enetirq.dtb imx6dl-sabresd-btwifi.dtb"
-
-UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "mx6dlsabresd_config,sdcard"
-UBOOT_CONFIG[epdc] = "mx6dlsabresd_epdc_config"
-UBOOT_CONFIG[mfgtool] = "mx6dlsabresd_config"
-
-MACHINE_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 @@
+#@TYPE: Machine
+#@NAME: NXP i.MX6QP/Q/DL SABRE Automotive
+#@SOC: i.MX6QP/Q/DL
+#@DESCRIPTION: Machine configuration for NXP i.MX6QP/Q/DL SABRE Automotive
+#@MAINTAINER: Daiane Angolini <daiane.angol...@nxp.com>
+#
+# This machine replaces the following machines:
+#    * imx6qpsabreauto
+#    * imx6qsabreauto
+#    * imx6dlsabreauto
+#    * imx6solosabreauto
+# and is able to work for all the machines.
+
+MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:"
+
+require conf/machine/include/imx-base.inc
+require conf/machine/include/tune-cortexa9.inc
+
+KERNEL_DEVICETREE = " \
+    imx6qp-sabreauto.dtb imx6qp-sabreauto-ecspi.dtb 
imx6qp-sabreauto-flexcan1.dtb \
+    imx6qp-sabreauto-gpmi-weim.dtb \
+    \
+    imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb 
imx6q-sabreauto-ecspi.dtb \
+    imx6q-sabreauto-flexcan1.dtb imx6q-sabreauto-enetirq.dtb \
+    \
+    imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb 
imx6dl-sabreauto-ecspi.dtb \
+    imx6dl-sabreauto-flexcan1.dtb imx6dl-sabreauto-enetirq.dtb \
+"
+
+UBOOT_MACHINE ?= "mx6sabreauto_defconfig"
+UBOOT_MAKE_TARGET = "all"
+UBOOT_SUFFIX = "img"
+SPL_BINARY = "SPL"
+
+SERIAL_CONSOLE = "115200 ttymxc3"
+
+MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
+
+MACHINE_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 @@
+#@TYPE: Machine
+#@NAME: NXP i.MX6QP/Q/DL SABRE Smart Device
+#@SOC: i.MX6QP/Q/DL
+#@DESCRIPTION: Machine configuration for NXP i.MX6QP/Q/DL SABRE Smart Device
+#@MAINTAINER: Otavio Salvador <ota...@ossystems.com.br>
+#
+# This machine replaces the following machines:
+#    * imx6qpsabresd
+#    * imx6qsabresd
+#    * imx6dlsabresd
+#    * imx6solosabresd
+# and is able to work for all the machines.
+
+MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:"
+
+require conf/machine/include/imx-base.inc
+require conf/machine/include/tune-cortexa9.inc
+
+KERNEL_DEVICETREE = " \
+    imx6qp-sabresd.dtb imx6qp-sabresd-btwifi.dtb imx6qp-sabresd-hdcp.dtb \
+    imx6qp-sabresd-ldo.dtb imx6qp-sabresd-ldo-pcie-cert.dtb \
+    \
+    imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \
+    imx6q-sabresd-enetirq.dtb imx6q-sabresd-btwifi.dtb \
+    \
+    imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
+    imx6dl-sabresd-enetirq.dtb imx6dl-sabresd-btwifi.dtb \
+"
+
+UBOOT_MACHINE ?= "mx6sabresd_defconfig"
+UBOOT_MAKE_TARGET = "all"
+UBOOT_SUFFIX = "img"
+SPL_BINARY = "SPL"
+
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
+
+MACHINE_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 @@
-#@TYPE: Machine
-#@NAME: NXP i.MX6Q Plus SABRE Automotive
-#@SOC: i.MX6QP
-#@DESCRIPTION: Machine configuration for NXP i.MX6QP SABRE Automotive
-#@MAINTAINER: Lauren Post <lauren.p...@nxp.com>
-
-MACHINEOVERRIDES =. "mx6:mx6q:"
-
-require conf/machine/include/imx6sabreauto-common.inc
-
-KERNEL_DEVICETREE = "imx6qp-sabreauto.dtb imx6qp-sabreauto-ecspi.dtb 
imx6qp-sabreauto-flexcan1.dtb \
-                     imx6qp-sabreauto-gpmi-weim.dtb"
-
-PREFERRED_PROVIDER_u-boot = "u-boot-imx"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
-PREFERRED_PROVIDER_virtual/kernel = "linux-imx"
-
-UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "mx6qpsabreauto_config,sdcard"
-UBOOT_CONFIG[eimnor] = "mx6qpsabreauto_eimnor_config"
-UBOOT_CONFIG[nand] = "mx6qpsabreauto_nand_config,ubifs"
-UBOOT_CONFIG[spinor] = "mx6qpsabreauto_spinor_config"
-UBOOT_CONFIG[sata] = "mx6qpsabreauto_sata_config"
-UBOOT_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 @@
-#@TYPE: Machine
-#@NAME: NXP i.MX6Q Plus SABRE Smart Device
-#@SOC: i.MX6QP
-#@DESCRIPTION: Machine configuration for NXP i.MX6QP SABRE Smart Device
-#@MAINTAINER: Lauren Post <lauren.p...@nxp.com>
-
-MACHINEOVERRIDES =. "mx6:mx6q:"
-
-require conf/machine/include/imx6sabresd-common.inc
-
-KERNEL_DEVICETREE = "imx6qp-sabresd.dtb imx6qp-sabresd-btwifi.dtb 
imx6qp-sabresd-hdcp.dtb \
-                     imx6qp-sabresd-ldo.dtb imx6qp-sabresd-ldo-pcie-cert.dtb"
-
-PREFERRED_PROVIDER_u-boot = "u-boot-imx"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
-
-UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "mx6qpsabresd_config,sdcard"
-UBOOT_CONFIG[sata] = "mx6qpsabresd_sata_config"
-UBOOT_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 @@
-#@TYPE: Machine
-#@NAME: NXP i.MX6Q SABRE Automotive
-#@SOC: i.MX6Q
-#@DESCRIPTION: Machine configuration for NXP i.MX6Q SABRE Automotive
-#@MAINTAINER: Daiane Angolini <daiane.angol...@nxp.com>
-
-MACHINEOVERRIDES =. "mx6:mx6q:"
-
-require conf/machine/include/imx6sabreauto-common.inc
-
-KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb 
imx6q-sabreauto-ecspi.dtb \
-                     imx6q-sabreauto-flexcan1.dtb imx6q-sabreauto-enetirq.dtb"
-
-UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "mx6qsabreauto_config,sdcard"
-UBOOT_CONFIG[eimnor] = "mx6qsabreauto_eimnor_config"
-UBOOT_CONFIG[nand] = "mx6qsabreauto_nand_config,ubifs"
-UBOOT_CONFIG[spinor] = "mx6qsabreauto_spinor_config"
-UBOOT_CONFIG[sata] = "mx6qsabreauto_sata_config"
-UBOOT_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 @@
-#@TYPE: Machine
-#@NAME: NXP i.MX6Q SABRE Smart Device
-#@SOC: i.MX6Q
-#@DESCRIPTION: Machine configuration for NXP i.MX6Q SABRE Smart Device
-#@MAINTAINER: Otavio Salvador <ota...@ossystems.com.br>
-
-MACHINEOVERRIDES =. "mx6:mx6q:"
-
-require conf/machine/include/imx6sabresd-common.inc
-
-KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb 
imx6q-sabresd-hdcp.dtb \
-                     imx6q-sabresd-enetirq.dtb imx6q-sabresd-btwifi.dtb"
-
-UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "mx6qsabresd_config,sdcard"
-UBOOT_CONFIG[sata] = "mx6qsabresd_sata_config"
-UBOOT_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 @@
-#@TYPE: Machine
-#@NAME: NXP i.MX6Solo SABRE Automotive
-#@SOC: i.MX6S
-#@DESCRIPTION: Machine configuration for NXP i.MX6Solo SABRE Automotive
-
-MACHINEOVERRIDES =. "mx6:mx6dl:"
-
-require conf/machine/include/imx6sabresd-common.inc
-
-KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb"
-
-PREFERRED_PROVIDER_u-boot = "u-boot-imx"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
-KERNEL_IMAGETYPE = "zImage"
-
-UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "mx6solosabreauto_config,sdcard"
-UBOOT_CONFIG[eimnor] = "mx6solosabreauto_eimnor_config"
-UBOOT_CONFIG[nand] = "mx6solosabreauto_nand_config,ubifs"
-UBOOT_CONFIG[spinor] = "mx6solosabreauto_spinor_config"
-UBOOT_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 @@
-#@TYPE: Machine
-#@NAME: NXP i.MX6Solo SABRE Smart Device
-#@SOC: i.MX6S
-#@DESCRIPTION: Machine configuration for NXP i.MX6Solo SABRE Smart Device
-#@MAINTAINER: Otavio Salvador <ota...@ossystems.com.br>
-
-MACHINEOVERRIDES =. "mx6:mx6dl:"
-
-require conf/machine/include/imx6sabresd-common.inc
-
-KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb"
-
-PREFERRED_PROVIDER_u-boot = "u-boot-imx"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
-KERNEL_IMAGETYPE = "zImage"
-
-UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "mx6solosabresd_config,sdcard"
-UBOOT_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 @@
MACHINEOVERRIDES =. "mx6:mx6sx:" -require conf/machine/include/imx6sabreauto-common.inc
+require conf/machine/include/imx-base.inc
+require conf/machine/include/tune-cortexa9.inc
KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb imx6sx-sabreauto-m4.dtb" @@ -18,3 +19,9 @@ UBOOT_CONFIG[sd] = "mx6sxsabreauto_config,sdcard"
  UBOOT_CONFIG[qspi1] = "mx6sxsabreauto_qspi1_config"
  UBOOT_CONFIG[nand] = "mx6sxsabreauto_nand_config,ubifs"
  UBOOT_CONFIG[mfgtool] = "mx6sxsabreauto_config"
+
+SERIAL_CONSOLE = "115200 ttymxc3"
+
+MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
+
+MACHINE_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 @@
MACHINEOVERRIDES =. "mx6:mx6sx:" -require conf/machine/include/imx6sabresd-common.inc
+require conf/machine/include/imx-base.inc
+require conf/machine/include/tune-cortexa9.inc
KERNEL_DEVICETREE = "imx6sx-sdb.dtb imx6sx-sdb-emmc.dtb imx6sx-sdb-m4.dtb \
                       imx6sx-sdb-sai.dtb imx6sx-sdb-lcdif1.dtb 
imx6sx-sdb-ldo.dtb \
@@ -19,3 +20,9 @@ UBOOT_CONFIG[emmc] = "mx6sxsabresd_emmc_config,sdcard"
  UBOOT_CONFIG[qspi2] = "mx6sxsabresd_qspi2_config"
  UBOOT_CONFIG[m4fastup] = "mx6sxsabresd_m4fastup_config"
  UBOOT_CONFIG[mfgtool] = "mx6sxsabresd_config"
+
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
+
+MACHINE_FEATURES += " pci wifi bluetooth"
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 @@
-# Provides the i.MX6 SABRE AUTO common settings
-
-require conf/machine/include/imx-base.inc
-require conf/machine/include/tune-cortexa9.inc
-
-SERIAL_CONSOLE = "115200 ttymxc3"
-
-MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
-
-MACHINE_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 @@
-# Provides the i.MX6 SABRE SD common settings
-
-require conf/machine/include/imx-base.inc
-require conf/machine/include/tune-cortexa9.inc
-
-SERIAL_CONSOLE = "115200 ttymxc0"
-
-MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
-
-MACHINE_FEATURES += " pci wifi bluetooth"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.09.bb 
b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2017.07.bb
similarity index 87%
rename from recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.09.bb
rename to recipes-bsp/u-boot/u-boot-fslc-mxsboot_2017.07.bb
index 86a6abf2..2c6a1332 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.09.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2017.07.bb
@@ -5,10 +5,10 @@ SECTION = "bootloader"
  DEPENDS = "openssl"
  PROVIDES = "u-boot-mxsboot"
-PV = "v2016.09+git${SRCPV}"
+PV = "v2017.07+git${SRCPV}"
-SRCREV = "a3d27ead69a9e84a7794117cf965af20d0cfec4f"
-SRCBRANCH = "2016.09+fslc"
+SRCREV = "8ccb1970b8731c2e8bd26f0c68ca04b9cc9008dc"
+SRCBRANCH = "2017.07+fslc"
SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}" diff --git a/recipes-bsp/u-boot/u-boot-fslc_2017.03.bb b/recipes-bsp/u-boot/u-boot-fslc_2017.03.bb
deleted file mode 100644
index ce62e53a..00000000
--- a/recipes-bsp/u-boot/u-boot-fslc_2017.03.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-include u-boot-fslc.inc
-
-PV = "v2017.03+git${SRCPV}"
-
-SRCREV = "ac3b20cdbe5282fbfa46d7fd39358f5ee07e24d9"
-SRCBRANCH = "2017.03+fslc"
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2017.07.bb 
b/recipes-bsp/u-boot/u-boot-fslc_2017.07.bb
new file mode 100644
index 00000000..208e7251
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc_2017.07.bb
@@ -0,0 +1,6 @@
+include u-boot-fslc.inc
+
+PV = "v2017.07+git${SRCPV}"
+
+SRCREV = "8ccb1970b8731c2e8bd26f0c68ca04b9cc9008dc"
+SRCBRANCH = "2017.07+fslc"

--
_______________________________________________
meta-freescale mailing list
meta-freescale@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-freescale

Reply via email to