25 files changed, 25 insertions, 25 deletions
diff --git a/meta-fsl-ppc/conf/machine/b4420qds-64b.conf b/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
index b8c4f5a3..0bb959cb 100644
--- a/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
@@ -9,7 +9,7 @@ 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"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 JFFS2_ERASEBLOCK = "0x10000"
diff --git a/meta-fsl-ppc/conf/machine/b4420qds.conf b/meta-fsl-ppc/conf/machine/b4420qds.conf
index 6119330b..b07ab5d2 100644
--- a/meta-fsl-ppc/conf/machine/b4420qds.conf
+++ b/meta-fsl-ppc/conf/machine/b4420qds.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
 SOC_FAMILY = "b4420"
 UBOOT_MACHINES ?= "B4420QDS"
 KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb"
-KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 JFFS2_ERASEBLOCK = "0x10000"
diff --git a/meta-fsl-ppc/conf/machine/b4860qds-64b.conf b/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
index 6cf2fce8..86596106 100644
--- a/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
@@ -8,7 +8,7 @@ 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"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 JFFS2_ERASEBLOCK = "0x10000"
diff --git a/meta-fsl-ppc/conf/machine/b4860qds.conf b/meta-fsl-ppc/conf/machine/b4860qds.conf
index e8c88972..2aa471ef 100644
--- a/meta-fsl-ppc/conf/machine/b4860qds.conf
+++ b/meta-fsl-ppc/conf/machine/b4860qds.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
 SOC_FAMILY = "b4860"
 UBOOT_MACHINES ?= "B4860QDS"
 KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb"
-KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 JFFS2_ERASEBLOCK = "0x10000"
diff --git a/meta-fsl-ppc/conf/machine/bsc9131rdb.conf b/meta-fsl-ppc/conf/machine/bsc9131rdb.conf
index 9c08af4b..c145a047 100644
--- a/meta-fsl-ppc/conf/machine/bsc9131rdb.conf
+++ b/meta-fsl-ppc/conf/machine/bsc9131rdb.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
 SOC_FAMILY = "bsc9131"
 UBOOT_MACHINES ?= "BSC9131RDB_SPIFLASH BSC9131RDB_NAND BSC9131RDB_NAND_SYSCLK100 BSC9131RDB_SPIFLASH_SYSCLK100"
 KERNEL_DEVICETREE ?= "bsc9131rdb.dtb"
-KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/bsc913x_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/bsc913x_defconfig"
 JFFS2_ERASEBLOCK = "0x10000"
diff --git a/meta-fsl-ppc/conf/machine/bsc9132qds.conf b/meta-fsl-ppc/conf/machine/bsc9132qds.conf
index 7ca4e127..5b9a1006 100644
--- a/meta-fsl-ppc/conf/machine/bsc9132qds.conf
+++ b/meta-fsl-ppc/conf/machine/bsc9132qds.conf
@@ -7,7 +7,7 @@ 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"
 KERNEL_DEVICETREE ?= "bsc9132qds.dtb"
-KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/bsc913x_smp_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/bsc913x_smp_defconfig"
 JFFS2_ERASEBLOCK = "0x10000"
diff --git a/meta-fsl-ppc/conf/machine/p1010rdb.conf b/meta-fsl-ppc/conf/machine/p1010rdb.conf
index be576561..a9217472 100644
--- a/meta-fsl-ppc/conf/machine/p1010rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1010rdb.conf
@@ -11,7 +11,7 @@ UBOOT_MACHINES ?= "P1010RDB-PB_NAND P1010RDB-PB_NOR \
    P1010RDB-PB_SPIFLASH P1010RDB-PB_36BIT_NOR P1010RDB-PB_36BIT_NAND \
    P1010RDB-PB_36BIT_SPIFLASH"
 KERNEL_DEVICETREE ?= "p1010rdb-pa.dtb p1010rdb-pb.dtb"
-KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_defconfig"
 JFFS2_ERASEBLOCK = "0x20000"
diff --git a/meta-fsl-ppc/conf/machine/p1020rdb.conf b/meta-fsl-ppc/conf/machine/p1020rdb.conf
index 1e9f14e7..9adac799 100644
--- a/meta-fsl-ppc/conf/machine/p1020rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1020rdb.conf
@@ -10,7 +10,7 @@ UBOOT_MACHINES ?= " P1020RDB-PD P1020RDB-PD_NAND P1020RDB-PD_SDCARD P1020RDB-PD_
 KERNEL_DEVICETREE ?= "p1020rdb-pd_32b.dtb"
-KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 JFFS2_ERASEBLOCK = "0x20000"
diff --git a/meta-fsl-ppc/conf/machine/p1021rdb.conf b/meta-fsl-ppc/conf/machine/p1021rdb.conf
index fe783447..37c17a4c 100644
--- a/meta-fsl-ppc/conf/machine/p1021rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1021rdb.conf
@@ -9,7 +9,7 @@ SOC_FAMILY = "p1021"
 BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
 UBOOT_MACHINES ?= "P1021RDB-PC P1021RDB-PC_NAND P1021RDB-PC_SDCARD P1021RDB-PC_SPIFLASH P1021RDB-PC_36BIT P1021RDB-PC_36BIT_SPIFLASH P1021RDB-PC_36BIT_NAND P1021RDB-PC_36BIT_SDCARD"
 KERNEL_DEVICETREE ?= "p1021rdb-pc_32b.dtb"
-KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 JFFS2_ERASEBLOCK = "0x20000"
diff --git a/meta-fsl-ppc/conf/machine/p1022ds.conf b/meta-fsl-ppc/conf/machine/p1022ds.conf
index 64df2f84..b06da815 100644
--- a/meta-fsl-ppc/conf/machine/p1022ds.conf
+++ b/meta-fsl-ppc/conf/machine/p1022ds.conf
@@ -8,7 +8,7 @@ SOC_FAMILY = "p1022"
 BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
 UBOOT_MACHINES ?= "P1022DS P1022DS_NAND P1022DS_SPIFLASH P1022DS_SDCARD P1022DS_36BIT P1022DS_36BIT_SPIFLASH P1022DS_36BIT_NAND P1022DS_36BIT_SDCARD"
 KERNEL_DEVICETREE ?= "p1022ds_32b.dtb"
-KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
diff --git a/meta-fsl-ppc/conf/machine/p1023rdb.conf b/meta-fsl-ppc/conf/machine/p1023rdb.conf
index 13eff250..ece7e3f8 100644
--- a/meta-fsl-ppc/conf/machine/p1023rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1023rdb.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
 SOC_FAMILY = "p1023"
 UBOOT_MACHINES ?= "P1023RDB"
 KERNEL_DEVICETREE ?= "p1023rdb.dtb"
-KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/p1023rds_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/p1023rds_defconfig"
 JFFS2_ERASEBLOCK = "0x10000"
diff --git a/meta-fsl-ppc/conf/machine/p1025twr.conf b/meta-fsl-ppc/conf/machine/p1025twr.conf
index acfac25f..eb7c439a 100644
--- a/meta-fsl-ppc/conf/machine/p1025twr.conf
+++ b/meta-fsl-ppc/conf/machine/p1025twr.conf
@@ -9,7 +9,7 @@ SOC_FAMILY = "p1025"
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat"
 UBOOT_MACHINES ?= "TWR-P1025"
 KERNEL_DEVICETREE ?= "p1025twr_32b.dtb"
-KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 JFFS2_ERASEBLOCK = "0x20000"
diff --git a/meta-fsl-ppc/conf/machine/p2020ds.conf b/meta-fsl-ppc/conf/machine/p2020ds.conf
index b7d1a1dc..cb0b65ef 100644
--- a/meta-fsl-ppc/conf/machine/p2020ds.conf
+++ b/meta-fsl-ppc/conf/machine/p2020ds.conf
@@ -8,7 +8,7 @@ SOC_FAMILY = "p2020"
 BOOTFORMAT_CONFIG = "config_sram_p2020ds.dat"
 UBOOT_MACHINES ?= "P2020DS P2020DS_36BIT P2020DS_DDR2 P2020DS_SDCARD P2020DS_SPIFLASH"
 KERNEL_DEVICETREE ?= "p2020ds.dtb"
-KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 JFFS2_ERASEBLOCK = "0x20000"
diff --git a/meta-fsl-ppc/conf/machine/p2020rdb.conf b/meta-fsl-ppc/conf/machine/p2020rdb.conf
index 13698593..6e45ebec 100644
--- a/meta-fsl-ppc/conf/machine/p2020rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p2020rdb.conf
@@ -9,7 +9,7 @@ SOC_FAMILY = "p2020"
 BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
 UBOOT_MACHINES ?= " P2020RDB-PC P2020RDB-PC_NAND P2020RDB-PC_SDCARD P2020RDB-PC_SPIFLASH P2020RDB-PC_36BIT P2020RDB-PC_36BIT_SPIFLASH P2020RDB-PC_36BIT_NAND P2020RDB-PC_36BIT_SDCARD"
 KERNEL_DEVICETREE ?= "p2020rdb-pc_32b.dtb"
-KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 JFFS2_ERASEBLOCK = "0x20000"
diff --git a/meta-fsl-ppc/conf/machine/p2041rdb.conf b/meta-fsl-ppc/conf/machine/p2041rdb.conf
index 73210279..14b602cf 100644
--- a/meta-fsl-ppc/conf/machine/p2041rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p2041rdb.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
 SOC_FAMILY = "p2041"
 UBOOT_MACHINES ?= "P2041RDB P2041RDB_NAND P2041RDB_SECURE_BOOT P2041RDB_SDCARD P2041RDB_SPIFLASH"
 KERNEL_DEVICETREE ?= "p2041rdb.dtb p2041rdb-usdpaa.dtb"
-KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 JFFS2_ERASEBLOCK = "0x10000"
diff --git a/meta-fsl-ppc/conf/machine/p3041ds.conf b/meta-fsl-ppc/conf/machine/p3041ds.conf
index 5dd10838..0116ab52 100644
--- a/meta-fsl-ppc/conf/machine/p3041ds.conf
+++ b/meta-fsl-ppc/conf/machine/p3041ds.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
 SOC_FAMILY = "p3041"
 UBOOT_MACHINES ?= "P3041DS P3041DS_NAND P3041DS_SECURE_BOOT P3041DS_SDCARD P3041DS_SPIFLASH"
 KERNEL_DEVICETREE ?= "p3041ds.dtb p3041ds-usdpaa.dtb"
-KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 JFFS2_ERASEBLOCK = "0x10000"
diff --git a/meta-fsl-ppc/conf/machine/p4080ds.conf b/meta-fsl-ppc/conf/machine/p4080ds.conf
index 461044bb..5ea1d4f5 100644
--- a/meta-fsl-ppc/conf/machine/p4080ds.conf
+++ b/meta-fsl-ppc/conf/machine/p4080ds.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
 SOC_FAMILY = "p4080"
 UBOOT_MACHINES ?= "P4080DS P4080DS_SECURE_BOOT P4080DS_SDCARD P4080DS_SPIFLASH "
 KERNEL_DEVICETREE ?= "p4080ds.dtb p4080ds-usdpaa.dtb"
-KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 JFFS2_ERASEBLOCK = "0x10000"
diff --git a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
index 8a45958b..144781bf 100644
--- a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
@@ -8,7 +8,7 @@ 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"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
 JFFS2_ERASEBLOCK = "0x10000"
diff --git a/meta-fsl-ppc/conf/machine/p5020ds.conf b/meta-fsl-ppc/conf/machine/p5020ds.conf
index 9951c770..8c263d8e 100644
--- a/meta-fsl-ppc/conf/machine/p5020ds.conf
+++ b/meta-fsl-ppc/conf/machine/p5020ds.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
 SOC_FAMILY = "p5020"
 UBOOT_MACHINES ?= "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT P5020DS_SDCARD P5020DS_SPIFLASH "
 KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb"
-KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 JFFS2_ERASEBLOCK = "0x10000"
diff --git a/meta-fsl-ppc/conf/machine/p5040ds-64b.conf b/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
index 3f16d6ea..e3f6ce16 100644
--- a/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
 SOC_FAMILY = "p5040"
 UBOOT_MACHINES ?= "P5040DS  P5040DS_NAND P5040DS_SECURE_BOOT P5040DS_SDCARD P5040DS_SPIFLASH"
 KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb"
-KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
 JFFS2_ERASEBLOCK = "0x10000"
diff --git a/meta-fsl-ppc/conf/machine/p5040ds.conf b/meta-fsl-ppc/conf/machine/p5040ds.conf
index bb61fd93..5692ab0c 100644
--- a/meta-fsl-ppc/conf/machine/p5040ds.conf
+++ b/meta-fsl-ppc/conf/machine/p5040ds.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
 SOC_FAMILY = "p5040"
 UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT P5040DS_SDCARD P5040DS_SPIFLASH"
 KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb"
-KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 JFFS2_ERASEBLOCK = "0x10000"
diff --git a/meta-fsl-ppc/conf/machine/t4160qds-64b.conf b/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
index 0e4ee086..83696d54 100644
--- a/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
@@ -8,7 +8,7 @@ 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"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 JFFS2_ERASEBLOCK = "0x10000"
diff --git a/meta-fsl-ppc/conf/machine/t4160qds.conf b/meta-fsl-ppc/conf/machine/t4160qds.conf
index cf3a3049..34b2b2e0 100644
--- a/meta-fsl-ppc/conf/machine/t4160qds.conf
+++ b/meta-fsl-ppc/conf/machine/t4160qds.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
 SOC_FAMILY = "t4160"
 UBOOT_MACHINES ?= "T4160QDS"
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
-KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 JFFS2_ERASEBLOCK = "0x10000"
diff --git a/meta-fsl-ppc/conf/machine/t4240qds-64b.conf b/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
index 4ea62c57..ffdf6589 100644
--- a/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
@@ -8,7 +8,7 @@ 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"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 JFFS2_ERASEBLOCK = "0x10000"
diff --git a/meta-fsl-ppc/conf/machine/t4240qds.conf b/meta-fsl-ppc/conf/machine/t4240qds.conf
index 099be470..c2c31dde 100644
--- a/meta-fsl-ppc/conf/machine/t4240qds.conf
+++ b/meta-fsl-ppc/conf/machine/t4240qds.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
 SOC_FAMILY = "t4240"
 UBOOT_MACHINES ?= "T4240QDS"
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
-KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 JFFS2_ERASEBLOCK = "0x10000"

diff --git a/meta-fsl-ppc/conf/machine/b4420qds-64b.conf b/meta-fsl-ppc/conf/machine/b4420qds-64b.conf index b8c4f5a3..0bb959cb 100644 --- a/meta-fsl-ppc/conf/machine/b4420qds-64b.conf +++ b/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
@@ -9,7 +9,7 @@ SOC_FAMILY = "b4420"
9	# TODO: fix 32bit build of u-boot	9	# TODO: fix 32bit build of u-boot
10	UBOOT_MACHINES ?= "B4420QDS"	10	UBOOT_MACHINES ?= "B4420QDS"
11	KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb"	11	KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb"
12	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"	12	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
13		13
14	JFFS2_ERASEBLOCK = "0x10000"	14	JFFS2_ERASEBLOCK = "0x10000"
15		15


diff --git a/meta-fsl-ppc/conf/machine/b4420qds.conf b/meta-fsl-ppc/conf/machine/b4420qds.conf index 6119330b..b07ab5d2 100644 --- a/meta-fsl-ppc/conf/machine/b4420qds.conf +++ b/meta-fsl-ppc/conf/machine/b4420qds.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
7	SOC_FAMILY = "b4420"	7	SOC_FAMILY = "b4420"
8	UBOOT_MACHINES ?= "B4420QDS"	8	UBOOT_MACHINES ?= "B4420QDS"
9	KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb"	9	KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb"
10	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"	10	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
11		11
12	JFFS2_ERASEBLOCK = "0x10000"	12	JFFS2_ERASEBLOCK = "0x10000"
13		13


diff --git a/meta-fsl-ppc/conf/machine/b4860qds-64b.conf b/meta-fsl-ppc/conf/machine/b4860qds-64b.conf index 6cf2fce8..86596106 100644 --- a/meta-fsl-ppc/conf/machine/b4860qds-64b.conf +++ b/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
@@ -8,7 +8,7 @@ SOC_FAMILY = "b4860"
8	# TODO: fix 32bit build of u-boot	8	# TODO: fix 32bit build of u-boot
9	UBOOT_MACHINES ?= "B4860QDS"	9	UBOOT_MACHINES ?= "B4860QDS"
10	KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb"	10	KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb"
11	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"	11	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
12		12
13	JFFS2_ERASEBLOCK = "0x10000"	13	JFFS2_ERASEBLOCK = "0x10000"
14		14


diff --git a/meta-fsl-ppc/conf/machine/b4860qds.conf b/meta-fsl-ppc/conf/machine/b4860qds.conf index e8c88972..2aa471ef 100644 --- a/meta-fsl-ppc/conf/machine/b4860qds.conf +++ b/meta-fsl-ppc/conf/machine/b4860qds.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
7	SOC_FAMILY = "b4860"	7	SOC_FAMILY = "b4860"
8	UBOOT_MACHINES ?= "B4860QDS"	8	UBOOT_MACHINES ?= "B4860QDS"
9	KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb"	9	KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb"
10	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"	10	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
11		11
12	JFFS2_ERASEBLOCK = "0x10000"	12	JFFS2_ERASEBLOCK = "0x10000"
13		13


diff --git a/meta-fsl-ppc/conf/machine/bsc9131rdb.conf b/meta-fsl-ppc/conf/machine/bsc9131rdb.conf index 9c08af4b..c145a047 100644 --- a/meta-fsl-ppc/conf/machine/bsc9131rdb.conf +++ b/meta-fsl-ppc/conf/machine/bsc9131rdb.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
7	SOC_FAMILY = "bsc9131"	7	SOC_FAMILY = "bsc9131"
8	UBOOT_MACHINES ?= "BSC9131RDB_SPIFLASH BSC9131RDB_NAND BSC9131RDB_NAND_SYSCLK100 BSC9131RDB_SPIFLASH_SYSCLK100"	8	UBOOT_MACHINES ?= "BSC9131RDB_SPIFLASH BSC9131RDB_NAND BSC9131RDB_NAND_SYSCLK100 BSC9131RDB_SPIFLASH_SYSCLK100"
9	KERNEL_DEVICETREE ?= "bsc9131rdb.dtb"	9	KERNEL_DEVICETREE ?= "bsc9131rdb.dtb"
10	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/bsc913x_defconfig"	10	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/bsc913x_defconfig"
11		11
12	JFFS2_ERASEBLOCK = "0x10000"	12	JFFS2_ERASEBLOCK = "0x10000"
13		13


diff --git a/meta-fsl-ppc/conf/machine/bsc9132qds.conf b/meta-fsl-ppc/conf/machine/bsc9132qds.conf index 7ca4e127..5b9a1006 100644 --- a/meta-fsl-ppc/conf/machine/bsc9132qds.conf +++ b/meta-fsl-ppc/conf/machine/bsc9132qds.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
7	SOC_FAMILY = "bsc9132"	7	SOC_FAMILY = "bsc9132"
8	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"	8	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"
9	KERNEL_DEVICETREE ?= "bsc9132qds.dtb"	9	KERNEL_DEVICETREE ?= "bsc9132qds.dtb"
10	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/bsc913x_smp_defconfig"	10	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/bsc913x_smp_defconfig"
11		11
12	JFFS2_ERASEBLOCK = "0x10000"	12	JFFS2_ERASEBLOCK = "0x10000"
13		13


diff --git a/meta-fsl-ppc/conf/machine/p1010rdb.conf b/meta-fsl-ppc/conf/machine/p1010rdb.conf index be576561..a9217472 100644 --- a/meta-fsl-ppc/conf/machine/p1010rdb.conf +++ b/meta-fsl-ppc/conf/machine/p1010rdb.conf
@@ -11,7 +11,7 @@ UBOOT_MACHINES ?= "P1010RDB-PB_NAND P1010RDB-PB_NOR \
11	P1010RDB-PB_SPIFLASH P1010RDB-PB_36BIT_NOR P1010RDB-PB_36BIT_NAND \	11	P1010RDB-PB_SPIFLASH P1010RDB-PB_36BIT_NOR P1010RDB-PB_36BIT_NAND \
12	P1010RDB-PB_36BIT_SPIFLASH"	12	P1010RDB-PB_36BIT_SPIFLASH"
13	KERNEL_DEVICETREE ?= "p1010rdb-pa.dtb p1010rdb-pb.dtb"	13	KERNEL_DEVICETREE ?= "p1010rdb-pa.dtb p1010rdb-pb.dtb"
14	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"	14	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_defconfig"
15		15
16	JFFS2_ERASEBLOCK = "0x20000"	16	JFFS2_ERASEBLOCK = "0x20000"
17		17


diff --git a/meta-fsl-ppc/conf/machine/p1020rdb.conf b/meta-fsl-ppc/conf/machine/p1020rdb.conf index 1e9f14e7..9adac799 100644 --- a/meta-fsl-ppc/conf/machine/p1020rdb.conf +++ b/meta-fsl-ppc/conf/machine/p1020rdb.conf
@@ -10,7 +10,7 @@ UBOOT_MACHINES ?= " P1020RDB-PD P1020RDB-PD_NAND P1020RDB-PD_SDCARD P1020RDB-PD_
10		10
11	KERNEL_DEVICETREE ?= "p1020rdb-pd_32b.dtb"	11	KERNEL_DEVICETREE ?= "p1020rdb-pd_32b.dtb"
12		12
13	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"	13	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
14		14
15	JFFS2_ERASEBLOCK = "0x20000"	15	JFFS2_ERASEBLOCK = "0x20000"
16		16


diff --git a/meta-fsl-ppc/conf/machine/p1021rdb.conf b/meta-fsl-ppc/conf/machine/p1021rdb.conf index fe783447..37c17a4c 100644 --- a/meta-fsl-ppc/conf/machine/p1021rdb.conf +++ b/meta-fsl-ppc/conf/machine/p1021rdb.conf
@@ -9,7 +9,7 @@ SOC_FAMILY = "p1021"
9	BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"	9	BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
10	UBOOT_MACHINES ?= "P1021RDB-PC P1021RDB-PC_NAND P1021RDB-PC_SDCARD P1021RDB-PC_SPIFLASH P1021RDB-PC_36BIT P1021RDB-PC_36BIT_SPIFLASH P1021RDB-PC_36BIT_NAND P1021RDB-PC_36BIT_SDCARD"	10	UBOOT_MACHINES ?= "P1021RDB-PC P1021RDB-PC_NAND P1021RDB-PC_SDCARD P1021RDB-PC_SPIFLASH P1021RDB-PC_36BIT P1021RDB-PC_36BIT_SPIFLASH P1021RDB-PC_36BIT_NAND P1021RDB-PC_36BIT_SDCARD"
11	KERNEL_DEVICETREE ?= "p1021rdb-pc_32b.dtb"	11	KERNEL_DEVICETREE ?= "p1021rdb-pc_32b.dtb"
12	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"	12	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
13		13
14	JFFS2_ERASEBLOCK = "0x20000"	14	JFFS2_ERASEBLOCK = "0x20000"
15		15


diff --git a/meta-fsl-ppc/conf/machine/p1022ds.conf b/meta-fsl-ppc/conf/machine/p1022ds.conf index 64df2f84..b06da815 100644 --- a/meta-fsl-ppc/conf/machine/p1022ds.conf +++ b/meta-fsl-ppc/conf/machine/p1022ds.conf
@@ -8,7 +8,7 @@ SOC_FAMILY = "p1022"
8	BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"	8	BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
9	UBOOT_MACHINES ?= "P1022DS P1022DS_NAND P1022DS_SPIFLASH P1022DS_SDCARD P1022DS_36BIT P1022DS_36BIT_SPIFLASH P1022DS_36BIT_NAND P1022DS_36BIT_SDCARD"	9	UBOOT_MACHINES ?= "P1022DS P1022DS_NAND P1022DS_SPIFLASH P1022DS_SDCARD P1022DS_36BIT P1022DS_36BIT_SPIFLASH P1022DS_36BIT_NAND P1022DS_36BIT_SDCARD"
10	KERNEL_DEVICETREE ?= "p1022ds_32b.dtb"	10	KERNEL_DEVICETREE ?= "p1022ds_32b.dtb"
11	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"	11	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
12		12
13	PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"	13	PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
14		14


diff --git a/meta-fsl-ppc/conf/machine/p1023rdb.conf b/meta-fsl-ppc/conf/machine/p1023rdb.conf index 13eff250..ece7e3f8 100644 --- a/meta-fsl-ppc/conf/machine/p1023rdb.conf +++ b/meta-fsl-ppc/conf/machine/p1023rdb.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
7	SOC_FAMILY = "p1023"	7	SOC_FAMILY = "p1023"
8	UBOOT_MACHINES ?= "P1023RDB"	8	UBOOT_MACHINES ?= "P1023RDB"
9	KERNEL_DEVICETREE ?= "p1023rdb.dtb"	9	KERNEL_DEVICETREE ?= "p1023rdb.dtb"
10	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/p1023rds_defconfig"	10	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/p1023rds_defconfig"
11		11
12	JFFS2_ERASEBLOCK = "0x10000"	12	JFFS2_ERASEBLOCK = "0x10000"
13		13


diff --git a/meta-fsl-ppc/conf/machine/p1025twr.conf b/meta-fsl-ppc/conf/machine/p1025twr.conf index acfac25f..eb7c439a 100644 --- a/meta-fsl-ppc/conf/machine/p1025twr.conf +++ b/meta-fsl-ppc/conf/machine/p1025twr.conf
@@ -9,7 +9,7 @@ SOC_FAMILY = "p1025"
9	BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat"	9	BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat"
10	UBOOT_MACHINES ?= "TWR-P1025"	10	UBOOT_MACHINES ?= "TWR-P1025"
11	KERNEL_DEVICETREE ?= "p1025twr_32b.dtb"	11	KERNEL_DEVICETREE ?= "p1025twr_32b.dtb"
12	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"	12	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
13		13
14	JFFS2_ERASEBLOCK = "0x20000"	14	JFFS2_ERASEBLOCK = "0x20000"
15		15


diff --git a/meta-fsl-ppc/conf/machine/p2020ds.conf b/meta-fsl-ppc/conf/machine/p2020ds.conf index b7d1a1dc..cb0b65ef 100644 --- a/meta-fsl-ppc/conf/machine/p2020ds.conf +++ b/meta-fsl-ppc/conf/machine/p2020ds.conf
@@ -8,7 +8,7 @@ SOC_FAMILY = "p2020"
8	BOOTFORMAT_CONFIG = "config_sram_p2020ds.dat"	8	BOOTFORMAT_CONFIG = "config_sram_p2020ds.dat"
9	UBOOT_MACHINES ?= "P2020DS P2020DS_36BIT P2020DS_DDR2 P2020DS_SDCARD P2020DS_SPIFLASH"	9	UBOOT_MACHINES ?= "P2020DS P2020DS_36BIT P2020DS_DDR2 P2020DS_SDCARD P2020DS_SPIFLASH"
10	KERNEL_DEVICETREE ?= "p2020ds.dtb"	10	KERNEL_DEVICETREE ?= "p2020ds.dtb"
11	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"	11	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
12		12
13	JFFS2_ERASEBLOCK = "0x20000"	13	JFFS2_ERASEBLOCK = "0x20000"
14		14


diff --git a/meta-fsl-ppc/conf/machine/p2020rdb.conf b/meta-fsl-ppc/conf/machine/p2020rdb.conf index 13698593..6e45ebec 100644 --- a/meta-fsl-ppc/conf/machine/p2020rdb.conf +++ b/meta-fsl-ppc/conf/machine/p2020rdb.conf
@@ -9,7 +9,7 @@ SOC_FAMILY = "p2020"
9	BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"	9	BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
10	UBOOT_MACHINES ?= " P2020RDB-PC P2020RDB-PC_NAND P2020RDB-PC_SDCARD P2020RDB-PC_SPIFLASH P2020RDB-PC_36BIT P2020RDB-PC_36BIT_SPIFLASH P2020RDB-PC_36BIT_NAND P2020RDB-PC_36BIT_SDCARD"	10	UBOOT_MACHINES ?= " P2020RDB-PC P2020RDB-PC_NAND P2020RDB-PC_SDCARD P2020RDB-PC_SPIFLASH P2020RDB-PC_36BIT P2020RDB-PC_36BIT_SPIFLASH P2020RDB-PC_36BIT_NAND P2020RDB-PC_36BIT_SDCARD"
11	KERNEL_DEVICETREE ?= "p2020rdb-pc_32b.dtb"	11	KERNEL_DEVICETREE ?= "p2020rdb-pc_32b.dtb"
12	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"	12	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
13		13
14	JFFS2_ERASEBLOCK = "0x20000"	14	JFFS2_ERASEBLOCK = "0x20000"
15		15


diff --git a/meta-fsl-ppc/conf/machine/p2041rdb.conf b/meta-fsl-ppc/conf/machine/p2041rdb.conf index 73210279..14b602cf 100644 --- a/meta-fsl-ppc/conf/machine/p2041rdb.conf +++ b/meta-fsl-ppc/conf/machine/p2041rdb.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
7	SOC_FAMILY = "p2041"	7	SOC_FAMILY = "p2041"
8	UBOOT_MACHINES ?= "P2041RDB P2041RDB_NAND P2041RDB_SECURE_BOOT P2041RDB_SDCARD P2041RDB_SPIFLASH"	8	UBOOT_MACHINES ?= "P2041RDB P2041RDB_NAND P2041RDB_SECURE_BOOT P2041RDB_SDCARD P2041RDB_SPIFLASH"
9	KERNEL_DEVICETREE ?= "p2041rdb.dtb p2041rdb-usdpaa.dtb"	9	KERNEL_DEVICETREE ?= "p2041rdb.dtb p2041rdb-usdpaa.dtb"
10	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"	10	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
11		11
12	JFFS2_ERASEBLOCK = "0x10000"	12	JFFS2_ERASEBLOCK = "0x10000"
13		13


diff --git a/meta-fsl-ppc/conf/machine/p3041ds.conf b/meta-fsl-ppc/conf/machine/p3041ds.conf index 5dd10838..0116ab52 100644 --- a/meta-fsl-ppc/conf/machine/p3041ds.conf +++ b/meta-fsl-ppc/conf/machine/p3041ds.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
7	SOC_FAMILY = "p3041"	7	SOC_FAMILY = "p3041"
8	UBOOT_MACHINES ?= "P3041DS P3041DS_NAND P3041DS_SECURE_BOOT P3041DS_SDCARD P3041DS_SPIFLASH"	8	UBOOT_MACHINES ?= "P3041DS P3041DS_NAND P3041DS_SECURE_BOOT P3041DS_SDCARD P3041DS_SPIFLASH"
9	KERNEL_DEVICETREE ?= "p3041ds.dtb p3041ds-usdpaa.dtb"	9	KERNEL_DEVICETREE ?= "p3041ds.dtb p3041ds-usdpaa.dtb"
10	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"	10	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
11		11
12	JFFS2_ERASEBLOCK = "0x10000"	12	JFFS2_ERASEBLOCK = "0x10000"
13		13


diff --git a/meta-fsl-ppc/conf/machine/p4080ds.conf b/meta-fsl-ppc/conf/machine/p4080ds.conf index 461044bb..5ea1d4f5 100644 --- a/meta-fsl-ppc/conf/machine/p4080ds.conf +++ b/meta-fsl-ppc/conf/machine/p4080ds.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
7	SOC_FAMILY = "p4080"	7	SOC_FAMILY = "p4080"
8	UBOOT_MACHINES ?= "P4080DS P4080DS_SECURE_BOOT P4080DS_SDCARD P4080DS_SPIFLASH "	8	UBOOT_MACHINES ?= "P4080DS P4080DS_SECURE_BOOT P4080DS_SDCARD P4080DS_SPIFLASH "
9	KERNEL_DEVICETREE ?= "p4080ds.dtb p4080ds-usdpaa.dtb"	9	KERNEL_DEVICETREE ?= "p4080ds.dtb p4080ds-usdpaa.dtb"
10	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"	10	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
11		11
12	JFFS2_ERASEBLOCK = "0x10000"	12	JFFS2_ERASEBLOCK = "0x10000"
13		13


diff --git a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf index 8a45958b..144781bf 100644 --- a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf +++ b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
@@ -8,7 +8,7 @@ SOC_FAMILY = "p5020"
8	# TODO: fix 32bit build of u-boot for p5020ds-64b	8	# TODO: fix 32bit build of u-boot for p5020ds-64b
9	UBOOT_MACHINES ?= "P5020DS"	9	UBOOT_MACHINES ?= "P5020DS"
10	KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb"	10	KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb"
11	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet64_smp_defconfig"	11	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
12		12
13	JFFS2_ERASEBLOCK = "0x10000"	13	JFFS2_ERASEBLOCK = "0x10000"
14		14


diff --git a/meta-fsl-ppc/conf/machine/p5020ds.conf b/meta-fsl-ppc/conf/machine/p5020ds.conf index 9951c770..8c263d8e 100644 --- a/meta-fsl-ppc/conf/machine/p5020ds.conf +++ b/meta-fsl-ppc/conf/machine/p5020ds.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
7	SOC_FAMILY = "p5020"	7	SOC_FAMILY = "p5020"
8	UBOOT_MACHINES ?= "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT P5020DS_SDCARD P5020DS_SPIFLASH "	8	UBOOT_MACHINES ?= "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT P5020DS_SDCARD P5020DS_SPIFLASH "
9	KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb"	9	KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb"
10	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"	10	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
11		11
12	JFFS2_ERASEBLOCK = "0x10000"	12	JFFS2_ERASEBLOCK = "0x10000"
13		13


diff --git a/meta-fsl-ppc/conf/machine/p5040ds-64b.conf b/meta-fsl-ppc/conf/machine/p5040ds-64b.conf index 3f16d6ea..e3f6ce16 100644 --- a/meta-fsl-ppc/conf/machine/p5040ds-64b.conf +++ b/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
7	SOC_FAMILY = "p5040"	7	SOC_FAMILY = "p5040"
8	UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT P5040DS_SDCARD P5040DS_SPIFLASH"	8	UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT P5040DS_SDCARD P5040DS_SPIFLASH"
9	KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb"	9	KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb"
10	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet64_smp_defconfig"	10	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
11		11
12	JFFS2_ERASEBLOCK = "0x10000"	12	JFFS2_ERASEBLOCK = "0x10000"
13		13


diff --git a/meta-fsl-ppc/conf/machine/p5040ds.conf b/meta-fsl-ppc/conf/machine/p5040ds.conf index bb61fd93..5692ab0c 100644 --- a/meta-fsl-ppc/conf/machine/p5040ds.conf +++ b/meta-fsl-ppc/conf/machine/p5040ds.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
7	SOC_FAMILY = "p5040"	7	SOC_FAMILY = "p5040"
8	UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT P5040DS_SDCARD P5040DS_SPIFLASH"	8	UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT P5040DS_SDCARD P5040DS_SPIFLASH"
9	KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb"	9	KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb"
10	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"	10	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
11		11
12	JFFS2_ERASEBLOCK = "0x10000"	12	JFFS2_ERASEBLOCK = "0x10000"
13		13


diff --git a/meta-fsl-ppc/conf/machine/t4160qds-64b.conf b/meta-fsl-ppc/conf/machine/t4160qds-64b.conf index 0e4ee086..83696d54 100644 --- a/meta-fsl-ppc/conf/machine/t4160qds-64b.conf +++ b/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
@@ -8,7 +8,7 @@ SOC_FAMILY = "t4160"
8	# TODO: fix 32bit build of u-boot	8	# TODO: fix 32bit build of u-boot
9	UBOOT_MACHINES ?= "T4160QDS"	9	UBOOT_MACHINES ?= "T4160QDS"
10	KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"	10	KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
11	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"	11	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
12		12
13	JFFS2_ERASEBLOCK = "0x10000"	13	JFFS2_ERASEBLOCK = "0x10000"
14		14


diff --git a/meta-fsl-ppc/conf/machine/t4160qds.conf b/meta-fsl-ppc/conf/machine/t4160qds.conf index cf3a3049..34b2b2e0 100644 --- a/meta-fsl-ppc/conf/machine/t4160qds.conf +++ b/meta-fsl-ppc/conf/machine/t4160qds.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
7	SOC_FAMILY = "t4160"	7	SOC_FAMILY = "t4160"
8	UBOOT_MACHINES ?= "T4160QDS"	8	UBOOT_MACHINES ?= "T4160QDS"
9	KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"	9	KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
10	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"	10	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
11		11
12	JFFS2_ERASEBLOCK = "0x10000"	12	JFFS2_ERASEBLOCK = "0x10000"
13		13


diff --git a/meta-fsl-ppc/conf/machine/t4240qds-64b.conf b/meta-fsl-ppc/conf/machine/t4240qds-64b.conf index 4ea62c57..ffdf6589 100644 --- a/meta-fsl-ppc/conf/machine/t4240qds-64b.conf +++ b/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
@@ -8,7 +8,7 @@ SOC_FAMILY = "t4240"
8	# TODO: fix 32bit build of u-boot	8	# TODO: fix 32bit build of u-boot
9	UBOOT_MACHINES ?= "T4240QDS"	9	UBOOT_MACHINES ?= "T4240QDS"
10	KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"	10	KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
11	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"	11	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
12		12
13	JFFS2_ERASEBLOCK = "0x10000"	13	JFFS2_ERASEBLOCK = "0x10000"
14		14


diff --git a/meta-fsl-ppc/conf/machine/t4240qds.conf b/meta-fsl-ppc/conf/machine/t4240qds.conf index 099be470..c2c31dde 100644 --- a/meta-fsl-ppc/conf/machine/t4240qds.conf +++ b/meta-fsl-ppc/conf/machine/t4240qds.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
7	SOC_FAMILY = "t4240"	7	SOC_FAMILY = "t4240"
8	UBOOT_MACHINES ?= "T4240QDS"	8	UBOOT_MACHINES ?= "T4240QDS"
9	KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"	9	KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
10	KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"	10	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
11		11
12	JFFS2_ERASEBLOCK = "0x10000"	12	JFFS2_ERASEBLOCK = "0x10000"
13		13