From 8e1658082efaef874378078f187cad32fb0727bc Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Fri, 17 Jul 2015 15:17:40 +0800 Subject: [PATCH] p2/p3/p5/t2/t4/b4: build usdpaa-shared-interfaces.dtb Also split long line to multiple ones. Signed-off-by: Ting Liu Acked-by: Otavio Salvador Signed-off-by: Otavio Salvador --- meta-fsl-ppc/conf/machine/b4860qds-64b.conf | 4 +++- meta-fsl-ppc/conf/machine/b4860qds.conf | 4 +++- meta-fsl-ppc/conf/machine/p2041rdb.conf | 8 ++++++-- meta-fsl-ppc/conf/machine/p3041ds.conf | 8 ++++++-- meta-fsl-ppc/conf/machine/p4080ds.conf | 4 +++- meta-fsl-ppc/conf/machine/p5020ds-64b.conf | 4 +++- meta-fsl-ppc/conf/machine/p5020ds.conf | 8 ++++++-- meta-fsl-ppc/conf/machine/p5040ds-64b.conf | 8 ++++++-- meta-fsl-ppc/conf/machine/p5040ds.conf | 8 ++++++-- meta-fsl-ppc/conf/machine/t2080qds-64b.conf | 4 +++- meta-fsl-ppc/conf/machine/t2080qds.conf | 4 +++- meta-fsl-ppc/conf/machine/t2080rdb-64b.conf | 4 +++- meta-fsl-ppc/conf/machine/t2080rdb.conf | 4 +++- meta-fsl-ppc/conf/machine/t4240qds-64b.conf | 4 +++- meta-fsl-ppc/conf/machine/t4240qds.conf | 4 +++- meta-fsl-ppc/conf/machine/t4240rdb-64b.conf | 4 +++- meta-fsl-ppc/conf/machine/t4240rdb.conf | 4 +++- 17 files changed, 66 insertions(+), 22 deletions(-) diff --git a/meta-fsl-ppc/conf/machine/b4860qds-64b.conf b/meta-fsl-ppc/conf/machine/b4860qds-64b.conf index 3c00fdfd..c40fb305 100644 --- a/meta-fsl-ppc/conf/machine/b4860qds-64b.conf +++ b/meta-fsl-ppc/conf/machine/b4860qds-64b.conf @@ -8,7 +8,9 @@ require conf/machine/include/e6500-64b.inc SOC_FAMILY = "b4:b4860" UBOOT_MACHINES ?= "B4860QDS B4860QDS_SECURE_BOOT" -KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb" +KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb \ + b4860qds-usdpaa-shared-interfaces.dtb \ +" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/meta-fsl-ppc/conf/machine/b4860qds.conf b/meta-fsl-ppc/conf/machine/b4860qds.conf index 13b76629..10b4ad41 100644 --- a/meta-fsl-ppc/conf/machine/b4860qds.conf +++ b/meta-fsl-ppc/conf/machine/b4860qds.conf @@ -8,7 +8,9 @@ require conf/machine/include/e6500.inc SOC_FAMILY = "b4:b4860" UBOOT_MACHINES ?= "B4860QDS B4860QDS_SECURE_BOOT" -KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb" +KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb \ + b4860qds-usdpaa-shared-interfaces.dtb \ +" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/meta-fsl-ppc/conf/machine/p2041rdb.conf b/meta-fsl-ppc/conf/machine/p2041rdb.conf index f641a000..9ed63ff1 100644 --- a/meta-fsl-ppc/conf/machine/p2041rdb.conf +++ b/meta-fsl-ppc/conf/machine/p2041rdb.conf @@ -7,8 +7,12 @@ require conf/machine/include/e500mc.inc SOC_FAMILY = "p2041" -UBOOT_MACHINES ?= "P2041RDB P2041RDB_NAND P2041RDB_SECURE_BOOT P2041RDB_SDCARD P2041RDB_SPIFLASH" -KERNEL_DEVICETREE ?= "p2041rdb.dtb p2041rdb-usdpaa.dtb" +UBOOT_MACHINES ?= "P2041RDB P2041RDB_NAND P2041RDB_SECURE_BOOT \ + P2041RDB_SDCARD P2041RDB_SPIFLASH \ +" +KERNEL_DEVICETREE ?= "p2041rdb.dtb p2041rdb-usdpaa.dtb \ + p2041rdb-usdpaa-shared-interfaces.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 01c51e40..8fca5b40 100644 --- a/meta-fsl-ppc/conf/machine/p3041ds.conf +++ b/meta-fsl-ppc/conf/machine/p3041ds.conf @@ -7,8 +7,12 @@ require conf/machine/include/e500mc.inc SOC_FAMILY = "p3041" -UBOOT_MACHINES ?= "P3041DS P3041DS_NAND P3041DS_SECURE_BOOT P3041DS_SDCARD P3041DS_SPIFLASH" -KERNEL_DEVICETREE ?= "p3041ds.dtb p3041ds-usdpaa.dtb" +UBOOT_MACHINES ?= "P3041DS P3041DS_NAND P3041DS_SECURE_BOOT \ + P3041DS_SDCARD P3041DS_SPIFLASH \ +" +KERNEL_DEVICETREE ?= "p3041ds.dtb p3041ds-usdpaa.dtb \ + p3041ds-usdpaa-shared-interfaces.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 1b6fad74..b3fc87b2 100644 --- a/meta-fsl-ppc/conf/machine/p4080ds.conf +++ b/meta-fsl-ppc/conf/machine/p4080ds.conf @@ -8,7 +8,9 @@ require conf/machine/include/e500mc.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 \ + p4080ds-usdpaa-shared-interfaces.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 615157f8..3586da7b 100644 --- a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf +++ b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf @@ -10,7 +10,9 @@ 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 \ + p5020ds-usdpaa-shared-interfaces.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 7effe1e9..57de0ca7 100644 --- a/meta-fsl-ppc/conf/machine/p5020ds.conf +++ b/meta-fsl-ppc/conf/machine/p5020ds.conf @@ -7,8 +7,12 @@ require conf/machine/include/e5500.inc SOC_FAMILY = "p5020" -UBOOT_MACHINES ?= "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT P5020DS_SDCARD P5020DS_SPIFLASH " -KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb" +UBOOT_MACHINES ?= "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT \ + P5020DS_SDCARD P5020DS_SPIFLASH \ +" +KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb \ + p5020ds-usdpaa-shared-interfaces.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 fbbe9e2f..cf2400db 100644 --- a/meta-fsl-ppc/conf/machine/p5040ds-64b.conf +++ b/meta-fsl-ppc/conf/machine/p5040ds-64b.conf @@ -7,8 +7,12 @@ require conf/machine/include/e5500-64b.inc SOC_FAMILY = "p5040" -UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT P5040DS_SDCARD P5040DS_SPIFLASH" -KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb" +UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT \ + P5040DS_SDCARD P5040DS_SPIFLASH \ +" +KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb \ + p5040ds-usdpaa-shared-interfaces.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 1cd95120..534b5da2 100644 --- a/meta-fsl-ppc/conf/machine/p5040ds.conf +++ b/meta-fsl-ppc/conf/machine/p5040ds.conf @@ -7,8 +7,12 @@ require conf/machine/include/e5500.inc SOC_FAMILY = "p5040" -UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT P5040DS_SDCARD P5040DS_SPIFLASH" -KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb" +UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT \ + P5040DS_SDCARD P5040DS_SPIFLASH \ +" +KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb \ + p5040ds-usdpaa-shared-interfaces.dtb \ +" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/meta-fsl-ppc/conf/machine/t2080qds-64b.conf b/meta-fsl-ppc/conf/machine/t2080qds-64b.conf index 4f5f5c7d..3c81fb98 100644 --- a/meta-fsl-ppc/conf/machine/t2080qds-64b.conf +++ b/meta-fsl-ppc/conf/machine/t2080qds-64b.conf @@ -10,7 +10,9 @@ SOC_FAMILY = "t2:t2080" UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH \ T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT T2080QDS_SECURE_BOOT \ " -KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb" +KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb \ + t2080qds-usdpaa-shared-interfaces.dtb \ +" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/meta-fsl-ppc/conf/machine/t2080qds.conf b/meta-fsl-ppc/conf/machine/t2080qds.conf index 7fdc919b..23b43ca3 100644 --- a/meta-fsl-ppc/conf/machine/t2080qds.conf +++ b/meta-fsl-ppc/conf/machine/t2080qds.conf @@ -10,7 +10,9 @@ SOC_FAMILY = "t2:t2080" UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH \ T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT T2080QDS_SECURE_BOOT \ " -KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb" +KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb \ + t2080qds-usdpaa-shared-interfaces.dtb \ +" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf b/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf index d863924e..e421567b 100644 --- a/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf +++ b/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf @@ -10,7 +10,9 @@ SOC_FAMILY = "t2:t2080" UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH \ T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT T2080RDB_SECURE_BOOT \ " -KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb" +KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb \ + t2080rdb-usdpaa-shared-interfaces.dtb \ +" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/meta-fsl-ppc/conf/machine/t2080rdb.conf b/meta-fsl-ppc/conf/machine/t2080rdb.conf index 31ae3293..8ce27e95 100644 --- a/meta-fsl-ppc/conf/machine/t2080rdb.conf +++ b/meta-fsl-ppc/conf/machine/t2080rdb.conf @@ -10,7 +10,9 @@ SOC_FAMILY = "t2:t2080" UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH \ T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT T2080RDB_SECURE_BOOT \ " -KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb" +KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb \ + t2080rdb-usdpaa-shared-interfaces.dtb \ +" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_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 8c610fed..1caa24e7 100644 --- a/meta-fsl-ppc/conf/machine/t4240qds-64b.conf +++ b/meta-fsl-ppc/conf/machine/t4240qds-64b.conf @@ -8,7 +8,9 @@ require conf/machine/include/e6500-64b.inc SOC_FAMILY = "t4:t4240" UBOOT_MACHINES ?= "T4240QDS T4240QDS_SECURE_BOOT" -KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb" +KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb \ + t4240qds-usdpaa-shared-interfaces.dtb \ +" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/meta-fsl-ppc/conf/machine/t4240qds.conf b/meta-fsl-ppc/conf/machine/t4240qds.conf index 3f4b73c6..c244bfb5 100644 --- a/meta-fsl-ppc/conf/machine/t4240qds.conf +++ b/meta-fsl-ppc/conf/machine/t4240qds.conf @@ -8,7 +8,9 @@ require conf/machine/include/e6500.inc SOC_FAMILY = "t4:t4240" UBOOT_MACHINES ?= "T4240QDS T4240QDS_SECURE_BOOT" -KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb" +KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb \ + t4240qds-usdpaa-shared-interfaces.dtb \ +" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/meta-fsl-ppc/conf/machine/t4240rdb-64b.conf b/meta-fsl-ppc/conf/machine/t4240rdb-64b.conf index bbc0bc74..7d6543c0 100644 --- a/meta-fsl-ppc/conf/machine/t4240rdb-64b.conf +++ b/meta-fsl-ppc/conf/machine/t4240rdb-64b.conf @@ -8,7 +8,9 @@ require conf/machine/include/e6500-64b.inc SOC_FAMILY = "t4:t4240" UBOOT_MACHINES ?= "T4240RDB" -KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb t4240rdb-usdpaa-shared-interfaces.dtb" +KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb \ + t4240rdb-usdpaa-shared-interfaces.dtb \ +" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" diff --git a/meta-fsl-ppc/conf/machine/t4240rdb.conf b/meta-fsl-ppc/conf/machine/t4240rdb.conf index ed5dfec8..a4b79951 100644 --- a/meta-fsl-ppc/conf/machine/t4240rdb.conf +++ b/meta-fsl-ppc/conf/machine/t4240rdb.conf @@ -8,7 +8,9 @@ require conf/machine/include/e6500.inc SOC_FAMILY = "t4:t4240" UBOOT_MACHINES ?= "T4240RDB" -KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb t4240rdb-usdpaa-shared-interfaces.dtb" +KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb \ + t4240rdb-usdpaa-shared-interfaces.dtb \ +" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" -- 2.40.1