In preparation for syncing with Linux, adopt Linux' current directory
layout to reduce the diff.
Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
---
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
