Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com ---

lib/Makefile | 6 +----- lib/bzip2/Makefile | 2 ++ lib/{ => bzip2}/bzlib.c | 0 lib/{ => bzip2}/bzlib_crctable.c | 0 lib/{ => bzip2}/bzlib_decompress.c | 0 lib/{ => bzip2}/bzlib_huffman.c | 0 lib/{ => bzip2}/bzlib_private.h | 0 lib/{ => bzip2}/bzlib_randtable.c | 0 8 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 lib/bzip2/Makefile rename lib/{ => bzip2}/bzlib.c (100%) rename lib/{ => bzip2}/bzlib_crctable.c (100%) rename lib/{ => bzip2}/bzlib_decompress.c (100%) rename lib/{ => bzip2}/bzlib_huffman.c (100%) rename lib/{ => bzip2}/bzlib_private.h (100%) rename lib/{ => bzip2}/bzlib_randtable.c (100%)

diff --git a/lib/Makefile b/lib/Makefile index 320197a..09b011f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -11,14 +11,10 @@ obj-$(CONFIG_RSA) += rsa/ obj-$(CONFIG_LZMA) += lzma/ obj-$(CONFIG_LZO) += lzo/ obj-$(CONFIG_ZLIB) += zlib/ +obj-$(CONFIG_BZIP2) += bzip2/ obj-$(CONFIG_TIZEN) += tizen/

obj-$(CONFIG_AES) += aes.o -obj-$(CONFIG_BZIP2) += bzlib.o -obj-$(CONFIG_BZIP2) += bzlib_crctable.o -obj-$(CONFIG_BZIP2) += bzlib_decompress.o -obj-$(CONFIG_BZIP2) += bzlib_randtable.o -obj-$(CONFIG_BZIP2) += bzlib_huffman.o obj-$(CONFIG_USB_TTY) += circbuf.o obj-y += crc7.o obj-y += crc8.o diff --git a/lib/bzip2/Makefile b/lib/bzip2/Makefile new file mode 100644 index 0000000..929c24e --- /dev/null +++ b/lib/bzip2/Makefile @@ -0,0 +1,2 @@ +obj-y += bzlib.o bzlib_crctable.o bzlib_decompress.o \ + bzlib_randtable.o bzlib_huffman.o diff --git a/lib/bzlib.c b/lib/bzip2/bzlib.c similarity index 100% rename from lib/bzlib.c rename to lib/bzip2/bzlib.c diff --git a/lib/bzlib_crctable.c b/lib/bzip2/bzlib_crctable.c similarity index 100% rename from lib/bzlib_crctable.c rename to lib/bzip2/bzlib_crctable.c diff --git a/lib/bzlib_decompress.c b/lib/bzip2/bzlib_decompress.c similarity index 100% rename from lib/bzlib_decompress.c rename to lib/bzip2/bzlib_decompress.c diff --git a/lib/bzlib_huffman.c b/lib/bzip2/bzlib_huffman.c similarity index 100% rename from lib/bzlib_huffman.c rename to lib/bzip2/bzlib_huffman.c diff --git a/lib/bzlib_private.h b/lib/bzip2/bzlib_private.h similarity index 100% rename from lib/bzlib_private.h rename to lib/bzip2/bzlib_private.h diff --git a/lib/bzlib_randtable.c b/lib/bzip2/bzlib_randtable.c similarity index 100% rename from lib/bzlib_randtable.c rename to lib/bzip2/bzlib_randtable.c

Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com ---

Makefile | 1 - lib/Makefile | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile index 79cb45c..e91c4a4 100644 --- a/Makefile +++ b/Makefile @@ -645,7 +645,6 @@ libs-y += drivers/usb/musb-new/ libs-y += drivers/usb/phy/ libs-y += drivers/usb/ulpi/ libs-y += common/ -libs-y += lib/libfdt/ libs-$(CONFIG_API) += api/ libs-$(CONFIG_HAS_POST) += post/ libs-y += test/ diff --git a/lib/Makefile b/lib/Makefile index 09b011f..e8635ef 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -13,6 +13,7 @@ obj-$(CONFIG_LZO) += lzo/ obj-$(CONFIG_ZLIB) += zlib/ obj-$(CONFIG_BZIP2) += bzip2/ obj-$(CONFIG_TIZEN) += tizen/ +obj-y += libfdt/

obj-$(CONFIG_AES) += aes.o obj-$(CONFIG_USB_TTY) += circbuf.o

Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com ---

lib/Makefile | 3 ++- lib/libfdt/Makefile | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile index e8635ef..3ceb697 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -13,7 +13,8 @@ obj-$(CONFIG_LZO) += lzo/ obj-$(CONFIG_ZLIB) += zlib/ obj-$(CONFIG_BZIP2) += bzip2/ obj-$(CONFIG_TIZEN) += tizen/ -obj-y += libfdt/ +obj-$(CONFIG_OF_LIBFDT) += libfdt/ +obj-$(CONFIG_FIT) += libfdt/

obj-$(CONFIG_AES) += aes.o obj-$(CONFIG_USB_TTY) += circbuf.o diff --git a/lib/libfdt/Makefile b/lib/libfdt/Makefile index 6fe79e0..2f5413f 100644 --- a/lib/libfdt/Makefile +++ b/lib/libfdt/Makefile @@ -5,8 +5,5 @@ # SPDX-License-Identifier: GPL-2.0+ #

-COBJS-libfdt += fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_sw.o fdt_wip.o \ +obj-y += fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_sw.o fdt_wip.o \ fdt_empty_tree.o fdt_addresses.o - -obj-$(CONFIG_OF_LIBFDT) += $(COBJS-libfdt) -obj-$(CONFIG_FIT) += $(COBJS-libfdt)