diff options
| -rw-r--r-- | package/u-boot/Makefile | 5 | ||||
| -rw-r--r-- | package/u-boot/patches/patch-common_image_c | 10 | ||||
| -rw-r--r-- | package/u-boot/patches/patch-include_image_h | 10 | ||||
| -rw-r--r-- | target/config/Config.in.tools | 4 | ||||
| -rw-r--r-- | target/xtensa/systems/qemu-xtensa | 1 |
5 files changed, 28 insertions, 2 deletions
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index d6b467a97..6107847a3 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= u-boot PKG_VERSION:= d8bec60c1b0de7770f9b56ad092ab9be801d99af PKG_RELEASE:= 1 -PKG_HASH:= f04993a54863849c123107509ebff5360c17fe04d3ca86242ae08b577653d415 +PKG_HASH:= 21108ec5accf0737859834f051aef02d26163e0c0b41da265ea8f64e4af17a5e PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot PKG_URL:= http://www.denx.de/wiki/U-Boot @@ -30,7 +30,8 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual host-build: - (cd $(WRKBUILD) && $(MAKE) $(CONFIG)) + (cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \ + $(HOST_MAKE_FLAGS) sandbox_defconfig ) (cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \ $(HOST_MAKE_FLAGS) tools $(MAKE_TRACE) ) diff --git a/package/u-boot/patches/patch-common_image_c b/package/u-boot/patches/patch-common_image_c new file mode 100644 index 000000000..07a5f106b --- /dev/null +++ b/package/u-boot/patches/patch-common_image_c @@ -0,0 +1,10 @@ +--- u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af.orig/common/image.c 2014-12-31 15:12:25.000000000 -0600 ++++ u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af/common/image.c 2015-01-02 03:10:44.486002312 -0600 +@@ -86,6 +86,7 @@ static const table_entry_t uimage_arch[] + { IH_ARCH_ARM64, "arm64", "AArch64", }, + { IH_ARCH_ARC, "arc", "ARC", }, + { IH_ARCH_X86_64, "x86_64", "AMD x86_64", }, ++ { 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 new file mode 100644 index 000000000..1f6eec416 --- /dev/null +++ b/package/u-boot/patches/patch-include_image_h @@ -0,0 +1,10 @@ +--- u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af.orig/include/image.h 2014-12-31 15:12:25.000000000 -0600 ++++ u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af/include/image.h 2015-01-02 03:11:36.078001840 -0600 +@@ -180,6 +180,7 @@ struct lmb; + #define IH_ARCH_ARM64 22 /* ARM64 */ + #define IH_ARCH_ARC 23 /* Synopsys DesignWare ARC */ + #define IH_ARCH_X86_64 24 /* AMD x86_64, Intel and Via */ ++#define IH_ARCH_XTENSA 25 /* Xtensa */ + + /* + * Image Types diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index cfd002ffd..04d8ff949 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -61,6 +61,10 @@ config ADK_HOST_BUILD_GREP boolean default n +config ADK_HOST_BUILD_U_BOOT + boolean + default n + config ADK_HOST_BUILD_PATCH boolean default n diff --git a/target/xtensa/systems/qemu-xtensa b/target/xtensa/systems/qemu-xtensa index d7b3501d3..0aa01576b 100644 --- a/target/xtensa/systems/qemu-xtensa +++ b/target/xtensa/systems/qemu-xtensa @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_QEMU_XTENSA select ADK_qemu_xtensa select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE + select ADK_HOST_BUILD_U_BOOT help Support for Qemu Emulator XTENSA architecture. |