diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-06-21 22:38:30 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-21 22:38:30 +0300 |
commit | d8cd888a0e5142e1540d50f5c69805b2279a8b36 (patch) | |
tree | a8038d990bb08807c9baa857f75cd1f572ddd138 | |
parent | ed883a5d560d5c034925160458b3b5395a583d32 (diff) | |
parent | 642b5f47ab8399d5aa011bd939b92e8fa343e2e8 (diff) | |
download | openbmc-d8cd888a0e5142e1540d50f5c69805b2279a8b36.tar.xz |
Merge pull request #402 from bradbishop/pflash-build
Add pflash parallel build fix patch
2 files changed, 29 insertions, 0 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/pflash/pflash.bb b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/pflash/pflash.bb index 496e900e7c..ec43b4f62a 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/pflash/pflash.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/pflash/pflash.bb @@ -11,6 +11,7 @@ SRC_URI += "file://0003-external-Fix-pflash-install-target.patch" SRC_URI += "file://0004-external-Remove-m64-from-shared-CFLAGS-on-ARM.patch" SRC_URI += "file://0005-external-Create-shared-rules.mk.patch" SRC_URI += "file://0006-external-Add-dynamically-linked-pflash.patch" +SRC_URI += "file://0007-external-Fix-ARM-build-failure-with-parallel-make.patch" LIC_FILES_CHKSUM = "file://${S}/LICENCE;md5=3b83ef96387f14655fc854ddc3c6bd57" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/pflash/pflash/0007-external-Fix-ARM-build-failure-with-parallel-make.patch b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/pflash/pflash/0007-external-Fix-ARM-build-failure-with-parallel-make.patch new file mode 100644 index 0000000000..a9d219cde6 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/pflash/pflash/0007-external-Fix-ARM-build-failure-with-parallel-make.patch @@ -0,0 +1,28 @@ +From 55749b091414e0cf2691bd8f72c4cb48235b51c3 Mon Sep 17 00:00:00 2001 +From: Brad Bishop <bradleyb@fuzziesquirrel.com> +Date: Mon, 20 Jun 2016 20:31:07 -0400 +Subject: [PATCH] external: Fix ARM build failure with parallel make + +Arch headers need to be linked in before compiling. + +Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> +--- + external/common/rules.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/external/common/rules.mk b/external/common/rules.mk +index 5558cd3..bb12fd5 100644 +--- a/external/common/rules.mk ++++ b/external/common/rules.mk +@@ -67,7 +67,7 @@ arch_clean: + + $(ARCH_SRC): | common + +-$(ARCH_OBJS): common-%.o: common/%.c ++$(ARCH_OBJS): common-%.o: common/%.c $(ARCH_LINKS) + $(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + + common-arch_flash.o: $(ARCH_OBJS) +-- +1.8.3.1 + |