Skip to contentSkip to conversation

Kbuild: some trivial cleanups

PATCH New Masahiro Yamada 2 participants 7 messages Nov 28, 2014 – Dec 8, 2014

Subsystems (2)
Kbuild Library code
lore
Share & tools
lore

Masahiro Yamada

author
#0 lore raw

cover Kbuild: some trivial cleanups

Masahiro Yamada (3):
lib: bzip2: move bzip2 files to lib/bzip2/ directory
libfdt: descend from lib/ to lib/libfdt/
libfdt: move CONFIG_OF_LIBFDT and CONFIG_FIT to lib/Makefile

 Makefile                           | 1 -
 lib/Makefile                       | 8 +++-----
 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
 lib/libfdt/Makefile                | 5 +----
 10 files changed, 6 insertions(+), 10 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%)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/3 lib: bzip2: move bzip2 files to lib/bzip2/ directory

Signed-off-by Masahiro Yamada <[email protected]>

---

 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%)
lib/Makefile +1 -5
index 320197a..09b011f 100644
@@ -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
lib/bzip2/Makefile new file +2 -0
new file mode 100644
index 0000000..929c24e
@@ -0,0 +1,2 @@
+obj-y += bzlib.o bzlib_crctable.o bzlib_decompress.o \
+	bzlib_randtable.o bzlib_huffman.o
lib/bzip2/bzlib.c renamed from lib/bzlib.c +0 -0
similarity index 100%
rename from lib/bzlib.c
rename to lib/bzip2/bzlib.c
lib/bzip2/bzlib_crctable.c renamed from lib/bzlib_crctable.c +0 -0
similarity index 100%
rename from lib/bzlib_crctable.c
rename to lib/bzip2/bzlib_crctable.c
lib/bzip2/bzlib_decompress.c renamed from lib/bzlib_decompress.c +0 -0
similarity index 100%
rename from lib/bzlib_decompress.c
rename to lib/bzip2/bzlib_decompress.c
lib/bzip2/bzlib_huffman.c renamed from lib/bzlib_huffman.c +0 -0
similarity index 100%
rename from lib/bzlib_huffman.c
rename to lib/bzip2/bzlib_huffman.c
lib/bzip2/bzlib_private.h renamed from lib/bzlib_private.h +0 -0
similarity index 100%
rename from lib/bzlib_private.h
rename to lib/bzip2/bzlib_private.h
lib/bzip2/bzlib_randtable.c renamed from lib/bzlib_randtable.c +0 -0
similarity index 100%
rename from lib/bzlib_randtable.c
rename to lib/bzip2/bzlib_randtable.c
Signature · 1 line
1.9.1
#2 lore raw

PATCH 1/3 lib: bzip2: move bzip2 files to lib/bzip2/ directory

Quoted 1 line · Masahiro Yamada
Signed-off-by Masahiro Yamada <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141208/18b30cee/attachment-0001.pgp>
author
#3 lore raw

PATCH 2/3 libfdt: descend from lib/ to lib/libfdt/

In reply to Masahiro Yamada
Signed-off-by Masahiro Yamada <[email protected]>

---

 Makefile     | 1 -
 lib/Makefile | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
Makefile +0 -1
index 79cb45c..e91c4a4 100644
@@ -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/
lib/Makefile +1 -0
index 09b011f..e8635ef 100644
@@ -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
Signature · 1 line
1.9.1
#4 lore raw

PATCH 2/3 libfdt: descend from lib/ to lib/libfdt/

Quoted 1 line · Masahiro Yamada
Signed-off-by Masahiro Yamada <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141208/ec91018c/attachment-0001.pgp>
author
#5 lore raw

PATCH 3/3 libfdt: move CONFIG_OF_LIBFDT and CONFIG_FIT to lib/Makefile

In reply to Masahiro Yamada
Signed-off-by Masahiro Yamada <[email protected]>

---

 lib/Makefile        | 3 ++-
 lib/libfdt/Makefile | 5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)
lib/Makefile +2 -1
index e8635ef..3ceb697 100644
@@ -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
lib/libfdt/Makefile +1 -4
index 6fe79e0..2f5413f 100644
@@ -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)
Signature · 1 line
1.9.1
#6 lore raw

PATCH 3/3 libfdt: move CONFIG_OF_LIBFDT and CONFIG_FIT to lib/Makefile

Quoted 1 line · Masahiro Yamada
Signed-off-by Masahiro Yamada <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141208/4bf2b5c5/attachment-0001.pgp>