[meta-freescale] [meta-fsl-arm][PATCH 04/41] qoriq-arm.inc: split common bits into qoriq.inc

[ting.liu at nxp.com]

From: Ting Liu <ting.liu at nxp.com>

Signed-off-by: Ting Liu <ting.liu at nxp.com>
---
 conf/machine/include/qoriq-arm.inc | 15 +++------------
 conf/machine/include/qoriq.inc     | 12 ++++++++++++
 conf/machine/ls1021atwr.conf       |  3 +++
 3 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 conf/machine/include/qoriq.inc

diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc
index f20ce56..ec320bb 100644
--- a/conf/machine/include/qoriq-arm.inc
+++ b/conf/machine/include/qoriq-arm.inc
@@ -1,17 +1,8 @@
+# Provides the QorIQ common settings for ARM
 require conf/machine/include/soc-family.inc
 
-# Freescale BSP default providers
-PREFERRED_PROVIDER_u-boot_ls102xa ?= "u-boot-qoriq"
-PREFERRED_PROVIDER_virtual/bootloader_ls102xa ?= "u-boot-qoriq"
-PREFERRED_PROVIDER_virtual/kernel_ls102xa ?= "linux-qoriq"
-
-# Define the default image type
-IMAGE_CLASSES ?= "image_types_uboot"
 KERNEL_IMAGETYPE ?= "uImage"
 
-UBOOT_ENTRYPOINT_ls102xa = "0x80008000"
-
-MACHINE_FEATURES = "pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS = "udev-extraconf"
+MACHINEOVERRIDES =. "qoriq-arm:"
 
-DEFAULTTUNE_ls102xa ?= "cortexa7hf-neon"
+require conf/machine/include/qoriq.inc
diff --git a/conf/machine/include/qoriq.inc b/conf/machine/include/qoriq.inc
new file mode 100644
index 0000000..d583b09
--- /dev/null
+++ b/conf/machine/include/qoriq.inc
@@ -0,0 +1,12 @@
+# Provides the QorIQ common settings
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-qoriq"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq"
+
+MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf kernel-modules"
+
+IMAGE_CLASSES += "image_types_uboot"
+EXTRA_IMAGEDEPENDS += "u-boot"
+
+MACHINEOVERRIDES =. "qoriq:"
diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index 4478e95..562ae96 100644
--- a/conf/machine/ls1021atwr.conf
+++ b/conf/machine/ls1021atwr.conf
@@ -7,6 +7,8 @@
 require conf/machine/include/qoriq-arm.inc
 require conf/machine/include/tune-cortexa7.inc
 
+DEFAULTTUNE = "cortexa7hf-neon"
+
 SOC_FAMILY = "ls102xa"
 
 UBOOT_CONFIG ??= "nor"
@@ -16,6 +18,7 @@ UBOOT_CONFIG[lpuart] = "ls1021atwr_nor_lpuart_config"
 UBOOT_CONFIG[qspi] = "ls1021atwr_qspi_config"
 UBOOT_CONFIG[secure-boot] = "ls1021atwr_nor_SECURE_BOOT_config"
 
+UBOOT_ENTRYPOINT = "0x80008000"
 QE_UCODE="iram_Type_A_LS1021a_r1.0.bin"
 
 KERNEL_DEVICETREE ?= "ls1021a-twr.dtb"
-- 
1.9.2