Patchwork [meta-fsl-ppc,dora,30/31] conf/machine/*: make KERNEL_DEVICETREE overridable

login
register
mail settings
Submitter Ting Liu
Date Jan. 15, 2014, 9:41 a.m.
Message ID <1389778896-11563-31-git-send-email-b28495@freescale.com>
Download mbox | patch
Permalink /patch/64847/
State Accepted
Headers show

Comments

Ting Liu - Jan. 15, 2014, 9:41 a.m.
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/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/t4160qds-64b.conf |    2 +-
 conf/machine/t4160qds.conf     |    2 +-
 conf/machine/t4240qds-64b.conf |    2 +-
 conf/machine/t4240qds.conf     |    2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

Patch

diff --git a/conf/machine/b4420qds-64b.conf b/conf/machine/b4420qds-64b.conf
index 3a01dfa..b8c4f5a 100644
--- a/conf/machine/b4420qds-64b.conf
+++ b/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/conf/machine/b4420qds.conf b/conf/machine/b4420qds.conf
index 84b7c9c..6119330 100644
--- a/conf/machine/b4420qds.conf
+++ b/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/conf/machine/b4860qds-64b.conf b/conf/machine/b4860qds-64b.conf
index e9eacfe..6cf2fce 100644
--- a/conf/machine/b4860qds-64b.conf
+++ b/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/conf/machine/b4860qds.conf b/conf/machine/b4860qds.conf
index 17446c7..e8c8897 100644
--- a/conf/machine/b4860qds.conf
+++ b/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/conf/machine/bsc9131rdb.conf b/conf/machine/bsc9131rdb.conf
index 766d5d2..9c08af4 100644
--- a/conf/machine/bsc9131rdb.conf
+++ b/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/conf/machine/bsc9132qds.conf b/conf/machine/bsc9132qds.conf
index 9baa49b..7ca4e12 100644
--- a/conf/machine/bsc9132qds.conf
+++ b/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/conf/machine/p1020rdb.conf b/conf/machine/p1020rdb.conf
index 927efc3..1e9f14e 100644
--- a/conf/machine/p1020rdb.conf
+++ b/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/conf/machine/p1021rdb.conf b/conf/machine/p1021rdb.conf
index 896e541..fe78344 100644
--- a/conf/machine/p1021rdb.conf
+++ b/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/conf/machine/p1022ds.conf b/conf/machine/p1022ds.conf
index ba45dd0..64df2f8 100644
--- a/conf/machine/p1022ds.conf
+++ b/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/conf/machine/p1023rdb.conf b/conf/machine/p1023rdb.conf
index 3422cbf..13eff25 100644
--- a/conf/machine/p1023rdb.conf
+++ b/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/conf/machine/p1025twr.conf b/conf/machine/p1025twr.conf
index 286ec69..acfac25 100644
--- a/conf/machine/p1025twr.conf
+++ b/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/conf/machine/p2020ds.conf b/conf/machine/p2020ds.conf
index a69e62c..b7d1a1d 100644
--- a/conf/machine/p2020ds.conf
+++ b/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/conf/machine/p2020rdb.conf b/conf/machine/p2020rdb.conf
index 0abb39c..1369859 100644
--- a/conf/machine/p2020rdb.conf
+++ b/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/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf
index bc6764f..7321027 100644
--- a/conf/machine/p2041rdb.conf
+++ b/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/conf/machine/p3041ds.conf b/conf/machine/p3041ds.conf
index ced9590..5dd1083 100644
--- a/conf/machine/p3041ds.conf
+++ b/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/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf
index 6f4a89e..461044b 100644
--- a/conf/machine/p4080ds.conf
+++ b/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/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf
index 968deaa..8a45958 100644
--- a/conf/machine/p5020ds-64b.conf
+++ b/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/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf
index 1a4055a..9951c77 100644
--- a/conf/machine/p5020ds.conf
+++ b/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/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf
index 4fdc3d6..3f16d6e 100644
--- a/conf/machine/p5040ds-64b.conf
+++ b/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/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf
index 53a3f09..bb61fd9 100644
--- a/conf/machine/p5040ds.conf
+++ b/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/conf/machine/t4160qds-64b.conf b/conf/machine/t4160qds-64b.conf
index 67d8ba5..0e4ee08 100644
--- a/conf/machine/t4160qds-64b.conf
+++ b/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/conf/machine/t4160qds.conf b/conf/machine/t4160qds.conf
index 9e4b10a..cf3a304 100644
--- a/conf/machine/t4160qds.conf
+++ b/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/conf/machine/t4240qds-64b.conf b/conf/machine/t4240qds-64b.conf
index ac5cd4a..4ea62c5 100644
--- a/conf/machine/t4240qds-64b.conf
+++ b/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/conf/machine/t4240qds.conf b/conf/machine/t4240qds.conf
index dc41e40..099be47 100644
--- a/conf/machine/t4240qds.conf
+++ b/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"