diff options
author | Ting Liu <ting.liu@nxp.com> | 2016-07-04 11:08:35 +0800 |
---|---|---|
committer | Zhenhua Luo <zhenhua.luo@nxp.com> | 2016-07-04 11:08:35 +0800 |
commit | 86bf800f57e9e4a3b791b10e493a2f982f431ed1 (patch) | |
tree | 5b4725116cc24496a91113fdd0b7122692a655ae /conf/machine | |
parent | 5bfce27a42aaa5c5144bd9d4e8f8d4b222dbaec3 (diff) | |
download | meta-fsl-ppc-86bf800f57e9e4a3b791b10e493a2f982f431ed1.tar.gz |
p5040: switch to new UBOOT_CONFIG format
Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
Diffstat (limited to 'conf/machine')
-rw-r--r-- | conf/machine/p5040ds-64b.conf | 7 | ||||
-rw-r--r-- | conf/machine/p5040ds.conf | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf index 7cc9b0f..74f6f52 100644 --- a/conf/machine/p5040ds-64b.conf +++ b/conf/machine/p5040ds-64b.conf | |||
@@ -10,16 +10,15 @@ require conf/machine/include/e5500-64b.inc | |||
10 | SOC_FAMILY = "p5040" | 10 | SOC_FAMILY = "p5040" |
11 | UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor" | 11 | UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor" |
12 | UBOOT_CONFIG[nor] = "P5040DS_config" | 12 | UBOOT_CONFIG[nor] = "P5040DS_config" |
13 | UBOOT_CONFIG[nand] = "P5040DS_NAND_config" | 13 | UBOOT_CONFIG[nand] = "P5040DS_NAND_config,,u-boot.pbl" |
14 | UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config" | 14 | UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config" |
15 | UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config" | 15 | UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config,,u-boot.pbl" |
16 | UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config" | 16 | UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config,,u-boot.pbl" |
17 | KERNEL_DEVICETREE ?= "fsl/p5040ds.dtb fsl/p5040ds-usdpaa.dtb \ | 17 | KERNEL_DEVICETREE ?= "fsl/p5040ds.dtb fsl/p5040ds-usdpaa.dtb \ |
18 | fsl/p5040ds-usdpaa-shared-interfaces.dtb \ | 18 | fsl/p5040ds-usdpaa-shared-interfaces.dtb \ |
19 | " | 19 | " |
20 | KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig" | 20 | KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig" |
21 | 21 | ||
22 | JFFS2_ERASEBLOCK = "0x10000" | 22 | JFFS2_ERASEBLOCK = "0x10000" |
23 | |||
24 | EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg" | 23 | EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg" |
25 | USE_VT ?= "0" | 24 | USE_VT ?= "0" |
diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf index d361bff..b9f8ce7 100644 --- a/conf/machine/p5040ds.conf +++ b/conf/machine/p5040ds.conf | |||
@@ -10,16 +10,15 @@ require conf/machine/include/e5500.inc | |||
10 | SOC_FAMILY = "p5040" | 10 | SOC_FAMILY = "p5040" |
11 | UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor" | 11 | UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor" |
12 | UBOOT_CONFIG[nor] = "P5040DS_config" | 12 | UBOOT_CONFIG[nor] = "P5040DS_config" |
13 | UBOOT_CONFIG[nand] = "P5040DS_NAND_config" | 13 | UBOOT_CONFIG[nand] = "P5040DS_NAND_config,,u-boot.pbl" |
14 | UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config" | 14 | UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config" |
15 | UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config" | 15 | UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config,,u-boot.pbl" |
16 | UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config" | 16 | UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config,,u-boot.pbl" |
17 | KERNEL_DEVICETREE ?= "fsl/p5040ds.dtb fsl/p5040ds-usdpaa.dtb \ | 17 | KERNEL_DEVICETREE ?= "fsl/p5040ds.dtb fsl/p5040ds-usdpaa.dtb \ |
18 | fsl/p5040ds-usdpaa-shared-interfaces.dtb \ | 18 | fsl/p5040ds-usdpaa-shared-interfaces.dtb \ |
19 | " | 19 | " |
20 | KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig" | 20 | KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig" |
21 | 21 | ||
22 | JFFS2_ERASEBLOCK = "0x10000" | 22 | JFFS2_ERASEBLOCK = "0x10000" |
23 | |||
24 | EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg" | 23 | EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg" |
25 | USE_VT ?= "0" | 24 | USE_VT ?= "0" |