Update machine conf of e6500 targets

* update the DESCRIPTION to provide more details
* switch to UBOOT_CONFIG way for u-boot build
* add EXTRA_IMAGEDEPENDS

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
Acked-by: Daiane Angolini <daiane.angolini@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

14 files changed, 120 insertions, 35 deletions

diff --git a/conf/machine/b4420qds-64b.conf b/conf/machine/b4420qds-64b.conf
index 3df5e955..545c54af 100644
--- a/conf/machine/b4420qds-64b.conf
+++ b/conf/machine/b4420qds-64b.conf
@@ -1,15 +1,19 @@
 #@TYPE: Machine
 #@NAME: Freescale B4420QDS-64B
 #@SOC: b4420
-#@DESCRIPTION: Machine configuration for running B4420QDS in 64-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ Qonverge B4420
+#              Application Development System with ppce6500 core in
+#              64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "b4:b4420"
-UBOOT_MACHINES ?= "B4420QDS"
+UBOOT_CONFIG ??= "nor"
+UBOOT_CONFIG[nor] = "B4420QDS_config"
 KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw"
diff --git a/conf/machine/b4420qds.conf b/conf/machine/b4420qds.conf
index c5433e86..31f0a5d8 100644
--- a/conf/machine/b4420qds.conf
+++ b/conf/machine/b4420qds.conf
@@ -1,15 +1,19 @@
 #@TYPE: Machine
 #@NAME: Freescale B4420QDS
 #@SOC: b4420
-#@DESCRIPTION: Machine configuration for running B4420QDS in 32-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ Qonverge B4420
+#              Application Development System with ppce6500 core in
+#              32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "b4:b4420"
-UBOOT_MACHINES ?= "B4420QDS"
+UBOOT_CONFIG ??= "nor"
+UBOOT_CONFIG[nor] = "B4420QDS_config"
 KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw"
diff --git a/conf/machine/b4860qds-64b.conf b/conf/machine/b4860qds-64b.conf
index c40fb305..2c77526e 100644
--- a/conf/machine/b4860qds-64b.conf
+++ b/conf/machine/b4860qds-64b.conf
@@ -1,13 +1,18 @@
 #@TYPE: Machine
 #@NAME: Freescale B4860QDS-64B
 #@SOC: b4860
-#@DESCRIPTION: Machine configuration for running B4860QDS in 64-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ Qonverge B4860
+#              Application Development System with ppce6500 core in
+#              64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "b4:b4860"
 UBOOT_MACHINES ?= "B4860QDS B4860QDS_SECURE_BOOT"
+UBOOT_CONFIG ??= "nor secure-boot"
+UBOOT_CONFIG[nor] = "B4860QDS_config"
+UBOOT_CONFIG[secure-boot] = "B4860QDS_SECURE_BOOT_config"
 KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb \
     b4860qds-usdpaa-shared-interfaces.dtb \
 "
@@ -15,3 +20,4 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
diff --git a/conf/machine/b4860qds.conf b/conf/machine/b4860qds.conf
index 10b4ad41..72f0d81f 100644
--- a/conf/machine/b4860qds.conf
+++ b/conf/machine/b4860qds.conf
@@ -1,13 +1,17 @@
 #@TYPE: Machine
 #@NAME: Freescale B4860QDS
 #@SOC: b4860
-#@DESCRIPTION: Machine configuration for running B4860QDS in 32-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ Qonverge B4860
+#              Application Development System with ppce6500 core in
+#              32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "b4:b4860"
-UBOOT_MACHINES ?= "B4860QDS B4860QDS_SECURE_BOOT"
+UBOOT_CONFIG ??= "nor secure-boot"
+UBOOT_CONFIG[nor] = "B4860QDS_config"
+UBOOT_CONFIG[secure-boot] = "B4860QDS_SECURE_BOOT_config"
 KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb \
     b4860qds-usdpaa-shared-interfaces.dtb \
 "
@@ -15,3 +19,4 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg"
diff --git a/conf/machine/t2080qds-64b.conf b/conf/machine/t2080qds-64b.conf
index 3c81fb98..f785a57b 100644
--- a/conf/machine/t2080qds-64b.conf
+++ b/conf/machine/t2080qds-64b.conf
@@ -1,15 +1,22 @@
 #@TYPE: Machine
 #@NAME: Freescale T2080QDS-64B
 #@SOC: t2080
-#@DESCRIPTION: Machine configuration for running T2080QDS in 64-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T2080 Development
+#              System with ppce6500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "t2:t2080"
-UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH \
-    T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT T2080QDS_SECURE_BOOT \
-"
+
+UBOOT_CONFIG ??= "nor sdcard spi nand srio-pcie-boot secure-boot"
+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[srio-pcie-boot] = "T2080QDS_SRIO_PCIE_BOOT_config"
+UBOOT_CONFIG[secure-boot] = "T2080QDS_SECURE_BOOT_config"
+
 KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb \
     t2080qds-usdpaa-shared-interfaces.dtb \
 "
@@ -17,3 +24,4 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
diff --git a/conf/machine/t2080qds.conf b/conf/machine/t2080qds.conf
index 23b43ca3..a80c70dd 100644
--- a/conf/machine/t2080qds.conf
+++ b/conf/machine/t2080qds.conf
@@ -1,15 +1,22 @@
 #@TYPE: Machine
 #@NAME: Freescale T2080QDS
 #@SOC: t2080
-#@DESCRIPTION: Machine configuration for running T2080QDS in 32-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T2080 Development
+#              System with ppce6500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "t2:t2080"
-UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH \
-    T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT T2080QDS_SECURE_BOOT \
-"
+
+UBOOT_CONFIG ??= "nor sdcard spi nand srio-pcie-boot secure-boot"
+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[srio-pcie-boot] = "T2080QDS_SRIO_PCIE_BOOT_config"
+UBOOT_CONFIG[secure-boot] = "T2080QDS_SECURE_BOOT_config"
+
 KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb \
     t2080qds-usdpaa-shared-interfaces.dtb \
 "
@@ -17,3 +24,4 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg"
diff --git a/conf/machine/t2080rdb-64b.conf b/conf/machine/t2080rdb-64b.conf
index e421567b..d50b0134 100644
--- a/conf/machine/t2080rdb-64b.conf
+++ b/conf/machine/t2080rdb-64b.conf
@@ -1,15 +1,22 @@
 #@TYPE: Machine
 #@NAME: Freescale T2080RDB
 #@SOC: t2080
-#@DESCRIPTION: Machine configuration for running T2080RDB in 64-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T2080 Reference
+#              Design Board with ppce6500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "t2:t2080"
-UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH \
-    T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT T2080RDB_SECURE_BOOT \
-"
+
+UBOOT_CONFIG ??= "nor nor sdcard spi nand srio-pcie-boot secure-boot"
+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[srio-pcie-boot] = "T2080RDB_SRIO_PCIE_BOOT_config"
+UBOOT_CONFIG[secure-boot] = "T2080RDB_SECURE_BOOT_config"
+
 KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb \
     t2080rdb-usdpaa-shared-interfaces.dtb \
 "
@@ -17,3 +24,4 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
diff --git a/conf/machine/t2080rdb.conf b/conf/machine/t2080rdb.conf
index 8ce27e95..50ec8287 100644
--- a/conf/machine/t2080rdb.conf
+++ b/conf/machine/t2080rdb.conf
@@ -1,15 +1,22 @@
 #@TYPE: Machine
 #@NAME: Freescale T2080RDB
 #@SOC: t2080
-#@DESCRIPTION: Machine configuration for running T2080RDB in 32-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T2080 Reference
+#              Design Board with ppce6500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "t2:t2080"
-UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH \
-    T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT T2080RDB_SECURE_BOOT \
-"
+
+UBOOT_CONFIG ??= "nor sdcard spi nand srio-pcie-boot secure-boot"
+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[srio-pcie-boot] = "T2080RDB_SRIO_PCIE_BOOT_config"
+UBOOT_CONFIG[secure-boot] = "T2080RDB_SECURE_BOOT_config"
+
 KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb \
     t2080rdb-usdpaa-shared-interfaces.dtb \
 "
@@ -17,3 +24,4 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg"
diff --git a/conf/machine/t4160qds-64b.conf b/conf/machine/t4160qds-64b.conf
index fb0d9663..26dbccaa 100644
--- a/conf/machine/t4160qds-64b.conf
+++ b/conf/machine/t4160qds-64b.conf
@@ -1,15 +1,21 @@
 #@TYPE: Machine
 #@NAME: Freescale T4160QDS-64B
 #@SOC: t4160
-#@DESCRIPTION: Machine configuration for running T4160QDS in 64-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T4160 Development
+#              System with ppce6500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "t4:t4160"
-UBOOT_MACHINES ?= "T4160QDS T4160QDS_SECURE_BOOT"
+
+UBOOT_CONFIG ??= "nor secure-boot"
+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"
diff --git a/conf/machine/t4160qds.conf b/conf/machine/t4160qds.conf
index d3dd58e3..a65e729d 100644
--- a/conf/machine/t4160qds.conf
+++ b/conf/machine/t4160qds.conf
@@ -1,15 +1,21 @@
 #@TYPE: Machine
 #@NAME: Freescale T4160QDS
 #@SOC: t4160
-#@DESCRIPTION: Machine configuration for running T4160QDS in 32-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T4160 Development
+#              System with ppce6500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "t4:t4160"
-UBOOT_MACHINES ?= "T4160QDS T4160QDS_SECURE_BOOT"
+
+UBOOT_CONFIG ??= "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"
diff --git a/conf/machine/t4240qds-64b.conf b/conf/machine/t4240qds-64b.conf
index 1caa24e7..405d694b 100644
--- a/conf/machine/t4240qds-64b.conf
+++ b/conf/machine/t4240qds-64b.conf
@@ -1,13 +1,18 @@
 #@TYPE: Machine
 #@NAME: Freescale T4240QDS-64B
 #@SOC: t4240
-#@DESCRIPTION: Machine configuration for running T4240QDS in 64-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T4240 Development
+#              System with ppce6500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "t4:t4240"
-UBOOT_MACHINES ?= "T4240QDS T4240QDS_SECURE_BOOT"
+
+UBOOT_CONFIG ??= "nor secure-boot"
+UBOOT_CONFIG[nor] = "T4240QDS_config"
+UBOOT_CONFIG[secure-boot] = "T4240QDS_SECURE_BOOT_config"
+
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb \
     t4240qds-usdpaa-shared-interfaces.dtb \
 "
@@ -15,3 +20,4 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
diff --git a/conf/machine/t4240qds.conf b/conf/machine/t4240qds.conf
index c244bfb5..b51dbd49 100644
--- a/conf/machine/t4240qds.conf
+++ b/conf/machine/t4240qds.conf
@@ -1,13 +1,18 @@
 #@TYPE: Machine
 #@NAME: Freescale T4240QDS
 #@SOC: t4240
-#@DESCRIPTION: Machine configuration for running T4240QDS in 32-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T4240 Development
+#              System with ppce6500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "t4:t4240"
-UBOOT_MACHINES ?= "T4240QDS T4240QDS_SECURE_BOOT"
+
+UBOOT_CONFIG ??= "nor secure-boot"
+UBOOT_CONFIG[nor] = "T4240QDS_config"
+UBOOT_CONFIG[secure-boot] = "T4240QDS_SECURE_BOOT_config
+
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb \
     t4240qds-usdpaa-shared-interfaces.dtb \
 "
@@ -15,3 +20,4 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg"
diff --git a/conf/machine/t4240rdb-64b.conf b/conf/machine/t4240rdb-64b.conf
index 7d6543c0..ede258e3 100644
--- a/conf/machine/t4240rdb-64b.conf
+++ b/conf/machine/t4240rdb-64b.conf
@@ -1,13 +1,17 @@
 #@TYPE: Machine
 #@NAME: Freescale T4240RDB
 #@SOC: t4240
-#@DESCRIPTION: Machine configuration for running T4240RDB in 64-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T4240 Reference
+#              Design Board with ppce6500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "t4:t4240"
-UBOOT_MACHINES ?= "T4240RDB"
+
+UBOOT_CONFIG ??= "nor"
+UBOOT_CONFIG[nor] = "T4240RDB_config"
+
 KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb \
     t4240rdb-usdpaa-shared-interfaces.dtb \
 "
@@ -15,3 +19,4 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
diff --git a/conf/machine/t4240rdb.conf b/conf/machine/t4240rdb.conf
index a4b79951..89771095 100644
--- a/conf/machine/t4240rdb.conf
+++ b/conf/machine/t4240rdb.conf
@@ -1,13 +1,17 @@
 #@TYPE: Machine
 #@NAME: Freescale T4240RDB
 #@SOC: t4240
-#@DESCRIPTION: Machine configuration for running T4240RDB in 32-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T4240 Reference
+#              Design Board with ppce6500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "t4:t4240"
-UBOOT_MACHINES ?= "T4240RDB"
+
+UBOOT_CONFIG ??= "nor"
+UBOOT_CONFIG[nor] = "T4240RDB_config"
+
 KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb \
     t4240rdb-usdpaa-shared-interfaces.dtb \
 "
@@ -15,3 +19,4 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg"