From e9899d52ade2181bd97dcf79bec64650e8b0f718 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sun, 11 Dec 2011 14:47:37 -0800 Subject: u-boot: renamed dir from uboot to the more appropriate u-boot recipe dirs normally have the name of the (main) package and the official name is u-boot Signed-off-by: Frans Meulenbroeks Signed-off-by: Richard Purdie --- ...Drop-config.h-include-in-tools-imximage.h.patch | 39 ---------- ...ove-LDSCRIPT-processing-to-the-top-level-.patch | 82 ---------------------- 2 files changed, 121 deletions(-) delete mode 100644 meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch delete mode 100644 meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch (limited to 'meta/recipes-bsp/uboot/u-boot-mkimage-2011.03') diff --git a/meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch b/meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch deleted file mode 100644 index 040583469..000000000 --- a/meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ce56e089ddb51dbd81bb2c86b1646d77447afe39 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lo=C3=AFc=20Minier?= -Date: Thu, 3 Feb 2011 15:07:01 +0100 -Subject: Drop config.h include in tools/imximage.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Accepted - -"make tools-all" should allow building tools such as mkimage and the new -imximage without any config, but imximage.c currently fails to build -with: -imximage.h:27:20: error: config.h: No such file or directory - -config.h is not needed in imximage.h nor in imximage.c, and imximage.h -is only included from imximage.c, so drop this include to fix the build. - -Signed-off-by: Loïc Minier ---- - tools/imximage.h | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/tools/imximage.h b/tools/imximage.h -index 38ca6be..d126a46 100644 ---- a/tools/imximage.h -+++ b/tools/imximage.h -@@ -24,8 +24,6 @@ - #ifndef _IMXIMAGE_H_ - #define _IMXIMAGE_H_ - --#include -- - #define MAX_HW_CFG_SIZE_V2 121 /* Max number of registers imx can set for v2 */ - #define MAX_HW_CFG_SIZE_V1 60 /* Max number of registers imx can set for v1 */ - #define APP_CODE_BARKER 0xB1 --- -1.7.4.4 - diff --git a/meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch b/meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch deleted file mode 100644 index 5729cd947..000000000 --- a/meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch +++ /dev/null @@ -1,82 +0,0 @@ -From fd1b50c5ff9c288040abf5e78815151327d32e0e Mon Sep 17 00:00:00 2001 -From: Ilya Yanok -Date: Mon, 20 Jun 2011 12:45:37 +0000 -Subject: config.mk: move LDSCRIPT processing to the top-level Makefile - -Upstream-Status: Accepted - -LDSCRIPT is used only from the top-level Makefile and only when the -system is configured so we can move LDSCRIPT and CONFIG_SYS_LDSCRIPT -related logic into the top level Makefile and under configured condition -to avoid errors when building tools from unconfigured tree. - -Signed-off-by: Ilya Yanok -Acked-by: Mike Frysinger ---- - Makefile | 30 ++++++++++++++++++++++++++++++ - config.mk | 8 -------- - 2 files changed, 30 insertions(+), 8 deletions(-) - -diff --git a/Makefile b/Makefile -index ece91ab..358c410 100644 ---- a/Makefile -+++ b/Makefile -@@ -163,6 +163,36 @@ endif - # load other configuration - include $(TOPDIR)/config.mk - -+# If board code explicitly specified LDSCRIPT or CONFIG_SYS_LDSCRIPT, use -+# that (or fail if absent). Otherwise, search for a linker script in a -+# standard location. -+ -+ifndef LDSCRIPT -+ #LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug -+ ifdef CONFIG_SYS_LDSCRIPT -+ # need to strip off double quotes -+ LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT)) -+ endif -+endif -+ -+ifndef LDSCRIPT -+ ifeq ($(CONFIG_NAND_U_BOOT),y) -+ LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds -+ ifeq ($(wildcard $(LDSCRIPT)),) -+ LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds -+ endif -+ endif -+ ifeq ($(wildcard $(LDSCRIPT)),) -+ LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds -+ endif -+ ifeq ($(wildcard $(LDSCRIPT)),) -+ LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot.lds -+ endif -+ ifeq ($(wildcard $(LDSCRIPT)),) -+$(error could not find linker script) -+ endif -+endif -+ - ######################################################################### - # U-Boot objects....order is important (i.e. start must be first) - -diff --git a/config.mk b/config.mk -index fa46ff1..59c4c93 100644 ---- a/config.mk -+++ b/config.mk -@@ -153,14 +153,6 @@ endif - RELFLAGS= $(PLATFORM_RELFLAGS) - DBGFLAGS= -g # -DDEBUG - OPTFLAGS= -Os #-fomit-frame-pointer --ifndef LDSCRIPT --#LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug --ifeq ($(CONFIG_NAND_U_BOOT),y) --LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds --else --LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds --endif --endif - OBJCFLAGS += --gap-fill=0xff - - gccincdir := $(shell $(CC) -print-file-name=include) --- -1.7.5.4 - -- cgit v1.2.3