From 88dc7ebb9b826b7d85c8603958d21092181d1d1d Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Wed, 12 Aug 2015 22:42:39 +0800 Subject: Update machine conf of e500mc 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 Acked-by: Daiane Angolini Signed-off-by: Otavio Salvador --- conf/machine/p2041rdb.conf | 15 +++++++++++---- conf/machine/p3041ds.conf | 15 +++++++++++---- conf/machine/p4080ds.conf | 12 ++++++++++-- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf index 9ed63ff1..3385bcc1 100644 --- a/conf/machine/p2041rdb.conf +++ b/conf/machine/p2041rdb.conf @@ -1,15 +1,21 @@ #@TYPE: Machine #@NAME: Freescale P2041RDB #@SOC: p2041 -#@DESCRIPTION: Machine configuration for running P2041RDB +#@DESCRIPTION: Machine configuration for Freescale QorIQ P2041 Reference +# Design Board, rev2 silicon with ppce500mc core #@MAINTAINER: Chunrong Guo require conf/machine/include/e500mc.inc SOC_FAMILY = "p2041" -UBOOT_MACHINES ?= "P2041RDB P2041RDB_NAND P2041RDB_SECURE_BOOT \ - P2041RDB_SDCARD P2041RDB_SPIFLASH \ -" + +UBOOT_CONFIG ??= "nor nand secure-boot sdcard spi" +UBOOT_CONFIG[nor] = "P2041RDB_config" +UBOOT_CONFIG[nand] = "P2041RDB_NAND_config" +UBOOT_CONFIG[secure-boot] = "P2041RDB_SECURE_BOOT_config" +UBOOT_CONFIG[sdcard] = "P2041RDB_SDCARD_config" +UBOOT_CONFIG[spi] = "P2041RDB_SPIFLASH_config" + KERNEL_DEVICETREE ?= "p2041rdb.dtb p2041rdb-usdpaa.dtb \ p2041rdb-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/p3041ds.conf b/conf/machine/p3041ds.conf index 8fca5b40..1d88a53f 100644 --- a/conf/machine/p3041ds.conf +++ b/conf/machine/p3041ds.conf @@ -1,15 +1,21 @@ #@TYPE: Machine #@NAME: Freescale P3041DS #@SOC: p3041 -#@DESCRIPTION: Machine configuration for running P3041DS +#@DESCRIPTION: Machine configuration for Freescale QorIQ P3041 Development +# System with ppce500mc core #@MAINTAINER: Chunrong Guo require conf/machine/include/e500mc.inc SOC_FAMILY = "p3041" -UBOOT_MACHINES ?= "P3041DS P3041DS_NAND P3041DS_SECURE_BOOT \ - P3041DS_SDCARD P3041DS_SPIFLASH \ -" + +UBOOT_CONFIG ??= "nor nand secure-boot sdcard spi" +UBOOT_CONFIG[nor] = "P3041DS_config" +UBOOT_CONFIG[nand] = "P3041DS_NAND_config" +UBOOT_CONFIG[secure-boot] = "P3041DS_SECURE_BOOT_config" +UBOOT_CONFIG[sdcard] = "P3041DS_SDCARD_config" +UBOOT_CONFIG[spi] = "P3041DS_SPIFLASH_config" + KERNEL_DEVICETREE ?= "p3041ds.dtb p3041ds-usdpaa.dtb \ p3041ds-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/p4080ds.conf b/conf/machine/p4080ds.conf index b3fc87b2..a458e4cf 100644 --- a/conf/machine/p4080ds.conf +++ b/conf/machine/p4080ds.conf @@ -1,13 +1,20 @@ #@TYPE: Machine #@NAME: Freescale P4080DS #@SOC: p4080 -#@DESCRIPTION: Machine configuration for running P4080DS +#@DESCRIPTION: Machine configuration for Freescale QorIQ P4080 Development +# System with ppce500mc core #@MAINTAINER: Chunrong Guo require conf/machine/include/e500mc.inc SOC_FAMILY = "p4080" -UBOOT_MACHINES ?= "P4080DS P4080DS_SECURE_BOOT P4080DS_SDCARD P4080DS_SPIFLASH " + +UBOOT_CONFIG ??= "nor secure-boot sdcard spi" +UBOOT_CONFIG[nor] = "P4080DS_config" +UBOOT_CONFIG[secure-boot] = "P4080DS_SECURE_BOOT_config" +UBOOT_CONFIG[sdcard] = "P4080DS_SDCARD_config" +UBOOT_CONFIG[spi] = "P4080DS_SPIFLASH_config" + KERNEL_DEVICETREE ?= "p4080ds.dtb p4080ds-usdpaa.dtb \ p4080ds-usdpaa-shared-interfaces.dtb \ " @@ -15,3 +22,4 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" +EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg" -- cgit v1.2.3-54-g00ecf