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, 13 insertions, 3 deletions

diff --git a/conf/machine/p1022ds.conf b/conf/machine/p1022ds.conf
index 823131ad6..30854cad6 100644
--- a/conf/machine/p1022ds.conf
+++ b/conf/machine/p1022ds.conf
@@ -1,14 +1,25 @@
 #@TYPE: Machine
 #@NAME: Freescale P1022DS 
 #@SOC: p1022
-#@DESCRIPTION: Machine configuration for running P1022DS
+#@DESCRIPTION: Machine configuration for Freescale QorIQ P1022 Development
+#              System, revB with ppce500v2 core
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
 
 SOC_FAMILY = "p1022"
 BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
-UBOOT_MACHINES ?= "P1022DS P1022DS_NAND P1022DS_SPIFLASH P1022DS_SDCARD P1022DS_36BIT P1022DS_36BIT_SPIFLASH P1022DS_36BIT_NAND P1022DS_36BIT_SDCARD"
+
+UBOOT_CONFIG ??= "nor nand spi sdcard 36bit-nor 36bit-spi 36bit-nand 36bit-sdcard"
+UBOOT_CONFIG[nor] = "P1022DS_config"
+UBOOT_CONFIG[nand] = "P1022DS_NAND_config"
+UBOOT_CONFIG[spi] = "P1022DS_SPIFLASH_config"
+UBOOT_CONFIG[sdcard] = "P1022DS_SDCARD_config"
+UBOOT_CONFIG[36bit-nor] = "P1022DS_36BIT_config"
+UBOOT_CONFIG[36bit-spi] = "P1022DS_36BIT_SPIFLASH_config"
+UBOOT_CONFIG[36bit-nand] = "P1022DS_36BIT_NAND_config"
+UBOOT_CONFIG[36bit-sdcard] = "P1022DS_36BIT_SDCARD_config"
+
 KERNEL_DEVICETREE ?= "p1022ds_32b.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
@@ -23,4 +34,3 @@ XSERVER = " \
 "
 
 JFFS2_ERASEBLOCK = "0x20000"
-