From c18b56890877292691d92f2fae939cb332d83dbe Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Wed, 12 Aug 2015 22:42:38 +0800 Subject: [PATCH] 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 Acked-by: Daiane Angolini Signed-off-by: Otavio Salvador --- conf/machine/bsc9131rdb.conf | 12 +++++++++--- conf/machine/bsc9132qds.conf | 36 +++++++++++++++++++++++++----------- conf/machine/c293pcie.conf | 12 +++++++++--- conf/machine/p1010rdb.conf | 28 +++++++++++++++++++--------- conf/machine/p1020rdb.conf | 12 +++++++++--- conf/machine/p1021rdb.conf | 16 ++++++++++++++-- conf/machine/p1022ds.conf | 16 +++++++++++++--- conf/machine/p1023rdb.conf | 9 +++++++-- conf/machine/p1025twr.conf | 9 +++++++-- conf/machine/p2020rdb.conf | 16 +++++++++++++--- 10 files changed, 125 insertions(+), 41 deletions(-) diff --git a/conf/machine/bsc9131rdb.conf b/conf/machine/bsc9131rdb.conf index e65f7e4e..e79632a5 100644 --- a/conf/machine/bsc9131rdb.conf +++ b/conf/machine/bsc9131rdb.conf @@ -1,15 +1,21 @@ #@TYPE: Machine #@NAME: Freescale BSC9131RDB #@SOC: bsc9131 -#@DESCRIPTION: Machine configuration for running BSC9131RDB +#@DESCRIPTION: Machine configuration for Freescale QorIQ Qonverge BSC9131 +# Reference Design Board with ppce500v2 core #@MAINTAINER: Chunrong Guo require conf/machine/include/e500v2.inc SOC_FAMILY = "bsc9131" -UBOOT_MACHINES ?= "BSC9131RDB_SPIFLASH BSC9131RDB_NAND BSC9131RDB_NAND_SYSCLK100 BSC9131RDB_SPIFLASH_SYSCLK100" + +UBOOT_CONFIG ??= "nand nand-sysclk100 spi spi-sysclk100" +UBOOT_CONFIG[nand] = "BSC9131RDB_NAND_config" +UBOOT_CONFIG[nand-sysclk100] = "BSC9131RDB_NAND_SYSCLK100_config" +UBOOT_CONFIG[spi] = "BSC9131RDB_SPIFLASH_config" +UBOOT_CONFIG[spi-sysclk100] = "BSC9131RDB_SPIFLASH_SYSCLK100_config" + KERNEL_DEVICETREE ?= "bsc9131rdb.dtb" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/bsc913x_defconfig" JFFS2_ERASEBLOCK = "0x10000" - diff --git a/conf/machine/bsc9132qds.conf b/conf/machine/bsc9132qds.conf index 90ac2a3b..1a2e1438 100644 --- a/conf/machine/bsc9132qds.conf +++ b/conf/machine/bsc9132qds.conf @@ -1,23 +1,37 @@ #@TYPE: Machine #@NAME: Freescale BSC9132QDS #@SOC: bsc9132 -#@DESCRIPTION: Machine configuration for running BSC9132QDS +#@DESCRIPTION: Machine configuration for Freescale QorIQ Qonverge BSC9132 +# Qonverge Development System with ppce500v2 core #@MAINTAINER: Chunrong Guo require conf/machine/include/e500v2.inc SOC_FAMILY = "bsc9132" -UBOOT_MACHINES ?= " BSC9132QDS_NAND_DDRCLK133 BSC9132QDS_NAND_DDRCLK100 \ - BSC9132QDS_NOR_DDRCLK100 BSC9132QDS_NOR_DDRCLK133 \ - BSC9132QDS_SDCARD_DDRCLK100 BSC9132QDS_SDCARD_DDRCLK133 \ - BSC9132QDS_SPIFLASH_DDRCLK100 BSC9132QDS_SPIFLASH_DDRCLK133 \ - BSC9132QDS_NAND_DDRCLK100_SECURE BSC9132QDS_NAND_DDRCLK133_SECURE \ - BSC9132QDS_NOR_DDRCLK100_SECURE BSC9132QDS_NOR_DDRCLK133_SECURE \ - BSC9132QDS_SDCARD_DDRCLK100_SECURE BSC9132QDS_SDCARD_DDRCLK133_SECURE \ - BSC9132QDS_SPIFLASH_DDRCLK100_SECURE BSC9132QDS_SPIFLASH_DDRCLK133_SECURE \ -" + +UBOOT_CONFIG ??= "nand-ddrclk133 nand-ddrclk100 nor-ddrclk100 nor-ddrclk133 \ +sdcard-ddrclk100 sdcard-ddrclk133 spi-ddrclk100 spi-ddrclk133 \ +nand-ddrclk100-secure nand-ddrclk133-secure nor-ddrclk100-secure \ +nor-ddrclk133-secure sdcard-ddrclk100-secure sdcard-ddrclk133-secure \ +spi-ddrclk100-secure spi-ddrclk133-secure" +UBOOT_CONFIG[nand-ddrclk133] = "BSC9132QDS_NAND_DDRCLK133_config" +UBOOT_CONFIG[nand-ddrclk100] = "BSC9132QDS_NAND_DDRCLK100_config" +UBOOT_CONFIG[nor-ddrclk100] = "BSC9132QDS_NOR_DDRCLK100_config" +UBOOT_CONFIG[nor-ddrclk133] = "BSC9132QDS_NOR_DDRCLK133_config" +UBOOT_CONFIG[sdcard-ddrclk100] = "BSC9132QDS_SDCARD_DDRCLK100_config" +UBOOT_CONFIG[sdcard-ddrclk133] = "BSC9132QDS_SDCARD_DDRCLK133_config" +UBOOT_CONFIG[spi-ddrclk100] = "BSC9132QDS_SPIFLASH_DDRCLK100_config" +UBOOT_CONFIG[spi-ddrclk133] = "BSC9132QDS_SPIFLASH_DDRCLK133_config" +UBOOT_CONFIG[nand-ddrclk100-secure] = "BSC9132QDS_NAND_DDRCLK100_SECURE_config" +UBOOT_CONFIG[nand-ddrclk133-secure] = "BSC9132QDS_NAND_DDRCLK133_SECURE_config" +UBOOT_CONFIG[nor-ddrclk100-secure] = "BSC9132QDS_NOR_DDRCLK100_SECURE_config" +UBOOT_CONFIG[nor-ddrclk133-secure] = "BSC9132QDS_NOR_DDRCLK133_SECURE_config" +UBOOT_CONFIG[sdcard-ddrclk100-secure] = "BSC9132QDS_SDCARD_DDRCLK100_SECURE_config" +UBOOT_CONFIG[sdcard-ddrclk133-secure] = "BSC9132QDS_SDCARD_DDRCLK133_SECURE_config" +UBOOT_CONFIG[spi-ddrclk100-secure] = "BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_config" +UBOOT_CONFIG[spi-ddrclk133-secure] = "BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_config" + KERNEL_DEVICETREE ?= "bsc9132qds.dtb" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/bsc913x_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" - diff --git a/conf/machine/c293pcie.conf b/conf/machine/c293pcie.conf index 6a63844e..df3e6bf4 100644 --- a/conf/machine/c293pcie.conf +++ b/conf/machine/c293pcie.conf @@ -1,16 +1,22 @@ #@TYPE: Machine #@NAME: Freescale C293PCIE #@SOC: c293pcie -#@DESCRIPTION: Machine configuration for running C293PCIE in 36-bit mode +#@DESCRIPTION: Machine configuration for Freescale C29x Crypto Coprocessor +# PCI Express Adapter Platform with ppce500v2 core #@MAINTAINER: Chunrong Guo require conf/machine/include/e500v2.inc SOC_FAMILY = "c293pcie" BOOTFORMAT_CONFIG = "config_ddr3_512m_c29xpcie_800M.dat" -UBOOT_MACHINES ?= "C29XPCIE C29XPCIE_SPIFLASH C29XPCIE_SECBOOT C29XPCIE_SPIFLASH_SECBOOT" + +UBOOT_CONFIG ??= "nor spi secboot spi-secboot" +UBOOT_CONFIG[nor] = "C29XPCIE_config" +UBOOT_CONFIG[spi] = "C29XPCIE_SPIFLASH_config" +UBOOT_CONFIG[secboot] = "C29XPCIE_NOR_SECBOOT_config" +UBOOT_CONFIG[spi-secboot] = "C29XPCIE_SPIFLASH_SECBOOT_config" + KERNEL_DEVICETREE ?= "c293pcie_36b.dtb" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_defconfig" JFFS2_ERASEBLOCK = "0x10000" - 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 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" - diff --git a/conf/machine/p1020rdb.conf b/conf/machine/p1020rdb.conf index e2b706ed..2a6c9db5 100644 --- a/conf/machine/p1020rdb.conf +++ b/conf/machine/p1020rdb.conf @@ -1,16 +1,22 @@ #@TYPE: Machine #@NAME: Freescale P1020RDB #@SOC: p1020 -#@DESCRIPTION: Machine configuration for running P1020RDB +#@DESCRIPTION: Machine configuration for Freescale QorIQ P1020 Reference +# Design Board, revD with ppce500v2 core #@MAINTAINER: Chunrong Guo require conf/machine/include/e500v2.inc SOC_FAMILY = "p1020" BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat" -UBOOT_MACHINES ?= " P1020RDB-PD P1020RDB-PD_NAND P1020RDB-PD_SDCARD P1020RDB-PD_SPIFLASH" + +UBOOT_CONFIG ??= "nor nand sdcard spi" +UBOOT_CONFIG[nor] = "P1020RDB-PD_config" +UBOOT_CONFIG[nand] = "P1020RDB-PD_NAND_config" +UBOOT_CONFIG[sdcard] = "P1020RDB-PD_SDCARD_config" +UBOOT_CONFIG[spi] = "P1020RDB-PD_SPIFLASH_config" + KERNEL_DEVICETREE ?= "p1020rdb-pd_32b.dtb" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig" JFFS2_ERASEBLOCK = "0x20000" - diff --git a/conf/machine/p1021rdb.conf b/conf/machine/p1021rdb.conf index 03a18215..110515ff 100644 --- a/conf/machine/p1021rdb.conf +++ b/conf/machine/p1021rdb.conf @@ -1,17 +1,29 @@ #@TYPE: Machine #@Name: Freescale P1021RDB #@SOC: p1021 -#@DESCRIPTION: Machine configuration for running P1021RDB +#@DESCRIPTION: Machine configuration for Freescale QorIQ P1021 Reference +# Design Board, revC with ppce500v2 core #@MAINTAINER: Chunrong Guo require conf/machine/include/e500v2.inc SOC_FAMILY = "p1021" BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat" -UBOOT_MACHINES ?= "P1021RDB-PC P1021RDB-PC_NAND P1021RDB-PC_SDCARD P1021RDB-PC_SPIFLASH P1021RDB-PC_36BIT P1021RDB-PC_36BIT_SPIFLASH P1021RDB-PC_36BIT_NAND P1021RDB-PC_36BIT_SDCARD" + +UBOOT_CONFIG ??= "nor nand sdcard spi 36bit-nor 36bit-spi 36bit-nand 36bit-sdcard" +UBOOT_CONFIG[nor] = "P1021RDB-PC_config" +UBOOT_CONFIG[nand] = "P1021RDB-PC_NAND_config" +UBOOT_CONFIG[sdcard] = "P1021RDB-PC_SDCARD_config" +UBOOT_CONFIG[spi] = "P1021RDB-PC_SPIFLASH_config" +UBOOT_CONFIG[36bit-nor] = "P1021RDB-PC_36BIT_config" +UBOOT_CONFIG[36bit-spi] = "P1021RDB-PC_36BIT_SPIFLASH_config" +UBOOT_CONFIG[36bit-nand] = "P1021RDB-PC_36BIT_NAND_config" +UBOOT_CONFIG[36bit-sdcard] = "P1021RDB-PC_36BIT_SDCARD_config" + KERNEL_DEVICETREE ?= "p1021rdb-pc_32b.dtb" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig" JFFS2_ERASEBLOCK = "0x20000" QE_UCODE ?= "fsl_qe_ucode_1021_10_A.bin" +EXTRA_IMAGEDEPENDS += "qe-ucode" diff --git a/conf/machine/p1022ds.conf b/conf/machine/p1022ds.conf index 823131ad..30854cad 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 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" - diff --git a/conf/machine/p1023rdb.conf b/conf/machine/p1023rdb.conf index 02ec4a59..64a150aa 100644 --- a/conf/machine/p1023rdb.conf +++ b/conf/machine/p1023rdb.conf @@ -1,15 +1,20 @@ #@TYPE: Machine #@NAME: Freescale P1023RDB #@SOC: p1023 -#@DESCRIPTION: Machine configuration for running P1023RDB +#@DESCRIPTION: Machine configuration for Freescale QorIQ P1023 Reference +# Design Board, revA with ppce500v2 core #@MAINTAINER: Chunrong Guo require conf/machine/include/e500v2.inc SOC_FAMILY = "p1023" -UBOOT_MACHINES ?= "P1023RDB" + +UBOOT_CONFIG ??= "nor" +UBOOT_CONFIG[nor] = "P1023RDB_config" + KERNEL_DEVICETREE ?= "p1023rdb.dtb" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/p1023_defconfig" JFFS2_ERASEBLOCK = "0x10000" +EXTRA_IMAGEDEPENDS += "fm-ucode" diff --git a/conf/machine/p1025twr.conf b/conf/machine/p1025twr.conf index 0c6bb57a..d2a306c9 100644 --- a/conf/machine/p1025twr.conf +++ b/conf/machine/p1025twr.conf @@ -1,17 +1,22 @@ #@TYPE: Machine #@Name: Freescale P1025TWR #@SOC: p1025 -#@DESCRIPTION: Machine configuration for running P1025TWR +#@DESCRIPTION: Machine configuration for Freescale QorIQ P1025 MPU Tower +# System Module with ppce500v2 core #@MAINTAINER: Chunrong Guo require conf/machine/include/e500v2.inc SOC_FAMILY = "p1025" BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat" -UBOOT_MACHINES ?= "TWR-P1025" + +UBOOT_CONFIG ??= "nor" +UBOOT_CONFIG[nor] = "TWR-P1025_config" + KERNEL_DEVICETREE ?= "p1025twr_32b.dtb" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig" JFFS2_ERASEBLOCK = "0x20000" QE_UCODE ?= "fsl_qe_ucode_1021_10_A.bin" +EXTRA_IMAGEDEPENDS += "qe-ucode" diff --git a/conf/machine/p2020rdb.conf b/conf/machine/p2020rdb.conf index 9544c256..a06f4c98 100644 --- a/conf/machine/p2020rdb.conf +++ b/conf/machine/p2020rdb.conf @@ -1,16 +1,26 @@ #@TYPE: Machine #@Name: Freescale P2020RDB #@SOC: p2020 -#@DESCRIPTION: Machine configuration for running P2020RDB +#@DESCRIPTION: Machine configuration for Freescale QorIQ P2020 Reference +# Design Board with ppce500v2 core #@MAINTAINER: Chunrong Guo require conf/machine/include/e500v2.inc SOC_FAMILY = "p2020" BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat" -UBOOT_MACHINES ?= " P2020RDB-PC P2020RDB-PC_NAND P2020RDB-PC_SDCARD P2020RDB-PC_SPIFLASH P2020RDB-PC_36BIT P2020RDB-PC_36BIT_SPIFLASH P2020RDB-PC_36BIT_NAND P2020RDB-PC_36BIT_SDCARD" + +UBOOT_CONFIG ??= "nor nand sdcard spi 36bit-nor 36bit-spi 36bit-nand 36bit-sdcard" +UBOOT_CONFIG[nor] = "P2020RDB-PC_config" +UBOOT_CONFIG[nand] = "P2020RDB-PC_NAND_config" +UBOOT_CONFIG[sdcard] = "P2020RDB-PC_SDCARD_config" +UBOOT_CONFIG[spi] = "P2020RDB-PC_SPIFLASH_config" +UBOOT_CONFIG[36bit-nor] = "P2020RDB-PC_36BIT_config" +UBOOT_CONFIG[36bit-spi] = "P2020RDB-PC_36BIT_SPIFLASH_config" +UBOOT_CONFIG[36bit-nand] = "P2020RDB-PC_36BIT_NAND_config" +UBOOT_CONFIG[36bit-sdcard] = "P2020RDB-PC_36BIT_SDCARD_config" + KERNEL_DEVICETREE ?= "p2020rdb-pc_32b.dtb" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig" JFFS2_ERASEBLOCK = "0x20000" - -- 2.40.1