From 1ccc8841569c1f27976017cc135df87b868ed62b Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Sat, 16 Jul 2016 00:35:59 +0800 Subject: [PATCH] t2080: switch to new UBOOT_CONFIG format Signed-off-by: Ting Liu Signed-off-by: Otavio Salvador --- conf/machine/t2080qds-64b.conf | 10 ++++------ conf/machine/t2080qds.conf | 10 ++++------ conf/machine/t2080rdb-64b.conf | 10 ++++------ conf/machine/t2080rdb.conf | 10 ++++------ 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/conf/machine/t2080qds-64b.conf b/conf/machine/t2080qds-64b.conf index 8da4582f..7c033515 100644 --- a/conf/machine/t2080qds-64b.conf +++ b/conf/machine/t2080qds-64b.conf @@ -9,11 +9,11 @@ require conf/machine/include/e6500-64b.inc SOC_FAMILY = "t2:t2080" -UBOOT_CONFIG ??= "nor sdcard spi nand srio-pcie-boot secure-boot" +UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor" UBOOT_CONFIG[nor] = "T2080QDS_config" -UBOOT_CONFIG[sdcard] = "T2080QDS_SDCARD_config" -UBOOT_CONFIG[spi] = "T2080QDS_SPIFLASH_config" -UBOOT_CONFIG[nand] = "T2080QDS_NAND_config" +UBOOT_CONFIG[sdcard] = "T2080QDS_SDCARD_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[spi] = "T2080QDS_SPIFLASH_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[nand] = "T2080QDS_NAND_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[srio-pcie-boot] = "T2080QDS_SRIO_PCIE_BOOT_config" UBOOT_CONFIG[secure-boot] = "T2080QDS_SECURE_BOOT_config" @@ -23,7 +23,5 @@ KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb \ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" - EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg" - USE_VT ?= "0" diff --git a/conf/machine/t2080qds.conf b/conf/machine/t2080qds.conf index 825e946f..230eb7bb 100644 --- a/conf/machine/t2080qds.conf +++ b/conf/machine/t2080qds.conf @@ -9,11 +9,11 @@ require conf/machine/include/e6500.inc SOC_FAMILY = "t2:t2080" -UBOOT_CONFIG ??= "nor sdcard spi nand srio-pcie-boot secure-boot" +UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor" UBOOT_CONFIG[nor] = "T2080QDS_config" -UBOOT_CONFIG[sdcard] = "T2080QDS_SDCARD_config" -UBOOT_CONFIG[spi] = "T2080QDS_SPIFLASH_config" -UBOOT_CONFIG[nand] = "T2080QDS_NAND_config" +UBOOT_CONFIG[sdcard] = "T2080QDS_SDCARD_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[spi] = "T2080QDS_SPIFLASH_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[nand] = "T2080QDS_NAND_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[srio-pcie-boot] = "T2080QDS_SRIO_PCIE_BOOT_config" UBOOT_CONFIG[secure-boot] = "T2080QDS_SECURE_BOOT_config" @@ -23,7 +23,5 @@ KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb \ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" - EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg" - USE_VT ?= "0" diff --git a/conf/machine/t2080rdb-64b.conf b/conf/machine/t2080rdb-64b.conf index 3a52d4b4..86e1bff6 100644 --- a/conf/machine/t2080rdb-64b.conf +++ b/conf/machine/t2080rdb-64b.conf @@ -9,11 +9,11 @@ require conf/machine/include/e6500-64b.inc SOC_FAMILY = "t2:t2080" -UBOOT_CONFIG ??= "nor nor sdcard spi nand srio-pcie-boot secure-boot" +UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor" UBOOT_CONFIG[nor] = "T2080RDB_config" -UBOOT_CONFIG[sdcard] = "T2080RDB_SDCARD_config" -UBOOT_CONFIG[spi] = "T2080RDB_SPIFLASH_config" -UBOOT_CONFIG[nand] = "T2080RDB_NAND_config" +UBOOT_CONFIG[sdcard] = "T2080RDB_SDCARD_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[spi] = "T2080RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[nand] = "T2080RDB_NAND_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[srio-pcie-boot] = "T2080RDB_SRIO_PCIE_BOOT_config" UBOOT_CONFIG[secure-boot] = "T2080RDB_SECURE_BOOT_config" @@ -23,7 +23,5 @@ KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb \ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" - EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg" - USE_VT ?= "0" diff --git a/conf/machine/t2080rdb.conf b/conf/machine/t2080rdb.conf index 43bd5574..f0b7d328 100644 --- a/conf/machine/t2080rdb.conf +++ b/conf/machine/t2080rdb.conf @@ -9,11 +9,11 @@ require conf/machine/include/e6500.inc SOC_FAMILY = "t2:t2080" -UBOOT_CONFIG ??= "nor sdcard spi nand srio-pcie-boot secure-boot" +UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor" UBOOT_CONFIG[nor] = "T2080RDB_config" -UBOOT_CONFIG[sdcard] = "T2080RDB_SDCARD_config" -UBOOT_CONFIG[spi] = "T2080RDB_SPIFLASH_config" -UBOOT_CONFIG[nand] = "T2080RDB_NAND_config" +UBOOT_CONFIG[sdcard] = "T2080RDB_SDCARD_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[spi] = "T2080RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[nand] = "T2080RDB_NAND_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[srio-pcie-boot] = "T2080RDB_SRIO_PCIE_BOOT_config" UBOOT_CONFIG[secure-boot] = "T2080RDB_SECURE_BOOT_config" @@ -23,7 +23,5 @@ KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb \ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" - EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg" - USE_VT ?= "0" -- 2.40.1