From: Ting Liu <[email protected]> The linux-dtb.inc has been rework to use the Linux kernel build system to generate the DeviceTree binaries so now KERNEL_DEVICETREE variable should has the /target/ name, not the file path.
Signed-off-by: Ting Liu <[email protected]> --- conf/machine/b4420qds-64b.conf | 2 +- conf/machine/b4420qds.conf | 2 +- conf/machine/b4860qds-64b.conf | 3 +-- conf/machine/b4860qds.conf | 3 +-- conf/machine/bsc9131rdb.conf | 2 +- conf/machine/bsc9132qds.conf | 2 +- 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 | 3 +-- conf/machine/p3041ds.conf | 3 +-- conf/machine/p4080ds.conf | 3 +-- conf/machine/p5020ds-64b.conf | 3 +-- conf/machine/p5020ds.conf | 3 +-- conf/machine/p5040ds-64b.conf | 3 +-- conf/machine/p5040ds.conf | 3 +-- conf/machine/t4160qds-64b.conf | 3 +-- conf/machine/t4160qds.conf | 3 +-- conf/machine/t4240qds-64b.conf | 3 +-- conf/machine/t4240qds.conf | 3 +-- 25 files changed, 25 insertions(+), 38 deletions(-) diff --git a/conf/machine/b4420qds-64b.conf b/conf/machine/b4420qds-64b.conf index 8ab1d29..9b4973e 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 = "${S}/arch/powerpc/boot/dts/b4420qds.dts" +KERNEL_DEVICETREE = "b4420qds.dtb" KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev1_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/conf/machine/b4420qds.conf b/conf/machine/b4420qds.conf index fe1a44e..ef8f977 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 = "${S}/arch/powerpc/boot/dts/b4420qds.dts" +KERNEL_DEVICETREE = "b4420qds.dtb" KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev1_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/conf/machine/b4860qds-64b.conf b/conf/machine/b4860qds-64b.conf index 7cd18f9..06268ef 100644 --- a/conf/machine/b4860qds-64b.conf +++ b/conf/machine/b4860qds-64b.conf @@ -7,8 +7,7 @@ require conf/machine/include/soc-family.inc SOC_FAMILY = "b4860" # TODO: fix 32bit build of u-boot UBOOT_MACHINES ?= "B4860QDS" -KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/b4860qds.dts \ - ${S}/arch/powerpc/boot/dts/b4860qds-usdpaa.dts" +KERNEL_DEVICETREE = "b4860qds.dtb b4860qds-usdpaa.dtb" KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev1_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/conf/machine/b4860qds.conf b/conf/machine/b4860qds.conf index 1143a65..6ca29e3 100644 --- a/conf/machine/b4860qds.conf +++ b/conf/machine/b4860qds.conf @@ -6,8 +6,7 @@ require conf/machine/include/soc-family.inc SOC_FAMILY = "b4860" UBOOT_MACHINES ?= "B4860QDS" -KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/b4860qds.dts \ - ${S}/arch/powerpc/boot/dts/b4860qds-usdpaa.dts" +KERNEL_DEVICETREE = "b4860qds.dtb b4860qds-usdpaa.dtb" KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev1_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/conf/machine/bsc9131rdb.conf b/conf/machine/bsc9131rdb.conf index 39a73e5..766d5d2 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 = "${S}/arch/powerpc/boot/dts/bsc9131rdb.dts" +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 90131a9..9baa49b 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 = "${S}/arch/powerpc/boot/dts/bsc9132qds.dts" +KERNEL_DEVICETREE = "bsc9132qds.dtb" KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/bsc913x_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/conf/machine/p1010rdb.conf b/conf/machine/p1010rdb.conf index ccc5053..2ee53fc 100644 --- a/conf/machine/p1010rdb.conf +++ b/conf/machine/p1010rdb.conf @@ -7,7 +7,7 @@ require conf/machine/include/soc-family.inc SOC_FAMILY = "p1010" UBOOT_MACHINES ?= "P1010RDB_NAND P1010RDB_NOR" -KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1010rdb.dts" +KERNEL_DEVICETREE = "p1010rdb.dtb" KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig" JFFS2_ERASEBLOCK = "0x20000" diff --git a/conf/machine/p1020rdb.conf b/conf/machine/p1020rdb.conf index b17213c..ced2d37 100644 --- a/conf/machine/p1020rdb.conf +++ b/conf/machine/p1020rdb.conf @@ -8,7 +8,7 @@ SOC_FAMILY = "p1020" BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_800M.dat" UBOOT_MACHINES ?= " P1020RDB-PD P1020RDB-PD_NAND P1020RDB-PD_SDCARD P1020RDB-PD_SPIFLASH" -KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020rdb-pd_32b.dts" +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 c1657a4..2e62adb 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_ddr3_1gb_p1_p2_rdb_pc_800M.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 = "${S}/arch/powerpc/boot/dts/p1021rdb-pc_32b.dts" +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 f604ea1..624353f 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_ddr3_2gb_p1022ds.dat" UBOOT_MACHINES ?= "P1022DS P1022DS_NAND P1022DS_SPIFLASH P1022DS_SDCARD P1022DS_36BIT P1022DS_36BIT_SPIFLASH P1022DS_36BIT_NAND P1022DS_36BIT_SDCARD" -KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1022ds_32b.dts" +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 e591e09..3422cbf 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 = "${S}/arch/powerpc/boot/dts/p1023rdb.dts" +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 d1d1db0..286ec69 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 = "${S}/arch/powerpc/boot/dts/p1025twr_32b.dts" +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 9ca1617..a69e62c 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 = "${S}/arch/powerpc/boot/dts/p2020ds.dts" +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 b703b9f..b9d9590 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_ddr3_1gb_64bit_p2020rdb_pc.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 = "${S}/arch/powerpc/boot/dts/p2020rdb-pc_32b.dts" +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 2f96ce6..bc6764f 100644 --- a/conf/machine/p2041rdb.conf +++ b/conf/machine/p2041rdb.conf @@ -6,8 +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 = "${S}/arch/powerpc/boot/dts/p2041rdb.dts \ - ${S}/arch/powerpc/boot/dts/p2041rdb-usdpaa.dts" +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 6fb80e1..ced9590 100644 --- a/conf/machine/p3041ds.conf +++ b/conf/machine/p3041ds.conf @@ -6,8 +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 = "${S}/arch/powerpc/boot/dts/p3041ds.dts \ - ${S}/arch/powerpc/boot/dts/p3041ds-usdpaa.dts" +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 daa929a..6f4a89e 100644 --- a/conf/machine/p4080ds.conf +++ b/conf/machine/p4080ds.conf @@ -6,8 +6,7 @@ require conf/machine/include/soc-family.inc SOC_FAMILY = "p4080" UBOOT_MACHINES ?= "P4080DS P4080DS_SECURE_BOOT P4080DS_SDCARD P4080DS_SPIFLASH " -KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p4080ds.dts \ - ${S}/arch/powerpc/boot/dts/p4080ds-usdpaa.dts" +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 e67ad1e..968deaa 100644 --- a/conf/machine/p5020ds-64b.conf +++ b/conf/machine/p5020ds-64b.conf @@ -7,8 +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 = "${S}/arch/powerpc/boot/dts/p5020ds.dts \ - ${S}/arch/powerpc/boot/dts/p5020ds-usdpaa.dts" +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 d4ce3d3..1a4055a 100644 --- a/conf/machine/p5020ds.conf +++ b/conf/machine/p5020ds.conf @@ -6,8 +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 = "${S}/arch/powerpc/boot/dts/p5020ds.dts \ - ${S}/arch/powerpc/boot/dts/p5020ds-usdpaa.dts" +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 2a885b7..4fdc3d6 100644 --- a/conf/machine/p5040ds-64b.conf +++ b/conf/machine/p5040ds-64b.conf @@ -6,8 +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 = "${S}/arch/powerpc/boot/dts/p5040ds.dts \ - ${S}/arch/powerpc/boot/dts/p5040ds-usdpaa.dts" +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 c7d253f..53a3f09 100644 --- a/conf/machine/p5040ds.conf +++ b/conf/machine/p5040ds.conf @@ -6,8 +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 = "${S}/arch/powerpc/boot/dts/p5040ds.dts \ - ${S}/arch/powerpc/boot/dts/p5040ds-usdpaa.dts" +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 e8d4475..af07526 100644 --- a/conf/machine/t4160qds-64b.conf +++ b/conf/machine/t4160qds-64b.conf @@ -7,8 +7,7 @@ require conf/machine/include/soc-family.inc SOC_FAMILY = "t4160" # TODO: fix 32bit build of u-boot UBOOT_MACHINES ?= "T4160QDS" -KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/t4240qds.dts \ - ${S}/arch/powerpc/boot/dts/t4240qds-usdpaa.dts" +KERNEL_DEVICETREE = "t4240qds.dtb t4240qds-usdpaa.dtb" KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev1_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/conf/machine/t4160qds.conf b/conf/machine/t4160qds.conf index 71b4efb..150bbcd 100644 --- a/conf/machine/t4160qds.conf +++ b/conf/machine/t4160qds.conf @@ -6,8 +6,7 @@ require conf/machine/include/soc-family.inc SOC_FAMILY = "t4160" UBOOT_MACHINES ?= "T4160QDS" -KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/t4240qds.dts \ - ${S}/arch/powerpc/boot/dts/t4240qds-usdpaa.dts" +KERNEL_DEVICETREE = "t4240qds.dtb t4240qds-usdpaa.dtb" KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev1_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/conf/machine/t4240qds-64b.conf b/conf/machine/t4240qds-64b.conf index 31345b1..24a53dd 100644 --- a/conf/machine/t4240qds-64b.conf +++ b/conf/machine/t4240qds-64b.conf @@ -7,8 +7,7 @@ require conf/machine/include/soc-family.inc SOC_FAMILY = "t4240" # TODO: fix 32bit build of u-boot UBOOT_MACHINES ?= "T4240QDS" -KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/t4240qds.dts \ - ${S}/arch/powerpc/boot/dts/t4240qds-usdpaa.dts" +KERNEL_DEVICETREE = "t4240qds.dtb t4240qds-usdpaa.dtb" KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev1_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/conf/machine/t4240qds.conf b/conf/machine/t4240qds.conf index a348fe1..8066e28 100644 --- a/conf/machine/t4240qds.conf +++ b/conf/machine/t4240qds.conf @@ -6,8 +6,7 @@ require conf/machine/include/soc-family.inc SOC_FAMILY = "t4240" UBOOT_MACHINES ?= "T4240QDS" -KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/t4240qds.dts \ - ${S}/arch/powerpc/boot/dts/t4240qds-usdpaa.dts" +KERNEL_DEVICETREE = "t4240qds.dtb t4240qds-usdpaa.dtb" KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev1_defconfig" JFFS2_ERASEBLOCK = "0x10000" -- 1.7.3.4 _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
