diff options
author | Chunrong Guo <b40290@freescale.com> | 2012-04-09 14:09:15 +0800 |
---|---|---|
committer | Zhenhua Luo <b19537@freescale.com> | 2012-04-09 14:11:06 +0800 |
commit | cbfb8dc35c3ad5d679cd20c6509bf579225e016a (patch) | |
tree | e4fa0e0336c47af3ce591a6e5e030385e2ad1a7e | |
parent | 570c2bc1963aa464050f120cb2487d7090e935a4 (diff) | |
download | meta-fsl-ppc-cbfb8dc35c3ad5d679cd20c6509bf579225e016a.tar.gz |
Add more supported u-boot types for dpaa targets
Signed-off-by: Chunrong Guo <b40290@freescale.com>
Signed-off-by: Zhenhua Luo <b19537@freescale.com>
-rw-r--r-- | conf/machine/p2041rdb.conf | 2 | ||||
-rw-r--r-- | conf/machine/p3041ds.conf | 2 | ||||
-rw-r--r-- | conf/machine/p3060qds.conf | 2 | ||||
-rw-r--r-- | conf/machine/p4080ds.conf | 2 | ||||
-rw-r--r-- | conf/machine/p5020ds.conf | 2 | ||||
-rw-r--r-- | recipes-kernel/u-boot/u-boot_git.bb | 19 |
6 files changed, 20 insertions, 9 deletions
diff --git a/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf index 83dc852..014699e 100644 --- a/conf/machine/p2041rdb.conf +++ b/conf/machine/p2041rdb.conf | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | require e500mc.inc | 4 | require e500mc.inc |
5 | 5 | ||
6 | UBOOT_MACHINES = "P2041RDB" | 6 | UBOOT_MACHINES = "P2041RDB P2041RDB_SECURE_BOOT P2041RDB_SDCARD P2041RDB_SPIFLASH" |
7 | KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2041rdb.dts \ | 7 | KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2041rdb.dts \ |
8 | ${S}/arch/powerpc/boot/dts/p2041rdb-usdpaa.dts" | 8 | ${S}/arch/powerpc/boot/dts/p2041rdb-usdpaa.dts" |
9 | KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig" | 9 | KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig" |
diff --git a/conf/machine/p3041ds.conf b/conf/machine/p3041ds.conf index 8331292..2bdfb33 100644 --- a/conf/machine/p3041ds.conf +++ b/conf/machine/p3041ds.conf | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | require e500mc.inc | 4 | require e500mc.inc |
5 | 5 | ||
6 | UBOOT_MACHINES = "P3041DS" | 6 | UBOOT_MACHINES = "P3041DS P3041DS_NAND P3041DS_SECURE_BOOT P3041DS_SRIOBOOT_MASTER P3041DS_SRIOBOOT_SLAVE P3041DS_SDCARD P3041DS_SPIFLASH" |
7 | KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p3041ds.dts \ | 7 | KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p3041ds.dts \ |
8 | ${S}/arch/powerpc/boot/dts/p3041ds-usdpaa.dts" | 8 | ${S}/arch/powerpc/boot/dts/p3041ds-usdpaa.dts" |
9 | KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig" | 9 | KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig" |
diff --git a/conf/machine/p3060qds.conf b/conf/machine/p3060qds.conf index dd872c9..4cfc85e 100644 --- a/conf/machine/p3060qds.conf +++ b/conf/machine/p3060qds.conf | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | require e500mc.inc | 4 | require e500mc.inc |
5 | 5 | ||
6 | UBOOT_MACHINES = "P3060QDS" | 6 | UBOOT_MACHINES = "P3060QDS P3060QDS_NAND P3060QDS_SECURE_BOOT " |
7 | KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p3060qds.dts \ | 7 | KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p3060qds.dts \ |
8 | ${S}/arch/powerpc/boot/dts/p3060qds-usdpaa.dts" | 8 | ${S}/arch/powerpc/boot/dts/p3060qds-usdpaa.dts" |
9 | KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig" | 9 | KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig" |
diff --git a/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf index 96d082c..66a9554 100644 --- a/conf/machine/p4080ds.conf +++ b/conf/machine/p4080ds.conf | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | require e500mc.inc | 4 | require e500mc.inc |
5 | 5 | ||
6 | UBOOT_MACHINES = "P4080DS" | 6 | UBOOT_MACHINES = "P4080DS P4080DS_SECURE_BOOT P4080DS_SRIOBOOT_MASTER P4080DS_SRIOBOOT_SLAVE P4080DS_SDCARD P4080DS_SPIFLASH " |
7 | KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p4080ds.dts \ | 7 | KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p4080ds.dts \ |
8 | ${S}/arch/powerpc/boot/dts/p4080ds-usdpaa.dts" | 8 | ${S}/arch/powerpc/boot/dts/p4080ds-usdpaa.dts" |
9 | KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig" | 9 | KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig" |
diff --git a/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf index 296fd4e..84de757 100644 --- a/conf/machine/p5020ds.conf +++ b/conf/machine/p5020ds.conf | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | require e5500.inc | 4 | require e5500.inc |
5 | 5 | ||
6 | UBOOT_MACHINES = "P5020DS" | 6 | UBOOT_MACHINES = "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT P5020DS_SRIOBOOT_MASTER P5020DS_SRIOBOOT_SLAVE P5020DS_SDCARD P5020DS_SPIFLASH " |
7 | KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5020ds.dts \ | 7 | KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5020ds.dts \ |
8 | ${S}/arch/powerpc/boot/dts/p5020ds-usdpaa.dts" | 8 | ${S}/arch/powerpc/boot/dts/p5020ds-usdpaa.dts" |
9 | KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig" | 9 | KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig" |
diff --git a/recipes-kernel/u-boot/u-boot_git.bb b/recipes-kernel/u-boot/u-boot_git.bb index 50c89a9..6568a78 100644 --- a/recipes-kernel/u-boot/u-boot_git.bb +++ b/recipes-kernel/u-boot/u-boot_git.bb | |||
@@ -5,7 +5,7 @@ PROVIDES = "virtual/bootloader" | |||
5 | LICENSE = "GPLv2" | 5 | LICENSE = "GPLv2" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" |
7 | 7 | ||
8 | PR = "r11" | 8 | PR = "r12" |
9 | INHIBIT_DEFAULT_DEPS = "1" | 9 | INHIBIT_DEFAULT_DEPS = "1" |
10 | DEPENDS = "boot-format-native virtual/${TARGET_PREFIX}gcc" | 10 | DEPENDS = "boot-format-native virtual/${TARGET_PREFIX}gcc" |
11 | 11 | ||
@@ -44,13 +44,24 @@ do_compile () { | |||
44 | case "${board}" in | 44 | case "${board}" in |
45 | *SDCARD*) UBOOT_TARGET="u-boot-sd";; | 45 | *SDCARD*) UBOOT_TARGET="u-boot-sd";; |
46 | *SPIFLASH*) UBOOT_TARGET="u-boot-spi";; | 46 | *SPIFLASH*) UBOOT_TARGET="u-boot-spi";; |
47 | *NAND*) UBOOT_TARGET="u-boot-nand";; | ||
47 | *) UBOOT_TARGET="";; | 48 | *) UBOOT_TARGET="";; |
48 | esac | 49 | esac |
49 | 50 | ||
50 | if [ "x${UBOOT_TARGET}" != "x" ]; then | 51 | if [ "x${UBOOT_TARGET}" != "x" ]; then |
51 | ${STAGING_BINDIR_NATIVE}/boot_format \ | 52 | if [ "${MACHINE_ARCH}" == "p1023rds" ] || \ |
52 | ${STAGING_DATADIR_NATIVE}/${BOOTFORMAT_CONFIG} \ | 53 | [ "${MACHINE_ARCH}" == "p2041rdb" ] || \ |
53 | ${S}/${board}/u-boot.bin -spi ${S}/${board}/${UBOOT_TARGET}.bin | 54 | [ "${MACHINE_ARCH}" == "p3041ds" ] || \ |
55 | [ "${MACHINE_ARCH}" == "p3060qds" ] || \ | ||
56 | [ "${MACHINE_ARCH}" == "p4080ds" ] || \ | ||
57 | [ "${MACHINE_ARCH}" == "p5020ds" ] || \ | ||
58 | [ "${MACHINE_ARCH}" == "p5020ds-64b" ]; then | ||
59 | cp ${S}/${board}/u-boot.bin ${S}/${board}/${UBOOT_TARGET}.bin | ||
60 | else | ||
61 | ${STAGING_BINDIR_NATIVE}/boot_format \ | ||
62 | ${STAGING_DATADIR_NATIVE}/${BOOTFORMAT_CONFIG} \ | ||
63 | ${S}/${board}/u-boot.bin -spi ${S}/${board}/${UBOOT_TARGET}.bin | ||
64 | fi | ||
54 | fi | 65 | fi |
55 | done | 66 | done |
56 | } | 67 | } |