conf/machine/*: make KERNEL_DEVICETREE overridable

Signed-off-by: Ting Liu <b28495@freescale.com>

diff --git a/meta-fsl-ppc/conf/machine/b4420qds-64b.conf b/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
index 3a01dfaf8e33a60832cee3088a53beb787b6bdf8..b8c4f5a3b1b9ad894cd4d82df9d5b86849f0b90e 100644 (file)
--- a/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
@@ -8,7 +8,7 @@ SOC_FAMILY = "b4420"
 
 # TODO: fix 32bit build of u-boot
 UBOOT_MACHINES ?= "B4420QDS"
-KERNEL_DEVICETREE = "b4420qds.dtb b4420qds-usdpaa.dtb"
+KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb"
 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 84b7c9c90a747e976cd7a104b4bc8a8c0656cb1e..6119330beda640048b9738934dbd51abb32a09ba 100644 (file)
--- a/meta-fsl-ppc/conf/machine/b4420qds.conf
+++ b/meta-fsl-ppc/conf/machine/b4420qds.conf
@@ -6,7 +6,7 @@ require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "b4420"
 UBOOT_MACHINES ?= "B4420QDS"
-KERNEL_DEVICETREE = "b4420qds.dtb b4420qds-usdpaa.dtb"
+KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb"
 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 e9eacfe207fbe7b458c230d15a0ed7c3ba32e264..6cf2fce8123589dde4ca33f02c54bcfa3baa982e 100644 (file)
--- a/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
@@ -7,7 +7,7 @@ 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_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb"
 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 17446c75705cfbf692570ea76de480c5750b17c0..e8c88972c53e0655d3f7d9a83c4bc2bff20c6ec5 100644 (file)
--- a/meta-fsl-ppc/conf/machine/b4860qds.conf
+++ b/meta-fsl-ppc/conf/machine/b4860qds.conf
@@ -6,7 +6,7 @@ require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "b4860"
 UBOOT_MACHINES ?= "B4860QDS"
-KERNEL_DEVICETREE = "b4860qds.dtb b4860qds-usdpaa.dtb"
+KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb"
 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 766d5d227deec0872988cc0d2ce3a9964aae665c..9c08af4b5263eca654c9467cacd46194f9b058bb 100644 (file)
--- a/meta-fsl-ppc/conf/machine/bsc9131rdb.conf
+++ b/meta-fsl-ppc/conf/machine/bsc9131rdb.conf
@@ -6,7 +6,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_DEVICETREE ?= "bsc9131rdb.dtb"
 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 9baa49b50f8a03958058128908d3b53d93ef9b90..7ca4e127f74a0b5b3ef6f1ac0fcfc8f775a32fd1 100644 (file)
--- a/meta-fsl-ppc/conf/machine/bsc9132qds.conf
+++ b/meta-fsl-ppc/conf/machine/bsc9132qds.conf
@@ -6,7 +6,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_DEVICETREE ?= "bsc9132qds.dtb"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/bsc913x_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"

diff --git a/meta-fsl-ppc/conf/machine/p1020rdb.conf b/meta-fsl-ppc/conf/machine/p1020rdb.conf
index 927efc3d56e0cf9745c910745b8b3040a070b0bf..1e9f14e7b37071f086d690854449767e227b12fe 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1020rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1020rdb.conf
@@ -8,7 +8,7 @@ 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_DEVICETREE ?= "p1020rdb-pd_32b.dtb"
 
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 

diff --git a/meta-fsl-ppc/conf/machine/p1021rdb.conf b/meta-fsl-ppc/conf/machine/p1021rdb.conf
index 896e541ada4fc25358fe1e3363a43df0e33d48da..fe783447b15290923132ca8eceb97871e23da6b3 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1021rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1021rdb.conf
@@ -8,7 +8,7 @@ require conf/machine/include/soc-family.inc
 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_DEVICETREE ?= "p1021rdb-pc_32b.dtb"
 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 ba45dd0be79f6a786ae8429c5a1d4d5766c5359f..64df2f84d0603e6e65774c712ad5f36fe578db58 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1022ds.conf
+++ b/meta-fsl-ppc/conf/machine/p1022ds.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
 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_DEVICETREE ?= "p1022ds_32b.dtb"
 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 3422cbfddaab507f00cb3f1965008d120f0cd45c..13eff2500886a91b6ed4433c9ccc2126236ce417 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1023rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1023rdb.conf
@@ -6,7 +6,7 @@ require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "p1023"
 UBOOT_MACHINES ?= "P1023RDB"
-KERNEL_DEVICETREE = "p1023rdb.dtb"
+KERNEL_DEVICETREE ?= "p1023rdb.dtb"
 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 286ec6938204b4882bb5be7afa612da4849c5c7d..acfac25f0f4b2c1b3c98f0aacf17d59f52b5f659 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1025twr.conf
+++ b/meta-fsl-ppc/conf/machine/p1025twr.conf
@@ -8,7 +8,7 @@ require conf/machine/include/soc-family.inc
 SOC_FAMILY = "p1025"
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat"
 UBOOT_MACHINES ?= "TWR-P1025"
-KERNEL_DEVICETREE = "p1025twr_32b.dtb"
+KERNEL_DEVICETREE ?= "p1025twr_32b.dtb"
 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 a69e62cd278dd277ab13abeae0e19a662d339f02..b7d1a1dc66739738705923557fe6d146dcc62912 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p2020ds.conf
+++ b/meta-fsl-ppc/conf/machine/p2020ds.conf
@@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc
 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_DEVICETREE ?= "p2020ds.dtb"
 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 0abb39caf17bebacb096d88499195aa1e2037db3..136985932517d765652eb4be29eaa982420da7e0 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p2020rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p2020rdb.conf
@@ -8,7 +8,7 @@ require conf/machine/include/soc-family.inc
 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_DEVICETREE ?= "p2020rdb-pc_32b.dtb"
 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 bc6764f81c1d555b9f7dd6c372230b1fe0f03b23..732102796fda1a963cca980cea70bcd6d3bfe8bd 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p2041rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p2041rdb.conf
@@ -6,7 +6,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_DEVICETREE ?= "p2041rdb.dtb p2041rdb-usdpaa.dtb"
 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 ced9590656ef55c8e3f85e967b9eaedaa886cc72..5dd10838e5521092953578776eb3f27f11dd0931 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p3041ds.conf
+++ b/meta-fsl-ppc/conf/machine/p3041ds.conf
@@ -6,7 +6,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_DEVICETREE ?= "p3041ds.dtb p3041ds-usdpaa.dtb"
 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 6f4a89e11ff77a411cd42ebdbdad2ec1fd807a80..461044bb7de5f0c4be4e22f9b7398e64159abe20 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p4080ds.conf
+++ b/meta-fsl-ppc/conf/machine/p4080ds.conf
@@ -6,7 +6,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_DEVICETREE ?= "p4080ds.dtb p4080ds-usdpaa.dtb"
 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 968deaa72d9296e1ca7c37a053836c7e62fb8e91..8a45958bbb7e4b9a7062518bedf906069117803b 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
@@ -7,7 +7,7 @@ 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_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb"
 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 1a4055a09f8aac8870d9fc5d91a4ff09e15979fb..9951c770fc67056a90a06571bc7fa36add543ace 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5020ds.conf
+++ b/meta-fsl-ppc/conf/machine/p5020ds.conf
@@ -6,7 +6,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_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb"
 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 4fdc3d6ecd371194d70078d112e373f17b648e47..3f16d6eaf0cf0068b0e89d5ae8776d14e4f595c2 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
@@ -6,7 +6,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_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb"
 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 53a3f095422c1c7a23888123ca28d71d903ce717..bb61fd9372fc394777bc57713296234beeee679f 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5040ds.conf
+++ b/meta-fsl-ppc/conf/machine/p5040ds.conf
@@ -6,7 +6,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_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb"
 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 67d8ba500f2f7c5095fad9526e9fc2628ba60994..0e4ee08691656106b3d4b88870d41586adc9d3df 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
@@ -7,7 +7,7 @@ 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_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
 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 9e4b10a86b54ab1793a20bf16265aef0b5cf231a..cf3a3049c230b76da4a32e631b616aa4af7c13d1 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4160qds.conf
+++ b/meta-fsl-ppc/conf/machine/t4160qds.conf
@@ -6,7 +6,7 @@ require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t4160"
 UBOOT_MACHINES ?= "T4160QDS"
-KERNEL_DEVICETREE = "t4240qds.dtb t4240qds-usdpaa.dtb"
+KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
 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 ac5cd4a02ab3a5a49f582380e4486d0469ca5e1e..4ea62c5763c073d4beda36f39c927dc54cbf6ea7 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
@@ -7,7 +7,7 @@ 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_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
 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 dc41e402923f30e0034072ae4857e8c42a09ac0b..099be470b10d95d5604ed1d0bd8323288f45ef6f 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4240qds.conf
+++ b/meta-fsl-ppc/conf/machine/t4240qds.conf
@@ -6,7 +6,7 @@ require conf/machine/include/soc-family.inc
 
 SOC_FAMILY = "t4240"
 UBOOT_MACHINES ?= "T4240QDS"
-KERNEL_DEVICETREE = "t4240qds.dtb t4240qds-usdpaa.dtb"
+KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"