diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-12-27 13:59:29 -0600 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-12-27 13:59:29 -0600 |
commit | 55bade535d3fca53ff5ceb6e7e1f6ee7369b59fb (patch) | |
tree | 76548649280d5ef5818790cb456c7467dcaa3632 /package/u-boot/patches | |
parent | e88b2dabb69234dbfab57592faf9737a7cd226da (diff) |
update u-boot to latest git. make it compilable for raspberry-pi target
Diffstat (limited to 'package/u-boot/patches')
-rw-r--r-- | package/u-boot/patches/patch-Kbuild | 45 | ||||
-rw-r--r-- | package/u-boot/patches/patch-Makefile | 57 | ||||
-rw-r--r-- | package/u-boot/patches/patch-arch_arm_cpu_arm1176_config_mk | 8 | ||||
-rw-r--r-- | package/u-boot/patches/patch-common_image_c | 10 | ||||
-rw-r--r-- | package/u-boot/patches/patch-include_image_h | 10 |
5 files changed, 8 insertions, 122 deletions
diff --git a/package/u-boot/patches/patch-Kbuild b/package/u-boot/patches/patch-Kbuild deleted file mode 100644 index 7efe26e13..000000000 --- a/package/u-boot/patches/patch-Kbuild +++ /dev/null @@ -1,45 +0,0 @@ -Sometimes it is required to build only host U-Boot tools without building -U-Boot itself for either board. - -For example: - * In "buildroot" "uboot-tools" could be built for host just to have an ability - to create uImage. - * Linux distributions ship "mkimage" utility as a separate substance. - -This patch allows building host U-Boot tools separately from U-Boot itself and -what is more important user only needs to have host compiler (gcc). - -To build host tools just execute: -===== -make tools HOST_TOOLS_ONLY=yes -===== - -Without this patch to generate tools user needs: - 1. Configure any existing board with "make XXX_config" - 2. Execute tools building but still cross-compiler will be invoked and if - there's no proper cross-compiler in PATH compilation will fail. - -Signed-off-by: Alexey Brodkin <abrodkin at synopsys.com> - -Cc: Masahiro Yamada <yamada.m at jp.panasonic.com> -Cc: Tom Rini <trini at ti.com> -Cc: Simon Glass <sjg at chromium.org> - ---- u-boot-2014.07.orig/Kbuild 2014-07-14 19:16:45.000000000 +0200 -+++ u-boot-2014.07/Kbuild 2014-08-11 10:06:13.311946939 +0200 -@@ -4,6 +4,9 @@ - # 1) Generate generic-asm-offsets.h - # 2) Generate asm-offsets.h - -+# Don't execute target below if building host tools only -+ifneq ($(HOST_TOOLS_ONLY),yes) -+ - ##### - # 1) Generate generic-asm-offsets.h - -@@ -85,3 +88,5 @@ arch/$(ARCH)/lib/asm-offsets.s: arch/$(A - - $(obj)/$(offsets-file): arch/$(ARCH)/lib/asm-offsets.s Kbuild - $(call cmd,offsets) -+ -+endif diff --git a/package/u-boot/patches/patch-Makefile b/package/u-boot/patches/patch-Makefile deleted file mode 100644 index b2c069111..000000000 --- a/package/u-boot/patches/patch-Makefile +++ /dev/null @@ -1,57 +0,0 @@ -Sometimes it is required to build only host U-Boot tools without building -U-Boot itself for either board. - -For example: - * In "buildroot" "uboot-tools" could be built for host just to have an ability - to create uImage. - * Linux distributions ship "mkimage" utility as a separate substance. - -This patch allows building host U-Boot tools separately from U-Boot itself and -what is more important user only needs to have host compiler (gcc). - -To build host tools just execute: -===== -make tools HOST_TOOLS_ONLY=yes -===== - -Without this patch to generate tools user needs: - 1. Configure any existing board with "make XXX_config" - 2. Execute tools building but still cross-compiler will be invoked and if - there's no proper cross-compiler in PATH compilation will fail. - -Signed-off-by: Alexey Brodkin <abrodkin at synopsys.com> - -Cc: Masahiro Yamada <yamada.m at jp.panasonic.com> -Cc: Tom Rini <trini at ti.com> -Cc: Simon Glass <sjg at chromium.org> - ---- u-boot-2014.07.orig/Makefile 2014-07-14 19:16:45.000000000 +0200 -+++ u-boot-2014.07/Makefile 2014-08-11 10:06:13.315946952 +0200 -@@ -483,9 +483,12 @@ ifeq ($(dot-config),1) - # load other configuration - include $(srctree)/config.mk - -+# Don't check for config.mk presence if building host tools only -+ifneq ($(HOST_TOOLS_ONLY),yes) - ifeq ($(wildcard include/config.mk),) - $(error "System not configured - see README") - endif -+endif - - # If board code explicitly specified LDSCRIPT or CONFIG_SYS_LDSCRIPT, use - # that (or fail if absent). Otherwise, search for a linker script in a -@@ -1055,10 +1058,14 @@ ifeq ($(CONFIG_SYS_GENERIC_BOARD),y) - @/bin/false - endif - endif -+ -+# Don't check for ldscript presence if building host tools only -+ifneq ($(HOST_TOOLS_ONLY),yes) - ifeq ($(wildcard $(LDSCRIPT)),) - @echo >&2 " Could not find linker script." - @/bin/false - endif -+endif - - archprepare: prepare1 scripts_basic - diff --git a/package/u-boot/patches/patch-arch_arm_cpu_arm1176_config_mk b/package/u-boot/patches/patch-arch_arm_cpu_arm1176_config_mk new file mode 100644 index 000000000..8542e5290 --- /dev/null +++ b/package/u-boot/patches/patch-arch_arm_cpu_arm1176_config_mk @@ -0,0 +1,8 @@ +--- u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af.orig/arch/arm/cpu/arm1176/config.mk 2014-12-27 11:52:56.000000000 -0600 ++++ u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af/arch/arm/cpu/arm1176/config.mk 2014-12-27 12:27:09.407517499 -0600 +@@ -6,4 +6,4 @@ + # + + # Make ARMv5 to allow more compilers to work, even though its v6. +-PLATFORM_CPPFLAGS += -march=armv5t ++PLATFORM_CPPFLAGS += -march=armv6 diff --git a/package/u-boot/patches/patch-common_image_c b/package/u-boot/patches/patch-common_image_c deleted file mode 100644 index 6dc82212e..000000000 --- a/package/u-boot/patches/patch-common_image_c +++ /dev/null @@ -1,10 +0,0 @@ ---- u-boot-2014.07.orig/common/image.c 2014-07-14 19:16:45.000000000 +0200 -+++ u-boot-2014.07/common/image.c 2014-08-11 13:41:05.204369615 +0200 -@@ -85,6 +85,7 @@ static const table_entry_t uimage_arch[] - { IH_ARCH_SANDBOX, "sandbox", "Sandbox", }, - { IH_ARCH_ARM64, "arm64", "AArch64", }, - { IH_ARCH_ARC, "arc", "ARC", }, -+ { IH_ARCH_XTENSA, "xtensa", "XTENSA", }, - { -1, "", "", }, - }; - diff --git a/package/u-boot/patches/patch-include_image_h b/package/u-boot/patches/patch-include_image_h deleted file mode 100644 index 76b12b1ea..000000000 --- a/package/u-boot/patches/patch-include_image_h +++ /dev/null @@ -1,10 +0,0 @@ ---- u-boot-2014.07.orig/include/image.h 2014-07-14 19:16:45.000000000 +0200 -+++ u-boot-2014.07/include/image.h 2014-08-11 13:46:36.186486117 +0200 -@@ -173,6 +173,7 @@ struct lmb; - #define IH_ARCH_OPENRISC 21 /* OpenRISC 1000 */ - #define IH_ARCH_ARM64 22 /* ARM64 */ - #define IH_ARCH_ARC 23 /* Synopsys DesignWare ARC */ -+#define IH_ARCH_XTENSA 24 /* Xtensa */ - - /* - * Image Types |