From ce7314b9776757c1fffc9c60098f2c1ffd3e0b37 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 22 Mar 2010 11:53:03 -0400 Subject: u-boot: update LICENSE to more specific GPLv2 There are parts of U-Boot that are GPLv2 and GPLv2+ (version 2 or later) Also, U-Boot's author Wolfgang Denk is planning to switch to GPLv3+ Signed-off-by: Denys Dmytriyenko --- recipes/u-boot/u-boot-mkimage-native_1.3.2.bb | 2 +- recipes/u-boot/u-boot.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes/u-boot') diff --git a/recipes/u-boot/u-boot-mkimage-native_1.3.2.bb b/recipes/u-boot/u-boot-mkimage-native_1.3.2.bb index 3c210a099b..946f48569e 100644 --- a/recipes/u-boot/u-boot-mkimage-native_1.3.2.bb +++ b/recipes/u-boot/u-boot-mkimage-native_1.3.2.bb @@ -1,5 +1,5 @@ DESCRIPTION = "U-boot bootloader mkimage tool" -LICENSE = "GPL" +LICENSE = "GPLv2" SECTION = "bootloader" SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \ diff --git a/recipes/u-boot/u-boot.inc b/recipes/u-boot/u-boot.inc index 6fdbaac87f..24dcb2b966 100644 --- a/recipes/u-boot/u-boot.inc +++ b/recipes/u-boot/u-boot.inc @@ -2,7 +2,7 @@ DESCRIPTION = "U-Boot - the Universal Boot Loader" HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome" SECTION = "bootloaders" PRIORITY = "optional" -LICENSE = "GPL" +LICENSE = "GPLv2" PROVIDES = "virtual/bootloader" DEPENDS = "mtd-utils" -- cgit v1.2.3 From 5e90184edf906949d075026c213d771a10b4a0fe Mon Sep 17 00:00:00 2001 From: Adrian Alonso Date: Mon, 22 Mar 2010 07:24:53 +0000 Subject: u-boot_git.bb: add xilinx ml507 support * Based on xilinx official repos * If a hardware project dir is set in local.conf XILINX_BSP_PATH * it will over write xparameters header and append some canonical * definitions. It also install u-boot elf executable for bare metal * execution, early development stages. Signed-off-by: Adrian Alonso Signed-off-by: Stefan Schmidt --- recipes/u-boot/u-boot_git.bb | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'recipes/u-boot') diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index fb81caf183..928642dbbb 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -1,5 +1,5 @@ require u-boot.inc -PR ="r42" +PR ="r43" FILESPATHPKG =. "u-boot-git:" @@ -207,6 +207,9 @@ SRC_URI_append_c7x0 = "file://pdaXrom-u-boot.patch;patch=1 \ SRC_URI_sheevaplug = "git://git.denx.de/u-boot-marvell.git;protocol=git;branch=testing" SRCREV_sheevaplug = "119b9942da2e450d4e525fc004208dd7f7d062e0" +SRC_URI_xilinx-ml507 = "git://git.xilinx.com/u-boot-xlnx.git;protocol=git" +SRCREV_xilinx-ml507 = "26e999650cf77c16f33c580abaadab2532f5e8b2" + S = "${WORKDIR}/git" @@ -237,3 +240,19 @@ do_deploy_prepend_mini2440() { do_deploy_prepend_micro2440() { cp ${S}/u-boot-nand16k.bin ${S}/u-boot.bin } + +do_configure_prepend_xilinx-ml507() { +if [ -e "${XILINX_BSP_PATH}/ppc440_0/include/xparameters.h" ]; then + cp ${XILINX_BSP_PATH}/ppc440_0/include/xparameters.h \ + ${S}/board/xilinx/ml507 + echo "#define XPAR_PLB_CLOCK_FREQ_HZ XPAR_CPU_PPC440_MPLB_FREQ_HZ +#define XPAR_CORE_CLOCK_FREQ_HZ XPAR_CPU_PPC440_CORE_CLOCK_FREQ_HZ +#define XPAR_PCI_0_CLOCK_FREQ_HZ 0" >> ${S}/board/xilinx/ml507/xparameters.h +fi +} + +do_deploy_prepend_xilinx-ml507() { +if [ -d "${XILINX_BSP_PATH}" ]; then + install ${S}/u-boot ${XILINX_BSP_PATH} +fi +} -- cgit v1.2.3