Update machine conf of e5500 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>

12 files changed, 132 insertions, 40 deletions

diff --git a/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf
index 3586da7b..39497a2e 100644
--- a/conf/machine/p5020ds-64b.conf
+++ b/conf/machine/p5020ds-64b.conf
@@ -1,15 +1,21 @@
 #@TYPE: Machine
 #@NAME: Freescale P5020DS-64B
 #@SOC: p5020
-#@DESCRIPTION: Machine configuration for running P5020DS in 64-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ P5020 Development
+#              System with ppce5500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500-64b.inc
 
 SOC_FAMILY = "p5020"
-UBOOT_MACHINES ?= "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT \
-    P5020DS_SDCARD P5020DS_SPIFLASH \
-"
+
+UBOOT_CONFIG ??= "nor nand secure-boot sdcard spi"
+UBOOT_CONFIG[nor] = "P5020DS_config"
+UBOOT_CONFIG[nand] = "P5020DS_NAND_config"
+UBOOT_CONFIG[secure-boot] = "P5020DS_SECURE_BOOT_config"
+UBOOT_CONFIG[sdcard] = "P5020DS_SDCARD_config"
+UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config"
+
 KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb \
     p5020ds-usdpaa-shared-interfaces.dtb \
 "
@@ -17,3 +23,4 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
diff --git a/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf
index 57de0ca7..cfb9fe2a 100644
--- a/conf/machine/p5020ds.conf
+++ b/conf/machine/p5020ds.conf
@@ -1,15 +1,21 @@
 #@TYPE: Machine
 #@NAME: Freescale P5020DS
 #@SOC: p5020
-#@DESCRIPTION: Machine configuration for running P5020DS in 32-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ P5020 Development
+#              System with ppce5500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500.inc
 
 SOC_FAMILY = "p5020"
-UBOOT_MACHINES ?= "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT \
-    P5020DS_SDCARD P5020DS_SPIFLASH \
-"
+
+UBOOT_CONFIG ??= "nor nand secure-boot sdcard spi"
+UBOOT_CONFIG[nor] = "P5020DS_config"
+UBOOT_CONFIG[nand] = "P5020DS_NAND_config"
+UBOOT_CONFIG[secure-boot] = "P5020DS_SECURE_BOOT_config"
+UBOOT_CONFIG[sdcard] = "P5020DS_SDCARD_config"
+UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config"
+
 KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb \
     p5020ds-usdpaa-shared-interfaces.dtb \
 "
@@ -17,3 +23,4 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf
index cf2400db..604af9d1 100644
--- a/conf/machine/p5040ds-64b.conf
+++ b/conf/machine/p5040ds-64b.conf
@@ -1,15 +1,21 @@
 #@TYPE: Machine
 #@NAME: Freescale P5040DS-64B
 #@SOC: p5040
-#@DESCRIPTION: Machine configuration for running P5040DS in 64-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ P5040 Development
+#              System with ppce5500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500-64b.inc
 
 SOC_FAMILY = "p5040"
-UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT \
-    P5040DS_SDCARD P5040DS_SPIFLASH \
-"
+
+UBOOT_CONFIG ??= "nor nand secure-boot sdcard spi"
+UBOOT_CONFIG[nor] = "P5040DS_config"
+UBOOT_CONFIG[nand] = "P5040DS_NAND_config"
+UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config"
+UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config"
+UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config"
+
 KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb \
     p5040ds-usdpaa-shared-interfaces.dtb \
 "
@@ -17,3 +23,4 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf
index 534b5da2..a56e8a35 100644
--- a/conf/machine/p5040ds.conf
+++ b/conf/machine/p5040ds.conf
@@ -1,15 +1,21 @@
 #@TYPE: Machine
 #@NAME: Freescale P5040DS
 #@SOC: p5040
-#@DESCRIPTION: Machine configuration for running P5040DS in 32-bit mode 
+#@DESCRIPTION: Machine configuration for Freescale QorIQ P5040 Development
+#              System with ppce5500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500.inc
 
 SOC_FAMILY = "p5040"
-UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT \
-    P5040DS_SDCARD P5040DS_SPIFLASH \
-"
+
+UBOOT_CONFIG ??= "nor nand secure-boot sdcard spi"
+UBOOT_CONFIG[nor] = "P5040DS_config"
+UBOOT_CONFIG[nand] = "P5040DS_NAND_config"
+UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config"
+UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config"
+UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config"
+
 KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb \
     p5040ds-usdpaa-shared-interfaces.dtb \
 "
@@ -17,3 +23,4 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
diff --git a/conf/machine/t1023rdb-64b.conf b/conf/machine/t1023rdb-64b.conf
index 4cbfac0d..d121a19e 100644
--- a/conf/machine/t1023rdb-64b.conf
+++ b/conf/machine/t1023rdb-64b.conf
@@ -1,15 +1,22 @@
 #@TYPE: Machine
 #@NAME: Freescale T1023RDB
 #@SOC: t1023
-#@DESCRIPTION: Machine configuration for running T1023RDB in 64-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T1023 Reference
+#              Design Board with ppce5500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500-64b.inc
 
 SOC_FAMILY = "t1:t1023"
-UBOOT_MACHINES ?= "T1023RDB_NAND T1023RDB_SDCARD T1023RDB_SPIFLASH"
+
+UBOOT_CONFIG ??= "nand sdcard spi"
+UBOOT_CONFIG[nand] = "T1024RDB_NAND_config"
+UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config"
+UBOOT_CONFIG[spi] = "T1023RDB_SPIFLASH_config"
+
 KERNEL_DEVICETREE ?= "t1023rdb.dtb t1023rdb-usdpaa.dtb t1023rdb-usdpaa-shared-interfaces.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw"
diff --git a/conf/machine/t1023rdb.conf b/conf/machine/t1023rdb.conf
index c895868f..5496ab56 100644
--- a/conf/machine/t1023rdb.conf
+++ b/conf/machine/t1023rdb.conf
@@ -1,15 +1,22 @@
 #@TYPE: Machine
 #@NAME: Freescale T1023RDB
 #@SOC: t1023
-#@DESCRIPTION: Machine configuration for running T1023RDB in 32-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T1023 Reference
+#              Design Board with ppce5500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500.inc
 
 SOC_FAMILY = "t1:t1023"
-UBOOT_MACHINES ?= "T1023RDB_NAND T1023RDB_SDCARD T1023RDB_SPIFLASH"
+
+UBOOT_CONFIG ??= "nand sdcard spi"
+UBOOT_CONFIG[nand] = "T1024RDB_NAND_config"
+UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config"
+UBOOT_CONFIG[spi] = "T1023RDB_SPIFLASH_config"
+
 KERNEL_DEVICETREE ?= "t1023rdb.dtb t1023rdb-usdpaa.dtb t1023rdb-usdpaa-shared-interfaces.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw"
diff --git a/conf/machine/t1024rdb-64b.conf b/conf/machine/t1024rdb-64b.conf
index 9186be2d..cd22f1fa 100644
--- a/conf/machine/t1024rdb-64b.conf
+++ b/conf/machine/t1024rdb-64b.conf
@@ -1,16 +1,25 @@
 #@TYPE: Machine
 #@NAME: Freescale T1024RDB
 #@SOC: t1024
-#@DESCRIPTION: Machine configuration for running T1024RDB in 64-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T1024 Reference
+#              Design Board with ppce5500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500-64b.inc
 
 SOC_FAMILY = "t1:t1024"
-UBOOT_MACHINES ?= "T1024RDB T1024RDB_NAND T1024RDB_SDCARD T1024RDB_SPIFLASH T1024RDB_SECURE_BOOT"
+
+UBOOT_CONFIG ??= "nor nand sdcard spi secure-boot"
+UBOOT_CONFIG[nor] = "T1024RDB_config"
+UBOOT_CONFIG[nand] = "T1024RDB_NAND_config"
+UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config"
+UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config"
+UBOOT_CONFIG[secure-boot] = "T1024RDB_SECURE_BOOT_config"
+
 KERNEL_DEVICETREE ?= "t1024rdb.dtb t1024rdb-usdpaa.dtb t1024rdb-usdpaa-capwap.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 QE_UCODE ?= "iram_Type_A_T1024_r1.0.bin"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode"
diff --git a/conf/machine/t1024rdb.conf b/conf/machine/t1024rdb.conf
index 275b5d1b..bd40b897 100644
--- a/conf/machine/t1024rdb.conf
+++ b/conf/machine/t1024rdb.conf
@@ -1,16 +1,25 @@
 #@TYPE: Machine
 #@NAME: Freescale T1024RDB
 #@SOC: t1024
-#@DESCRIPTION: Machine configuration for running T1024RDB in 32-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T1024 Reference
+#              Design Board with ppce5500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500.inc
 
 SOC_FAMILY = "t1:t1024"
-UBOOT_MACHINES ?= "T1024RDB T1024RDB_NAND T1024RDB_SDCARD T1024RDB_SPIFLASH T1024RDB_SECURE_BOOT"
+
+UBOOT_CONFIG ??= "nor nand sdcard spi secure-boot"
+UBOOT_CONFIG[nor] = "T1024RDB_config"
+UBOOT_CONFIG[nand] = "T1024RDB_NAND_config"
+UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config"
+UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config"
+UBOOT_CONFIG[secure-boot] = "T1024RDB_SECURE_BOOT_config"
+
 KERNEL_DEVICETREE ?= "t1024rdb.dtb t1024rdb-usdpaa.dtb t1024rdb-usdpaa-capwap.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 QE_UCODE ?= "iram_Type_A_T1024_r1.0.bin"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode"
diff --git a/conf/machine/t1040d4rdb-64b.conf b/conf/machine/t1040d4rdb-64b.conf
index 2bfa6523..f7ed1f03 100644
--- a/conf/machine/t1040d4rdb-64b.conf
+++ b/conf/machine/t1040d4rdb-64b.conf
@@ -1,18 +1,26 @@
 #@TYPE: Machine
 #@NAME: Freescale T1040D4RDB
 #@SOC: t1040
-#@DESCRIPTION: Machine configuration for running T1040D4RDB in 64-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T1040D4 Reference
+#              Design Board with ppce5500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500-64b.inc
 
 SOC_FAMILY = "t1:t1040"
-UBOOT_MACHINES ?= "T1040D4RDB T1040D4RDB_NAND T1040D4RDB_SDCARD \
-    T1040D4RDB_SPIFLASH T1040D4RDB_SECURE_BOOT \
-"
+
+UBOOT_CONFIG ??= "nor nand sdcard spi secure-boot"
+UBOOT_CONFIG[nor] = "T1040D4RDB_config"
+UBOOT_CONFIG[nand] = "T1040D4RDB_NAND_config"
+UBOOT_CONFIG[sdcard] = "T1040D4RDB_SDCARD_config"
+UBOOT_CONFIG[spi] = "T1040D4RDB_SPIFLASH_config"
+UBOOT_CONFIG[secure-boot] = "T1040D4RDB_SECURE_BOOT_config"
+
 KERNEL_DEVICETREE ?= "t1040d4rdb.dtb t1040d4rdb-usdpaa-lag.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
 QE_UCODE = "iram_Type_A_T1040_r1.0.bin"
+
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg qe-ucode"
diff --git a/conf/machine/t1040d4rdb.conf b/conf/machine/t1040d4rdb.conf
index 0872cfe1..539765fa 100644
--- a/conf/machine/t1040d4rdb.conf
+++ b/conf/machine/t1040d4rdb.conf
@@ -1,18 +1,26 @@
 #@TYPE: Machine
 #@NAME: Freescale T1040D4RDB
 #@SOC: t1040
-#@DESCRIPTION: Machine configuration for running T1040D4RDB in 32-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T1040D4 Reference
+#              Design Board with ppce5500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500.inc
 
 SOC_FAMILY = "t1:t1040"
-UBOOT_MACHINES ?= "T1040D4RDB T1040D4RDB_NAND T1040D4RDB_SDCARD \
-    T1040D4RDB_SPIFLASH T1040D4RDB_SECURE_BOOT \
-"
+
+UBOOT_CONFIG ??= "nor nand sdcard spi secure-boot"
+UBOOT_CONFIG[nor] = "T1040D4RDB_config"
+UBOOT_CONFIG[nand] = "T1040D4RDB_NAND_config"
+UBOOT_CONFIG[sdcard] = "T1040D4RDB_SDCARD_config"
+UBOOT_CONFIG[spi] = "T1040D4RDB_SPIFLASH_config"
+UBOOT_CONFIG[secure-boot] = "T1040D4RDB_SECURE_BOOT_config"
+
 KERNEL_DEVICETREE ?= "t1040d4rdb.dtb t1040d4rdb-usdpaa-lag.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
 QE_UCODE = "iram_Type_A_T1040_r1.0.bin"
+
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg qe-ucode"
diff --git a/conf/machine/t1042d4rdb-64b.conf b/conf/machine/t1042d4rdb-64b.conf
index d9898662..2196230d 100644
--- a/conf/machine/t1042d4rdb-64b.conf
+++ b/conf/machine/t1042d4rdb-64b.conf
@@ -1,18 +1,26 @@
 #@TYPE: Machine
 #@NAME: Freescale T1042D4RDB
 #@SOC: t1042
-#@DESCRIPTION: Machine configuration for running T1042D4RDB in 64-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T1042D4 Reference
+#              Design Board with ppce5500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500-64b.inc
 
 SOC_FAMILY = "t1:t1042"
-UBOOT_MACHINES ?= "T1042D4RDB T1042D4RDB_NAND T1042D4RDB_SDCARD \
-    T1042D4RDB_SPIFLASH T1042D4RDB_SECURE_BOOT \
-"
+
+UBOOT_CONFIG ??= "nor nand sdcard spi secure-boot"
+UBOOT_CONFIG[nor] = "T1042D4RDB_config"
+UBOOT_CONFIG[nand] = "T1042D4RDB_NAND_config"
+UBOOT_CONFIG[sdcard] = "T1042D4RDB_SDCARD_config"
+UBOOT_CONFIG[spi] = "T1042D4RDB_SPIFLASH_config"
+UBOOT_CONFIG[secure-boot] = "T1042D4RDB_SECURE_BOOT_config"
+
 KERNEL_DEVICETREE ?= "t1042d4rdb.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
 QE_UCODE = "iram_Type_A_T1040_r1.0.bin"
+
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg qe-ucode"
diff --git a/conf/machine/t1042d4rdb.conf b/conf/machine/t1042d4rdb.conf
index 6142bea4..674267d0 100644
--- a/conf/machine/t1042d4rdb.conf
+++ b/conf/machine/t1042d4rdb.conf
@@ -1,18 +1,26 @@
 #@TYPE: Machine
 #@NAME: Freescale T1042D4RDB
 #@SOC: t1042
-#@DESCRIPTION: Machine configuration for running T1042D4RDB in 32-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T1042D4 Reference
+#              Design Board with ppce5500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500.inc
 
 SOC_FAMILY = "t1:t1042"
-UBOOT_MACHINES ?= "T1042D4RDB T1042D4RDB_NAND T1042D4RDB_SDCARD \
-    T1042D4RDB_SPIFLASH T1042D4RDB_SECURE_BOOT \
-"
+
+UBOOT_CONFIG ??= "nor nand sdcard spi secure-boot"
+UBOOT_CONFIG[nor] = "T1042D4RDB_config"
+UBOOT_CONFIG[nand] = "T1042D4RDB_NAND_config"
+UBOOT_CONFIG[sdcard] = "T1042D4RDB_SDCARD_config"
+UBOOT_CONFIG[spi] = "T1042D4RDB_SPIFLASH_config"
+UBOOT_CONFIG[secure-boot] = "T1042D4RDB_SECURE_BOOT_config"
+
 KERNEL_DEVICETREE ?= "t1042d4rdb.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
 QE_UCODE = "iram_Type_A_T1040_r1.0.bin"
+
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg qe-ucode"