Update machine conf of e500v2 targets

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

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>

1 files changed, 19 insertions, 9 deletions

diff --git a/conf/machine/p1010rdb.conf b/conf/machine/p1010rdb.conf
index e24c341e..2f6ba58b 100644
--- a/conf/machine/p1010rdb.conf
+++ b/conf/machine/p1010rdb.conf
@@ -1,22 +1,32 @@
 #@TYPE: Machine
 #@Name: Freescale P1010RDB
 #@SOC: p1010
-#@DESCRIPTION: Machine configuration for running P1010RDB
+#@DESCRIPTION: Machine configuration for Freescale QorIQ P1010 Reference
+#              Design Board with ppce500v2 core
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
 
 SOC_FAMILY = "p1010"
 BOOTFORMAT_CONFIG = "config_sram_p1010rdb.dat"
-UBOOT_MACHINES ?= "P1010RDB-PB_NAND P1010RDB-PB_NOR \
-    P1010RDB-PB_SPIFLASH P1010RDB-PB_36BIT_NOR P1010RDB-PB_36BIT_NAND \
-    P1010RDB-PB_36BIT_SPIFLASH P1010RDB-PB_36BIT_NAND_SECBOOT \
-    P1010RDB-PB_36BIT_NOR_SECBOOT P1010RDB-PB_36BIT_SPIFLASH_SECBOOT \
-    P1010RDB-PB_NAND_SECBOOT P1010RDB-PB_NOR_SECBOOT \
-    P1010RDB-PB_SPIFLASH_SECBOOT \
-"
+
+UBOOT_CONFIG ??= "nor nand spi 36bit-nor 36bit-nand 36bit-spi \
+36bit-nand-secboot 36bit-nor-secboot 36bit-spi-secboot nand-secboot \
+nor-secboot spi-secboot"
+UBOOT_CONFIG[nor] = "P1010RDB-PB_NOR_config"
+UBOOT_CONFIG[nand] = "P1010RDB-PB_NAND_config"
+UBOOT_CONFIG[spi] = "P1010RDB-PB_SPIFLASH_config"
+UBOOT_CONFIG[36bit-nor] = "P1010RDB-PB_36BIT_NOR_config"
+UBOOT_CONFIG[36bit-nand] = "P1010RDB-PB_36BIT_NAND_config"
+UBOOT_CONFIG[36bit-spi] = "P1010RDB-PB_36BIT_SPIFLASH_config"
+UBOOT_CONFIG[36bit-nand-secboot] = "P1010RDB-PB_36BIT_NAND_SECBOOT_config"
+UBOOT_CONFIG[36bit-nor-secboot] = "P1010RDB-PB_36BIT_NOR_SECBOOT_config"
+UBOOT_CONFIG[36bit-spi-secboot] = "P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_config"
+UBOOT_CONFIG[nand-secboot] = "P1010RDB-PB_NAND_SECBOOT_config"
+UBOOT_CONFIG[nor-secboot] = "P1010RDB-PB_NOR_SECBOOT_config"
+UBOOT_CONFIG[spi-secboot] = "P1010RDB-PB_SPIFLASH_SECBOOT_config"
+
 KERNEL_DEVICETREE ?= "p1010rdb-pa.dtb p1010rdb-pb.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
-