diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2013-09-04 21:39:11 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-10 16:02:23 +0100 |
| commit | 4acfbb1bb0dbe6ea4ab1388ca6bd63b47bd58211 (patch) | |
| tree | cc1efc51d2a5b1f960244d42b98354606003a92c | |
| parent | aae576c60b31783de0b072deabbc7fbdd0969ee2 (diff) | |
| download | poky-4acfbb1bb0dbe6ea4ab1388ca6bd63b47bd58211.tar.gz | |
u-boot, u-boot-fw-utils-cross, u-boot-mkimage: Upgrade to 2013.07
This upgrades the U-Boot based recipes for 2013.07 release.
This removes the 2011.03, 2011.06 and 2013.01.01 versions so we keep a
single one in core. The following recipes has been upgraded:
- u-boot (remove old versions)
- u-boot-mkimage (remove old versions)
- u-boot-fw-utils -> u-boot-fw-utils-cross (renamed and reworked)
The u-boot-fw-utils-cross recipe has been reworked as it uses the
UBOOT_MACHINE to find default environment for use so it is indeed a
cross binary and not a native one.
(From OE-Core rev: c5fff5748e0aaf7e135fdd464c2104b1d3cbfd5a)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
15 files changed, 47 insertions, 504 deletions
diff --git a/meta/recipes-bsp/u-boot/files/fix-arm920t-eabi.patch b/meta/recipes-bsp/u-boot/files/fix-arm920t-eabi.patch deleted file mode 100644 index d61444231c..0000000000 --- a/meta/recipes-bsp/u-boot/files/fix-arm920t-eabi.patch +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | Upstream-Status: Inappropriate [configuration] | ||
| 2 | |||
| 3 | --- | ||
| 4 | cpu/arm920t/config.mk | 4 ++-- | ||
| 5 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 6 | |||
| 7 | --- u-boot-1.3.2.orig/cpu/arm920t/config.mk | ||
| 8 | +++ u-boot-1.3.2/cpu/arm920t/config.mk | ||
| 9 | @@ -22,13 +22,13 @@ | ||
| 10 | # | ||
| 11 | |||
| 12 | PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 \ | ||
| 13 | -msoft-float | ||
| 14 | |||
| 15 | -PLATFORM_CPPFLAGS += -march=armv4 | ||
| 16 | +#PLATFORM_CPPFLAGS += -march=armv4 | ||
| 17 | # ========================================================================= | ||
| 18 | # | ||
| 19 | # Supply options according to compiler version | ||
| 20 | # | ||
| 21 | # ========================================================================= | ||
| 22 | -PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) | ||
| 23 | +PLATFORM_CPPFLAGS +=$(call cc-option) | ||
| 24 | PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) | ||
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb new file mode 100644 index 0000000000..7f649caac3 --- /dev/null +++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2013.07.bb | |||
| @@ -0,0 +1,38 @@ | |||
| 1 | DESCRIPTION = "U-boot bootloader fw_printenv/setenv utils" | ||
| 2 | LICENSE = "GPLv2+" | ||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" | ||
| 4 | SECTION = "bootloader" | ||
| 5 | DEPENDS = "mtd-utils" | ||
| 6 | |||
| 7 | # This revision corresponds to the tag "v2013.07" | ||
| 8 | # We use the revision in order to avoid having to fetch it from the | ||
| 9 | # repo during parse | ||
| 10 | SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c" | ||
| 11 | |||
| 12 | PV = "v2013.07+git${SRCPV}" | ||
| 13 | |||
| 14 | SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" | ||
| 15 | |||
| 16 | S = "${WORKDIR}/git" | ||
| 17 | |||
| 18 | inherit cross | ||
| 19 | |||
| 20 | EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"' | ||
| 21 | |||
| 22 | do_compile () { | ||
| 23 | oe_runmake ${UBOOT_MACHINE} | ||
| 24 | oe_runmake env | ||
| 25 | } | ||
| 26 | |||
| 27 | do_install () { | ||
| 28 | install -d ${D}${bindir_cross} | ||
| 29 | install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv | ||
| 30 | install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv | ||
| 31 | } | ||
| 32 | |||
| 33 | SYSROOT_PREPROCESS_FUNCS = "uboot_fw_utils_cross" | ||
| 34 | uboot_fw_utils_cross() { | ||
| 35 | sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross} | ||
| 36 | } | ||
| 37 | |||
| 38 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2011.06.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2011.06.bb deleted file mode 100644 index 7c4df1a4ec..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2011.06.bb +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | DESCRIPTION = "U-boot bootloader fw_printenv/setenv utils" | ||
| 2 | LICENSE = "GPLv2+" | ||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ | ||
| 4 | file://README;beginline=1;endline=22;md5=5ba4218ac89af7846802d0348df3fb90" | ||
| 5 | SECTION = "bootloader" | ||
| 6 | |||
| 7 | DEPENDS = "mtd-utils" | ||
| 8 | |||
| 9 | PR = "r1" | ||
| 10 | |||
| 11 | SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2" | ||
| 12 | |||
| 13 | SRC_URI[md5sum] = "0cc5026aad02f218a9b9ac56b301c97a" | ||
| 14 | SRC_URI[sha256sum] = "362ddb935885da98cf461eba08f31e3e59d0c4ada6cb2fa15596f43af310ba8b" | ||
| 15 | |||
| 16 | S = "${WORKDIR}/u-boot-${PV}" | ||
| 17 | |||
| 18 | EXTRA_OEMAKE = 'HOSTCC="${CC}"' | ||
| 19 | |||
| 20 | do_compile () { | ||
| 21 | oe_runmake env | ||
| 22 | } | ||
| 23 | |||
| 24 | do_install () { | ||
| 25 | install -d ${D}${base_sbindir} | ||
| 26 | install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv | ||
| 27 | install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv | ||
| 28 | } | ||
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.01.01.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.01.01.bb deleted file mode 100644 index e1c2d46cb0..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.01.01.bb +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | DESCRIPTION = "U-boot bootloader fw_printenv/setenv utils" | ||
| 2 | LICENSE = "GPLv2+" | ||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" | ||
| 4 | SECTION = "bootloader" | ||
| 5 | |||
| 6 | DEPENDS = "mtd-utils" | ||
| 7 | |||
| 8 | # This is needs to be validated among supported BSP's before we can | ||
| 9 | # make it default | ||
| 10 | DEFAULT_PREFERENCE = "-1" | ||
| 11 | |||
| 12 | # This revision corresponds to the tag "v2013.01.01" | ||
| 13 | # We use the revision in order to avoid having to fetch it from the | ||
| 14 | # repo during parse | ||
| 15 | SRCREV = "e8ae0fa5edd152b2b29c470b88429be4cdcd2c46" | ||
| 16 | |||
| 17 | PV = "v2013.01.01+git${SRCPV}" | ||
| 18 | |||
| 19 | SRC_URI = "git://git.denx.de/u-boot.git;branch=master" | ||
| 20 | |||
| 21 | S = "${WORKDIR}/git" | ||
| 22 | |||
| 23 | EXTRA_OEMAKE = 'HOSTCC="${CC}"' | ||
| 24 | |||
| 25 | do_compile () { | ||
| 26 | oe_runmake env | ||
| 27 | } | ||
| 28 | |||
| 29 | do_install () { | ||
| 30 | install -d ${D}${base_sbindir} | ||
| 31 | install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv | ||
| 32 | install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv | ||
| 33 | } | ||
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch b/meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch deleted file mode 100644 index 0405834698..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | From ce56e089ddb51dbd81bb2c86b1646d77447afe39 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <loic.minier@linaro.org> | ||
| 3 | Date: Thu, 3 Feb 2011 15:07:01 +0100 | ||
| 4 | Subject: Drop config.h include in tools/imximage.h | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | Upstream-Status: Accepted | ||
| 10 | |||
| 11 | "make tools-all" should allow building tools such as mkimage and the new | ||
| 12 | imximage without any config, but imximage.c currently fails to build | ||
| 13 | with: | ||
| 14 | imximage.h:27:20: error: config.h: No such file or directory | ||
| 15 | |||
| 16 | config.h is not needed in imximage.h nor in imximage.c, and imximage.h | ||
| 17 | is only included from imximage.c, so drop this include to fix the build. | ||
| 18 | |||
| 19 | Signed-off-by: Loïc Minier <loic.minier@linaro.org> | ||
| 20 | --- | ||
| 21 | tools/imximage.h | 2 -- | ||
| 22 | 1 files changed, 0 insertions(+), 2 deletions(-) | ||
| 23 | |||
| 24 | diff --git a/tools/imximage.h b/tools/imximage.h | ||
| 25 | index 38ca6be..d126a46 100644 | ||
| 26 | --- a/tools/imximage.h | ||
| 27 | +++ b/tools/imximage.h | ||
| 28 | @@ -24,8 +24,6 @@ | ||
| 29 | #ifndef _IMXIMAGE_H_ | ||
| 30 | #define _IMXIMAGE_H_ | ||
| 31 | |||
| 32 | -#include <config.h> | ||
| 33 | - | ||
| 34 | #define MAX_HW_CFG_SIZE_V2 121 /* Max number of registers imx can set for v2 */ | ||
| 35 | #define MAX_HW_CFG_SIZE_V1 60 /* Max number of registers imx can set for v1 */ | ||
| 36 | #define APP_CODE_BARKER 0xB1 | ||
| 37 | -- | ||
| 38 | 1.7.4.4 | ||
| 39 | |||
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch b/meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch deleted file mode 100644 index 5729cd9473..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch +++ /dev/null | |||
| @@ -1,82 +0,0 @@ | |||
| 1 | From fd1b50c5ff9c288040abf5e78815151327d32e0e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Ilya Yanok <yanok@emcraft.com> | ||
| 3 | Date: Mon, 20 Jun 2011 12:45:37 +0000 | ||
| 4 | Subject: config.mk: move LDSCRIPT processing to the top-level Makefile | ||
| 5 | |||
| 6 | Upstream-Status: Accepted | ||
| 7 | |||
| 8 | LDSCRIPT is used only from the top-level Makefile and only when the | ||
| 9 | system is configured so we can move LDSCRIPT and CONFIG_SYS_LDSCRIPT | ||
| 10 | related logic into the top level Makefile and under configured condition | ||
| 11 | to avoid errors when building tools from unconfigured tree. | ||
| 12 | |||
| 13 | Signed-off-by: Ilya Yanok <yanok@emcraft.com> | ||
| 14 | Acked-by: Mike Frysinger <vapier@gentoo.org> | ||
| 15 | --- | ||
| 16 | Makefile | 30 ++++++++++++++++++++++++++++++ | ||
| 17 | config.mk | 8 -------- | ||
| 18 | 2 files changed, 30 insertions(+), 8 deletions(-) | ||
| 19 | |||
| 20 | diff --git a/Makefile b/Makefile | ||
| 21 | index ece91ab..358c410 100644 | ||
| 22 | --- a/Makefile | ||
| 23 | +++ b/Makefile | ||
| 24 | @@ -163,6 +163,36 @@ endif | ||
| 25 | # load other configuration | ||
| 26 | include $(TOPDIR)/config.mk | ||
| 27 | |||
| 28 | +# If board code explicitly specified LDSCRIPT or CONFIG_SYS_LDSCRIPT, use | ||
| 29 | +# that (or fail if absent). Otherwise, search for a linker script in a | ||
| 30 | +# standard location. | ||
| 31 | + | ||
| 32 | +ifndef LDSCRIPT | ||
| 33 | + #LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug | ||
| 34 | + ifdef CONFIG_SYS_LDSCRIPT | ||
| 35 | + # need to strip off double quotes | ||
| 36 | + LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT)) | ||
| 37 | + endif | ||
| 38 | +endif | ||
| 39 | + | ||
| 40 | +ifndef LDSCRIPT | ||
| 41 | + ifeq ($(CONFIG_NAND_U_BOOT),y) | ||
| 42 | + LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds | ||
| 43 | + ifeq ($(wildcard $(LDSCRIPT)),) | ||
| 44 | + LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds | ||
| 45 | + endif | ||
| 46 | + endif | ||
| 47 | + ifeq ($(wildcard $(LDSCRIPT)),) | ||
| 48 | + LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds | ||
| 49 | + endif | ||
| 50 | + ifeq ($(wildcard $(LDSCRIPT)),) | ||
| 51 | + LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot.lds | ||
| 52 | + endif | ||
| 53 | + ifeq ($(wildcard $(LDSCRIPT)),) | ||
| 54 | +$(error could not find linker script) | ||
| 55 | + endif | ||
| 56 | +endif | ||
| 57 | + | ||
| 58 | ######################################################################### | ||
| 59 | # U-Boot objects....order is important (i.e. start must be first) | ||
| 60 | |||
| 61 | diff --git a/config.mk b/config.mk | ||
| 62 | index fa46ff1..59c4c93 100644 | ||
| 63 | --- a/config.mk | ||
| 64 | +++ b/config.mk | ||
| 65 | @@ -153,14 +153,6 @@ endif | ||
| 66 | RELFLAGS= $(PLATFORM_RELFLAGS) | ||
| 67 | DBGFLAGS= -g # -DDEBUG | ||
| 68 | OPTFLAGS= -Os #-fomit-frame-pointer | ||
| 69 | -ifndef LDSCRIPT | ||
| 70 | -#LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug | ||
| 71 | -ifeq ($(CONFIG_NAND_U_BOOT),y) | ||
| 72 | -LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds | ||
| 73 | -else | ||
| 74 | -LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds | ||
| 75 | -endif | ||
| 76 | -endif | ||
| 77 | OBJCFLAGS += --gap-fill=0xff | ||
| 78 | |||
| 79 | gccincdir := $(shell $(CC) -print-file-name=include) | ||
| 80 | -- | ||
| 81 | 1.7.5.4 | ||
| 82 | |||
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch b/meta/recipes-bsp/u-boot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch deleted file mode 100644 index 0405834698..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | From ce56e089ddb51dbd81bb2c86b1646d77447afe39 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <loic.minier@linaro.org> | ||
| 3 | Date: Thu, 3 Feb 2011 15:07:01 +0100 | ||
| 4 | Subject: Drop config.h include in tools/imximage.h | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | Upstream-Status: Accepted | ||
| 10 | |||
| 11 | "make tools-all" should allow building tools such as mkimage and the new | ||
| 12 | imximage without any config, but imximage.c currently fails to build | ||
| 13 | with: | ||
| 14 | imximage.h:27:20: error: config.h: No such file or directory | ||
| 15 | |||
| 16 | config.h is not needed in imximage.h nor in imximage.c, and imximage.h | ||
| 17 | is only included from imximage.c, so drop this include to fix the build. | ||
| 18 | |||
| 19 | Signed-off-by: Loïc Minier <loic.minier@linaro.org> | ||
| 20 | --- | ||
| 21 | tools/imximage.h | 2 -- | ||
| 22 | 1 files changed, 0 insertions(+), 2 deletions(-) | ||
| 23 | |||
| 24 | diff --git a/tools/imximage.h b/tools/imximage.h | ||
| 25 | index 38ca6be..d126a46 100644 | ||
| 26 | --- a/tools/imximage.h | ||
| 27 | +++ b/tools/imximage.h | ||
| 28 | @@ -24,8 +24,6 @@ | ||
| 29 | #ifndef _IMXIMAGE_H_ | ||
| 30 | #define _IMXIMAGE_H_ | ||
| 31 | |||
| 32 | -#include <config.h> | ||
| 33 | - | ||
| 34 | #define MAX_HW_CFG_SIZE_V2 121 /* Max number of registers imx can set for v2 */ | ||
| 35 | #define MAX_HW_CFG_SIZE_V1 60 /* Max number of registers imx can set for v1 */ | ||
| 36 | #define APP_CODE_BARKER 0xB1 | ||
| 37 | -- | ||
| 38 | 1.7.4.4 | ||
| 39 | |||
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch b/meta/recipes-bsp/u-boot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch deleted file mode 100644 index 5729cd9473..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch +++ /dev/null | |||
| @@ -1,82 +0,0 @@ | |||
| 1 | From fd1b50c5ff9c288040abf5e78815151327d32e0e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Ilya Yanok <yanok@emcraft.com> | ||
| 3 | Date: Mon, 20 Jun 2011 12:45:37 +0000 | ||
| 4 | Subject: config.mk: move LDSCRIPT processing to the top-level Makefile | ||
| 5 | |||
| 6 | Upstream-Status: Accepted | ||
| 7 | |||
| 8 | LDSCRIPT is used only from the top-level Makefile and only when the | ||
| 9 | system is configured so we can move LDSCRIPT and CONFIG_SYS_LDSCRIPT | ||
| 10 | related logic into the top level Makefile and under configured condition | ||
| 11 | to avoid errors when building tools from unconfigured tree. | ||
| 12 | |||
| 13 | Signed-off-by: Ilya Yanok <yanok@emcraft.com> | ||
| 14 | Acked-by: Mike Frysinger <vapier@gentoo.org> | ||
| 15 | --- | ||
| 16 | Makefile | 30 ++++++++++++++++++++++++++++++ | ||
| 17 | config.mk | 8 -------- | ||
| 18 | 2 files changed, 30 insertions(+), 8 deletions(-) | ||
| 19 | |||
| 20 | diff --git a/Makefile b/Makefile | ||
| 21 | index ece91ab..358c410 100644 | ||
| 22 | --- a/Makefile | ||
| 23 | +++ b/Makefile | ||
| 24 | @@ -163,6 +163,36 @@ endif | ||
| 25 | # load other configuration | ||
| 26 | include $(TOPDIR)/config.mk | ||
| 27 | |||
| 28 | +# If board code explicitly specified LDSCRIPT or CONFIG_SYS_LDSCRIPT, use | ||
| 29 | +# that (or fail if absent). Otherwise, search for a linker script in a | ||
| 30 | +# standard location. | ||
| 31 | + | ||
| 32 | +ifndef LDSCRIPT | ||
| 33 | + #LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug | ||
| 34 | + ifdef CONFIG_SYS_LDSCRIPT | ||
| 35 | + # need to strip off double quotes | ||
| 36 | + LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT)) | ||
| 37 | + endif | ||
| 38 | +endif | ||
| 39 | + | ||
| 40 | +ifndef LDSCRIPT | ||
| 41 | + ifeq ($(CONFIG_NAND_U_BOOT),y) | ||
| 42 | + LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds | ||
| 43 | + ifeq ($(wildcard $(LDSCRIPT)),) | ||
| 44 | + LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds | ||
| 45 | + endif | ||
| 46 | + endif | ||
| 47 | + ifeq ($(wildcard $(LDSCRIPT)),) | ||
| 48 | + LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds | ||
| 49 | + endif | ||
| 50 | + ifeq ($(wildcard $(LDSCRIPT)),) | ||
| 51 | + LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot.lds | ||
| 52 | + endif | ||
| 53 | + ifeq ($(wildcard $(LDSCRIPT)),) | ||
| 54 | +$(error could not find linker script) | ||
| 55 | + endif | ||
| 56 | +endif | ||
| 57 | + | ||
| 58 | ######################################################################### | ||
| 59 | # U-Boot objects....order is important (i.e. start must be first) | ||
| 60 | |||
| 61 | diff --git a/config.mk b/config.mk | ||
| 62 | index fa46ff1..59c4c93 100644 | ||
| 63 | --- a/config.mk | ||
| 64 | +++ b/config.mk | ||
| 65 | @@ -153,14 +153,6 @@ endif | ||
| 66 | RELFLAGS= $(PLATFORM_RELFLAGS) | ||
| 67 | DBGFLAGS= -g # -DDEBUG | ||
| 68 | OPTFLAGS= -Os #-fomit-frame-pointer | ||
| 69 | -ifndef LDSCRIPT | ||
| 70 | -#LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug | ||
| 71 | -ifeq ($(CONFIG_NAND_U_BOOT),y) | ||
| 72 | -LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds | ||
| 73 | -else | ||
| 74 | -LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds | ||
| 75 | -endif | ||
| 76 | -endif | ||
| 77 | OBJCFLAGS += --gap-fill=0xff | ||
| 78 | |||
| 79 | gccincdir := $(shell $(CC) -print-file-name=include) | ||
| 80 | -- | ||
| 81 | 1.7.5.4 | ||
| 82 | |||
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2011.03.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2011.03.bb deleted file mode 100644 index 34bae8e3e7..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2011.03.bb +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | DESCRIPTION = "U-boot bootloader mkimage tool" | ||
| 2 | LICENSE = "GPLv2+" | ||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ | ||
| 4 | file://README;beginline=1;endline=22;md5=3a00ef51d3fc96e9d6c1bc4708ccd3b5" | ||
| 5 | SECTION = "bootloader" | ||
| 6 | |||
| 7 | PR = "r1" | ||
| 8 | |||
| 9 | SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \ | ||
| 10 | file://0001-Drop-config.h-include-in-tools-imximage.h.patch \ | ||
| 11 | file://0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch" | ||
| 12 | |||
| 13 | SRC_URI[md5sum] = "91d02124c94368557d0e9ac05fb8c33f" | ||
| 14 | SRC_URI[sha256sum] = "08677f66d8d4ee542f6599f580cdffdf730544e1803f9d3739117d6f6d68083e" | ||
| 15 | |||
| 16 | S = "${WORKDIR}/u-boot-${PV}" | ||
| 17 | |||
| 18 | BBCLASSEXTEND = "native nativesdk" | ||
| 19 | |||
| 20 | EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTLD="${LD}" HOSTSTRIP=true' | ||
| 21 | |||
| 22 | do_compile () { | ||
| 23 | oe_runmake tools | ||
| 24 | } | ||
| 25 | |||
| 26 | do_install () { | ||
| 27 | install -d ${D}${bindir} | ||
| 28 | install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage | ||
| 29 | ln -sf uboot-mkimage ${D}${bindir}/mkimage | ||
| 30 | } | ||
| 31 | |||
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2011.06.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2011.06.bb deleted file mode 100644 index 3ca0c2cfcb..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2011.06.bb +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | DESCRIPTION = "U-boot bootloader mkimage tool" | ||
| 2 | LICENSE = "GPLv2+" | ||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ | ||
| 4 | file://README;beginline=1;endline=22;md5=5ba4218ac89af7846802d0348df3fb90" | ||
| 5 | SECTION = "bootloader" | ||
| 6 | |||
| 7 | PR = "r0" | ||
| 8 | |||
| 9 | SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2" | ||
| 10 | |||
| 11 | SRC_URI[md5sum] = "0cc5026aad02f218a9b9ac56b301c97a" | ||
| 12 | SRC_URI[sha256sum] = "362ddb935885da98cf461eba08f31e3e59d0c4ada6cb2fa15596f43af310ba8b" | ||
| 13 | |||
| 14 | S = "${WORKDIR}/u-boot-${PV}" | ||
| 15 | |||
| 16 | BBCLASSEXTEND = "native nativesdk" | ||
| 17 | |||
| 18 | EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTLD="${LD}" HOSTLDFLAGS="${LDFLAGS}" HOSTSTRIP=true' | ||
| 19 | |||
| 20 | do_compile () { | ||
| 21 | oe_runmake tools | ||
| 22 | } | ||
| 23 | |||
| 24 | do_install () { | ||
| 25 | install -d ${D}${bindir} | ||
| 26 | install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage | ||
| 27 | ln -sf uboot-mkimage ${D}${bindir}/mkimage | ||
| 28 | } | ||
| 29 | |||
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2013.01.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2013.01.01.bb deleted file mode 100644 index dc6e2f6fac..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2013.01.01.bb +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | DESCRIPTION = "U-boot bootloader mkimage tool" | ||
| 2 | LICENSE = "GPLv2+" | ||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" | ||
| 4 | SECTION = "bootloader" | ||
| 5 | |||
| 6 | # This is needs to be validated among supported BSP's before we can | ||
| 7 | # make it default | ||
| 8 | DEFAULT_PREFERENCE = "-1" | ||
| 9 | |||
| 10 | # This revision corresponds to the tag "v2013.01.01" | ||
| 11 | # We use the revision in order to avoid having to fetch it from the | ||
| 12 | # repo during parse | ||
| 13 | SRCREV = "e8ae0fa5edd152b2b29c470b88429be4cdcd2c46" | ||
| 14 | |||
| 15 | PV = "v2013.01.01+git${SRCPV}" | ||
| 16 | |||
| 17 | SRC_URI = "git://git.denx.de/u-boot.git;branch=master" | ||
| 18 | |||
| 19 | S = "${WORKDIR}/git" | ||
| 20 | |||
| 21 | EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTLD="${LD}" HOSTLDFLAGS="${LDFLAGS}" HOSTSTRIP=true' | ||
| 22 | |||
| 23 | do_compile () { | ||
| 24 | oe_runmake tools | ||
| 25 | } | ||
| 26 | |||
| 27 | do_install () { | ||
| 28 | install -d ${D}${bindir} | ||
| 29 | install -m 0755 tools/mkimage ${D}${bindir}/uboot-mkimage | ||
| 30 | ln -sf uboot-mkimage ${D}${bindir}/mkimage | ||
| 31 | } | ||
| 32 | |||
| 33 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb index 0108e0059f..a1b1db9555 100644 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb +++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb | |||
| @@ -1,17 +1,18 @@ | |||
| 1 | DESCRIPTION = "U-boot bootloader mkimage tool" | 1 | DESCRIPTION = "U-boot bootloader mkimage tool" |
| 2 | LICENSE = "GPLv2+" | 2 | LICENSE = "GPLv2+" |
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" |
| 4 | file://README;beginline=1;endline=22;md5=78b195c11cb6ef63e6985140db7d7bab" | ||
| 5 | SECTION = "bootloader" | 4 | SECTION = "bootloader" |
| 6 | 5 | ||
| 7 | SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2" | 6 | # This revision corresponds to the tag "v2013.07" |
| 7 | # We use the revision in order to avoid having to fetch it from the | ||
| 8 | # repo during parse | ||
| 9 | SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c" | ||
| 8 | 10 | ||
| 9 | SRC_URI[md5sum] = "8445162690052e6afd4b8f87af2bb557" | 11 | PV = "v2013.07+git${SRCPV}" |
| 10 | SRC_URI[sha256sum] = "2bbd440c1b29928d230604eac372fda5152d3ae23f52b1910c77fc5bf531250b" | ||
| 11 | 12 | ||
| 12 | S = "${WORKDIR}/u-boot-${PV}" | 13 | SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" |
| 13 | 14 | ||
| 14 | BBCLASSEXTEND = "native nativesdk" | 15 | S = "${WORKDIR}/git" |
| 15 | 16 | ||
| 16 | EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTLD="${LD}" HOSTLDFLAGS="${LDFLAGS}" HOSTSTRIP=true' | 17 | EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTLD="${LD}" HOSTLDFLAGS="${LDFLAGS}" HOSTSTRIP=true' |
| 17 | 18 | ||
| @@ -25,3 +26,4 @@ do_install () { | |||
| 25 | ln -sf uboot-mkimage ${D}${bindir}/mkimage | 26 | ln -sf uboot-mkimage ${D}${bindir}/mkimage |
| 26 | } | 27 | } |
| 27 | 28 | ||
| 29 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-bsp/u-boot/u-boot_2011.03.bb b/meta/recipes-bsp/u-boot/u-boot_2011.03.bb deleted file mode 100644 index 0b8651a9d8..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot_2011.03.bb +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | require u-boot.inc | ||
| 2 | |||
| 3 | # To build u-boot for your machine, provide the following lines in your machine | ||
| 4 | # config, replacing the assignments as appropriate for your machine. | ||
| 5 | # UBOOT_MACHINE = "omap3_beagle_config" | ||
| 6 | # UBOOT_ENTRYPOINT = "0x80008000" | ||
| 7 | # UBOOT_LOADADDRESS = "0x80008000" | ||
| 8 | |||
| 9 | LICENSE = "GPLv2+" | ||
| 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ | ||
| 11 | file://README;beginline=1;endline=22;md5=3a00ef51d3fc96e9d6c1bc4708ccd3b5" | ||
| 12 | |||
| 13 | # This revision corresponds to the tag "v2011.03" | ||
| 14 | # We use the revision in order to avoid having to fetch it from the repo during parse | ||
| 15 | SRCREV = "19b54a701811220221fc4d5089a2bb18892018ca" | ||
| 16 | |||
| 17 | PV = "v2011.03+git${SRCPV}" | ||
| 18 | PR = "r8" | ||
| 19 | |||
| 20 | SRC_URI = "git://git.denx.de/u-boot.git;branch=master" | ||
| 21 | |||
| 22 | S = "${WORKDIR}/git" | ||
| 23 | |||
| 24 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
diff --git a/meta/recipes-bsp/u-boot/u-boot_2011.06.bb b/meta/recipes-bsp/u-boot/u-boot_2011.06.bb deleted file mode 100644 index 4eb00a24ae..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot_2011.06.bb +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | require u-boot.inc | ||
| 2 | |||
| 3 | # To build u-boot for your machine, provide the following lines in your machine | ||
| 4 | # config, replacing the assignments as appropriate for your machine. | ||
| 5 | # UBOOT_MACHINE = "omap3_beagle_config" | ||
| 6 | # UBOOT_ENTRYPOINT = "0x80008000" | ||
| 7 | # UBOOT_LOADADDRESS = "0x80008000" | ||
| 8 | |||
| 9 | LICENSE = "GPLv2+" | ||
| 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ | ||
| 11 | file://README;beginline=1;endline=22;md5=5ba4218ac89af7846802d0348df3fb90" | ||
| 12 | |||
| 13 | # This revision corresponds to the tag "v2011.06" | ||
| 14 | # We use the revision in order to avoid having to fetch it from the repo during parse | ||
| 15 | SRCREV = "b1af6f532e0d348b153d5c148369229d24af361a" | ||
| 16 | |||
| 17 | PV = "v2011.06+git${SRCPV}" | ||
| 18 | PR = "r3" | ||
| 19 | |||
| 20 | SRC_URI = "git://git.denx.de/u-boot.git;branch=master" | ||
| 21 | |||
| 22 | S = "${WORKDIR}/git" | ||
| 23 | |||
| 24 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
diff --git a/meta/recipes-bsp/u-boot/u-boot_2013.01.01.bb b/meta/recipes-bsp/u-boot/u-boot_2013.01.01.bb deleted file mode 100644 index 0876eb3c0a..0000000000 --- a/meta/recipes-bsp/u-boot/u-boot_2013.01.01.bb +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | require u-boot.inc | ||
| 2 | |||
| 3 | # This is needs to be validated among supported BSP's before we can | ||
| 4 | # make it default | ||
| 5 | DEFAULT_PREFERENCE = "-1" | ||
| 6 | |||
| 7 | # To build u-boot for your machine, provide the following lines in | ||
| 8 | # your machine config, replacing the assignments as appropriate for | ||
| 9 | # your machine. | ||
| 10 | # UBOOT_MACHINE = "omap3_beagle_config" | ||
| 11 | # UBOOT_ENTRYPOINT = "0x80008000" | ||
| 12 | # UBOOT_LOADADDRESS = "0x80008000" | ||
| 13 | |||
| 14 | LICENSE = "GPLv2+" | ||
| 15 | LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" | ||
| 16 | |||
| 17 | # This revision corresponds to the tag "v2013.01.01" | ||
| 18 | # We use the revision in order to avoid having to fetch it from the | ||
| 19 | # repo during parse | ||
| 20 | SRCREV = "e8ae0fa5edd152b2b29c470b88429be4cdcd2c46" | ||
| 21 | |||
| 22 | PV = "v2013.01.01+git${SRCPV}" | ||
| 23 | PR = "r0" | ||
| 24 | |||
| 25 | SRC_URI = "git://git.denx.de/u-boot.git;branch=master" | ||
| 26 | |||
| 27 | S = "${WORKDIR}/git" | ||
| 28 | |||
| 29 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
