From: Ting Liu Date: Sat, 13 Aug 2016 01:33:50 +0000 (+0800) Subject: adjust UBOOT_CONFIG order to let nor as the last one X-Git-Tag: 2.2~291 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=8d672c804c8aa1fcc6d7954666aac85d104a64ed;p=meta-freescale.git adjust UBOOT_CONFIG order to let nor as the last one The symlink u-boot.bin and u-boot-${MACHINE}.bin will be linked to binary of the last UBOOT_CONFIG. Put nor u-boot as the last one. Signed-off-by: Ting Liu Signed-off-by: Otavio Salvador --- diff --git a/conf/machine/b4860qds-64b.conf b/conf/machine/b4860qds-64b.conf index 6ace6433..b3ef4e69 100644 --- a/conf/machine/b4860qds-64b.conf +++ b/conf/machine/b4860qds-64b.conf @@ -9,7 +9,8 @@ require conf/machine/include/e6500-64b.inc SOC_FAMILY = "b4:b4860" -UBOOT_CONFIG ??= "nor secure-boot" + +UBOOT_CONFIG ??= "secure-boot nor" UBOOT_CONFIG[nor] = "B4860QDS_config" UBOOT_CONFIG[secure-boot] = "B4860QDS_SECURE_BOOT_config" @@ -19,7 +20,5 @@ KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-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/b4860qds.conf b/conf/machine/b4860qds.conf index b8b46236..eb8ea1a7 100644 --- a/conf/machine/b4860qds.conf +++ b/conf/machine/b4860qds.conf @@ -9,7 +9,8 @@ require conf/machine/include/e6500.inc SOC_FAMILY = "b4:b4860" -UBOOT_CONFIG ??= "nor secure-boot" + +UBOOT_CONFIG ??= "secure-boot nor" UBOOT_CONFIG[nor] = "B4860QDS_config" UBOOT_CONFIG[secure-boot] = "B4860QDS_SECURE_BOOT_config" @@ -19,7 +20,5 @@ KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-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/c293pcie.conf b/conf/machine/c293pcie.conf index a6ddb4cf..82c7153e 100644 --- a/conf/machine/c293pcie.conf +++ b/conf/machine/c293pcie.conf @@ -10,7 +10,7 @@ require conf/machine/include/e500v2.inc SOC_FAMILY = "c293pcie" BOOTFORMAT_CONFIG = "config_ddr3_512m_c29xpcie_800M.dat" -UBOOT_CONFIG ??= "nor spi secboot spi-secboot" +UBOOT_CONFIG ??= "spi secboot spi-secboot nor" UBOOT_CONFIG[nor] = "C29XPCIE_config" UBOOT_CONFIG[spi] = "C29XPCIE_SPIFLASH_config" UBOOT_CONFIG[secboot] = "C29XPCIE_NOR_SECBOOT_config" diff --git a/conf/machine/t4160qds-64b.conf b/conf/machine/t4160qds-64b.conf index d18d9000..75e4d0f7 100644 --- a/conf/machine/t4160qds-64b.conf +++ b/conf/machine/t4160qds-64b.conf @@ -9,16 +9,13 @@ require conf/machine/include/e6500-64b.inc SOC_FAMILY = "t4:t4160" -UBOOT_CONFIG ??= "nor secure-boot" +UBOOT_CONFIG ??= "secure-boot nor" UBOOT_CONFIG[nor] = "T4160QDS_config" UBOOT_CONFIG[secure-boot] = "T4160QDS_SECURE_BOOT_config" - KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" - EXTRA_IMAGEDEPENDS += "fm-ucode" - USE_VT ?= "0" diff --git a/conf/machine/t4160qds.conf b/conf/machine/t4160qds.conf index 48dacb3b..9c79ad5a 100644 --- a/conf/machine/t4160qds.conf +++ b/conf/machine/t4160qds.conf @@ -13,12 +13,9 @@ UBOOT_CONFIG ??= "secure-boot nor" UBOOT_CONFIG[nor] = "T4160QDS_config" UBOOT_CONFIG[secure-boot] = "T4160QDS_SECURE_BOOT_config" - KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" - EXTRA_IMAGEDEPENDS += "fm-ucode" - USE_VT ?= "0" diff --git a/conf/machine/t4240qds-64b.conf b/conf/machine/t4240qds-64b.conf index 1b960c2e..c5fbe49d 100644 --- a/conf/machine/t4240qds-64b.conf +++ b/conf/machine/t4240qds-64b.conf @@ -9,7 +9,7 @@ require conf/machine/include/e6500-64b.inc SOC_FAMILY = "t4:t4240" -UBOOT_CONFIG ??= "nor secure-boot" +UBOOT_CONFIG ??= "secure-boot nor" UBOOT_CONFIG[nor] = "T4240QDS_config" UBOOT_CONFIG[secure-boot] = "T4240QDS_SECURE_BOOT_config" @@ -19,7 +19,5 @@ KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-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/t4240qds.conf b/conf/machine/t4240qds.conf index 2840ac67..d8ca3cfc 100644 --- a/conf/machine/t4240qds.conf +++ b/conf/machine/t4240qds.conf @@ -9,7 +9,7 @@ require conf/machine/include/e6500.inc SOC_FAMILY = "t4:t4240" -UBOOT_CONFIG ??= "nor secure-boot" +UBOOT_CONFIG ??= "secure-boot nor" UBOOT_CONFIG[nor] = "T4240QDS_config" UBOOT_CONFIG[secure-boot] = "T4240QDS_SECURE_BOOT_config" @@ -19,7 +19,5 @@ KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-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/t4240rdb-64b.conf b/conf/machine/t4240rdb-64b.conf index 6399c94d..c9a2da6f 100644 --- a/conf/machine/t4240rdb-64b.conf +++ b/conf/machine/t4240rdb-64b.conf @@ -18,7 +18,5 @@ KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-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/t4240rdb.conf b/conf/machine/t4240rdb.conf index 1e51a404..fa4c0b02 100644 --- a/conf/machine/t4240rdb.conf +++ b/conf/machine/t4240rdb.conf @@ -18,7 +18,5 @@ KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-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"