Dear Mike Frysinger,
In message <1302301410-1135-1-git-send-email-vap...@gentoo.org> you wrote:
> While looking to upgrade to zlib-1.2.5, the current mondo merge of
> multiple files into a single was making things way more difficult
> than it should have been. Hard to pick out what has been changed
> to port it to U-Boot, been removed as useless, and bug fixes added
> after the fact.
>
> So split the single file up into the original file names, and merge
> non-essential changes back from the original tree (for some reason,
> style in code in a bunch of places was changed to U-Boot style even
> though this isn't "U-Boot" code).
>
> The original build style is retained -- we have a single zlib.c that
> includes all the other files, and that is the only file we compile.
>
> Signed-off-by: Mike Frysinger <vap...@gentoo.org>
> ---
> Makefile | 1 +
> lib/Makefile | 1 -
> lib/zlib.c | 2218
> ---------------------------------------------------
> lib/zlib/Makefile | 44 +
> lib/zlib/adler32.c | 125 +++
> lib/zlib/inffast.c | 349 ++++++++
> lib/zlib/inffast.h | 11 +
> lib/zlib/inffixed.h | 94 +++
> lib/zlib/inflate.c | 956 ++++++++++++++++++++++
> lib/zlib/inflate.h | 115 +++
> lib/zlib/inftrees.c | 329 ++++++++
> lib/zlib/inftrees.h | 55 ++
> lib/zlib/zlib.c | 24 +
> lib/zlib/zlib.h | 20 +
> lib/zlib/zutil.c | 73 ++
> lib/zlib/zutil.h | 121 +++
> 16 files changed, 2317 insertions(+), 2219 deletions(-)
> delete mode 100644 lib/zlib.c
> create mode 100644 lib/zlib/Makefile
> create mode 100644 lib/zlib/adler32.c
> create mode 100644 lib/zlib/inffast.c
> create mode 100644 lib/zlib/inffast.h
> create mode 100644 lib/zlib/inffixed.h
> create mode 100644 lib/zlib/inflate.c
> create mode 100644 lib/zlib/inflate.h
> create mode 100644 lib/zlib/inftrees.c
> create mode 100644 lib/zlib/inftrees.h
> create mode 100644 lib/zlib/zlib.c
> create mode 100644 lib/zlib/zlib.h
> create mode 100644 lib/zlib/zutil.c
> create mode 100644 lib/zlib/zutil.h
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de
I have yet to add the ESP-driver to the kernel to read the mind of
the user... - Linus Torvalds in
<pine.lnx.3.91.960426110644.24860i-100...@linux.cs.helsinki.fi>
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
