diff options
| author | Sergey Lapin <slapin@ossfans.org> | 2010-03-22 22:25:05 +0300 |
|---|---|---|
| committer | Sergey Lapin <slapin@ossfans.org> | 2010-03-22 22:25:05 +0300 |
| commit | 2a04d3897d8c9f6410914d6d95331543d1061830 (patch) | |
| tree | eefc623a11cae9f0fa96326f776e826a70f56a8a /recipes/u-boot | |
| parent | 12784ca2ec5786be5303773874431f2464187a16 (diff) | |
| parent | 9e35f0c735a1c680d16ef20a9ccdf876ccaad69e (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/u-boot')
| -rw-r--r-- | recipes/u-boot/u-boot-mkimage-native_1.3.2.bb | 2 | ||||
| -rw-r--r-- | recipes/u-boot/u-boot.inc | 2 | ||||
| -rw-r--r-- | recipes/u-boot/u-boot_git.bb | 21 |
3 files changed, 22 insertions, 3 deletions
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" 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 +} |