summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTing Liu <ting.liu@nxp.com>2016-07-16 00:35:54 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2016-07-22 11:34:12 -0300
commita6666c63321087abff4d637de59625b88ffd3c47 (patch)
tree0b1a5eb700d3b6ccf030bd7e9488f8c8752b671e
parent78528d818278c4833cf7a0e25c973abed2c425ee (diff)
downloadmeta-freescale-a6666c63321087abff4d637de59625b88ffd3c47.tar.gz
p5020: switch to new UBOOT_CONFIG format
Signed-off-by: Ting Liu <ting.liu@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--conf/machine/p5020ds-64b.conf10
-rw-r--r--conf/machine/p5020ds.conf10
2 files changed, 8 insertions, 12 deletions
diff --git a/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf
index 54cca65a..36aa0c6b 100644
--- a/conf/machine/p5020ds-64b.conf
+++ b/conf/machine/p5020ds-64b.conf
@@ -9,12 +9,12 @@ require conf/machine/include/e5500-64b.inc
9 9
10SOC_FAMILY = "p5020" 10SOC_FAMILY = "p5020"
11 11
12UBOOT_CONFIG ??= "nor nand secure-boot sdcard spi" 12UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
13UBOOT_CONFIG[nor] = "P5020DS_config" 13UBOOT_CONFIG[nor] = "P5020DS_config"
14UBOOT_CONFIG[nand] = "P5020DS_NAND_config" 14UBOOT_CONFIG[nand] = "P5020DS_NAND_config,,u-boot.pbl"
15UBOOT_CONFIG[secure-boot] = "P5020DS_SECURE_BOOT_config" 15UBOOT_CONFIG[secure-boot] = "P5020DS_SECURE_BOOT_config"
16UBOOT_CONFIG[sdcard] = "P5020DS_SDCARD_config" 16UBOOT_CONFIG[sdcard] = "P5020DS_SDCARD_config,,u-boot.pbl"
17UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config" 17UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config,,u-boot.pbl"
18 18
19KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb \ 19KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb \
20 p5020ds-usdpaa-shared-interfaces.dtb \ 20 p5020ds-usdpaa-shared-interfaces.dtb \
@@ -22,7 +22,5 @@ KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb \
22KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig" 22KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
23 23
24JFFS2_ERASEBLOCK = "0x10000" 24JFFS2_ERASEBLOCK = "0x10000"
25
26EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg" 25EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
27
28USE_VT ?= "0" 26USE_VT ?= "0"
diff --git a/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf
index e25e3dd1..1455533d 100644
--- a/conf/machine/p5020ds.conf
+++ b/conf/machine/p5020ds.conf
@@ -9,12 +9,12 @@ require conf/machine/include/e5500.inc
9 9
10SOC_FAMILY = "p5020" 10SOC_FAMILY = "p5020"
11 11
12UBOOT_CONFIG ??= "nor nand secure-boot sdcard spi" 12UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
13UBOOT_CONFIG[nor] = "P5020DS_config" 13UBOOT_CONFIG[nor] = "P5020DS_config"
14UBOOT_CONFIG[nand] = "P5020DS_NAND_config" 14UBOOT_CONFIG[nand] = "P5020DS_NAND_config,,u-boot.pbl"
15UBOOT_CONFIG[secure-boot] = "P5020DS_SECURE_BOOT_config" 15UBOOT_CONFIG[secure-boot] = "P5020DS_SECURE_BOOT_config"
16UBOOT_CONFIG[sdcard] = "P5020DS_SDCARD_config" 16UBOOT_CONFIG[sdcard] = "P5020DS_SDCARD_config,,u-boot.pbl"
17UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config" 17UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config,,u-boot.pbl"
18 18
19KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb \ 19KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb \
20 p5020ds-usdpaa-shared-interfaces.dtb \ 20 p5020ds-usdpaa-shared-interfaces.dtb \
@@ -22,7 +22,5 @@ KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb \
22KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig" 22KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
23 23
24JFFS2_ERASEBLOCK = "0x10000" 24JFFS2_ERASEBLOCK = "0x10000"
25
26EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg" 25EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
27
28USE_VT ?= "0" 26USE_VT ?= "0"