mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 1/5] lib: zstd: adopt Linux directory structure
Date: Wed, 13 Jul 2022 12:09:18 +0200	[thread overview]
Message-ID: <20220713100922.1880282-2-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20220713100922.1880282-1-a.fatoum@pengutronix.de>

In preparation for syncing with Linux, adopt Linux' current directory
layout to reduce the diff.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 lib/zstd/Makefile                          | 20 ++++++++++++++++----
 lib/zstd/{ => common}/entropy_common.c     |  0
 lib/zstd/{ => common}/fse_decompress.c     |  0
 lib/zstd/{ => common}/zstd_common.c        |  0
 lib/zstd/{ => decompress}/huf_decompress.c |  0
 5 files changed, 16 insertions(+), 4 deletions(-)
 rename lib/zstd/{ => common}/entropy_common.c (100%)
 rename lib/zstd/{ => common}/fse_decompress.c (100%)
 rename lib/zstd/{ => common}/zstd_common.c (100%)
 rename lib/zstd/{ => decompress}/huf_decompress.c (100%)

diff --git a/lib/zstd/Makefile b/lib/zstd/Makefile
index 4e8689a4855d..099c26c378f8 100644
--- a/lib/zstd/Makefile
+++ b/lib/zstd/Makefile
@@ -1,8 +1,20 @@
-# SPDX-License-Identifier: GPL-2.0-only
-
+# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
+# ################################################################
+# Copyright (c) Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under both the BSD-style license (found in the
+# LICENSE file in the root directory of this source tree) and the GPLv2 (found
+# in the COPYING file in the root directory of this source tree).
+# You may select, at your option, one of the above-listed licenses.
+# ################################################################
 obj-$(CONFIG_ZSTD_DECOMPRESS) += zstd_decompress.o
 
 ccflags-y += -O3
 
-zstd_decompress-y := huf_decompress.o decompress.o
-zstd_decompress-y += entropy_common.o fse_decompress.o zstd_common.o
+zstd_decompress-y := \
+		decompress.o \
+		common/entropy_common.o \
+		common/fse_decompress.o \
+		common/zstd_common.o \
+		decompress/huf_decompress.o
diff --git a/lib/zstd/entropy_common.c b/lib/zstd/common/entropy_common.c
similarity index 100%
rename from lib/zstd/entropy_common.c
rename to lib/zstd/common/entropy_common.c
diff --git a/lib/zstd/fse_decompress.c b/lib/zstd/common/fse_decompress.c
similarity index 100%
rename from lib/zstd/fse_decompress.c
rename to lib/zstd/common/fse_decompress.c
diff --git a/lib/zstd/zstd_common.c b/lib/zstd/common/zstd_common.c
similarity index 100%
rename from lib/zstd/zstd_common.c
rename to lib/zstd/common/zstd_common.c
diff --git a/lib/zstd/huf_decompress.c b/lib/zstd/decompress/huf_decompress.c
similarity index 100%
rename from lib/zstd/huf_decompress.c
rename to lib/zstd/decompress/huf_decompress.c
-- 
2.30.2




  reply	other threads:[~2022-07-13 10:10 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-13 10:09 [PATCH 0/5] lib: zstd: allow use in PBL and shell Ahmad Fatoum
2022-07-13 10:09 ` Ahmad Fatoum [this message]
2022-07-13 10:09 ` [PATCH 2/5] lib: zstd: sync with Linux Ahmad Fatoum
2022-07-13 10:09 ` [PATCH 3/5] decompressor: define macros for non-PBL case as well Ahmad Fatoum
2022-07-13 10:09 ` [PATCH 4/5] ARM: cpu: uncompress: increase early malloc pool to 256K Ahmad Fatoum
2022-07-13 10:09 ` [PATCH 5/5] lib: uncompress: add general zstd support Ahmad Fatoum
2022-07-14  8:45   ` Sascha Hauer
2022-07-14  8:54     ` Ahmad Fatoum
2022-07-14  9:20       ` Sascha Hauer

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=20220713100922.1880282-2-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --subject='Re: [PATCH 1/5] lib: zstd: adopt Linux directory structure' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox