diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-12-10 19:44:45 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-12-10 19:44:45 +0100 |
| commit | 1a46257cf80f9a51910229afc1d9d4ea28d81b51 (patch) | |
| tree | d88b88d7837d019fea40fbd7a8579a995e17305f | |
| parent | 0bd0ee471bc0fe80112dff49578baa3bee9edb99 (diff) | |
barebox: update to 2017.11.0, fix x86 builds
| -rw-r--r-- | package/barebox/Makefile | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/package/barebox/Makefile b/package/barebox/Makefile index 7cc4796c8..cb5f774bb 100644 --- a/package/barebox/Makefile +++ b/package/barebox/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= barebox -PKG_VERSION:= 2017.02.0 +PKG_VERSION:= 2017.11.0 PKG_RELEASE:= 1 -PKG_HASH:= d65d864fe598d61ed9c6712e32d50742e6996aae02acaae5955c3b22166344cb +PKG_HASH:= 7dff97dd94807fd7c0012fd9ddb8bc799a220e2b65e46dcc56724105a56feecc PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot PKG_BUILDDEP:= lzop-host @@ -24,6 +24,14 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual +BAREBOX_ARCH:= $(ADK_TARGET_ARCH) +ifeq ($(ADK_TARGET_ARCH_X86),y) +CONFIG:= efi_defconfig +endif +ifeq ($(ADK_TARGET_ARCH_X86_64),y) +CONFIG:= efi_defconfig +BAREBOX_ARCH:= x86 +endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_MIPS),y) CONFIG:= qemu-malta_defconfig endif @@ -32,12 +40,12 @@ CONFIG:= vexpress_ca9_defconfig endif do-configure: - (cd $(WRKBUILD) && $(MAKE) ARCH='$(ADK_TARGET_ARCH)' $(CONFIG)) + (cd $(WRKBUILD) && $(MAKE) ARCH=$(BAREBOX_ARCH) $(CONFIG)) do-build: (cd $(WRKBUILD) && env \ PATH='$(HOST_PATH)' \ - ARCH='$(ADK_TARGET_ARCH)' \ + ARCH=$(BAREBOX_ARCH) \ CROSS_COMPILE='$(TARGET_CROSS)' \ $(MAKE)) |