[meta-freescale] [meta-freescale-layer][PATCH 04/67] conf/machine: sync with meta-fsl-ppc

ting.liu at nxp.com ting.liu at nxp.com
Fri Jul 1 01:37:42 PDT 2016


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

Signed-off-by: Ting Liu <ting.liu at nxp.com>
---
 conf/machine/include/e500mc.inc    |  4 +++-
 conf/machine/include/e500v2.inc    |  4 +++-
 conf/machine/include/e5500-64b.inc |  4 +++-
 conf/machine/include/e5500.inc     |  4 +++-
 conf/machine/include/e6500-64b.inc |  4 +++-
 conf/machine/include/e6500.inc     |  4 +++-
 conf/machine/include/qoriq-arm.inc | 15 +++++----------
 conf/machine/include/qoriq-ppc.inc | 11 +++++------
 conf/machine/include/qoriq.inc     | 17 ++++++-----------
 conf/machine/ls1021atwr.conf       |  7 ++++++-
 10 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc
index a33485b..2ef904e 100644
--- a/conf/machine/include/e500mc.inc
+++ b/conf/machine/include/e500mc.inc
@@ -1,6 +1,8 @@
 TARGET_FPU = "hard"
 
 require conf/machine/include/tune-ppce500mc.inc
-require conf/machine/include/qoriq-ppc.inc
+require conf/machine/include/soc-family.inc
 
 MACHINEOVERRIDES =. "e500mc:"
+
+require conf/machine/include/qoriq-ppc.inc
diff --git a/conf/machine/include/e500v2.inc b/conf/machine/include/e500v2.inc
index 26ca9f0..1abcacb 100644
--- a/conf/machine/include/e500v2.inc
+++ b/conf/machine/include/e500v2.inc
@@ -1,4 +1,6 @@
 require conf/machine/include/tune-ppce500v2.inc
-require conf/machine/include/qoriq-ppc.inc
+require conf/machine/include/soc-family.inc
 
 MACHINEOVERRIDES =. "e500v2:"
+
+require conf/machine/include/qoriq-ppc.inc
diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc
index 72b958c..e493023 100644
--- a/conf/machine/include/e5500-64b.inc
+++ b/conf/machine/include/e5500-64b.inc
@@ -2,10 +2,12 @@ TARGET_FPU = "hard"
 DEFAULTTUNE ?= "ppc64e5500"
 
 require conf/machine/include/tune-ppce5500.inc
-require conf/machine/include/qoriq-ppc.inc
+require conf/machine/include/soc-family.inc
 
 MACHINEOVERRIDES =. "e5500-64b:"
 
 require conf/multilib.conf
 MULTILIBS ?= "multilib:lib32"
 DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce5500"
+
+require conf/machine/include/qoriq-ppc.inc
diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc
index 364ffac..dc8abb1 100644
--- a/conf/machine/include/e5500.inc
+++ b/conf/machine/include/e5500.inc
@@ -1,6 +1,8 @@
 TARGET_FPU = "hard"
 
 require conf/machine/include/tune-ppce5500.inc
-require conf/machine/include/qoriq-ppc.inc
+require conf/machine/include/soc-family.inc
 
 MACHINEOVERRIDES =. "e5500:"
+
+require conf/machine/include/qoriq-ppc.inc
diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
index e0e04db..2c9a885 100644
--- a/conf/machine/include/e6500-64b.inc
+++ b/conf/machine/include/e6500-64b.inc
@@ -2,10 +2,12 @@ TARGET_FPU = "hard"
 DEFAULTTUNE ?= "ppc64e6500"
 
 require conf/machine/include/tune-ppce6500.inc
-require conf/machine/include/qoriq-ppc.inc
+require conf/machine/include/soc-family.inc
 
 MACHINEOVERRIDES =. "e6500-64b:"
 
 require conf/multilib.conf
 MULTILIBS ?= "multilib:lib32"
 DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce6500"
+
+require conf/machine/include/qoriq-ppc.inc
diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
index 8d773b6..57ff8ed 100644
--- a/conf/machine/include/e6500.inc
+++ b/conf/machine/include/e6500.inc
@@ -1,7 +1,7 @@
 TARGET_FPU = "hard"
 
 require conf/machine/include/tune-ppce6500.inc
-require conf/machine/include/qoriq-ppc.inc
+require conf/machine/include/soc-family.inc
 
 MACHINEOVERRIDES =. "e6500:"
 
@@ -10,3 +10,5 @@ BUILD_64BIT_KERNEL = "1"
 require conf/multilib.conf
 MULTILIBS ?= "multilib:lib64"
 DEFAULTTUNE_virtclass-multilib-lib64 ?= "ppc64e6500"
+
+require conf/machine/include/qoriq-ppc.inc
diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc
index b150edc..ec320bb 100644
--- a/conf/machine/include/qoriq-arm.inc
+++ b/conf/machine/include/qoriq-arm.inc
@@ -1,13 +1,8 @@
-require conf/machine/include/qoriq.inc
-
-DEFAULTTUNE ?= "cortexa7hf-neon"
+# Provides the QorIQ common settings for ARM
+require conf/machine/include/soc-family.inc
 
-UBOOT_ENTRYPOINT = "0x80008000"
+KERNEL_IMAGETYPE ?= "uImage"
 
-MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600"
-UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512"
+MACHINEOVERRIDES =. "qoriq-arm:"
 
-SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0"
-SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
-
-MACHINEOVERRIDES .= ":qoriq-arm"
+require conf/machine/include/qoriq.inc
diff --git a/conf/machine/include/qoriq-ppc.inc b/conf/machine/include/qoriq-ppc.inc
index 7e900e6..f21f6d3 100644
--- a/conf/machine/include/qoriq-ppc.inc
+++ b/conf/machine/include/qoriq-ppc.inc
@@ -1,11 +1,10 @@
-require conf/machine/include/qoriq.inc
-
-UBOOT_ENTRYPOINT = "0x80008000"
+# Provides the QorIQ common settings for PPC
 
-MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600"
-UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512"
+KERNEL_IMAGETYPE ?= "uImage"
 
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-MACHINEOVERRIDES .= ":qoriq-ppc"
+MACHINEOVERRIDES =. "qoriq-ppc:"
+
+require conf/machine/include/qoriq.inc
diff --git a/conf/machine/include/qoriq.inc b/conf/machine/include/qoriq.inc
index c5cbe29..a909fc6 100644
--- a/conf/machine/include/qoriq.inc
+++ b/conf/machine/include/qoriq.inc
@@ -1,23 +1,18 @@
 # Provides the QorIQ common settings
-require conf/machine/include/soc-family.inc
 
-# common providers of QorIQ targets
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-qoriq"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq"
 PREFERRED_PROVIDER_cryptodev-linux = "cryptodev-qoriq-linux"
 PREFERRED_PROVIDER_cryptodev-module = "cryptodev-qoriq-module"
 PREFERRED_PROVIDER_cryptodev-tests = "cryptodev-qoriq-tests"
 PREFERRED_PROVIDER_openssl = "openssl-qoriq"
-PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-qoriq"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq"
 PREFERRED_PROVIDER_qemu = "qemu-qoriq"
 
-# Define the default image type
-IMAGE_CLASSES ?= "image_types_uboot"
-KERNEL_IMAGETYPE ?= "uImage"
-
-MACHINE_FEATURES ?= "pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS ?= "udev-rules-qoriq"
+MACHINE_FEATURES ?= "keyboard pci ext2 ext3 serial"
+MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf kernel-modules"
 
+IMAGE_CLASSES += "image_types_uboot"
 EXTRA_IMAGEDEPENDS += "u-boot cst-native"
 
 MACHINEOVERRIDES =. "qoriq:"
diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index eb03563..c294fe4 100644
--- a/conf/machine/ls1021atwr.conf
+++ b/conf/machine/ls1021atwr.conf
@@ -8,6 +8,8 @@
 require conf/machine/include/qoriq-arm.inc
 require conf/machine/include/tune-cortexa7.inc
 
+DEFAULTTUNE = "cortexa7hf-neon"
+
 SOC_FAMILY = "ls102xa"
 
 UBOOT_CONFIG ??= "sdcard-ifc sdcard-qspi lpuart qspi secure-boot nor"
@@ -18,11 +20,14 @@ 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"
 KERNEL_DEFCONFIG ?= "${S}/arch/arm/configs/ls1021a_defconfig"
 
-EXTRA_IMAGEDEPENDS += "rcw qe-ucode"
+SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0"
+SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
+EXTRA_IMAGEDEPENDS += "rcw qe-ucode"
 USE_VT ?= "0"
-- 
1.9.2



More information about the meta-freescale mailing list