linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Oliver O'Halloran <oohall@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Oliver O'Halloran <oohall@gmail.com>
Subject: [PATCH 2/5] powerpc/zImage: Don't build zlib object files
Date: Mon, 19 Mar 2018 16:14:00 +1100	[thread overview]
Message-ID: <20180319051403.23275-2-oohall@gmail.com> (raw)
In-Reply-To: <20180319051403.23275-1-oohall@gmail.com>

The required source files are directly #include`ed into
decompress.c when using gzip compression. Building the
separate .o files for the zlib sources isn't required
and can cause linker errors due to the symbols being
defined in decompress.o and the zlib .o files.

Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
---
You can stop throwing up now
---
 arch/powerpc/boot/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 26d5d2a5b8e9..f66b9dba99fd 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -108,7 +108,7 @@ $(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o epapr.o opal.o \
 src-wlib-y := string.S crt0.S stdio.c decompress.c main.c \
 		$(libfdt) libfdt-wrapper.c \
 		ns16550.c serial.c simple_alloc.c div64.S util.S \
-		elf_util.c $(zlib-y) devtree.c stdlib.c \
+		elf_util.c devtree.c stdlib.c \
 		oflib.c ofconsole.c cuboot.c
 
 src-wlib-$(CONFIG_PPC_MPC52XX) += mpc52xx-psc.c
-- 
2.9.5

  reply	other threads:[~2018-03-19  5:15 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-19  5:13 [PATCH 1/5] powerpc/zImage: Remove #ifdef in opal.c Oliver O'Halloran
2018-03-19  5:14 ` Oliver O'Halloran [this message]
2018-03-19  5:14 ` [PATCH 3/5] powerpc/zImage: Check compatible at driver init Oliver O'Halloran
2018-03-20  9:19   ` Michael Ellerman
2018-03-20 12:56     ` Oliver
2018-03-19  5:14 ` [PATCH 4/5] powerpc/zImage: Rework serial driver probing Oliver O'Halloran
2018-03-20  7:50   ` kbuild test robot
2018-03-20  8:04   ` kbuild test robot
2018-03-20  9:20   ` Michael Ellerman
2018-03-20 13:05     ` Oliver
2018-03-19  5:14 ` [PATCH 5/5] powerpc/zImage: Also check for stdout-path Oliver O'Halloran
2018-12-23 13:28   ` [5/5] " Michael Ellerman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180319051403.23275-2-oohall@gmail.com \
    --to=oohall@gmail.com \
    --cc=linuxppc-dev@lists.ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).