[meta-fsl-ppc][PATCH 01/12] move all inc files to folder include/

[meta-fsl-ppc][PATCH 01/12] move all inc files to folder include/

[ting.liu]

From: Ting Liu <b28495@freescale.com>

Signed-off-by: Ting Liu <b28495@freescale.com>
---
 conf/machine/b4420qds-64b.conf           |    2 +-
 conf/machine/b4420qds.conf               |    2 +-
 conf/machine/b4860qds-64b.conf           |    2 +-
 conf/machine/b4860qds.conf               |    2 +-
 conf/machine/bsc9131rdb.conf             |    2 +-
 conf/machine/bsc9132qds.conf             |    2 +-
 conf/machine/c293pcie.conf               |    2 +-
 conf/machine/{ => include}/e500mc.inc    |    0
 conf/machine/{ => include}/e500v2.inc    |    0
 conf/machine/{ => include}/e5500-64b.inc |    0
 conf/machine/{ => include}/e5500.inc     |    0
 conf/machine/{ => include}/e6500-64b.inc |    0
 conf/machine/{ => include}/e6500.inc     |    0
 conf/machine/p1010rdb.conf               |    2 +-
 conf/machine/p1020rdb.conf               |    2 +-
 conf/machine/p1021rdb.conf               |    2 +-
 conf/machine/p1022ds.conf                |    2 +-
 conf/machine/p1023rdb.conf               |    2 +-
 conf/machine/p1025twr.conf               |    2 +-
 conf/machine/p2020ds.conf                |    2 +-
 conf/machine/p2020rdb.conf               |    2 +-
 conf/machine/p2041rdb.conf               |    2 +-
 conf/machine/p3041ds.conf                |    2 +-
 conf/machine/p4080ds.conf                |    2 +-
 conf/machine/p5020ds-64b.conf            |    2 +-
 conf/machine/p5020ds.conf                |    2 +-
 conf/machine/p5040ds-64b.conf            |    2 +-
 conf/machine/p5040ds.conf                |    2 +-
 conf/machine/t1040rdb-64b.conf           |    2 +-
 conf/machine/t1040rdb.conf               |    2 +-
 conf/machine/t1042rdb-64b.conf           |    2 +-
 conf/machine/t1042rdb.conf               |    2 +-
 conf/machine/t2080qds-64b.conf           |    2 +-
 conf/machine/t2080qds.conf               |    2 +-
 conf/machine/t2080rdb-64b.conf           |    2 +-
 conf/machine/t2080rdb.conf               |    2 +-
 conf/machine/t4160qds-64b.conf           |    2 +-
 conf/machine/t4160qds.conf               |    2 +-
 conf/machine/t4240qds-64b.conf           |    2 +-
 conf/machine/t4240qds.conf               |    2 +-
 conf/machine/t4240rdb-64b.conf           |    2 +-
 conf/machine/t4240rdb.conf               |    2 +-
 42 files changed, 36 insertions(+), 36 deletions(-)
 rename conf/machine/{ => include}/e500mc.inc (100%)
 rename conf/machine/{ => include}/e500v2.inc (100%)
 rename conf/machine/{ => include}/e5500-64b.inc (100%)
 rename conf/machine/{ => include}/e5500.inc (100%)
 rename conf/machine/{ => include}/e6500-64b.inc (100%)
 rename conf/machine/{ => include}/e6500.inc (100%)

diff --git a/conf/machine/b4420qds-64b.conf b/conf/machine/b4420qds-64b.conf
index ea51fe4..45c820e 100644
--- a/conf/machine/b4420qds-64b.conf
+++ b/conf/machine/b4420qds-64b.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running B4420QDS in 64-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e6500-64b.inc
+require conf/machine/include/e6500-64b.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "b4420"
diff --git a/conf/machine/b4420qds.conf b/conf/machine/b4420qds.conf
index 6652612..9016cfb 100644
--- a/conf/machine/b4420qds.conf
+++ b/conf/machine/b4420qds.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running B4420QDS in 32-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e6500.inc
+require conf/machine/include/e6500.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "b4420"
diff --git a/conf/machine/b4860qds-64b.conf b/conf/machine/b4860qds-64b.conf
index 07770e8..4da069f 100644
--- a/conf/machine/b4860qds-64b.conf
+++ b/conf/machine/b4860qds-64b.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running B4860QDS in 64-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e6500-64b.inc
+require conf/machine/include/e6500-64b.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "b4860"
diff --git a/conf/machine/b4860qds.conf b/conf/machine/b4860qds.conf
index 5fafafd..c560f1c 100644
--- a/conf/machine/b4860qds.conf
+++ b/conf/machine/b4860qds.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running B4860QDS in 32-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e6500.inc
+require conf/machine/include/e6500.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "b4860"
diff --git a/conf/machine/bsc9131rdb.conf b/conf/machine/bsc9131rdb.conf
index 58c9f5b..64ba795 100644
--- a/conf/machine/bsc9131rdb.conf
+++ b/conf/machine/bsc9131rdb.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running BSC9131RDB
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com> 
 
-require e500v2.inc
+require conf/machine/include/e500v2.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "bsc9131"
diff --git a/conf/machine/bsc9132qds.conf b/conf/machine/bsc9132qds.conf
index fc05632..a51cbd8 100644
--- a/conf/machine/bsc9132qds.conf
+++ b/conf/machine/bsc9132qds.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running BSC9132QDS
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e500v2.inc
+require conf/machine/include/e500v2.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "bsc9132"
diff --git a/conf/machine/c293pcie.conf b/conf/machine/c293pcie.conf
index 88009ac..b22dfd0 100644
--- a/conf/machine/c293pcie.conf
+++ b/conf/machine/c293pcie.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running C293PCIE in 36-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e500v2.inc
+require conf/machine/include/e500v2.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "c293pcie"
diff --git a/conf/machine/e500mc.inc b/conf/machine/include/e500mc.inc
similarity index 100%
rename from conf/machine/e500mc.inc
rename to conf/machine/include/e500mc.inc
diff --git a/conf/machine/e500v2.inc b/conf/machine/include/e500v2.inc
similarity index 100%
rename from conf/machine/e500v2.inc
rename to conf/machine/include/e500v2.inc
diff --git a/conf/machine/e5500-64b.inc b/conf/machine/include/e5500-64b.inc
similarity index 100%
rename from conf/machine/e5500-64b.inc
rename to conf/machine/include/e5500-64b.inc
diff --git a/conf/machine/e5500.inc b/conf/machine/include/e5500.inc
similarity index 100%
rename from conf/machine/e5500.inc
rename to conf/machine/include/e5500.inc
diff --git a/conf/machine/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
similarity index 100%
rename from conf/machine/e6500-64b.inc
rename to conf/machine/include/e6500-64b.inc
diff --git a/conf/machine/e6500.inc b/conf/machine/include/e6500.inc
similarity index 100%
rename from conf/machine/e6500.inc
rename to conf/machine/include/e6500.inc
diff --git a/conf/machine/p1010rdb.conf b/conf/machine/p1010rdb.conf
index 53655c4..10b1c92 100644
--- a/conf/machine/p1010rdb.conf
+++ b/conf/machine/p1010rdb.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running P1010RDB
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e500v2.inc
+require conf/machine/include/e500v2.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p1010"
diff --git a/conf/machine/p1020rdb.conf b/conf/machine/p1020rdb.conf
index 24f9d97..3fa7377 100644
--- a/conf/machine/p1020rdb.conf
+++ b/conf/machine/p1020rdb.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running P1020RDB
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e500v2.inc
+require conf/machine/include/e500v2.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p1020"
diff --git a/conf/machine/p1021rdb.conf b/conf/machine/p1021rdb.conf
index 3d21175..711a62d 100644
--- a/conf/machine/p1021rdb.conf
+++ b/conf/machine/p1021rdb.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running P1021RDB
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e500v2.inc
+require conf/machine/include/e500v2.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p1021"
diff --git a/conf/machine/p1022ds.conf b/conf/machine/p1022ds.conf
index 0895d6d..107cbe4 100644
--- a/conf/machine/p1022ds.conf
+++ b/conf/machine/p1022ds.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running P1022DS
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e500v2.inc
+require conf/machine/include/e500v2.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p1022"
diff --git a/conf/machine/p1023rdb.conf b/conf/machine/p1023rdb.conf
index 4c18083..59a9ce6 100644
--- a/conf/machine/p1023rdb.conf
+++ b/conf/machine/p1023rdb.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running P1023RDB
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e500v2.inc
+require conf/machine/include/e500v2.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p1023"
diff --git a/conf/machine/p1025twr.conf b/conf/machine/p1025twr.conf
index 7eab342..e7d25fe 100644
--- a/conf/machine/p1025twr.conf
+++ b/conf/machine/p1025twr.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running P1025TWR
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e500v2.inc
+require conf/machine/include/e500v2.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p1025"
diff --git a/conf/machine/p2020ds.conf b/conf/machine/p2020ds.conf
index 84f792c..7510787 100644
--- a/conf/machine/p2020ds.conf
+++ b/conf/machine/p2020ds.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running P2020DS
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e500v2.inc
+require conf/machine/include/e500v2.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p2020"
diff --git a/conf/machine/p2020rdb.conf b/conf/machine/p2020rdb.conf
index 740df88..c3d08c9 100644
--- a/conf/machine/p2020rdb.conf
+++ b/conf/machine/p2020rdb.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running P2020RDB
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e500v2.inc
+require conf/machine/include/e500v2.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p2020"
diff --git a/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf
index 6988922..d06df45 100644
--- a/conf/machine/p2041rdb.conf
+++ b/conf/machine/p2041rdb.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running P2041RDB
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e500mc.inc
+require conf/machine/include/e500mc.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p2041"
diff --git a/conf/machine/p3041ds.conf b/conf/machine/p3041ds.conf
index 939d18d..7be35b9 100644
--- a/conf/machine/p3041ds.conf
+++ b/conf/machine/p3041ds.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running P3041DS
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e500mc.inc
+require conf/machine/include/e500mc.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p3041"
diff --git a/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf
index c3a1519..51c0fed 100644
--- a/conf/machine/p4080ds.conf
+++ b/conf/machine/p4080ds.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running P4080DS
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e500mc.inc
+require conf/machine/include/e500mc.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p4080"
diff --git a/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf
index 5f82dba..a901b48 100644
--- a/conf/machine/p5020ds-64b.conf
+++ b/conf/machine/p5020ds-64b.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running P5020DS in 64-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e5500-64b.inc
+require conf/machine/include/e5500-64b.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p5020"
diff --git a/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf
index 72effb1..42ab769 100644
--- a/conf/machine/p5020ds.conf
+++ b/conf/machine/p5020ds.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running P5020DS in 32-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e5500.inc
+require conf/machine/include/e5500.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p5020"
diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf
index 70508a4..c462970 100644
--- a/conf/machine/p5040ds-64b.conf
+++ b/conf/machine/p5040ds-64b.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running P5040DS in 64-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e5500-64b.inc
+require conf/machine/include/e5500-64b.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p5040"
diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf
index 2778218..8f5ea62 100644
--- a/conf/machine/p5040ds.conf
+++ b/conf/machine/p5040ds.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running P5040DS in 32-bit mode 
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e5500.inc
+require conf/machine/include/e5500.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p5040"
diff --git a/conf/machine/t1040rdb-64b.conf b/conf/machine/t1040rdb-64b.conf
index 0f0a685..bc4de7b 100644
--- a/conf/machine/t1040rdb-64b.conf
+++ b/conf/machine/t1040rdb-64b.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running T1040RDB in 64-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e5500-64b.inc
+require conf/machine/include/e5500-64b.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t1040"
diff --git a/conf/machine/t1040rdb.conf b/conf/machine/t1040rdb.conf
index 4532c49..d2ec7a4 100644
--- a/conf/machine/t1040rdb.conf
+++ b/conf/machine/t1040rdb.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running T1040RDB in 32-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e5500.inc
+require conf/machine/include/e5500.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t1040"
diff --git a/conf/machine/t1042rdb-64b.conf b/conf/machine/t1042rdb-64b.conf
index 52be355..58b2bd0 100644
--- a/conf/machine/t1042rdb-64b.conf
+++ b/conf/machine/t1042rdb-64b.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running T1042RDB in 64-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e5500-64b.inc
+require conf/machine/include/e5500-64b.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t1042"
diff --git a/conf/machine/t1042rdb.conf b/conf/machine/t1042rdb.conf
index ce877c7..e5c4112 100644
--- a/conf/machine/t1042rdb.conf
+++ b/conf/machine/t1042rdb.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running T1042RDB in 32-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e5500.inc
+require conf/machine/include/e5500.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t1042"
diff --git a/conf/machine/t2080qds-64b.conf b/conf/machine/t2080qds-64b.conf
index 1874902..bd1cd1d 100644
--- a/conf/machine/t2080qds-64b.conf
+++ b/conf/machine/t2080qds-64b.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running T2080QDS in 64-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e6500-64b.inc
+require conf/machine/include/e6500-64b.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t2080"
diff --git a/conf/machine/t2080qds.conf b/conf/machine/t2080qds.conf
index aa19307..2892baa 100644
--- a/conf/machine/t2080qds.conf
+++ b/conf/machine/t2080qds.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running T2080QDS in 32-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e6500.inc
+require conf/machine/include/e6500.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t2080"
diff --git a/conf/machine/t2080rdb-64b.conf b/conf/machine/t2080rdb-64b.conf
index e5dfb33..2d28f9c 100644
--- a/conf/machine/t2080rdb-64b.conf
+++ b/conf/machine/t2080rdb-64b.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running T2080RDB in 64-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e6500-64b.inc
+require conf/machine/include/e6500-64b.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t2080"
diff --git a/conf/machine/t2080rdb.conf b/conf/machine/t2080rdb.conf
index 5030588..256a3d0 100644
--- a/conf/machine/t2080rdb.conf
+++ b/conf/machine/t2080rdb.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running T2080RDB in 32-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e6500.inc
+require conf/machine/include/e6500.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t2080"
diff --git a/conf/machine/t4160qds-64b.conf b/conf/machine/t4160qds-64b.conf
index 778f554..1865078 100644
--- a/conf/machine/t4160qds-64b.conf
+++ b/conf/machine/t4160qds-64b.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running T4160QDS in 64-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e6500-64b.inc
+require conf/machine/include/e6500-64b.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t4160"
diff --git a/conf/machine/t4160qds.conf b/conf/machine/t4160qds.conf
index 62157d2..07ea41b 100644
--- a/conf/machine/t4160qds.conf
+++ b/conf/machine/t4160qds.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running T4160QDS in 32-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e6500.inc
+require conf/machine/include/e6500.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t4160"
diff --git a/conf/machine/t4240qds-64b.conf b/conf/machine/t4240qds-64b.conf
index dc77770..ff56c3b 100644
--- a/conf/machine/t4240qds-64b.conf
+++ b/conf/machine/t4240qds-64b.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running T4240QDS in 64-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e6500-64b.inc
+require conf/machine/include/e6500-64b.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t4240"
diff --git a/conf/machine/t4240qds.conf b/conf/machine/t4240qds.conf
index 8f51500..0df32f6 100644
--- a/conf/machine/t4240qds.conf
+++ b/conf/machine/t4240qds.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running T4240QDS in 32-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e6500.inc
+require conf/machine/include/e6500.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t4240"
diff --git a/conf/machine/t4240rdb-64b.conf b/conf/machine/t4240rdb-64b.conf
index ab7870b..0838187 100644
--- a/conf/machine/t4240rdb-64b.conf
+++ b/conf/machine/t4240rdb-64b.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running T4240RDB in 64-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e6500-64b.inc
+require conf/machine/include/e6500-64b.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t4240"
diff --git a/conf/machine/t4240rdb.conf b/conf/machine/t4240rdb.conf
index dc51e65..dc5f45c 100644
--- a/conf/machine/t4240rdb.conf
+++ b/conf/machine/t4240rdb.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for running T4240RDB in 32-bit mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require e6500.inc
+require conf/machine/include/e6500.inc
 require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t4240"
-- 
1.7.9.7

[meta-fsl-ppc][PATCH 02/12] remove kernel26 machine feature usage

[ting.liu]

From: Ting Liu <b28495@freescale.com>

kernel26 is now obsolete so remove it from the machine configs

Signed-off-by: Ting Liu <b28495@freescale.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 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc
index f5b419d..6fecb80 100644
--- a/conf/machine/include/e500mc.inc
+++ b/conf/machine/include/e500mc.inc
@@ -2,7 +2,7 @@ TARGET_FPU = "hard"
 
 require conf/machine/include/tune-ppce500mc.inc
 
-MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
+MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
 MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
diff --git a/conf/machine/include/e500v2.inc b/conf/machine/include/e500v2.inc
index 23b5091..2142d9d 100644
--- a/conf/machine/include/e500v2.inc
+++ b/conf/machine/include/e500v2.inc
@@ -1,6 +1,6 @@
 require conf/machine/include/tune-ppce500v2.inc
 
-MACHINE_FEATURES = "kernel26 pci ext2 ext3 serial"
+MACHINE_FEATURES = "pci ext2 ext3 serial"
 MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc
index b34be91..015444a 100644
--- a/conf/machine/include/e5500-64b.inc
+++ b/conf/machine/include/e5500-64b.inc
@@ -3,7 +3,7 @@ TARGET_FPU = "hard"
 DEFAULTTUNE ?= "ppc64e5500"
 require conf/machine/include/tune-ppce5500.inc
 
-MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
+MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
 MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc
index 0b4a9a3..bc948fa 100644
--- a/conf/machine/include/e5500.inc
+++ b/conf/machine/include/e5500.inc
@@ -2,7 +2,7 @@ TARGET_FPU = "hard"
 
 require conf/machine/include/tune-ppce5500.inc
 
-MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
+MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
 MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
index a37d1dd..21ee5d6 100644
--- a/conf/machine/include/e6500-64b.inc
+++ b/conf/machine/include/e6500-64b.inc
@@ -3,7 +3,7 @@ TARGET_FPU = "hard"
 DEFAULTTUNE ?= "ppc64e6500"
 require conf/machine/include/tune-ppce6500.inc
 
-MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
+MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
 MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
index dd259fc..c901020 100644
--- a/conf/machine/include/e6500.inc
+++ b/conf/machine/include/e6500.inc
@@ -2,7 +2,7 @@ TARGET_FPU = "hard"
 
 require conf/machine/include/tune-ppce6500.inc
 
-MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
+MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
 MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-- 
1.7.9.7

[meta-fsl-ppc][PATCH 03/12] remove obsolete PREFERRED_VERSION for virtual/kernel

[ting.liu]

From: Ting Liu <b28495@freescale.com>

there is only one linux-qoriq-sdk recipe that is based on 3.12 now

Signed-off-by: Ting Liu <b28495@freescale.com>
---
 conf/machine/include/e500mc.inc    |    1 -
 conf/machine/include/e500v2.inc    |    1 -
 conf/machine/include/e5500-64b.inc |    1 -
 conf/machine/include/e5500.inc     |    1 -
 conf/machine/include/e6500-64b.inc |    1 -
 conf/machine/include/e6500.inc     |    1 -
 6 files changed, 6 deletions(-)

diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc
index 6fecb80..a35d91b 100644
--- a/conf/machine/include/e500mc.inc
+++ b/conf/machine/include/e500mc.inc
@@ -6,7 +6,6 @@ MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
 MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
 PREFERRED_VERSION_qemu = "1.7+fsl"
 PREFERRED_VERSION_openssl = "1.0.1g"
 
diff --git a/conf/machine/include/e500v2.inc b/conf/machine/include/e500v2.inc
index 2142d9d..adaa3cd 100644
--- a/conf/machine/include/e500v2.inc
+++ b/conf/machine/include/e500v2.inc
@@ -4,7 +4,6 @@ MACHINE_FEATURES = "pci ext2 ext3 serial"
 MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
 PREFERRED_VERSION_qemu = "1.7+fsl"
 PREFERRED_VERSION_openssl = "1.0.1g"
 
diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc
index 015444a..c951843 100644
--- a/conf/machine/include/e5500-64b.inc
+++ b/conf/machine/include/e5500-64b.inc
@@ -7,7 +7,6 @@ MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
 MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
 PREFERRED_VERSION_qemu = "1.7+fsl"
 PREFERRED_VERSION_openssl = "1.0.1g"
 
diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc
index bc948fa..0babacc 100644
--- a/conf/machine/include/e5500.inc
+++ b/conf/machine/include/e5500.inc
@@ -6,7 +6,6 @@ MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
 MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
 PREFERRED_VERSION_qemu = "1.7+fsl"
 PREFERRED_VERSION_openssl = "1.0.1g"
 
diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
index 21ee5d6..36f55a2 100644
--- a/conf/machine/include/e6500-64b.inc
+++ b/conf/machine/include/e6500-64b.inc
@@ -7,7 +7,6 @@ MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
 MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
 PREFERRED_VERSION_qemu = "1.7+fsl"
 PREFERRED_VERSION_openssl = "1.0.1g"
 
diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
index c901020..81a2bf4 100644
--- a/conf/machine/include/e6500.inc
+++ b/conf/machine/include/e6500.inc
@@ -6,7 +6,6 @@ MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
 MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
 PREFERRED_VERSION_qemu = "1.7+fsl"
 PREFERRED_VERSION_openssl = "1.0.1g"
 
-- 
1.7.9.7

[meta-fsl-ppc][PATCH 04/12] conf/machine/: move common bits to inc files

[ting.liu]

From: Ting Liu <b28495@freescale.com>

* add four new files to hold common bits:
   include/qoriq-base.inc
   include/qoriq-default-providers.inc
   include/qoriq-default-settings.inc
   include/qoriq-default-versions.inc
* add 'qoriq' into list of MACHINEOVERRIDES

Signed-off-by: Ting Liu <b28495@freescale.com>
---
 conf/machine/b4420qds-64b.conf                   |    6 ------
 conf/machine/b4420qds.conf                       |    5 -----
 conf/machine/b4860qds-64b.conf                   |    5 -----
 conf/machine/b4860qds.conf                       |    5 -----
 conf/machine/bsc9131rdb.conf                     |    4 ----
 conf/machine/bsc9132qds.conf                     |    4 ----
 conf/machine/c293pcie.conf                       |    4 ----
 conf/machine/include/e500mc.inc                  |   13 +------------
 conf/machine/include/e500v2.inc                  |   13 +------------
 conf/machine/include/e5500-64b.inc               |   15 ++-------------
 conf/machine/include/e5500.inc                   |   13 +------------
 conf/machine/include/e6500-64b.inc               |   15 ++-------------
 conf/machine/include/e6500.inc                   |   14 +++-----------
 conf/machine/include/qoriq-base.inc              |    8 ++++++++
 conf/machine/include/qoriq-default-providers.inc |    2 ++
 conf/machine/include/qoriq-default-settings.inc  |   15 +++++++++++++++
 conf/machine/include/qoriq-default-versions.inc  |    3 +++
 conf/machine/p1010rdb.conf                       |    4 ----
 conf/machine/p1020rdb.conf                       |    6 ------
 conf/machine/p1021rdb.conf                       |    4 ----
 conf/machine/p1022ds.conf                        |    4 ----
 conf/machine/p1023rdb.conf                       |    4 ----
 conf/machine/p1025twr.conf                       |    4 ----
 conf/machine/p2020ds.conf                        |    4 ----
 conf/machine/p2020rdb.conf                       |    4 ----
 conf/machine/p2041rdb.conf                       |    4 ----
 conf/machine/p3041ds.conf                        |    4 ----
 conf/machine/p4080ds.conf                        |    4 ----
 conf/machine/p5020ds-64b.conf                    |    5 -----
 conf/machine/p5020ds.conf                        |    4 ----
 conf/machine/p5040ds-64b.conf                    |    4 ----
 conf/machine/p5040ds.conf                        |    4 ----
 conf/machine/t1040rdb-64b.conf                   |    4 ----
 conf/machine/t1040rdb.conf                       |    4 ----
 conf/machine/t1042rdb-64b.conf                   |    5 -----
 conf/machine/t1042rdb.conf                       |    5 -----
 conf/machine/t2080qds-64b.conf                   |    5 -----
 conf/machine/t2080qds.conf                       |    5 -----
 conf/machine/t2080rdb-64b.conf                   |    5 -----
 conf/machine/t2080rdb.conf                       |    5 -----
 conf/machine/t4160qds-64b.conf                   |    5 -----
 conf/machine/t4160qds.conf                       |    5 -----
 conf/machine/t4240qds-64b.conf                   |    5 -----
 conf/machine/t4240qds.conf                       |    5 -----
 conf/machine/t4240rdb-64b.conf                   |    5 -----
 conf/machine/t4240rdb.conf                       |    5 -----
 46 files changed, 38 insertions(+), 237 deletions(-)
 create mode 100644 conf/machine/include/qoriq-base.inc
 create mode 100644 conf/machine/include/qoriq-default-providers.inc
 create mode 100644 conf/machine/include/qoriq-default-settings.inc
 create mode 100644 conf/machine/include/qoriq-default-versions.inc

diff --git a/conf/machine/b4420qds-64b.conf b/conf/machine/b4420qds-64b.conf
index 45c820e..a623c84 100644
--- a/conf/machine/b4420qds-64b.conf
+++ b/conf/machine/b4420qds-64b.conf
@@ -5,17 +5,11 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "b4420"
-
-# TODO: fix 32bit build of u-boot
 UBOOT_MACHINES ?= "B4420QDS"
 KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/b4420qds.conf b/conf/machine/b4420qds.conf
index 9016cfb..fa1187b 100644
--- a/conf/machine/b4420qds.conf
+++ b/conf/machine/b4420qds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "b4420"
 UBOOT_MACHINES ?= "B4420QDS"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"
diff --git a/conf/machine/b4860qds-64b.conf b/conf/machine/b4860qds-64b.conf
index 4da069f..3ba5648 100644
--- a/conf/machine/b4860qds-64b.conf
+++ b/conf/machine/b4860qds-64b.conf
@@ -5,16 +5,11 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "b4860"
-# TODO: fix 32bit build of u-boot
 UBOOT_MACHINES ?= "B4860QDS"
 KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/b4860qds.conf b/conf/machine/b4860qds.conf
index c560f1c..972d29f 100644
--- a/conf/machine/b4860qds.conf
+++ b/conf/machine/b4860qds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "b4860"
 UBOOT_MACHINES ?= "B4860QDS"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"
diff --git a/conf/machine/bsc9131rdb.conf b/conf/machine/bsc9131rdb.conf
index 64ba795..e65f7e4 100644
--- a/conf/machine/bsc9131rdb.conf
+++ b/conf/machine/bsc9131rdb.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com> 
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "bsc9131"
 UBOOT_MACHINES ?= "BSC9131RDB_SPIFLASH BSC9131RDB_NAND BSC9131RDB_NAND_SYSCLK100 BSC9131RDB_SPIFLASH_SYSCLK100"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/bsc913x_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/bsc9132qds.conf b/conf/machine/bsc9132qds.conf
index a51cbd8..82078ee 100644
--- a/conf/machine/bsc9132qds.conf
+++ b/conf/machine/bsc9132qds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "bsc9132"
 UBOOT_MACHINES ?= " BSC9132QDS_NAND_DDRCLK133 BSC9132QDS_NAND_DDRCLK100 BSC9132QDS_NOR_DDRCLK100 BSC9132QDS_NOR_DDRCLK133 BSC9132QDS_SDCARD_DDRCLK100 BSC9132QDS_SDCARD_DDRCLK133 BSC9132QDS_SPIFLASH_DDRCLK100 BSC9132QDS_SPIFLASH_DDRCLK133"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/bsc913x_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/c293pcie.conf b/conf/machine/c293pcie.conf
index b22dfd0..6a63844 100644
--- a/conf/machine/c293pcie.conf
+++ b/conf/machine/c293pcie.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "c293pcie"
 BOOTFORMAT_CONFIG = "config_ddr3_512m_c29xpcie_800M.dat"
@@ -15,6 +14,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc
index a35d91b..09b5c69 100644
--- a/conf/machine/include/e500mc.inc
+++ b/conf/machine/include/e500mc.inc
@@ -1,17 +1,6 @@
 TARGET_FPU = "hard"
 
 require conf/machine/include/tune-ppce500mc.inc
-
-MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_qemu = "1.7+fsl"
-PREFERRED_VERSION_openssl = "1.0.1g"
-
-KERNEL_IMAGETYPE ?= "uImage"
-# disable the images below for now
-#		ext2.bz2 ext2.lzma \
-#		ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+require conf/machine/include/qoriq-base.inc
 
 MACHINEOVERRIDES .= ":e500mc:fslmachine"
diff --git a/conf/machine/include/e500v2.inc b/conf/machine/include/e500v2.inc
index adaa3cd..178de18 100644
--- a/conf/machine/include/e500v2.inc
+++ b/conf/machine/include/e500v2.inc
@@ -1,15 +1,4 @@
 require conf/machine/include/tune-ppce500v2.inc
-
-MACHINE_FEATURES = "pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_qemu = "1.7+fsl"
-PREFERRED_VERSION_openssl = "1.0.1g"
-
-KERNEL_IMAGETYPE ?= "uImage"
-# disable the images below for now
-#		ext2.bz2 ext2.lzma \
-#		ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+require conf/machine/include/qoriq-base.inc
 
 MACHINEOVERRIDES .= ":e500v2:fslmachine"
diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc
index c951843..47a9ad7 100644
--- a/conf/machine/include/e5500-64b.inc
+++ b/conf/machine/include/e5500-64b.inc
@@ -1,18 +1,7 @@
 TARGET_FPU = "hard"
-
 DEFAULTTUNE ?= "ppc64e5500"
-require conf/machine/include/tune-ppce5500.inc
-
-MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_qemu = "1.7+fsl"
-PREFERRED_VERSION_openssl = "1.0.1g"
-
-KERNEL_IMAGETYPE ?= "uImage"
-# disable the images below for now
-#		ext2.bz2 ext2.lzma \
-#		ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+require conf/machine/include/tune-ppce5500.inc
+require conf/machine/include/qoriq-base.inc
 
 MACHINEOVERRIDES .= ":e5500-64b:fslmachine"
diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc
index 0babacc..e6f0400 100644
--- a/conf/machine/include/e5500.inc
+++ b/conf/machine/include/e5500.inc
@@ -1,17 +1,6 @@
 TARGET_FPU = "hard"
 
 require conf/machine/include/tune-ppce5500.inc
-
-MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_qemu = "1.7+fsl"
-PREFERRED_VERSION_openssl = "1.0.1g"
-
-KERNEL_IMAGETYPE ?= "uImage"
-# disable the images below for now
-#		ext2.bz2 ext2.lzma \
-#		ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+require conf/machine/include/qoriq-base.inc
 
 MACHINEOVERRIDES .= ":e5500:fslmachine"
diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
index 36f55a2..0770cc3 100644
--- a/conf/machine/include/e6500-64b.inc
+++ b/conf/machine/include/e6500-64b.inc
@@ -1,18 +1,7 @@
 TARGET_FPU = "hard"
-
 DEFAULTTUNE ?= "ppc64e6500"
-require conf/machine/include/tune-ppce6500.inc
-
-MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_qemu = "1.7+fsl"
-PREFERRED_VERSION_openssl = "1.0.1g"
-
-KERNEL_IMAGETYPE ?= "uImage"
-# disable the images below for now
-#		ext2.bz2 ext2.lzma \
-#		ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+require conf/machine/include/tune-ppce6500.inc
+require conf/machine/include/qoriq-base.inc
 
 MACHINEOVERRIDES .= ":e6500-64b:fslmachine"
diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
index 81a2bf4..323e420 100644
--- a/conf/machine/include/e6500.inc
+++ b/conf/machine/include/e6500.inc
@@ -1,17 +1,9 @@
 TARGET_FPU = "hard"
 
 require conf/machine/include/tune-ppce6500.inc
+require conf/machine/include/qoriq-base.inc
 
-MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
-PREFERRED_VERSION_qemu = "1.7+fsl"
-PREFERRED_VERSION_openssl = "1.0.1g"
+MACHINEOVERRIDES .= ":e6500:fslmachine"
 
-KERNEL_IMAGETYPE ?= "uImage"
-# disable the images below for now
-#		ext2.bz2 ext2.lzma \
-#		ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+BUILD_64BIT_KERNEL = "1"
 
-MACHINEOVERRIDES .= ":e6500:fslmachine"
diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
new file mode 100644
index 0000000..9b26d10
--- /dev/null
+++ b/conf/machine/include/qoriq-base.inc
@@ -0,0 +1,8 @@
+# Provides the QorIQ common settings
+
+require conf/machine/include/qoriq-default-settings.inc
+require conf/machine/include/qoriq-default-versions.inc
+require conf/machine/include/qoriq-default-providers.inc
+
+require conf/machine/include/soc-family.inc
+
diff --git a/conf/machine/include/qoriq-default-providers.inc b/conf/machine/include/qoriq-default-providers.inc
new file mode 100644
index 0000000..824712b
--- /dev/null
+++ b/conf/machine/include/qoriq-default-providers.inc
@@ -0,0 +1,2 @@
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
+
diff --git a/conf/machine/include/qoriq-default-settings.inc b/conf/machine/include/qoriq-default-settings.inc
new file mode 100644
index 0000000..2247495
--- /dev/null
+++ b/conf/machine/include/qoriq-default-settings.inc
@@ -0,0 +1,15 @@
+MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
+MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
+
+KERNEL_IMAGETYPE ?= "uImage"
+# disable the images below for now
+#       ext2.bz2 ext2.lzma \
+#       ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
+
+MACHINEOVERRIDES .= ":qoriq"
+
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+
+USE_VT = "0"
+
diff --git a/conf/machine/include/qoriq-default-versions.inc b/conf/machine/include/qoriq-default-versions.inc
new file mode 100644
index 0000000..3bb03ba
--- /dev/null
+++ b/conf/machine/include/qoriq-default-versions.inc
@@ -0,0 +1,3 @@
+PREFERRED_VERSION_qemu = "1.7+fsl"
+PREFERRED_VERSION_openssl = "1.0.1g"
+
diff --git a/conf/machine/p1010rdb.conf b/conf/machine/p1010rdb.conf
index 10b1c92..ee7a9b6 100644
--- a/conf/machine/p1010rdb.conf
+++ b/conf/machine/p1010rdb.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p1010"
 BOOTFORMAT_CONFIG = "config_sram_p1010rdb.dat"
@@ -17,6 +16,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p1020rdb.conf b/conf/machine/p1020rdb.conf
index 3fa7377..e2b706e 100644
--- a/conf/machine/p1020rdb.conf
+++ b/conf/machine/p1020rdb.conf
@@ -5,18 +5,12 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p1020"
 BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
 UBOOT_MACHINES ?= " P1020RDB-PD P1020RDB-PD_NAND P1020RDB-PD_SDCARD P1020RDB-PD_SPIFLASH"
-
 KERNEL_DEVICETREE ?= "p1020rdb-pd_32b.dtb"
-
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p1021rdb.conf b/conf/machine/p1021rdb.conf
index 711a62d..4c793e8 100644
--- a/conf/machine/p1021rdb.conf
+++ b/conf/machine/p1021rdb.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p1021"
 BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
@@ -15,6 +14,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p1022ds.conf b/conf/machine/p1022ds.conf
index 107cbe4..823131a 100644
--- a/conf/machine/p1022ds.conf
+++ b/conf/machine/p1022ds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p1022"
 BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
@@ -25,6 +24,3 @@ XSERVER = " \
 
 JFFS2_ERASEBLOCK = "0x20000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p1023rdb.conf b/conf/machine/p1023rdb.conf
index 59a9ce6..02ec4a5 100644
--- a/conf/machine/p1023rdb.conf
+++ b/conf/machine/p1023rdb.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p1023"
 UBOOT_MACHINES ?= "P1023RDB"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/p1023_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p1025twr.conf b/conf/machine/p1025twr.conf
index e7d25fe..67fa569 100644
--- a/conf/machine/p1025twr.conf
+++ b/conf/machine/p1025twr.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p1025"
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat"
@@ -15,6 +14,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p2020ds.conf b/conf/machine/p2020ds.conf
index 7510787..96433a2 100644
--- a/conf/machine/p2020ds.conf
+++ b/conf/machine/p2020ds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p2020"
 BOOTFORMAT_CONFIG = "config_sram_p2020ds.dat"
@@ -15,6 +14,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p2020rdb.conf b/conf/machine/p2020rdb.conf
index c3d08c9..9544c25 100644
--- a/conf/machine/p2020rdb.conf
+++ b/conf/machine/p2020rdb.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p2020"
 BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
@@ -15,6 +14,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf
index d06df45..f641a00 100644
--- a/conf/machine/p2041rdb.conf
+++ b/conf/machine/p2041rdb.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500mc.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p2041"
 UBOOT_MACHINES ?= "P2041RDB P2041RDB_NAND P2041RDB_SECURE_BOOT P2041RDB_SDCARD P2041RDB_SPIFLASH"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p3041ds.conf b/conf/machine/p3041ds.conf
index 7be35b9..01c51e4 100644
--- a/conf/machine/p3041ds.conf
+++ b/conf/machine/p3041ds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500mc.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p3041"
 UBOOT_MACHINES ?= "P3041DS P3041DS_NAND P3041DS_SECURE_BOOT P3041DS_SDCARD P3041DS_SPIFLASH"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf
index 51c0fed..1b6fad7 100644
--- a/conf/machine/p4080ds.conf
+++ b/conf/machine/p4080ds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500mc.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p4080"
 UBOOT_MACHINES ?= "P4080DS P4080DS_SECURE_BOOT P4080DS_SDCARD P4080DS_SPIFLASH "
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf
index a901b48..057e9f3 100644
--- a/conf/machine/p5020ds-64b.conf
+++ b/conf/machine/p5020ds-64b.conf
@@ -5,16 +5,11 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p5020"
-# TODO: fix 32bit build of u-boot for p5020ds-64b
 UBOOT_MACHINES ?= "P5020DS"
 KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf
index 42ab769..7effe1e 100644
--- a/conf/machine/p5020ds.conf
+++ b/conf/machine/p5020ds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p5020"
 UBOOT_MACHINES ?= "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT P5020DS_SDCARD P5020DS_SPIFLASH "
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf
index c462970..fbbe9e2 100644
--- a/conf/machine/p5040ds-64b.conf
+++ b/conf/machine/p5040ds-64b.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p5040"
 UBOOT_MACHINES ?= "P5040DS  P5040DS_NAND P5040DS_SECURE_BOOT P5040DS_SDCARD P5040DS_SPIFLASH"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf
index 8f5ea62..1cd9512 100644
--- a/conf/machine/p5040ds.conf
+++ b/conf/machine/p5040ds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p5040"
 UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT P5040DS_SDCARD P5040DS_SPIFLASH"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/t1040rdb-64b.conf b/conf/machine/t1040rdb-64b.conf
index bc4de7b..b4ea5c8 100644
--- a/conf/machine/t1040rdb-64b.conf
+++ b/conf/machine/t1040rdb-64b.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t1040"
 UBOOT_MACHINES ?= "T1040RDB"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/t1040_64bit_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/t1040rdb.conf b/conf/machine/t1040rdb.conf
index d2ec7a4..684cf8e 100644
--- a/conf/machine/t1040rdb.conf
+++ b/conf/machine/t1040rdb.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t1040"
 UBOOT_MACHINES ?= "T1040RDB"
@@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/t1040_32bit_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/t1042rdb-64b.conf b/conf/machine/t1042rdb-64b.conf
index 58b2bd0..0141e10 100644
--- a/conf/machine/t1042rdb-64b.conf
+++ b/conf/machine/t1042rdb-64b.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t1042"
 UBOOT_MACHINES ?= "T1042RDB_PI"
@@ -14,10 +13,6 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/t1040_64bit_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 XSERVER = " \
     xserver-xorg \
diff --git a/conf/machine/t1042rdb.conf b/conf/machine/t1042rdb.conf
index e5c4112..1f13d86 100644
--- a/conf/machine/t1042rdb.conf
+++ b/conf/machine/t1042rdb.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t1042"
 UBOOT_MACHINES ?= "T1042RDB_PI"
@@ -14,10 +13,6 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/t1040_32bit_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 XSERVER = " \
     xserver-xorg \
diff --git a/conf/machine/t2080qds-64b.conf b/conf/machine/t2080qds-64b.conf
index bd1cd1d..e2b5682 100644
--- a/conf/machine/t2080qds-64b.conf
+++ b/conf/machine/t2080qds-64b.conf
@@ -5,16 +5,11 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t2080"
-# TODO: fix 32bit build of u-boot
 UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT"
 KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/t2080qds.conf b/conf/machine/t2080qds.conf
index 2892baa..dfa6b09 100644
--- a/conf/machine/t2080qds.conf
+++ b/conf/machine/t2080qds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t2080"
 UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"
diff --git a/conf/machine/t2080rdb-64b.conf b/conf/machine/t2080rdb-64b.conf
index 2d28f9c..5d4eed4 100644
--- a/conf/machine/t2080rdb-64b.conf
+++ b/conf/machine/t2080rdb-64b.conf
@@ -5,16 +5,11 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t2080"
-# TODO: fix 32bit build of u-boot
 UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT"
 KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/t2080rdb.conf b/conf/machine/t2080rdb.conf
index 256a3d0..08d2dd7 100644
--- a/conf/machine/t2080rdb.conf
+++ b/conf/machine/t2080rdb.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t2080"
 UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"
diff --git a/conf/machine/t4160qds-64b.conf b/conf/machine/t4160qds-64b.conf
index 1865078..3f35e57 100644
--- a/conf/machine/t4160qds-64b.conf
+++ b/conf/machine/t4160qds-64b.conf
@@ -5,16 +5,11 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t4160"
-# TODO: fix 32bit build of u-boot
 UBOOT_MACHINES ?= "T4160QDS"
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/t4160qds.conf b/conf/machine/t4160qds.conf
index 07ea41b..f87b58e 100644
--- a/conf/machine/t4160qds.conf
+++ b/conf/machine/t4160qds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t4160"
 UBOOT_MACHINES ?= "T4160QDS"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"
diff --git a/conf/machine/t4240qds-64b.conf b/conf/machine/t4240qds-64b.conf
index ff56c3b..510b813 100644
--- a/conf/machine/t4240qds-64b.conf
+++ b/conf/machine/t4240qds-64b.conf
@@ -5,16 +5,11 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t4240"
-# TODO: fix 32bit build of u-boot
 UBOOT_MACHINES ?= "T4240QDS"
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/t4240qds.conf b/conf/machine/t4240qds.conf
index 0df32f6..58e5200 100644
--- a/conf/machine/t4240qds.conf
+++ b/conf/machine/t4240qds.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t4240"
 UBOOT_MACHINES ?= "T4240QDS"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"
diff --git a/conf/machine/t4240rdb-64b.conf b/conf/machine/t4240rdb-64b.conf
index 0838187..ea45895 100644
--- a/conf/machine/t4240rdb-64b.conf
+++ b/conf/machine/t4240rdb-64b.conf
@@ -5,16 +5,11 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t4240"
-# TODO: fix 32bit build of u-boot
 UBOOT_MACHINES ?= "T4240RDB"
 KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb t4240rdb-usdpaa-shared-interfaces.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
diff --git a/conf/machine/t4240rdb.conf b/conf/machine/t4240rdb.conf
index dc5f45c..ec9c5bb 100644
--- a/conf/machine/t4240rdb.conf
+++ b/conf/machine/t4240rdb.conf
@@ -5,7 +5,6 @@
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
-require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t4240"
 UBOOT_MACHINES ?= "T4240RDB"
@@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-USE_VT = "0"
-BUILD_64BIT_KERNEL = "1"
-- 
1.7.9.7

[meta-fsl-ppc][PATCH 05/12] u-boot: rename to u-boot-qoriq

[ting.liu]

From: Ting Liu <b28495@freescale.com>

like u-boot-imx, u-boot-qoriq is supposed to be provided and supported
by Freescale. it uses latest u-boot codes on git.freescale.com

Signed-off-by: Ting Liu <b28495@freescale.com>
---
 conf/machine/include/qoriq-default-providers.inc   |    1 +
 .../u-boot/{u-boot_git.bb => u-boot-qoriq_git.bb}  |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename recipes-bsp/u-boot/{u-boot_git.bb => u-boot-qoriq_git.bb} (99%)

diff --git a/conf/machine/include/qoriq-default-providers.inc b/conf/machine/include/qoriq-default-providers.inc
index 824712b..b2c6c53 100644
--- a/conf/machine/include/qoriq-default-providers.inc
+++ b/conf/machine/include/qoriq-default-providers.inc
@@ -1,2 +1,3 @@
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq"
 
diff --git a/recipes-bsp/u-boot/u-boot_git.bb b/recipes-bsp/u-boot/u-boot-qoriq_git.bb
similarity index 99%
rename from recipes-bsp/u-boot/u-boot_git.bb
rename to recipes-bsp/u-boot/u-boot-qoriq_git.bb
index bd3053f..e16438f 100644
--- a/recipes-bsp/u-boot/u-boot_git.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "U-boot bootloader"
 HOMEPAGE = "http://u-boot.sf.net"
 SECTION = "bootloaders"
-PROVIDES = "virtual/bootloader"
+PROVIDES = "virtual/bootloader u-boot"
 LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1"
 LIC_FILES_CHKSUM = " \
     file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-- 
1.7.9.7

[meta-fsl-ppc][PATCH 06/12] linux-qoriq-sdk: rename to linux-qoriq

[ting.liu]

From: Ting Liu <b28495@freescale.com>

like linux-imx, linux-qoriq is supposed to be provided and supported
by Freescale. it uses latest linux codes on git.freescale.com

Signed-off-by: Ting Liu <b28495@freescale.com>
---
 conf/machine/include/qoriq-default-providers.inc   |    2 +-
 .../linux/{linux-qoriq-sdk.inc => linux-qoriq.inc} |    0
 ...linux-qoriq-sdk_3.12.bb => linux-qoriq_3.12.bb} |    2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename recipes-kernel/linux/{linux-qoriq-sdk.inc => linux-qoriq.inc} (100%)
 rename recipes-kernel/linux/{linux-qoriq-sdk_3.12.bb => linux-qoriq_3.12.bb} (79%)

diff --git a/conf/machine/include/qoriq-default-providers.inc b/conf/machine/include/qoriq-default-providers.inc
index b2c6c53..25197da 100644
--- a/conf/machine/include/qoriq-default-providers.inc
+++ b/conf/machine/include/qoriq-default-providers.inc
@@ -1,3 +1,3 @@
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq"
 PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq"
 
diff --git a/recipes-kernel/linux/linux-qoriq-sdk.inc b/recipes-kernel/linux/linux-qoriq.inc
similarity index 100%
rename from recipes-kernel/linux/linux-qoriq-sdk.inc
rename to recipes-kernel/linux/linux-qoriq.inc
diff --git a/recipes-kernel/linux/linux-qoriq-sdk_3.12.bb b/recipes-kernel/linux/linux-qoriq_3.12.bb
similarity index 79%
rename from recipes-kernel/linux/linux-qoriq-sdk_3.12.bb
rename to recipes-kernel/linux/linux-qoriq_3.12.bb
index 881180a..5d9a1f0 100644
--- a/recipes-kernel/linux/linux-qoriq-sdk_3.12.bb
+++ b/recipes-kernel/linux/linux-qoriq_3.12.bb
@@ -1,4 +1,4 @@
-require recipes-kernel/linux/linux-qoriq-sdk.inc
+require recipes-kernel/linux/linux-qoriq.inc
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git;nobranch=1 \
     file://powerpc-Fix-64-bit-builds-with-binutils-2.24.patch \
-- 
1.7.9.7

[meta-fsl-ppc][PATCH 07/12] remove fslmachine MACHINEOVERRIDES usage

[ting.liu]

From: Ting Liu <b28495@freescale.com>

fslmachine is too generic, use qoriq instead.

Signed-off-by: Ting Liu <b28495@freescale.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 +-
 recipes-bsp/rcw/rcw_git.bb                         |    2 +-
 recipes-devtools/qemu/qemu_fslgit.bb               |    2 +-
 recipes-dpaa/fmlib/fmlib_git.bb                    |    2 +-
 recipes-dpaa/usdpaa/usdpaa_git.bb                  |    2 +-
 recipes-extended/testfloat/testfloat_2a.bb         |    2 +-
 recipes-kernel/cryptodev/cryptodev-fsl.inc         |    6 +++---
 .../cryptodev/cryptodev-module_1.6.bbappend        |    2 +-
 recipes-virtualization/hv-cfg/hv-cfg_git.bb        |    2 +-
 .../hypervisor/hypervisor_git.bb                   |    2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc
index 09b5c69..5871104 100644
--- a/conf/machine/include/e500mc.inc
+++ b/conf/machine/include/e500mc.inc
@@ -3,4 +3,4 @@ TARGET_FPU = "hard"
 require conf/machine/include/tune-ppce500mc.inc
 require conf/machine/include/qoriq-base.inc
 
-MACHINEOVERRIDES .= ":e500mc:fslmachine"
+MACHINEOVERRIDES .= ":e500mc"
diff --git a/conf/machine/include/e500v2.inc b/conf/machine/include/e500v2.inc
index 178de18..a937254 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-base.inc
 
-MACHINEOVERRIDES .= ":e500v2:fslmachine"
+MACHINEOVERRIDES .= ":e500v2"
diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc
index 47a9ad7..5c75883 100644
--- a/conf/machine/include/e5500-64b.inc
+++ b/conf/machine/include/e5500-64b.inc
@@ -4,4 +4,4 @@ DEFAULTTUNE ?= "ppc64e5500"
 require conf/machine/include/tune-ppce5500.inc
 require conf/machine/include/qoriq-base.inc
 
-MACHINEOVERRIDES .= ":e5500-64b:fslmachine"
+MACHINEOVERRIDES .= ":e5500-64b"
diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc
index e6f0400..88f6d06 100644
--- a/conf/machine/include/e5500.inc
+++ b/conf/machine/include/e5500.inc
@@ -3,4 +3,4 @@ TARGET_FPU = "hard"
 require conf/machine/include/tune-ppce5500.inc
 require conf/machine/include/qoriq-base.inc
 
-MACHINEOVERRIDES .= ":e5500:fslmachine"
+MACHINEOVERRIDES .= ":e5500"
diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
index 0770cc3..5e533e0 100644
--- a/conf/machine/include/e6500-64b.inc
+++ b/conf/machine/include/e6500-64b.inc
@@ -4,4 +4,4 @@ DEFAULTTUNE ?= "ppc64e6500"
 require conf/machine/include/tune-ppce6500.inc
 require conf/machine/include/qoriq-base.inc
 
-MACHINEOVERRIDES .= ":e6500-64b:fslmachine"
+MACHINEOVERRIDES .= ":e6500-64b"
diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
index 323e420..5ebeccf 100644
--- a/conf/machine/include/e6500.inc
+++ b/conf/machine/include/e6500.inc
@@ -3,7 +3,7 @@ TARGET_FPU = "hard"
 require conf/machine/include/tune-ppce6500.inc
 require conf/machine/include/qoriq-base.inc
 
-MACHINEOVERRIDES .= ":e6500:fslmachine"
+MACHINEOVERRIDES .= ":e6500"
 
 BUILD_64BIT_KERNEL = "1"
 
diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
index 5e751b8..713ae86 100644
--- a/recipes-bsp/rcw/rcw_git.bb
+++ b/recipes-bsp/rcw/rcw_git.bb
@@ -42,6 +42,6 @@ addtask deploy after do_install
 PACKAGES += "${PN}-image"
 FILES_${PN}-image += "/boot"
 
-COMPATIBLE_HOST_fslmachine = ".*"
+COMPATIBLE_HOST_qoriq = ".*"
 COMPATIBLE_HOST ?= "(none)"
 ALLOW_EMPTY_${PN} = "1"
diff --git a/recipes-devtools/qemu/qemu_fslgit.bb b/recipes-devtools/qemu/qemu_fslgit.bb
index 30f27d6..03395a9 100644
--- a/recipes-devtools/qemu/qemu_fslgit.bb
+++ b/recipes-devtools/qemu/qemu_fslgit.bb
@@ -46,4 +46,4 @@ INSANE_SKIP_${PN} += "dev-deps"
 # the package get built. COMPATIBLE_HOST would not work
 # because it was too generic
 COMPATIBLE_MACHINE = "a^"
-COMPATIBLE_MACHINE_libc-glibc_fslmachine = ".*"
+COMPATIBLE_MACHINE_libc-glibc_qoriq = ".*"
diff --git a/recipes-dpaa/fmlib/fmlib_git.bb b/recipes-dpaa/fmlib/fmlib_git.bb
index 04ca515..4350cbd 100644
--- a/recipes-dpaa/fmlib/fmlib_git.bb
+++ b/recipes-dpaa/fmlib/fmlib_git.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}/git"
 TARGET_ARCH_FMLIB = "${DEFAULTTUNE}"
 TARGET_ARCH_FMLIB_e5500 = "ppc32e5500"
 TARGET_ARCH_FMLIB_e6500 = "ppc32e6500"
-COMPATIBLE_HOST_fslmachine = ".*"
+COMPATIBLE_HOST_qoriq = ".*"
 COMPATIBLE_HOST ?= "(none)"
 
 EXTRA_OEMAKE = "DESTDIR=${D} PREFIX=${prefix} LIB_DEST_DIR=${libdir} \
diff --git a/recipes-dpaa/usdpaa/usdpaa_git.bb b/recipes-dpaa/usdpaa/usdpaa_git.bb
index 9c7e388..e8ec4e7 100644
--- a/recipes-dpaa/usdpaa/usdpaa_git.bb
+++ b/recipes-dpaa/usdpaa/usdpaa_git.bb
@@ -71,6 +71,6 @@ do_install () {
 PARALLEL_MAKE_pn-${PN} = ""
 FILES_${PN} += "/root/SOURCE_THIS /usr/etc/"
 
-COMPATIBLE_HOST_fslmachine = ".*"
+COMPATIBLE_HOST_qoriq = ".*"
 COMPATIBLE_HOST ?= "(none)"
 
diff --git a/recipes-extended/testfloat/testfloat_2a.bb b/recipes-extended/testfloat/testfloat_2a.bb
index fb89e26..f3f58b4 100644
--- a/recipes-extended/testfloat/testfloat_2a.bb
+++ b/recipes-extended/testfloat/testfloat_2a.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://testfloat/testfloat.txt;beginline=87;endline=95;md5=b
 SRC_URI = " http://www.jhauser.us/arithmetic/TestFloat-2a.tar.Z;name=TestFloat \
             http://www.jhauser.us/arithmetic/SoftFloat-2b.tar.Z;name=SoftFloat \
           "
-SRC_URI_append_fslmachine = " file://SoftFloat-powerpc-1.patch \
+SRC_URI_append_qoriq = " file://SoftFloat-powerpc-1.patch \
                               file://TestFloat-powerpc-E500v2-SPE-1.patch \
                               file://Yocto-replace-COMPILE_PREFIX-gcc.patch \
                             "
diff --git a/recipes-kernel/cryptodev/cryptodev-fsl.inc b/recipes-kernel/cryptodev/cryptodev-fsl.inc
index 774ef10..0c59128 100644
--- a/recipes-kernel/cryptodev/cryptodev-fsl.inc
+++ b/recipes-kernel/cryptodev/cryptodev-fsl.inc
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/cryptodev-fsl"
 
-SRC_URI_fslmachine = "git://github.com/nmav/cryptodev-linux.git \
+SRC_URI_qoriq = "git://github.com/nmav/cryptodev-linux.git \
     file://0001-add-support-for-composite-TLS-SHA1-AES-algorithm-off.patch \
     file://0002-use-function-local-storage-for-cipher-and-hmac-keys.patch \
     file://0003-Add-support-for-aead-keys-for-composite-algorithms.patch \
@@ -18,7 +18,7 @@ SRC_URI_fslmachine = "git://github.com/nmav/cryptodev-linux.git \
     file://0015-Add-RSA-Key-generation-offloading.patch \
     file://0016-Fixed-compilation-error-of-openssl-with-fsl-cryptode.patch \
 "
-SRCREV_fslmachine = "e8609a408d40c83ae8fc11bbe9a7b3847612669b"
+SRCREV_qoriq = "e8609a408d40c83ae8fc11bbe9a7b3847612669b"
 
-S_fslmachine = "${WORKDIR}/git"
+S_qoriq = "${WORKDIR}/git"
 
diff --git a/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend b/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend
index 1dbf3b6..ff95702 100644
--- a/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend
+++ b/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend
@@ -2,7 +2,7 @@ require recipes-kernel/cryptodev/cryptodev-fsl.inc
 
 inherit qoriq_build_64bit_kernel
 
-do_install_append_fslmachine () {
+do_install_append_qoriq () {
     rm -fr ${D}/usr
 }
 
diff --git a/recipes-virtualization/hv-cfg/hv-cfg_git.bb b/recipes-virtualization/hv-cfg/hv-cfg_git.bb
index 304b78f..285f0be 100644
--- a/recipes-virtualization/hv-cfg/hv-cfg_git.bb
+++ b/recipes-virtualization/hv-cfg/hv-cfg_git.bb
@@ -41,6 +41,6 @@ addtask deploy after do_install
 PACKAGES += "${PN}-image"
 FILES_${PN}-image += "/boot"
 
-COMPATIBLE_HOST_fslmachine = ".*"
+COMPATIBLE_HOST_qoriq = ".*"
 COMPATIBLE_HOST ?= "(none)"
 ALLOW_EMPTY_${PN} = "1"
diff --git a/recipes-virtualization/hypervisor/hypervisor_git.bb b/recipes-virtualization/hypervisor/hypervisor_git.bb
index 4add9f3..f1ad3c1 100644
--- a/recipes-virtualization/hypervisor/hypervisor_git.bb
+++ b/recipes-virtualization/hypervisor/hypervisor_git.bb
@@ -36,7 +36,7 @@ EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHA
 DEFCONFIG = "defconfig"
 DEFCONFIG_powerpc64 = "64bit_defconfig"
 
-COMPATIBLE_HOST_fslmachine = ".*"
+COMPATIBLE_HOST_qoriq = ".*"
 COMPATIBLE_HOST ?= "(none)"
 
 inherit cml1
-- 
1.7.9.7

[meta-fsl-ppc][PATCH 08/12] add u-boot as EXTRA_IMAGEDEPENDS

[ting.liu]

From: Ting Liu <b28495@freescale.com>

* As the doc said:
EXTRA_IMAGEDEPENDS = "A list of recipes to build that do not
provide packages for installing into the root filesystem."
MACHINE_EXTRA_RRECOMMENDS = "A list of machine-specific packages
to install as part of the image being built"

* use += for MACHINE_EXTRA_RRECOMMENDS definition

Signed-off-by: Ting Liu <b28495@freescale.com>
---
 conf/machine/include/qoriq-default-settings.inc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/machine/include/qoriq-default-settings.inc b/conf/machine/include/qoriq-default-settings.inc
index 2247495..6dcbc9a 100644
--- a/conf/machine/include/qoriq-default-settings.inc
+++ b/conf/machine/include/qoriq-default-settings.inc
@@ -1,5 +1,6 @@
 MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
+MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf kernel-modules"
+EXTRA_IMAGEDEPENDS += "u-boot"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
-- 
1.7.9.7

[meta-fsl-ppc][PATCH 09/12] set IMAGE_CLASSES = "image_types_uboot" as defaut

[ting.liu]

From: Ting Liu <b28495@freescale.com>

Signed-off-by: Ting Liu <b28495@freescale.com>
---
 conf/machine/include/qoriq-default-settings.inc |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/machine/include/qoriq-default-settings.inc b/conf/machine/include/qoriq-default-settings.inc
index 6dcbc9a..f808ac2 100644
--- a/conf/machine/include/qoriq-default-settings.inc
+++ b/conf/machine/include/qoriq-default-settings.inc
@@ -1,5 +1,7 @@
 MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
 MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf kernel-modules"
+
+IMAGE_CLASSES = "image_types_uboot"
 EXTRA_IMAGEDEPENDS += "u-boot"
 
 KERNEL_IMAGETYPE ?= "uImage"
-- 
1.7.9.7

[meta-fsl-ppc][PATCH 10/12] add default setting for MKUBIFS_ARGS and UBINIZE_ARGS

[ting.liu]

From: Ting Liu <b28495@freescale.com>

Signed-off-by: Ting Liu <b28495@freescale.com>
---
 conf/machine/include/qoriq-default-settings.inc |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/machine/include/qoriq-default-settings.inc b/conf/machine/include/qoriq-default-settings.inc
index f808ac2..ef07b7d 100644
--- a/conf/machine/include/qoriq-default-settings.inc
+++ b/conf/machine/include/qoriq-default-settings.inc
@@ -16,3 +16,6 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 USE_VT = "0"
 
+MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600"
+UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512"
+
-- 
1.7.9.7

[meta-fsl-ppc][PATCH 11/12] inherit qoriq_build_64bit_kernel for kernel/module recipes

[ting.liu]

From: Ting Liu <b28495@freescale.com>

Signed-off-by: Ting Liu <b28495@freescale.com>
---
 recipes-bsp/ipc/ipc-modules.inc               |   20 +-------------------
 recipes-kernel/asf/asf_git.bb                 |   21 +--------------------
 recipes-kernel/ceetm/ceetm_git.bb             |   21 +--------------------
 recipes-kernel/linux/linux-qoriq.inc          |   25 +------------------------
 recipes-kernel/lttng/lttng-modules_%.bbappend |   18 +-----------------
 recipes-kernel/pkc-host/pkc-host_git.bb       |   21 +--------------------
 recipes-kernel/qoriq-debug/qoriq-debug_git.bb |   21 +--------------------
 recipes-kernel/skmm-host/skmm-host_git.bb     |   21 +--------------------
 8 files changed, 8 insertions(+), 160 deletions(-)

diff --git a/recipes-bsp/ipc/ipc-modules.inc b/recipes-bsp/ipc/ipc-modules.inc
index 015a91b..3d7dfa6 100644
--- a/recipes-bsp/ipc/ipc-modules.inc
+++ b/recipes-bsp/ipc/ipc-modules.inc
@@ -5,27 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fa38cd73d71527dc6efb546474f64d10"
 
 require ipc.inc
 
-inherit  module
+inherit  module qoriq_build_64bit_kernel
 
 S = "${WORKDIR}/git"
-python () {
-        ma = d.getVar("DISTRO_FEATURES", True)
-        arch = d.getVar("OVERRIDES", True)
-
-        # the : after the arch is to skip the message on 64b
-        if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch):
-                raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
-
-        promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
-
-        if promote_kernel == "1":
-                d.setVar('KERNEL_CC_append', ' -m64')
-                d.setVar('KERNEL_LD_append', ' -melf64ppc')
-
-        error_qa = d.getVar('ERROR_QA', True)
-        if 'arch' in error_qa:
-                d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
-}
 
 do_compile_prepend () {
     cd ${S}/kernel
diff --git a/recipes-kernel/asf/asf_git.bb b/recipes-kernel/asf/asf_git.bb
index 743ce62..9597257 100644
--- a/recipes-kernel/asf/asf_git.bb
+++ b/recipes-kernel/asf/asf_git.bb
@@ -9,32 +9,13 @@ SRCREV = "f107bc7dac7fe74d765dc09f66dca84951921d2c"
 DEPENDS="virtual/kernel"
 RDEPENDS_${PN} += "ipsec-tools"
 
-inherit module
+inherit module qoriq_build_64bit_kernel
 
 S = "${WORKDIR}/git/asfmodule"
 
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
 export KERNEL_PATH = "${STAGING_KERNEL_DIR}"
 
-python () {
-    ma = d.getVar("DISTRO_FEATURES", True)
-    arch = d.getVar("OVERRIDES", True)
-
-    # the : after the arch is to skip the message on 64b
-    if not "multiarch" in ma and "e6500:" in arch:
-        raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
-
-    promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
-
-    if promote_kernel == "1":
-        d.setVar('KERNEL_CC_append', ' -m64')
-        d.setVar('KERNEL_LD_append', ' -melf64ppc')
-
-    error_qa = d.getVar('ERROR_QA', True)
-    if 'arch' in error_qa:
-        d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
-}
-
 do_install(){
 	mkdir -p ${D}/usr/driver/asf
 	cp -rf ${S}/bin/full ${D}/usr/driver/asf
diff --git a/recipes-kernel/ceetm/ceetm_git.bb b/recipes-kernel/ceetm/ceetm_git.bb
index 7620cdb..266261e 100644
--- a/recipes-kernel/ceetm/ceetm_git.bb
+++ b/recipes-kernel/ceetm/ceetm_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b5881ecf398da8a03a3f4c501e29d287"
 
 DEPENDS="virtual/kernel"
 
-inherit module
+inherit module qoriq_build_64bit_kernel
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/ceetm.git;nobranch=1"
 SRCREV =  "ecf55c9ca0cd42a212653e1f99c19cd611e3a008"
@@ -14,25 +14,6 @@ S = "${WORKDIR}/git"
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} SYSROOT=${STAGING_DIR_TARGET}"
 export KERNEL_PATH = "${STAGING_KERNEL_DIR}"
 
-python () {
-    ma = d.getVar("DISTRO_FEATURES", True)
-    arch = d.getVar("OVERRIDES", True)
-
-    # the : after the arch is to skip the message on 64b
-    if not "multiarch" in ma and "e6500:" in arch:
-        raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
-
-    promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
-
-    if promote_kernel == "1":
-        d.setVar('KERNEL_CC_append', ' -m64')
-        d.setVar('KERNEL_LD_append', ' -melf64ppc')
-
-    error_qa = d.getVar('ERROR_QA', True)
-    if 'arch' in error_qa:
-        d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
-}
-
 do_install(){
 	mkdir -p ${D}/usr/driver/ceetm
 	mkdir -p ${D}/${libdir}/tc
diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index 00fe526..9e463dd 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -1,4 +1,4 @@
-inherit kernel
+inherit kernel qoriq_build_64bit_kernel
 require recipes-kernel/linux/linux-dtb.inc
 
 DESCRIPTION = "Linux kernel for Freescale platforms"
@@ -9,29 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 KSRC ?= ""
 S = '${@base_conditional("KSRC", "", "${WORKDIR}/git", "${KSRC}", d)}'
 
-python () {
-	ma = d.getVar("DISTRO_FEATURES", True)
-	arch = d.getVar("OVERRIDES", True)
-
-	# the : after the arch is to skip the message on 64b
-	if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch):
-		raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
-
-	promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
-
-	if promote_kernel == "1":
-		d.setVar('KERNEL_CC_append', ' -m64')
-		d.setVar('KERNEL_LD_append', ' -melf64ppc')
-
-	error_qa = d.getVar('ERROR_QA', True)
-	if 'arch' in error_qa:
-		d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
-
-	all_qa = d.getVar('ALL_QA', True)
-	if 'arch' in all_qa:
-		d.setVar('ALL_QA', all_qa.replace(' arch', ''))
-}
-
 DEPENDS_append = " libgcc"
 KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS}"
 KERNEL_LD_append = " ${TOOLCHAIN_OPTIONS}"
diff --git a/recipes-kernel/lttng/lttng-modules_%.bbappend b/recipes-kernel/lttng/lttng-modules_%.bbappend
index 5415f16..5ff765d 100644
--- a/recipes-kernel/lttng/lttng-modules_%.bbappend
+++ b/recipes-kernel/lttng/lttng-modules_%.bbappend
@@ -1,18 +1,2 @@
-inherit distro_features_check
+inherit qoriq_build_64bit_kernel
 
-REQUIRED_DISTRO_FEATURES_append_e6500 ?= "multiarch"
-
-python () {
-
-        promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
-
-        if promote_kernel == "1":
-                d.appendVar('KERNEL_CC', ' -m64')
-                d.appendVar('KERNEL_LD', ' -melf64ppc')
-
-        
-        error_qa = d.getVar('ERROR_QA', True)
-        if 'arch' in error_qa:
-            d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
-
-}
diff --git a/recipes-kernel/pkc-host/pkc-host_git.bb b/recipes-kernel/pkc-host/pkc-host_git.bb
index 9535005..2e579c1 100644
--- a/recipes-kernel/pkc-host/pkc-host_git.bb
+++ b/recipes-kernel/pkc-host/pkc-host_git.bb
@@ -3,7 +3,7 @@ SECTION = "pkc-host"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://Makefile;endline=30;md5=6a26ed8e76a8ea2e019c525369ed0f03"
 
-inherit  module
+inherit  module qoriq_build_64bit_kernel
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/pkc-host.git;nobranch=1"
 SRCREV = "cae512c94e2a26cc6b0d6393d307cdea2d7282c9"
@@ -12,25 +12,6 @@ S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
 
-python () {
-        ma = d.getVar("DISTRO_FEATURES", True)
-        arch = d.getVar("OVERRIDES", True)
-
-        # the : after the arch is to skip the message on 64b 
-        if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch):
-                raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
-
-        promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
-
-        if promote_kernel == "1":
-                d.setVar('KERNEL_CC_append', ' -m64')
-                d.setVar('KERNEL_LD_append', ' -melf64ppc')
-
-        error_qa = d.getVar('ERROR_QA', True)
-        if 'arch' in error_qa:
-                d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
-}
-
 do_install() {
         install -d ${D}/lib/modules/c2x0
         install -d ${D}/etc/crypto
diff --git a/recipes-kernel/qoriq-debug/qoriq-debug_git.bb b/recipes-kernel/qoriq-debug/qoriq-debug_git.bb
index 5dd2468..c08f057 100644
--- a/recipes-kernel/qoriq-debug/qoriq-debug_git.bb
+++ b/recipes-kernel/qoriq-debug/qoriq-debug_git.bb
@@ -3,7 +3,7 @@ SECTION = "qoriq-debug"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e29234dd5d40dc352cc60cc0c93437ba"
 
-inherit module autotools-brokensep
+inherit module autotools-brokensep qoriq_build_64bit_kernel
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/qoriq-debug.git;nobranch=1"
 SRCREV = "20615c1ea332102635f8314cee5787c48c1a4254"
@@ -13,22 +13,3 @@ S = "${WORKDIR}/git"
 EXTRA_OECONF += "--with-linux=${STAGING_KERNEL_DIR}"
 EXTRA_OEMAKE += 'SYSROOT="${D}"'
 
-python () {
-	ma = d.getVar("DISTRO_FEATURES", True)
-	arch = d.getVar("OVERRIDES", True)
-
-	# the : after the arch is to skip the message on 64b
-	if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch):
-		raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
-
-	promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
-
-	if promote_kernel == "1":
-		d.setVar('KERNEL_CC_append', ' -m64')
-		d.setVar('KERNEL_LD_append', ' -melf64ppc')
-
-	error_qa = d.getVar('ERROR_QA', True)
-	if 'arch' in error_qa:
-		d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
-}
-
diff --git a/recipes-kernel/skmm-host/skmm-host_git.bb b/recipes-kernel/skmm-host/skmm-host_git.bb
index 9ce8a1d..a1c43f3 100644
--- a/recipes-kernel/skmm-host/skmm-host_git.bb
+++ b/recipes-kernel/skmm-host/skmm-host_git.bb
@@ -3,7 +3,7 @@ SECTION = "c293-skmm-host"
 LICENSE = "Freescale-EULA"
 LIC_FILES_CHKSUM = "file://Makefile;endline=7;md5=edffaac1da9e809ade0d2fcfcc18d8df"
 
-inherit  module
+inherit  module qoriq_build_64bit_kernel
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/skmm-host.git;nobranch=1"
 SRCREV = "97c9241a359edccdf8913cb9accbfe4ceb511523"
@@ -12,23 +12,4 @@ S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
 
-python () {
-	ma = d.getVar("DISTRO_FEATURES", True)
-	arch = d.getVar("OVERRIDES", True)
-
-	# the : after the arch is to skip the message on 64b
-	if not "multiarch" in ma and ("e5500:" in arch or "e6500:" in arch):
-		raise bb.parse.SkipPackage("Building the kernel for this arch requires multiarch to be in DISTRO_FEATURES")
-
-	promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
-
-	if promote_kernel == "1":
-		d.setVar('KERNEL_CC_append', ' -m64')
-		d.setVar('KERNEL_LD_append', ' -melf64ppc')
-
-	error_qa = d.getVar('ERROR_QA', True)
-	if 'arch' in error_qa:
-		d.setVar('ERROR_QA', error_qa.replace(' arch', ''))
-}
-
 FILES_${PN} += "/etc/skmm/"
-- 
1.7.9.7

[meta-fsl-ppc][PATCH 12/12] ipc-modules: move to recipes-kernel/

[ting.liu]

From: Ting Liu <b28495@freescale.com>

Signed-off-by: Ting Liu <b28495@freescale.com>
---
 .../ipc/ipc-modules-multi_git.bb                   |    0
 .../ipc/ipc-modules-single_git.bb                  |    0
 .../ipc/ipc-modules.inc                            |    2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename {recipes-bsp => recipes-kernel}/ipc/ipc-modules-multi_git.bb (100%)
 rename {recipes-bsp => recipes-kernel}/ipc/ipc-modules-single_git.bb (100%)
 rename {recipes-bsp => recipes-kernel}/ipc/ipc-modules.inc (93%)

diff --git a/recipes-bsp/ipc/ipc-modules-multi_git.bb b/recipes-kernel/ipc/ipc-modules-multi_git.bb
similarity index 100%
rename from recipes-bsp/ipc/ipc-modules-multi_git.bb
rename to recipes-kernel/ipc/ipc-modules-multi_git.bb
diff --git a/recipes-bsp/ipc/ipc-modules-single_git.bb b/recipes-kernel/ipc/ipc-modules-single_git.bb
similarity index 100%
rename from recipes-bsp/ipc/ipc-modules-single_git.bb
rename to recipes-kernel/ipc/ipc-modules-single_git.bb
diff --git a/recipes-bsp/ipc/ipc-modules.inc b/recipes-kernel/ipc/ipc-modules.inc
similarity index 93%
rename from recipes-bsp/ipc/ipc-modules.inc
rename to recipes-kernel/ipc/ipc-modules.inc
index 3d7dfa6..e403e6b 100644
--- a/recipes-bsp/ipc/ipc-modules.inc
+++ b/recipes-kernel/ipc/ipc-modules.inc
@@ -3,7 +3,7 @@ DESCRIPTION = "DSP boot application and ipc test application"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fa38cd73d71527dc6efb546474f64d10"
 
-require ipc.inc
+require recipes-bsp/ipc/ipc.inc
 
 inherit  module qoriq_build_64bit_kernel
 
-- 
1.7.9.7

Re: [meta-fsl-ppc][PATCH 06/12] linux-qoriq-sdk: rename to linux-qoriq

[Otavio Salvador]

On Fri, Jul 11, 2014 at 5:09 AM,  <ting.liu@freescale.com> wrote:
> From: Ting Liu <b28495@freescale.com>
>
> like linux-imx, linux-qoriq is supposed to be provided and supported
> by Freescale. it uses latest linux codes on git.freescale.com
>
> Signed-off-by: Ting Liu <b28495@freescale.com>

Acked-by: Otavio Salvador <otavio@ossystems.com.br>

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-ppc][PATCH 02/12] remove kernel26 machine feature usage

[Otavio Salvador]

On Fri, Jul 11, 2014 at 5:09 AM,  <ting.liu@freescale.com> wrote:
> From: Ting Liu <b28495@freescale.com>
>
> kernel26 is now obsolete so remove it from the machine configs
>
> Signed-off-by: Ting Liu <b28495@freescale.com>
> ---


Acked-by: Otavio Salvador <otavio@ossystems.com.br>


-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-ppc][PATCH 09/12] set IMAGE_CLASSES = "image_types_uboot" as defaut

[Otavio Salvador]

On Fri, Jul 11, 2014 at 5:09 AM,  <ting.liu@freescale.com> wrote:
> From: Ting Liu <b28495@freescale.com>
>
> Signed-off-by: Ting Liu <b28495@freescale.com>
> ---
>  conf/machine/include/qoriq-default-settings.inc |    2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/conf/machine/include/qoriq-default-settings.inc b/conf/machine/include/qoriq-default-settings.inc
> index 6dcbc9a..f808ac2 100644
> --- a/conf/machine/include/qoriq-default-settings.inc
> +++ b/conf/machine/include/qoriq-default-settings.inc
> @@ -1,5 +1,7 @@
>  MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
>  MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf kernel-modules"
> +
> +IMAGE_CLASSES = "image_types_uboot"

It should be += no?

>  EXTRA_IMAGEDEPENDS += "u-boot"
>
>  KERNEL_IMAGETYPE ?= "uImage"
> --
> 1.7.9.7
>
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale



-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-ppc][PATCH 12/12] ipc-modules: move to recipes-kernel/

[Otavio Salvador]

On Fri, Jul 11, 2014 at 5:09 AM,  <ting.liu@freescale.com> wrote:
> From: Ting Liu <b28495@freescale.com>
>
> Signed-off-by: Ting Liu <b28495@freescale.com>

Acked-by: Otavio Salvador <otavio@ossystems.com.br>

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-ppc][PATCH 10/12] add default setting for MKUBIFS_ARGS and UBINIZE_ARGS

[Otavio Salvador]

On Fri, Jul 11, 2014 at 5:09 AM,  <ting.liu@freescale.com> wrote:
> From: Ting Liu <b28495@freescale.com>
>
> Signed-off-by: Ting Liu <b28495@freescale.com>

I'd like to see a comment, like we did for imx28evk, where we describe
model and values. In either case, change is fine.

Acked-by: Otavio Salvador <otavio@ossystems.com.br>

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-ppc][PATCH 01/12] move all inc files to folder include/

[Otavio Salvador]

2014-07-11 5:09 GMT-03:00  <ting.liu@freescale.com>:
> From: Ting Liu <b28495@freescale.com>
>
> Signed-off-by: Ting Liu <b28495@freescale.com>



Acked-by: Otavio Salvador <otavio@ossystems.com.br>


-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-ppc][PATCH 03/12] remove obsolete PREFERRED_VERSION for virtual/kernel

[Otavio Salvador]

On Fri, Jul 11, 2014 at 5:09 AM,  <ting.liu@freescale.com> wrote:
> From: Ting Liu <b28495@freescale.com>
>
> there is only one linux-qoriq-sdk recipe that is based on 3.12 now
>
> Signed-off-by: Ting Liu <b28495@freescale.com>


Acked-by: Otavio Salvador <otavio@ossystems.com.br>



-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-ppc][PATCH 11/12] inherit qoriq_build_64bit_kernel for kernel/module recipes

[Otavio Salvador]

On Fri, Jul 11, 2014 at 5:09 AM,  <ting.liu@freescale.com> wrote:
> From: Ting Liu <b28495@freescale.com>
>
> Signed-off-by: Ting Liu <b28495@freescale.com>

Could you explain in the commit log /why/?

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-ppc][PATCH 04/12] conf/machine/: move common bits to inc files

[Otavio Salvador]

Hello,

On Fri, Jul 11, 2014 at 5:09 AM,  <ting.liu@freescale.com> wrote:
> From: Ting Liu <b28495@freescale.com>
>
> * add four new files to hold common bits:
>    include/qoriq-base.inc
>    include/qoriq-default-providers.inc
>    include/qoriq-default-settings.inc
>    include/qoriq-default-versions.inc
> * add 'qoriq' into list of MACHINEOVERRIDES
>
> Signed-off-by: Ting Liu <b28495@freescale.com>

I really like the idea and I think it goes in the right direction. The
only concern I have is that the qoriq-default-settings hides many
things which are /board specific/. I am sure customers use different
serial console devices for example so everything which vary in
customers boards are not qoriq-base stuff.

Does it makes sense?

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-ppc][PATCH 08/12] add u-boot as EXTRA_IMAGEDEPENDS

[Otavio Salvador]

On Fri, Jul 11, 2014 at 5:09 AM,  <ting.liu@freescale.com> wrote:
> From: Ting Liu <b28495@freescale.com>
>
> * As the doc said:
> EXTRA_IMAGEDEPENDS = "A list of recipes to build that do not
> provide packages for installing into the root filesystem."
> MACHINE_EXTRA_RRECOMMENDS = "A list of machine-specific packages
> to install as part of the image being built"
>
> * use += for MACHINE_EXTRA_RRECOMMENDS definition
>
> Signed-off-by: Ting Liu <b28495@freescale.com>


Acked-by: Otavio Salvador <otavio@ossystems.com.br>


-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-ppc][PATCH 05/12] u-boot: rename to u-boot-qoriq

[Otavio Salvador]

On Fri, Jul 11, 2014 at 5:09 AM,  <ting.liu@freescale.com> wrote:
> From: Ting Liu <b28495@freescale.com>
>
> like u-boot-imx, u-boot-qoriq is supposed to be provided and supported
> by Freescale. it uses latest u-boot codes on git.freescale.com
>
> Signed-off-by: Ting Liu <b28495@freescale.com>


Acked-by: Otavio Salvador <otavio@ossystems.com.br>


-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-ppc][PATCH 07/12] remove fslmachine MACHINEOVERRIDES usage

[Otavio Salvador]

On Fri, Jul 11, 2014 at 5:09 AM,  <ting.liu@freescale.com> wrote:
> From: Ting Liu <b28495@freescale.com>
>
> fslmachine is too generic, use qoriq instead.
>
> Signed-off-by: Ting Liu <b28495@freescale.com>


Acked-by: Otavio Salvador <otavio@ossystems.com.br>


-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-ppc][PATCH 09/12] set IMAGE_CLASSES = "image_types_uboot" as defaut

[ting.liu]

> -----Original Message-----
> From: otavio.salvador@gmail.com [mailto:otavio.salvador@gmail.com] On Behalf
> Of Otavio Salvador
> Sent: Saturday, July 12, 2014 1:07 AM
> To: Liu Ting-B28495
> Cc: meta-freescale@yoctoproject.org
> Subject: Re: [meta-freescale] [meta-fsl-ppc][PATCH 09/12] set IMAGE_CLASSES =
> "image_types_uboot" as defaut
> 
> On Fri, Jul 11, 2014 at 5:09 AM,  <ting.liu@freescale.com> wrote:
> > From: Ting Liu <b28495@freescale.com>
> >
> > Signed-off-by: Ting Liu <b28495@freescale.com>
> > ---
> >  conf/machine/include/qoriq-default-settings.inc |    2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/conf/machine/include/qoriq-default-settings.inc
> b/conf/machine/include/qoriq-default-settings.inc
> > index 6dcbc9a..f808ac2 100644
> > --- a/conf/machine/include/qoriq-default-settings.inc
> > +++ b/conf/machine/include/qoriq-default-settings.inc
> > @@ -1,5 +1,7 @@
> >  MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
> >  MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf kernel-modules"
> > +
> > +IMAGE_CLASSES = "image_types_uboot"
> 
> It should be += no?

Patch v2 sent. Thanks.

> 
> >  EXTRA_IMAGEDEPENDS += "u-boot"
> >
> >  KERNEL_IMAGETYPE ?= "uImage"
> > --
> > 1.7.9.7
> >
> > --
> > _______________________________________________
> > meta-freescale mailing list
> > meta-freescale@yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/meta-freescale
> 
> 
> 
> --
> Otavio Salvador                             O.S. Systems
> http://www.ossystems.com.br        http://code.ossystems.com.br
> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-ppc][PATCH 04/12] conf/machine/: move common bits to inc files

[ting.liu]

> -----Original Message-----
> From: otavio.salvador@gmail.com [mailto:otavio.salvador@gmail.com] On Behalf
> Of Otavio Salvador
> Sent: Saturday, July 12, 2014 1:17 AM
> To: Liu Ting-B28495
> Cc: meta-freescale@yoctoproject.org
> Subject: Re: [meta-freescale] [meta-fsl-ppc][PATCH 04/12] conf/machine/: move
> common bits to inc files
> 
> Hello,
> 
> On Fri, Jul 11, 2014 at 5:09 AM,  <ting.liu@freescale.com> wrote:
> > From: Ting Liu <b28495@freescale.com>
> >
> > * add four new files to hold common bits:
> >    include/qoriq-base.inc
> >    include/qoriq-default-providers.inc
> >    include/qoriq-default-settings.inc
> >    include/qoriq-default-versions.inc
> > * add 'qoriq' into list of MACHINEOVERRIDES
> >
> > Signed-off-by: Ting Liu <b28495@freescale.com>
> 
> I really like the idea and I think it goes in the right direction. The only
> concern I have is that the qoriq-default-settings hides many things which are
> /board specific/. I am sure customers use different serial console devices for
> example so everything which vary in customers boards are not qoriq-base stuff.
> 
> Does it makes sense?

Yes, it does. I use ?= in patch v2 for SERIAL_CONSOLES settings.

IMO, user can always override it in board.conf after including the inc file :)


> 
> --
> Otavio Salvador                             O.S. Systems
> http://www.ossystems.com.br        http://code.ossystems.com.br
> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-ppc][PATCH 07/12] remove fslmachine MACHINEOVERRIDES usage

[Bob Cochran]

On 07/11/2014 04:09 AM, ting.liu@freescale.com wrote:
> From: Ting Liu <b28495@freescale.com>
>
> fslmachine is too generic, use qoriq instead.


Maybe something to think about here: I noticed that the luajit recipe in 
meta-openembedded/meta-oe/recipes-devtools uses 
SRC_URI_append_fslmachine to introduce a powerpc patch.

But switching the name from fslmachine to qoriq might still lead to 
problems down the road since there is a qoriq-ppc and qoriq-arm.


>
> Signed-off-by: Ting Liu <b28495@freescale.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 +-
>   recipes-bsp/rcw/rcw_git.bb                         |    2 +-
>   recipes-devtools/qemu/qemu_fslgit.bb               |    2 +-
>   recipes-dpaa/fmlib/fmlib_git.bb                    |    2 +-
>   recipes-dpaa/usdpaa/usdpaa_git.bb                  |    2 +-
>   recipes-extended/testfloat/testfloat_2a.bb         |    2 +-
>   recipes-kernel/cryptodev/cryptodev-fsl.inc         |    6 +++---
>   .../cryptodev/cryptodev-module_1.6.bbappend        |    2 +-
>   recipes-virtualization/hv-cfg/hv-cfg_git.bb        |    2 +-
>   .../hypervisor/hypervisor_git.bb                   |    2 +-
>   15 files changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc
> index 09b5c69..5871104 100644
> --- a/conf/machine/include/e500mc.inc
> +++ b/conf/machine/include/e500mc.inc
> @@ -3,4 +3,4 @@ TARGET_FPU = "hard"
>   require conf/machine/include/tune-ppce500mc.inc
>   require conf/machine/include/qoriq-base.inc
>
> -MACHINEOVERRIDES .= ":e500mc:fslmachine"
> +MACHINEOVERRIDES .= ":e500mc"
> diff --git a/conf/machine/include/e500v2.inc b/conf/machine/include/e500v2.inc
> index 178de18..a937254 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-base.inc
>
> -MACHINEOVERRIDES .= ":e500v2:fslmachine"
> +MACHINEOVERRIDES .= ":e500v2"
> diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc
> index 47a9ad7..5c75883 100644
> --- a/conf/machine/include/e5500-64b.inc
> +++ b/conf/machine/include/e5500-64b.inc
> @@ -4,4 +4,4 @@ DEFAULTTUNE ?= "ppc64e5500"
>   require conf/machine/include/tune-ppce5500.inc
>   require conf/machine/include/qoriq-base.inc
>
> -MACHINEOVERRIDES .= ":e5500-64b:fslmachine"
> +MACHINEOVERRIDES .= ":e5500-64b"
> diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc
> index e6f0400..88f6d06 100644
> --- a/conf/machine/include/e5500.inc
> +++ b/conf/machine/include/e5500.inc
> @@ -3,4 +3,4 @@ TARGET_FPU = "hard"
>   require conf/machine/include/tune-ppce5500.inc
>   require conf/machine/include/qoriq-base.inc
>
> -MACHINEOVERRIDES .= ":e5500:fslmachine"
> +MACHINEOVERRIDES .= ":e5500"
> diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
> index 0770cc3..5e533e0 100644
> --- a/conf/machine/include/e6500-64b.inc
> +++ b/conf/machine/include/e6500-64b.inc
> @@ -4,4 +4,4 @@ DEFAULTTUNE ?= "ppc64e6500"
>   require conf/machine/include/tune-ppce6500.inc
>   require conf/machine/include/qoriq-base.inc
>
> -MACHINEOVERRIDES .= ":e6500-64b:fslmachine"
> +MACHINEOVERRIDES .= ":e6500-64b"
> diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
> index 323e420..5ebeccf 100644
> --- a/conf/machine/include/e6500.inc
> +++ b/conf/machine/include/e6500.inc
> @@ -3,7 +3,7 @@ TARGET_FPU = "hard"
>   require conf/machine/include/tune-ppce6500.inc
>   require conf/machine/include/qoriq-base.inc
>
> -MACHINEOVERRIDES .= ":e6500:fslmachine"
> +MACHINEOVERRIDES .= ":e6500"
>
>   BUILD_64BIT_KERNEL = "1"
>
> diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
> index 5e751b8..713ae86 100644
> --- a/recipes-bsp/rcw/rcw_git.bb
> +++ b/recipes-bsp/rcw/rcw_git.bb
> @@ -42,6 +42,6 @@ addtask deploy after do_install
>   PACKAGES += "${PN}-image"
>   FILES_${PN}-image += "/boot"
>
> -COMPATIBLE_HOST_fslmachine = ".*"
> +COMPATIBLE_HOST_qoriq = ".*"
>   COMPATIBLE_HOST ?= "(none)"
>   ALLOW_EMPTY_${PN} = "1"
> diff --git a/recipes-devtools/qemu/qemu_fslgit.bb b/recipes-devtools/qemu/qemu_fslgit.bb
> index 30f27d6..03395a9 100644
> --- a/recipes-devtools/qemu/qemu_fslgit.bb
> +++ b/recipes-devtools/qemu/qemu_fslgit.bb
> @@ -46,4 +46,4 @@ INSANE_SKIP_${PN} += "dev-deps"
>   # the package get built. COMPATIBLE_HOST would not work
>   # because it was too generic
>   COMPATIBLE_MACHINE = "a^"
> -COMPATIBLE_MACHINE_libc-glibc_fslmachine = ".*"
> +COMPATIBLE_MACHINE_libc-glibc_qoriq = ".*"
> diff --git a/recipes-dpaa/fmlib/fmlib_git.bb b/recipes-dpaa/fmlib/fmlib_git.bb
> index 04ca515..4350cbd 100644
> --- a/recipes-dpaa/fmlib/fmlib_git.bb
> +++ b/recipes-dpaa/fmlib/fmlib_git.bb
> @@ -16,7 +16,7 @@ S = "${WORKDIR}/git"
>   TARGET_ARCH_FMLIB = "${DEFAULTTUNE}"
>   TARGET_ARCH_FMLIB_e5500 = "ppc32e5500"
>   TARGET_ARCH_FMLIB_e6500 = "ppc32e6500"
> -COMPATIBLE_HOST_fslmachine = ".*"
> +COMPATIBLE_HOST_qoriq = ".*"
>   COMPATIBLE_HOST ?= "(none)"
>
>   EXTRA_OEMAKE = "DESTDIR=${D} PREFIX=${prefix} LIB_DEST_DIR=${libdir} \
> diff --git a/recipes-dpaa/usdpaa/usdpaa_git.bb b/recipes-dpaa/usdpaa/usdpaa_git.bb
> index 9c7e388..e8ec4e7 100644
> --- a/recipes-dpaa/usdpaa/usdpaa_git.bb
> +++ b/recipes-dpaa/usdpaa/usdpaa_git.bb
> @@ -71,6 +71,6 @@ do_install () {
>   PARALLEL_MAKE_pn-${PN} = ""
>   FILES_${PN} += "/root/SOURCE_THIS /usr/etc/"
>
> -COMPATIBLE_HOST_fslmachine = ".*"
> +COMPATIBLE_HOST_qoriq = ".*"
>   COMPATIBLE_HOST ?= "(none)"
>
> diff --git a/recipes-extended/testfloat/testfloat_2a.bb b/recipes-extended/testfloat/testfloat_2a.bb
> index fb89e26..f3f58b4 100644
> --- a/recipes-extended/testfloat/testfloat_2a.bb
> +++ b/recipes-extended/testfloat/testfloat_2a.bb
> @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://testfloat/testfloat.txt;beginline=87;endline=95;md5=b
>   SRC_URI = " http://www.jhauser.us/arithmetic/TestFloat-2a.tar.Z;name=TestFloat \
>               http://www.jhauser.us/arithmetic/SoftFloat-2b.tar.Z;name=SoftFloat \
>             "
> -SRC_URI_append_fslmachine = " file://SoftFloat-powerpc-1.patch \
> +SRC_URI_append_qoriq = " file://SoftFloat-powerpc-1.patch \
>                                 file://TestFloat-powerpc-E500v2-SPE-1.patch \
>                                 file://Yocto-replace-COMPILE_PREFIX-gcc.patch \
>                               "
> diff --git a/recipes-kernel/cryptodev/cryptodev-fsl.inc b/recipes-kernel/cryptodev/cryptodev-fsl.inc
> index 774ef10..0c59128 100644
> --- a/recipes-kernel/cryptodev/cryptodev-fsl.inc
> +++ b/recipes-kernel/cryptodev/cryptodev-fsl.inc
> @@ -1,6 +1,6 @@
>   FILESEXTRAPATHS_prepend := "${THISDIR}/cryptodev-fsl"
>
> -SRC_URI_fslmachine = "git://github.com/nmav/cryptodev-linux.git \
> +SRC_URI_qoriq = "git://github.com/nmav/cryptodev-linux.git \
>       file://0001-add-support-for-composite-TLS-SHA1-AES-algorithm-off.patch \
>       file://0002-use-function-local-storage-for-cipher-and-hmac-keys.patch \
>       file://0003-Add-support-for-aead-keys-for-composite-algorithms.patch \
> @@ -18,7 +18,7 @@ SRC_URI_fslmachine = "git://github.com/nmav/cryptodev-linux.git \
>       file://0015-Add-RSA-Key-generation-offloading.patch \
>       file://0016-Fixed-compilation-error-of-openssl-with-fsl-cryptode.patch \
>   "
> -SRCREV_fslmachine = "e8609a408d40c83ae8fc11bbe9a7b3847612669b"
> +SRCREV_qoriq = "e8609a408d40c83ae8fc11bbe9a7b3847612669b"
>
> -S_fslmachine = "${WORKDIR}/git"
> +S_qoriq = "${WORKDIR}/git"
>
> diff --git a/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend b/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend
> index 1dbf3b6..ff95702 100644
> --- a/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend
> +++ b/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend
> @@ -2,7 +2,7 @@ require recipes-kernel/cryptodev/cryptodev-fsl.inc
>
>   inherit qoriq_build_64bit_kernel
>
> -do_install_append_fslmachine () {
> +do_install_append_qoriq () {
>       rm -fr ${D}/usr
>   }
>
> diff --git a/recipes-virtualization/hv-cfg/hv-cfg_git.bb b/recipes-virtualization/hv-cfg/hv-cfg_git.bb
> index 304b78f..285f0be 100644
> --- a/recipes-virtualization/hv-cfg/hv-cfg_git.bb
> +++ b/recipes-virtualization/hv-cfg/hv-cfg_git.bb
> @@ -41,6 +41,6 @@ addtask deploy after do_install
>   PACKAGES += "${PN}-image"
>   FILES_${PN}-image += "/boot"
>
> -COMPATIBLE_HOST_fslmachine = ".*"
> +COMPATIBLE_HOST_qoriq = ".*"
>   COMPATIBLE_HOST ?= "(none)"
>   ALLOW_EMPTY_${PN} = "1"
> diff --git a/recipes-virtualization/hypervisor/hypervisor_git.bb b/recipes-virtualization/hypervisor/hypervisor_git.bb
> index 4add9f3..f1ad3c1 100644
> --- a/recipes-virtualization/hypervisor/hypervisor_git.bb
> +++ b/recipes-virtualization/hypervisor/hypervisor_git.bb
> @@ -36,7 +36,7 @@ EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHA
>   DEFCONFIG = "defconfig"
>   DEFCONFIG_powerpc64 = "64bit_defconfig"
>
> -COMPATIBLE_HOST_fslmachine = ".*"
> +COMPATIBLE_HOST_qoriq = ".*"
>   COMPATIBLE_HOST ?= "(none)"
>
>   inherit cml1
>

Re: [meta-fsl-ppc][PATCH 07/12] remove fslmachine MACHINEOVERRIDES usage

[ting.liu]

> -----Original Message-----
> From: meta-freescale-bounces@yoctoproject.org [mailto:meta-freescale-
> bounces@yoctoproject.org] On Behalf Of Bob Cochran
> Sent: Monday, July 14, 2014 1:12 PM
> To: meta-freescale@yoctoproject.org
> Subject: Re: [meta-freescale] [meta-fsl-ppc][PATCH 07/12] remove fslmachine
> MACHINEOVERRIDES usage
> 
> On 07/11/2014 04:09 AM, ting.liu@freescale.com wrote:
> > From: Ting Liu <b28495@freescale.com>
> >
> > fslmachine is too generic, use qoriq instead.
> 
> 
> Maybe something to think about here: I noticed that the luajit recipe in meta-
> openembedded/meta-oe/recipes-devtools uses SRC_URI_append_fslmachine to
> introduce a powerpc patch.

I will send patches to update the recipes if this change applied. Thanks for the reminder.

> 
> But switching the name from fslmachine to qoriq might still lead to problems
> down the road since there is a qoriq-ppc and qoriq-arm.

Good catch. Will send patch v2 to s/qoriq/qoriq-ppc/.

> 
> 
> >
> > Signed-off-by: Ting Liu <b28495@freescale.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 +-
> >   recipes-bsp/rcw/rcw_git.bb                         |    2 +-
> >   recipes-devtools/qemu/qemu_fslgit.bb               |    2 +-
> >   recipes-dpaa/fmlib/fmlib_git.bb                    |    2 +-
> >   recipes-dpaa/usdpaa/usdpaa_git.bb                  |    2 +-
> >   recipes-extended/testfloat/testfloat_2a.bb         |    2 +-
> >   recipes-kernel/cryptodev/cryptodev-fsl.inc         |    6 +++---
> >   .../cryptodev/cryptodev-module_1.6.bbappend        |    2 +-
> >   recipes-virtualization/hv-cfg/hv-cfg_git.bb        |    2 +-
> >   .../hypervisor/hypervisor_git.bb                   |    2 +-
> >   15 files changed, 17 insertions(+), 17 deletions(-)
> >
> > diff --git a/conf/machine/include/e500mc.inc
> b/conf/machine/include/e500mc.inc
> > index 09b5c69..5871104 100644
> > --- a/conf/machine/include/e500mc.inc
> > +++ b/conf/machine/include/e500mc.inc
> > @@ -3,4 +3,4 @@ TARGET_FPU = "hard"
> >   require conf/machine/include/tune-ppce500mc.inc
> >   require conf/machine/include/qoriq-base.inc
> >
> > -MACHINEOVERRIDES .= ":e500mc:fslmachine"
> > +MACHINEOVERRIDES .= ":e500mc"
> > diff --git a/conf/machine/include/e500v2.inc
> b/conf/machine/include/e500v2.inc
> > index 178de18..a937254 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-base.inc
> >
> > -MACHINEOVERRIDES .= ":e500v2:fslmachine"
> > +MACHINEOVERRIDES .= ":e500v2"
> > diff --git a/conf/machine/include/e5500-64b.inc
> b/conf/machine/include/e5500-64b.inc
> > index 47a9ad7..5c75883 100644
> > --- a/conf/machine/include/e5500-64b.inc
> > +++ b/conf/machine/include/e5500-64b.inc
> > @@ -4,4 +4,4 @@ DEFAULTTUNE ?= "ppc64e5500"
> >   require conf/machine/include/tune-ppce5500.inc
> >   require conf/machine/include/qoriq-base.inc
> >
> > -MACHINEOVERRIDES .= ":e5500-64b:fslmachine"
> > +MACHINEOVERRIDES .= ":e5500-64b"
> > diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc
> > index e6f0400..88f6d06 100644
> > --- a/conf/machine/include/e5500.inc
> > +++ b/conf/machine/include/e5500.inc
> > @@ -3,4 +3,4 @@ TARGET_FPU = "hard"
> >   require conf/machine/include/tune-ppce5500.inc
> >   require conf/machine/include/qoriq-base.inc
> >
> > -MACHINEOVERRIDES .= ":e5500:fslmachine"
> > +MACHINEOVERRIDES .= ":e5500"
> > diff --git a/conf/machine/include/e6500-64b.inc
> b/conf/machine/include/e6500-64b.inc
> > index 0770cc3..5e533e0 100644
> > --- a/conf/machine/include/e6500-64b.inc
> > +++ b/conf/machine/include/e6500-64b.inc
> > @@ -4,4 +4,4 @@ DEFAULTTUNE ?= "ppc64e6500"
> >   require conf/machine/include/tune-ppce6500.inc
> >   require conf/machine/include/qoriq-base.inc
> >
> > -MACHINEOVERRIDES .= ":e6500-64b:fslmachine"
> > +MACHINEOVERRIDES .= ":e6500-64b"
> > diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
> > index 323e420..5ebeccf 100644
> > --- a/conf/machine/include/e6500.inc
> > +++ b/conf/machine/include/e6500.inc
> > @@ -3,7 +3,7 @@ TARGET_FPU = "hard"
> >   require conf/machine/include/tune-ppce6500.inc
> >   require conf/machine/include/qoriq-base.inc
> >
> > -MACHINEOVERRIDES .= ":e6500:fslmachine"
> > +MACHINEOVERRIDES .= ":e6500"
> >
> >   BUILD_64BIT_KERNEL = "1"
> >
> > diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
> > index 5e751b8..713ae86 100644
> > --- a/recipes-bsp/rcw/rcw_git.bb
> > +++ b/recipes-bsp/rcw/rcw_git.bb
> > @@ -42,6 +42,6 @@ addtask deploy after do_install
> >   PACKAGES += "${PN}-image"
> >   FILES_${PN}-image += "/boot"
> >
> > -COMPATIBLE_HOST_fslmachine = ".*"
> > +COMPATIBLE_HOST_qoriq = ".*"
> >   COMPATIBLE_HOST ?= "(none)"
> >   ALLOW_EMPTY_${PN} = "1"
> > diff --git a/recipes-devtools/qemu/qemu_fslgit.bb b/recipes-
> devtools/qemu/qemu_fslgit.bb
> > index 30f27d6..03395a9 100644
> > --- a/recipes-devtools/qemu/qemu_fslgit.bb
> > +++ b/recipes-devtools/qemu/qemu_fslgit.bb
> > @@ -46,4 +46,4 @@ INSANE_SKIP_${PN} += "dev-deps"
> >   # the package get built. COMPATIBLE_HOST would not work
> >   # because it was too generic
> >   COMPATIBLE_MACHINE = "a^"
> > -COMPATIBLE_MACHINE_libc-glibc_fslmachine = ".*"
> > +COMPATIBLE_MACHINE_libc-glibc_qoriq = ".*"
> > diff --git a/recipes-dpaa/fmlib/fmlib_git.bb b/recipes-
> dpaa/fmlib/fmlib_git.bb
> > index 04ca515..4350cbd 100644
> > --- a/recipes-dpaa/fmlib/fmlib_git.bb
> > +++ b/recipes-dpaa/fmlib/fmlib_git.bb
> > @@ -16,7 +16,7 @@ S = "${WORKDIR}/git"
> >   TARGET_ARCH_FMLIB = "${DEFAULTTUNE}"
> >   TARGET_ARCH_FMLIB_e5500 = "ppc32e5500"
> >   TARGET_ARCH_FMLIB_e6500 = "ppc32e6500"
> > -COMPATIBLE_HOST_fslmachine = ".*"
> > +COMPATIBLE_HOST_qoriq = ".*"
> >   COMPATIBLE_HOST ?= "(none)"
> >
> >   EXTRA_OEMAKE = "DESTDIR=${D} PREFIX=${prefix} LIB_DEST_DIR=${libdir} \
> > diff --git a/recipes-dpaa/usdpaa/usdpaa_git.bb b/recipes-
> dpaa/usdpaa/usdpaa_git.bb
> > index 9c7e388..e8ec4e7 100644
> > --- a/recipes-dpaa/usdpaa/usdpaa_git.bb
> > +++ b/recipes-dpaa/usdpaa/usdpaa_git.bb
> > @@ -71,6 +71,6 @@ do_install () {
> >   PARALLEL_MAKE_pn-${PN} = ""
> >   FILES_${PN} += "/root/SOURCE_THIS /usr/etc/"
> >
> > -COMPATIBLE_HOST_fslmachine = ".*"
> > +COMPATIBLE_HOST_qoriq = ".*"
> >   COMPATIBLE_HOST ?= "(none)"
> >
> > diff --git a/recipes-extended/testfloat/testfloat_2a.bb b/recipes-
> extended/testfloat/testfloat_2a.bb
> > index fb89e26..f3f58b4 100644
> > --- a/recipes-extended/testfloat/testfloat_2a.bb
> > +++ b/recipes-extended/testfloat/testfloat_2a.bb
> > @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM =
> "file://testfloat/testfloat.txt;beginline=87;endline=95;md5=b
> >   SRC_URI = " http://www.jhauser.us/arithmetic/TestFloat-
> 2a.tar.Z;name=TestFloat \
> >               http://www.jhauser.us/arithmetic/SoftFloat-
> 2b.tar.Z;name=SoftFloat \
> >             "
> > -SRC_URI_append_fslmachine = " file://SoftFloat-powerpc-1.patch \
> > +SRC_URI_append_qoriq = " file://SoftFloat-powerpc-1.patch \
> >                                 file://TestFloat-powerpc-E500v2-SPE-1.patch
> \
> >                                 file://Yocto-replace-COMPILE_PREFIX-
> gcc.patch \
> >                               "
> > diff --git a/recipes-kernel/cryptodev/cryptodev-fsl.inc b/recipes-
> kernel/cryptodev/cryptodev-fsl.inc
> > index 774ef10..0c59128 100644
> > --- a/recipes-kernel/cryptodev/cryptodev-fsl.inc
> > +++ b/recipes-kernel/cryptodev/cryptodev-fsl.inc
> > @@ -1,6 +1,6 @@
> >   FILESEXTRAPATHS_prepend := "${THISDIR}/cryptodev-fsl"
> >
> > -SRC_URI_fslmachine = "git://github.com/nmav/cryptodev-linux.git \
> > +SRC_URI_qoriq = "git://github.com/nmav/cryptodev-linux.git \
> >       file://0001-add-support-for-composite-TLS-SHA1-AES-algorithm-off.patch
> \
> >       file://0002-use-function-local-storage-for-cipher-and-hmac-keys.patch
> \
> >       file://0003-Add-support-for-aead-keys-for-composite-algorithms.patch \
> > @@ -18,7 +18,7 @@ SRC_URI_fslmachine = "git://github.com/nmav/cryptodev-
> linux.git \
> >       file://0015-Add-RSA-Key-generation-offloading.patch \
> >       file://0016-Fixed-compilation-error-of-openssl-with-fsl-cryptode.patch
> \
> >   "
> > -SRCREV_fslmachine = "e8609a408d40c83ae8fc11bbe9a7b3847612669b"
> > +SRCREV_qoriq = "e8609a408d40c83ae8fc11bbe9a7b3847612669b"
> >
> > -S_fslmachine = "${WORKDIR}/git"
> > +S_qoriq = "${WORKDIR}/git"
> >
> > diff --git a/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend
> b/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend
> > index 1dbf3b6..ff95702 100644
> > --- a/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend
> > +++ b/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend
> > @@ -2,7 +2,7 @@ require recipes-kernel/cryptodev/cryptodev-fsl.inc
> >
> >   inherit qoriq_build_64bit_kernel
> >
> > -do_install_append_fslmachine () {
> > +do_install_append_qoriq () {
> >       rm -fr ${D}/usr
> >   }
> >
> > diff --git a/recipes-virtualization/hv-cfg/hv-cfg_git.bb b/recipes-
> virtualization/hv-cfg/hv-cfg_git.bb
> > index 304b78f..285f0be 100644
> > --- a/recipes-virtualization/hv-cfg/hv-cfg_git.bb
> > +++ b/recipes-virtualization/hv-cfg/hv-cfg_git.bb
> > @@ -41,6 +41,6 @@ addtask deploy after do_install
> >   PACKAGES += "${PN}-image"
> >   FILES_${PN}-image += "/boot"
> >
> > -COMPATIBLE_HOST_fslmachine = ".*"
> > +COMPATIBLE_HOST_qoriq = ".*"
> >   COMPATIBLE_HOST ?= "(none)"
> >   ALLOW_EMPTY_${PN} = "1"
> > diff --git a/recipes-virtualization/hypervisor/hypervisor_git.bb b/recipes-
> virtualization/hypervisor/hypervisor_git.bb
> > index 4add9f3..f1ad3c1 100644
> > --- a/recipes-virtualization/hypervisor/hypervisor_git.bb
> > +++ b/recipes-virtualization/hypervisor/hypervisor_git.bb
> > @@ -36,7 +36,7 @@ EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX}
> CC="${TARGET_PREFIX}gcc ${TOOLCHA
> >   DEFCONFIG = "defconfig"
> >   DEFCONFIG_powerpc64 = "64bit_defconfig"
> >
> > -COMPATIBLE_HOST_fslmachine = ".*"
> > +COMPATIBLE_HOST_qoriq = ".*"
> >   COMPATIBLE_HOST ?= "(none)"
> >
> >   inherit cml1
> >
> 
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale

Re: [meta-fsl-ppc][PATCH 10/12] add default setting for MKUBIFS_ARGS and UBINIZE_ARGS

[Bob Cochran]

On 07/11/2014 04:09 AM, ting.liu@freescale.com wrote:
> From: Ting Liu <b28495@freescale.com>
>
> Signed-off-by: Ting Liu <b28495@freescale.com>
> ---
>   conf/machine/include/qoriq-default-settings.inc |    3 +++
>   1 file changed, 3 insertions(+)
>
> diff --git a/conf/machine/include/qoriq-default-settings.inc b/conf/machine/include/qoriq-default-settings.inc
> index f808ac2..ef07b7d 100644
> --- a/conf/machine/include/qoriq-default-settings.inc
> +++ b/conf/machine/include/qoriq-default-settings.inc
> @@ -16,3 +16,6 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>
>   USE_VT = "0"
>
> +MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600"

Hi Ting,

Just an FYI: when building meta-fsl-ppc master with poky master 
alongside sdk1.6 meta-fsl-networking, I need to bump mkfs.ubifs 
max_leb_cnt (-c param) to avoid error when building image:

ERROR: Error: The image creation script 
'/build/yocto/t1040_master/tmp/work/t1040rdb_64b-fsl-linux/fsl-image-core/1.0-r0/temp/create_image.ubi' 
returned 255:
Error: max_leb_cnt too low (3701 needed)

I don't know if something is amiss somewhere else or if 3600 was tight 
to begin with.   In order to move forward, I'm bumping the value in 
qoriq-default-settings.inc and assigning it so it overrides the default 
also set in meta-fsl-networking.

I probably won't revisit the actual size of my FLASH image for awhile. 
Let me know if you want me to look into anything related to this.

Bob


> +UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512"

> +
>