summaryrefslogtreecommitdiffstats
path: root/conf/machine
diff options
context:
space:
mode:
authorTing Liu <ting.liu@nxp.com>2016-08-13 09:33:50 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2016-08-15 14:45:08 -0300
commit8d672c804c8aa1fcc6d7954666aac85d104a64ed (patch)
treeda508c65a2766305e7946b3a390559a9450695f0 /conf/machine
parent2664dd0fb63d93b604668daa9cd22f280c61287e (diff)
downloadmeta-freescale-8d672c804c8aa1fcc6d7954666aac85d104a64ed.tar.gz
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 <ting.liu@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/b4860qds-64b.conf5
-rw-r--r--conf/machine/b4860qds.conf5
-rw-r--r--conf/machine/c293pcie.conf2
-rw-r--r--conf/machine/t4160qds-64b.conf5
-rw-r--r--conf/machine/t4160qds.conf3
-rw-r--r--conf/machine/t4240qds-64b.conf4
-rw-r--r--conf/machine/t4240qds.conf4
-rw-r--r--conf/machine/t4240rdb-64b.conf2
-rw-r--r--conf/machine/t4240rdb.conf2
9 files changed, 8 insertions, 24 deletions
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 @@
9require conf/machine/include/e6500-64b.inc 9require conf/machine/include/e6500-64b.inc
10 10
11SOC_FAMILY = "b4:b4860" 11SOC_FAMILY = "b4:b4860"
12UBOOT_CONFIG ??= "nor secure-boot" 12
13UBOOT_CONFIG ??= "secure-boot nor"
13UBOOT_CONFIG[nor] = "B4860QDS_config" 14UBOOT_CONFIG[nor] = "B4860QDS_config"
14UBOOT_CONFIG[secure-boot] = "B4860QDS_SECURE_BOOT_config" 15UBOOT_CONFIG[secure-boot] = "B4860QDS_SECURE_BOOT_config"
15 16
@@ -19,7 +20,5 @@ KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb \
19KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" 20KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
20 21
21JFFS2_ERASEBLOCK = "0x10000" 22JFFS2_ERASEBLOCK = "0x10000"
22
23EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg" 23EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
24
25USE_VT ?= "0" 24USE_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 @@
9require conf/machine/include/e6500.inc 9require conf/machine/include/e6500.inc
10 10
11SOC_FAMILY = "b4:b4860" 11SOC_FAMILY = "b4:b4860"
12UBOOT_CONFIG ??= "nor secure-boot" 12
13UBOOT_CONFIG ??= "secure-boot nor"
13UBOOT_CONFIG[nor] = "B4860QDS_config" 14UBOOT_CONFIG[nor] = "B4860QDS_config"
14UBOOT_CONFIG[secure-boot] = "B4860QDS_SECURE_BOOT_config" 15UBOOT_CONFIG[secure-boot] = "B4860QDS_SECURE_BOOT_config"
15 16
@@ -19,7 +20,5 @@ KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb \
19KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" 20KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
20 21
21JFFS2_ERASEBLOCK = "0x10000" 22JFFS2_ERASEBLOCK = "0x10000"
22
23EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg" 23EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg"
24
25USE_VT ?= "0" 24USE_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
10SOC_FAMILY = "c293pcie" 10SOC_FAMILY = "c293pcie"
11BOOTFORMAT_CONFIG = "config_ddr3_512m_c29xpcie_800M.dat" 11BOOTFORMAT_CONFIG = "config_ddr3_512m_c29xpcie_800M.dat"
12 12
13UBOOT_CONFIG ??= "nor spi secboot spi-secboot" 13UBOOT_CONFIG ??= "spi secboot spi-secboot nor"
14UBOOT_CONFIG[nor] = "C29XPCIE_config" 14UBOOT_CONFIG[nor] = "C29XPCIE_config"
15UBOOT_CONFIG[spi] = "C29XPCIE_SPIFLASH_config" 15UBOOT_CONFIG[spi] = "C29XPCIE_SPIFLASH_config"
16UBOOT_CONFIG[secboot] = "C29XPCIE_NOR_SECBOOT_config" 16UBOOT_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
9 9
10SOC_FAMILY = "t4:t4160" 10SOC_FAMILY = "t4:t4160"
11 11
12UBOOT_CONFIG ??= "nor secure-boot" 12UBOOT_CONFIG ??= "secure-boot nor"
13UBOOT_CONFIG[nor] = "T4160QDS_config" 13UBOOT_CONFIG[nor] = "T4160QDS_config"
14UBOOT_CONFIG[secure-boot] = "T4160QDS_SECURE_BOOT_config" 14UBOOT_CONFIG[secure-boot] = "T4160QDS_SECURE_BOOT_config"
15 15
16
17KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb" 16KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
18KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" 17KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
19 18
20JFFS2_ERASEBLOCK = "0x10000" 19JFFS2_ERASEBLOCK = "0x10000"
21
22EXTRA_IMAGEDEPENDS += "fm-ucode" 20EXTRA_IMAGEDEPENDS += "fm-ucode"
23
24USE_VT ?= "0" 21USE_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"
13UBOOT_CONFIG[nor] = "T4160QDS_config" 13UBOOT_CONFIG[nor] = "T4160QDS_config"
14UBOOT_CONFIG[secure-boot] = "T4160QDS_SECURE_BOOT_config" 14UBOOT_CONFIG[secure-boot] = "T4160QDS_SECURE_BOOT_config"
15 15
16
17KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb" 16KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
18KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" 17KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
19 18
20JFFS2_ERASEBLOCK = "0x10000" 19JFFS2_ERASEBLOCK = "0x10000"
21
22EXTRA_IMAGEDEPENDS += "fm-ucode" 20EXTRA_IMAGEDEPENDS += "fm-ucode"
23
24USE_VT ?= "0" 21USE_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
9 9
10SOC_FAMILY = "t4:t4240" 10SOC_FAMILY = "t4:t4240"
11 11
12UBOOT_CONFIG ??= "nor secure-boot" 12UBOOT_CONFIG ??= "secure-boot nor"
13UBOOT_CONFIG[nor] = "T4240QDS_config" 13UBOOT_CONFIG[nor] = "T4240QDS_config"
14UBOOT_CONFIG[secure-boot] = "T4240QDS_SECURE_BOOT_config" 14UBOOT_CONFIG[secure-boot] = "T4240QDS_SECURE_BOOT_config"
15 15
@@ -19,7 +19,5 @@ KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb \
19KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" 19KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
20 20
21JFFS2_ERASEBLOCK = "0x10000" 21JFFS2_ERASEBLOCK = "0x10000"
22
23EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg" 22EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
24
25USE_VT ?= "0" 23USE_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
9 9
10SOC_FAMILY = "t4:t4240" 10SOC_FAMILY = "t4:t4240"
11 11
12UBOOT_CONFIG ??= "nor secure-boot" 12UBOOT_CONFIG ??= "secure-boot nor"
13UBOOT_CONFIG[nor] = "T4240QDS_config" 13UBOOT_CONFIG[nor] = "T4240QDS_config"
14UBOOT_CONFIG[secure-boot] = "T4240QDS_SECURE_BOOT_config" 14UBOOT_CONFIG[secure-boot] = "T4240QDS_SECURE_BOOT_config"
15 15
@@ -19,7 +19,5 @@ KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb \
19KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" 19KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
20 20
21JFFS2_ERASEBLOCK = "0x10000" 21JFFS2_ERASEBLOCK = "0x10000"
22
23EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg" 22EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg"
24
25USE_VT ?= "0" 23USE_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 \
18KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" 18KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
19 19
20JFFS2_ERASEBLOCK = "0x10000" 20JFFS2_ERASEBLOCK = "0x10000"
21
22EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg" 21EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
23
24USE_VT ?= "0" 22USE_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 \
18KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig" 18KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
19 19
20JFFS2_ERASEBLOCK = "0x10000" 20JFFS2_ERASEBLOCK = "0x10000"
21
22EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg" 21EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg"
23
24USE_VT ?= "0" 22USE_VT ?= "0"