[meta-freescale-layer][PATCH 1/9] qoriq-arm.inc: move DEFAULTTUNE/UBOOT_ENTRYPOINT to ls1021atwr.conf

[meta-freescale-layer][PATCH 1/9] qoriq-arm.inc: move DEFAULTTUNE/UBOOT_ENTRYPOINT to ls1021atwr.conf

[ting.liu]

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

the specific values are for ls1021atwr.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
---
 conf/machine/include/qoriq-arm.inc | 4 ----
 conf/machine/ls1021atwr.conf       | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc
index 232bcbe..e6cf675 100644
--- a/conf/machine/include/qoriq-arm.inc
+++ b/conf/machine/include/qoriq-arm.inc
@@ -1,9 +1,5 @@
 require conf/machine/include/qoriq-base.inc
 
-DEFAULTTUNE ?= "cortexa7hf-neon"
-
-UBOOT_ENTRYPOINT = "0x80008000"
-
 MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600"
 UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512"
 
diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index eb03563..1ba4992 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"
@@ -23,6 +25,6 @@ QE_UCODE="iram_Type_A_LS1021a_r1.0.bin"
 KERNEL_DEVICETREE ?= "ls1021a-twr.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/arm/configs/ls1021a_defconfig"
 
+UBOOT_ENTRYPOINT = "0x80008000"
 EXTRA_IMAGEDEPENDS += "rcw qe-ucode"
-
 USE_VT ?= "0"
-- 
1.9.2

[meta-freescale-layer][PATCH 2/9] qoriq-arm/qoriq-ppc: adjust MACHINEOVERRIDES

[ting.liu]

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

Adjust the order of qoriq/qoriq-arm/qoriq-ppc.
Old: e500mc:qoriq:p4080ds:qoriq-ppc
New: qoriq:qoriq-ppc:e500mc:p4080ds

Signed-off-by: Ting Liu <ting.liu@nxp.com>
---
 conf/machine/include/e500mc.inc    | 2 +-
 conf/machine/include/e500v2.inc    | 2 +-
 conf/machine/include/e5500-64b.inc | 2 +-
 conf/machine/include/e5500.inc     | 2 +-
 conf/machine/include/e6500-64b.inc | 2 +-
 conf/machine/include/e6500.inc     | 2 +-
 conf/machine/include/qoriq-arm.inc | 6 ++++--
 conf/machine/include/qoriq-ppc.inc | 6 ++++--
 8 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc
index a33485b..ee1c296 100644
--- a/conf/machine/include/e500mc.inc
+++ b/conf/machine/include/e500mc.inc
@@ -1,6 +1,6 @@
 TARGET_FPU = "hard"
 
 require conf/machine/include/tune-ppce500mc.inc
-require conf/machine/include/qoriq-ppc.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..420f034 100644
--- a/conf/machine/include/e500v2.inc
+++ b/conf/machine/include/e500v2.inc
@@ -1,4 +1,4 @@
 require conf/machine/include/tune-ppce500v2.inc
-require conf/machine/include/qoriq-ppc.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..c515508 100644
--- a/conf/machine/include/e5500-64b.inc
+++ b/conf/machine/include/e5500-64b.inc
@@ -2,9 +2,9 @@ TARGET_FPU = "hard"
 DEFAULTTUNE ?= "ppc64e5500"
 
 require conf/machine/include/tune-ppce5500.inc
-require conf/machine/include/qoriq-ppc.inc
 
 MACHINEOVERRIDES =. "e5500-64b:"
+require conf/machine/include/qoriq-ppc.inc
 
 require conf/multilib.conf
 MULTILIBS ?= "multilib:lib32"
diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc
index 364ffac..f905088 100644
--- a/conf/machine/include/e5500.inc
+++ b/conf/machine/include/e5500.inc
@@ -1,6 +1,6 @@
 TARGET_FPU = "hard"
 
 require conf/machine/include/tune-ppce5500.inc
-require conf/machine/include/qoriq-ppc.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..33346d7 100644
--- a/conf/machine/include/e6500-64b.inc
+++ b/conf/machine/include/e6500-64b.inc
@@ -2,9 +2,9 @@ TARGET_FPU = "hard"
 DEFAULTTUNE ?= "ppc64e6500"
 
 require conf/machine/include/tune-ppce6500.inc
-require conf/machine/include/qoriq-ppc.inc
 
 MACHINEOVERRIDES =. "e6500-64b:"
+require conf/machine/include/qoriq-ppc.inc
 
 require conf/multilib.conf
 MULTILIBS ?= "multilib:lib32"
diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
index 8d773b6..b838c8d 100644
--- a/conf/machine/include/e6500.inc
+++ b/conf/machine/include/e6500.inc
@@ -1,9 +1,9 @@
 TARGET_FPU = "hard"
 
 require conf/machine/include/tune-ppce6500.inc
-require conf/machine/include/qoriq-ppc.inc
 
 MACHINEOVERRIDES =. "e6500:"
+require conf/machine/include/qoriq-ppc.inc
 
 BUILD_64BIT_KERNEL = "1"
 
diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc
index e6cf675..d61db71 100644
--- a/conf/machine/include/qoriq-arm.inc
+++ b/conf/machine/include/qoriq-arm.inc
@@ -1,4 +1,4 @@
-require conf/machine/include/qoriq-base.inc
+# Provides the common settings for QorIQ ARM
 
 MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600"
 UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512"
@@ -6,4 +6,6 @@ UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512"
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-MACHINEOVERRIDES .= ":qoriq-arm"
+MACHINEOVERRIDES =. "qoriq-arm:"
+
+require conf/machine/include/qoriq-base.inc
diff --git a/conf/machine/include/qoriq-ppc.inc b/conf/machine/include/qoriq-ppc.inc
index c60da4a..bd8d4d7 100644
--- a/conf/machine/include/qoriq-ppc.inc
+++ b/conf/machine/include/qoriq-ppc.inc
@@ -1,4 +1,4 @@
-require conf/machine/include/qoriq-base.inc
+# Provides the common settings for QorIQ PPC
 
 UBOOT_ENTRYPOINT = "0x80008000"
 
@@ -8,4 +8,6 @@ UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512"
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-MACHINEOVERRIDES .= ":qoriq-ppc"
+MACHINEOVERRIDES =. "qoriq-ppc:"
+
+require conf/machine/include/qoriq-base.inc
-- 
1.9.2

[meta-freescale-layer][PATCH 3/9] qoriq-arm/qoriq-ppc: rm MKUBIFS_ARGS/UBINIZE_ARGS setting

[ting.liu]

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

The value for two variables is specific to each board. They should be
added in machine configure file after being verified on each board.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
---
 conf/machine/include/qoriq-arm.inc | 3 ---
 conf/machine/include/qoriq-ppc.inc | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc
index d61db71..cc31492 100644
--- a/conf/machine/include/qoriq-arm.inc
+++ b/conf/machine/include/qoriq-arm.inc
@@ -1,8 +1,5 @@
 # Provides the common settings for QorIQ ARM
 
-MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600"
-UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512"
-
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
diff --git a/conf/machine/include/qoriq-ppc.inc b/conf/machine/include/qoriq-ppc.inc
index bd8d4d7..ed81886 100644
--- a/conf/machine/include/qoriq-ppc.inc
+++ b/conf/machine/include/qoriq-ppc.inc
@@ -2,9 +2,6 @@
 
 UBOOT_ENTRYPOINT = "0x80008000"
 
-MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600"
-UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512"
-
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-- 
1.9.2

[meta-freescale-layer][PATCH 4/9] qoriq-ppc.inc: rm UBOOT_ENTRYPOINT setting

[ting.liu]

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

qoriq ppc boards don't need this variable being set.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
---
 conf/machine/include/qoriq-ppc.inc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/conf/machine/include/qoriq-ppc.inc b/conf/machine/include/qoriq-ppc.inc
index ed81886..54ab6e3 100644
--- a/conf/machine/include/qoriq-ppc.inc
+++ b/conf/machine/include/qoriq-ppc.inc
@@ -1,7 +1,5 @@
 # Provides the common settings for QorIQ PPC
 
-UBOOT_ENTRYPOINT = "0x80008000"
-
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-- 
1.9.2

[meta-freescale-layer][PATCH 5/9] qoriq-arm64.inc: add

[ting.liu]

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

move KERNEL_IMAGETYPE setting from qoriq-base.inc as qoriq-arm64
has a different value.

Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
---
 conf/machine/include/qoriq-arm.inc   |  2 ++
 conf/machine/include/qoriq-arm64.inc | 10 ++++++++++
 conf/machine/include/qoriq-base.inc  |  2 --
 conf/machine/include/qoriq-ppc.inc   |  2 ++
 4 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 conf/machine/include/qoriq-arm64.inc

diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc
index cc31492..eb03af4 100644
--- a/conf/machine/include/qoriq-arm.inc
+++ b/conf/machine/include/qoriq-arm.inc
@@ -1,5 +1,7 @@
 # Provides the common settings for QorIQ ARM
 
+KERNEL_IMAGETYPE ?= "uImage"
+
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
diff --git a/conf/machine/include/qoriq-arm64.inc b/conf/machine/include/qoriq-arm64.inc
new file mode 100644
index 0000000..e8d99a6
--- /dev/null
+++ b/conf/machine/include/qoriq-arm64.inc
@@ -0,0 +1,10 @@
+# Provides the QorIQ common settings for ARM64
+
+KERNEL_IMAGETYPE ?= "Image"
+
+SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
+SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
+
+MACHINEOVERRIDES =. "qoriq-arm64:"
+
+require conf/machine/include/qoriq-base.inc
diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
index c5cbe29..f65eea3 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -11,9 +11,7 @@ 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"
diff --git a/conf/machine/include/qoriq-ppc.inc b/conf/machine/include/qoriq-ppc.inc
index 54ab6e3..b40e148 100644
--- a/conf/machine/include/qoriq-ppc.inc
+++ b/conf/machine/include/qoriq-ppc.inc
@@ -1,5 +1,7 @@
 # Provides the common settings for QorIQ PPC
 
+KERNEL_IMAGETYPE ?= "uImage"
+
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-- 
1.9.2

[meta-freescale-layer][PATCH 6/9] qoriq-base.inc: update MACHINE_EXTRA_RECOMMENDED

[ting.liu]

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

* use += to append, instead of ?=
* udev-rules-qoriq is not needed for all the qoriq boards, remove it.
* add udev-extraconf and kernel-modules.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
---
 conf/machine/include/qoriq-base.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
index f65eea3..a87ce37 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -14,7 +14,7 @@ PREFERRED_PROVIDER_qemu = "qemu-qoriq"
 IMAGE_CLASSES ?= "image_types_uboot"
 
 MACHINE_FEATURES ?= "pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS ?= "udev-rules-qoriq"
+MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf kernel-modules"
 
 EXTRA_IMAGEDEPENDS += "u-boot cst-native"
 
-- 
1.9.2

[meta-freescale-layer][PATCH 7/9] qoriq-base.inc: append image_types_uboot to IMAGE_CLASSES

[ting.liu]

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

Signed-off-by: Ting Liu <ting.liu@nxp.com>
---
 conf/machine/include/qoriq-base.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
index a87ce37..65bb170 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -11,7 +11,7 @@ PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-qoriq"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq"
 PREFERRED_PROVIDER_qemu = "qemu-qoriq"
 
-IMAGE_CLASSES ?= "image_types_uboot"
+IMAGE_CLASSES += "image_types_uboot"
 
 MACHINE_FEATURES ?= "pci ext2 ext3 serial"
 MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf kernel-modules"
-- 
1.9.2

[meta-freescale-layer][PATCH 8/9] ls2080ardb: Add machine file

[ting.liu]

From: Zongchun Yu <zongchun.yu@nxp.com>

The LS2080A Reference Design (RDB) is a high-performance computing,
evaluation, and development platform that supports the QorIQ LS2080A
Layerscape Architecture processor.

The LS2080A integrated multicore processor combines eight ARM Cortex-A57
processor cores with high-performance data path acceleration logic and network
and peripheral bus interfaces required for networking, telecom/datacom,
wireless infrastructure, and mil/aerospace applications.

For detailed info, please visit:
http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/qoriq-arm-processors/qoriq-ls2080a-rdb-reference-design-board:LS2080A-RDB

Signed-off-by: Zongchun Yu <zongchun.yu@nxp.com>
---
 conf/machine/ls2080ardb.conf | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 conf/machine/ls2080ardb.conf

diff --git a/conf/machine/ls2080ardb.conf b/conf/machine/ls2080ardb.conf
new file mode 100644
index 0000000..30dfe20
--- /dev/null
+++ b/conf/machine/ls2080ardb.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: NXP LS2080ARDB board
+#@SOC: LSCH3
+#@DESCRIPTION: Machine configuration for NXP QorIQ LS2080ARDB
+#              with ARM Cortext-A57 core
+#@MAINTAINER: Zongchun Yu <Zongchun.Yu@nxp.com>
+
+require conf/machine/include/qoriq-arm64.inc
+require conf/machine/include/arm/arch-arm64.inc
+
+UBOOT_CONFIG ??= "nor"
+UBOOT_CONFIG[nor] = "ls2080ardb_defconfig,,u-boot-dtb.bin"
+
+KERNEL_DEVICETREE ?= "freescale/fsl-ls2080a-rdb.dtb"
+KERNEL_DEFCONFIG ?= "${S}/arch/arm64/configs/defconfig"
+
+EXTRA_IMAGEDEPENDS += "dpl-examples ls2-phy ls2-rcw management-complex"
+USE_VT = "0"
-- 
1.9.2

[meta-freescale-layer][PATCH 9/9] ls1043ardb: add machine file

[ting.liu]

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

The LS1043A Reference Design Board (RDB) is a high-performance computing,
evaluation, and development platform that supports the QorIQ LS1043A
LayerScape Architecture processor. The LS1043ARDB provides SW development
platform for the Freescale LS1043A processor series, with a complete
debugging environment. The LS1043A RDB is lead-free and RoHS-compliant.

The LS1043A integrated multicore processor combines four ARM Cortex-A53
processor cores with datapath acceleration optimized for L2/3 packet
processing, single pass security offload and robust traffic management
and quality of service.

For detailed info, please visit:
http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/qoriq-arm-processors/qoriq-ls1043a-reference-design-board:LS1043A-RDB

Signed-off-by: Ting Liu <ting.liu@nxp.com>
---
 conf/machine/ls1043ardb.conf | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 conf/machine/ls1043ardb.conf

diff --git a/conf/machine/ls1043ardb.conf b/conf/machine/ls1043ardb.conf
new file mode 100644
index 0000000..9911707
--- /dev/null
+++ b/conf/machine/ls1043ardb.conf
@@ -0,0 +1,22 @@
+#@TYPE: Machine
+#@NAME: NXP LS1043ARDB board
+#@SOC: LSCH2
+#@DESCRIPTION: Machine configuration for NXP QorIQ LS1043ARDB
+#              with ARM Cortext-A53 core
+#@MAINTAINER: Ting Liu <ting.liu@nxp.com>
+
+require conf/machine/include/qoriq-arm64.inc
+require conf/machine/include/arm/arch-arm64.inc
+
+UBOOT_CONFIG ??= "nand sdcard nor"
+UBOOT_CONFIG[nor] = "ls1043ardb_config,,u-boot-dtb.bin"
+UBOOT_CONFIG[nand] = "ls1043ardb_nand_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[sdcard] = "ls1043ardb_sdcard_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[secure-boot] = "ls1043ardb_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+
+KERNEL_DEVICETREE ?= "freescale/fsl-ls1043a-rdb.dtb freescale/fsl-ls1043a-rdb-usdpaa.dtb"
+KERNEL_DEFCONFIG ?= "${S}/arch/arm64/configs/defconfig"
+
+QE_UCODE = "iram_Type_A_LS1021a_r1.0.bin"
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw ppa qe-ucode"
+USE_VT = "0"
-- 
1.9.2