42 files changed, 36 insertions, 36 deletions

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
index f5b419d..f5b419d 100644
--- a/conf/machine/e500mc.inc
+++ b/conf/machine/include/e500mc.inc
diff --git a/conf/machine/e500v2.inc b/conf/machine/include/e500v2.inc
index 23b5091..23b5091 100644
--- a/conf/machine/e500v2.inc
+++ b/conf/machine/include/e500v2.inc
diff --git a/conf/machine/e5500-64b.inc b/conf/machine/include/e5500-64b.inc
index b34be91..b34be91 100644
--- a/conf/machine/e5500-64b.inc
+++ b/conf/machine/include/e5500-64b.inc
diff --git a/conf/machine/e5500.inc b/conf/machine/include/e5500.inc
index 0b4a9a3..0b4a9a3 100644
--- a/conf/machine/e5500.inc
+++ b/conf/machine/include/e5500.inc
diff --git a/conf/machine/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
index a37d1dd..a37d1dd 100644
--- a/conf/machine/e6500-64b.inc
+++ b/conf/machine/include/e6500-64b.inc
diff --git a/conf/machine/e6500.inc b/conf/machine/include/e6500.inc
index dd259fc..dd259fc 100644
--- a/conf/machine/e6500.inc
+++ b/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"