update machine DESCRIPTION/UBOOT_CONFIG/EXTRA_IMAGEDEPENDS

Signed-off-by: Ting Liu <ting.liu@freescale.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>

1 files changed, 19 insertions, 9 deletions

diff --git a/conf/machine/p1022ds.conf b/conf/machine/p1022ds.conf
index 823131a..8c7dcf6 100644
--- a/conf/machine/p1022ds.conf
+++ b/conf/machine/p1022ds.conf
@@ -1,26 +1,36 @@
 #@TYPE: Machine
-#@NAME: Freescale P1022DS 
+#@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 ??= "nand spi sdcard 36bit-nor 36bit-spi 36bit-nand 36bit-sdcard nor"
+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"
 
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 
 XSERVER = " \
-        xserver-xorg \
-        xf86-input-evdev \
-        xf86-input-mouse \
-        xf86-input-keyboard \
-        xf86-video-fbdev \
+    xserver-xorg \
+    xf86-input-evdev \
+    xf86-input-mouse \
+    xf86-input-keyboard \
+    xf86-video-fbdev \
 "
 
 JFFS2_ERASEBLOCK = "0x20000"
-