diff --git a/Makefile b/Makefile
index de8a4cdba3f3962728fc7bd09f35f93e7c345830..0b70dcae40cd36323d1c4f045e839cef6b47e9a0 100644
--- a/Makefile
+++ b/Makefile
@@ -183,9 +183,9 @@ endif
 
 OBJS := $(addprefix $(obj),$(OBJS))
 
-LIBS  = lib_generic/libgeneric.a
-LIBS += lib_generic/lzma/liblzma.a
-LIBS += lib_generic/lzo/liblzo.a
+LIBS  = lib/libgeneric.a
+LIBS += lib/lzma/liblzma.a
+LIBS += lib/lzo/liblzo.a
 LIBS += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \
 	"board/$(VENDOR)/common/lib$(VENDOR).a"; fi)
 LIBS += $(CPUDIR)/lib$(CPU).a
diff --git a/README b/README
index dc2103fd4338e94fa976b97db8d3240b5117d9cf..e1d58bdf06cdea9bf054976c12f4cc5a0eedad24 100644
--- a/README
+++ b/README
@@ -185,7 +185,7 @@ Directory Hierarchy:
 - arch/arm/lib	Files generic to ARM	 architecture
 - arch/avr32/lib	Files generic to AVR32	 architecture
 - arch/blackfin/lib	Files generic to Blackfin architecture
-- lib_generic	Files generic to all	 architectures
+- lib	Files generic to all	 architectures
 - arch/i386/lib	Files generic to i386	 architecture
 - arch/m68k/lib	Files generic to m68k	 architecture
 - arch/microblaze/lib Files generic to microblaze architecture
diff --git a/board/BuS/EB+MCF-EV123/u-boot.lds b/board/BuS/EB+MCF-EV123/u-boot.lds
index 34507938fd010e0bb312e2b72f39dfe6d8c8e9e4..b05eacf1aca6803aead3ad0fbd9c5ee9d8b48b1f 100644
--- a/board/BuS/EB+MCF-EV123/u-boot.lds
+++ b/board/BuS/EB+MCF-EV123/u-boot.lds
@@ -57,10 +57,10 @@ SECTIONS
 
     cpu/mcf52x2/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/string.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o	(.text)
-    lib_generic/zlib.o	(.text)
+    lib/string.o	(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o	(.text)
+    lib/zlib.o	(.text)
 
 /*    . = env_offset; */
     common/env_embedded.o(.text)
diff --git a/board/LEOX/elpt860/u-boot.lds b/board/LEOX/elpt860/u-boot.lds
index 32778cacdaec336917d4e86fa627d489c7ca8d00..d3929ea89f1ceb5bb87e189138fb644e4c3ab4d2 100644
--- a/board/LEOX/elpt860/u-boot.lds
+++ b/board/LEOX/elpt860/u-boot.lds
@@ -67,10 +67,10 @@ SECTIONS
     cpu/mpc8xx/start.o			(.text)
     common/dlmalloc.o			(.text)
     arch/ppc/lib/ppcstring.o			(.text)
-    lib_generic/vsprintf.o		(.text)
-    lib_generic/crc32.o			(.text)
-    lib_generic/zlib.o			(.text)
-    lib_generic/string.o		(.text)
+    lib/vsprintf.o		(.text)
+    lib/crc32.o			(.text)
+    lib/zlib.o			(.text)
+    lib/string.o		(.text)
     arch/ppc/lib/cache.o			(.text)
     arch/ppc/lib/extable.o			(.text)
     arch/ppc/lib/time.o			(.text)
diff --git a/board/LEOX/elpt860/u-boot.lds.debug b/board/LEOX/elpt860/u-boot.lds.debug
index 5126083425d22a6e662614cd4d14f8ef41ba7d18..f6c21f745390fbc4d243cd88dbe5a9a8db9b25f6 100644
--- a/board/LEOX/elpt860/u-boot.lds.debug
+++ b/board/LEOX/elpt860/u-boot.lds.debug
@@ -66,8 +66,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o	(.text)
diff --git a/board/RPXClassic/u-boot.lds b/board/RPXClassic/u-boot.lds
index c354ff82834991558b4be4547c51593a57b971ec..09d9470f794324c35bb85a31fc9936960c840af1 100644
--- a/board/RPXClassic/u-boot.lds
+++ b/board/RPXClassic/u-boot.lds
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 /* XXX ?
     . = env_offset;
 */
diff --git a/board/RPXClassic/u-boot.lds.debug b/board/RPXClassic/u-boot.lds.debug
index a2d940f048973194841651ef288ee90b4a77db46..f559df71656bb6d2af028ec4bf268706916f1993 100644
--- a/board/RPXClassic/u-boot.lds.debug
+++ b/board/RPXClassic/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/RPXlite/u-boot.lds b/board/RPXlite/u-boot.lds
index c354ff82834991558b4be4547c51593a57b971ec..09d9470f794324c35bb85a31fc9936960c840af1 100644
--- a/board/RPXlite/u-boot.lds
+++ b/board/RPXlite/u-boot.lds
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 /* XXX ?
     . = env_offset;
 */
diff --git a/board/RPXlite/u-boot.lds.debug b/board/RPXlite/u-boot.lds.debug
index a2d940f048973194841651ef288ee90b4a77db46..f559df71656bb6d2af028ec4bf268706916f1993 100644
--- a/board/RPXlite/u-boot.lds.debug
+++ b/board/RPXlite/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/RPXlite_dw/u-boot.lds b/board/RPXlite_dw/u-boot.lds
index 89aaffff33c97e6e652c39acece6c529f2e54138..a099cb9d58b8c48351cea515e8f71f3e3c8d096a 100644
--- a/board/RPXlite_dw/u-boot.lds
+++ b/board/RPXlite_dw/u-boot.lds
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 /* XXX ?
     . = env_offset;
 */
diff --git a/board/RPXlite_dw/u-boot.lds.debug b/board/RPXlite_dw/u-boot.lds.debug
index 83fdc150118c537985664c8fc9c224e91644336c..3b61a42561af308cdb92bc4b17d7916e01780bda 100644
--- a/board/RPXlite_dw/u-boot.lds.debug
+++ b/board/RPXlite_dw/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds
index 88644a4591fa8bca2f13038602e179035eb45b0e..1132fd6eb5ddfad5981ec20349b044ed7617ee90 100644
--- a/board/RRvision/u-boot.lds
+++ b/board/RRvision/u-boot.lds
@@ -59,9 +59,9 @@ SECTIONS
     cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
     arch/ppc/lib/cache.o		(.text)
     arch/ppc/lib/time.o		(.text)
 
diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds
index 1087167bae344d285e0cdc8d6ecc2e34ff5104e3..40b5ef3bd19365b6b600cf344e691f4e1104de6a 100644
--- a/board/actux1/u-boot.lds
+++ b/board/actux1/u-boot.lds
@@ -31,8 +31,8 @@ SECTIONS
 	. = ALIGN (4);
 	.text : {
 		cpu/ixp/start.o(.text)
-		lib_generic/string.o(.text)
-		lib_generic/vsprintf.o(.text)
+		lib/string.o(.text)
+		lib/vsprintf.o(.text)
 		arch/arm/lib/board.o(.text)
 		common/dlmalloc.o(.text)
 		cpu/ixp/cpu.o(.text)
diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds
index 543af3050d1b43aabac7119e2ef1c7c63f174616..f9ab281bc0a0591cd46b731f615317511fcdabf4 100644
--- a/board/actux2/u-boot.lds
+++ b/board/actux2/u-boot.lds
@@ -31,8 +31,8 @@ SECTIONS
 	. = ALIGN (4);
 	.text : {
 		cpu/ixp/start.o(.text)
-		lib_generic/string.o(.text)
-		lib_generic/vsprintf.o(.text)
+		lib/string.o(.text)
+		lib/vsprintf.o(.text)
 		arch/arm/lib/board.o(.text)
 		common/dlmalloc.o(.text)
 		cpu/ixp/cpu.o(.text)
diff --git a/board/actux3/u-boot.lds b/board/actux3/u-boot.lds
index f63251dd9689505576c6015a41ace9e80aeb5e09..2fc3796150768bf3d99b70c9954800b9aa1e9b07 100644
--- a/board/actux3/u-boot.lds
+++ b/board/actux3/u-boot.lds
@@ -31,8 +31,8 @@ SECTIONS
 	. = ALIGN (4);
 	.text : {
 		cpu/ixp/start.o (.text)
-		lib_generic/string.o (.text)
-		lib_generic/vsprintf.o (.text)
+		lib/string.o (.text)
+		lib/vsprintf.o (.text)
 		arch/arm/lib/board.o (.text)
 		common/dlmalloc.o (.text)
 		cpu/ixp/cpu.o (.text)
diff --git a/board/amirix/ap1000/u-boot.lds b/board/amirix/ap1000/u-boot.lds
index 10308d598354db344bf914e8d1c1b813656cc44e..89ffc6d2d09d23d76a1374b9747586fd94a18cd5 100644
--- a/board/amirix/ap1000/u-boot.lds
+++ b/board/amirix/ap1000/u-boot.lds
@@ -64,9 +64,9 @@ SECTIONS
     cpu/ppc4xx/cpu_init.o	(.text)
     cpu/ppc4xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
 /*    . = env_offset;*/
 /*    common/env_embedded.o(.text)*/
diff --git a/board/astro/mcf5373l/u-boot.lds b/board/astro/mcf5373l/u-boot.lds
index 7fbe16f3481cc014bc3b628671ffe5216f7e8d14..73e0310156e689ad9e7457110431427f5fbc56b4 100644
--- a/board/astro/mcf5373l/u-boot.lds
+++ b/board/astro/mcf5373l/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     arch/m68k/lib/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/bf518f-ezbrd/config.mk b/board/bf518f-ezbrd/config.mk
index fb93531f7700f0cc66cb2f773a72587ab96bca2b..3f9d41f3715e6c9055842244e1551f8ffbaa5644 100644
--- a/board/bf518f-ezbrd/config.mk
+++ b/board/bf518f-ezbrd/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
diff --git a/board/bf526-ezbrd/config.mk b/board/bf526-ezbrd/config.mk
index fb93531f7700f0cc66cb2f773a72587ab96bca2b..3f9d41f3715e6c9055842244e1551f8ffbaa5644 100644
--- a/board/bf526-ezbrd/config.mk
+++ b/board/bf526-ezbrd/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
diff --git a/board/bf527-ezkit/config.mk b/board/bf527-ezkit/config.mk
index fb93531f7700f0cc66cb2f773a72587ab96bca2b..3f9d41f3715e6c9055842244e1551f8ffbaa5644 100644
--- a/board/bf527-ezkit/config.mk
+++ b/board/bf527-ezkit/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
diff --git a/board/bf533-ezkit/config.mk b/board/bf533-ezkit/config.mk
index b50e1f2c80ad2a1d698415f56a6d4437b99ef6f6..bc046f129f0d12d52225cf8fccad93e5aa688c60 100644
--- a/board/bf533-ezkit/config.mk
+++ b/board/bf533-ezkit/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
diff --git a/board/bf533-stamp/config.mk b/board/bf533-stamp/config.mk
index b50e1f2c80ad2a1d698415f56a6d4437b99ef6f6..bc046f129f0d12d52225cf8fccad93e5aa688c60 100644
--- a/board/bf533-stamp/config.mk
+++ b/board/bf533-stamp/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
diff --git a/board/bf537-stamp/config.mk b/board/bf537-stamp/config.mk
index 95d0fcc08ff715a256e40c85fbe6ef13effe8716..57668291155113e9dbe6abb8149e592bbd2603ce 100644
--- a/board/bf537-stamp/config.mk
+++ b/board/bf537-stamp/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
diff --git a/board/bf538f-ezkit/config.mk b/board/bf538f-ezkit/config.mk
index b50e1f2c80ad2a1d698415f56a6d4437b99ef6f6..bc046f129f0d12d52225cf8fccad93e5aa688c60 100644
--- a/board/bf538f-ezkit/config.mk
+++ b/board/bf538f-ezkit/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
diff --git a/board/bf548-ezkit/config.mk b/board/bf548-ezkit/config.mk
index aff12e9dc59dd869e320273dd4da9abc12ef806c..ce96c0d47935db5eb4e5e9874d7a9b2d56a80bdb 100644
--- a/board/bf548-ezkit/config.mk
+++ b/board/bf548-ezkit/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA       := --dma 6
diff --git a/board/bf561-acvilon/config.mk b/board/bf561-acvilon/config.mk
index b5170259b427d4859757bec0a5e7b11c340f6d9b..a90b193388094d464e88d29110288e1ded854d61 100644
--- a/board/bf561-acvilon/config.mk
+++ b/board/bf561-acvilon/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16
diff --git a/board/bf561-ezkit/config.mk b/board/bf561-ezkit/config.mk
index b5170259b427d4859757bec0a5e7b11c340f6d9b..a90b193388094d464e88d29110288e1ded854d61 100644
--- a/board/bf561-ezkit/config.mk
+++ b/board/bf561-ezkit/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16
diff --git a/board/c2mon/u-boot.lds b/board/c2mon/u-boot.lds
index 0571f025a1ee7d12079332302e204912f16c0ea5..51e95d555c13316ff7acd7f306842ac0e48d1116 100644
--- a/board/c2mon/u-boot.lds
+++ b/board/c2mon/u-boot.lds
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/c2mon/u-boot.lds.debug b/board/c2mon/u-boot.lds.debug
index ad36953915fc6659838e70b850ae0e51d7757ba0..d55bf33b88d476c8e35be45a2782ece94e99241f 100644
--- a/board/c2mon/u-boot.lds.debug
+++ b/board/c2mon/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/cm-bf527/config.mk b/board/cm-bf527/config.mk
index fb93531f7700f0cc66cb2f773a72587ab96bca2b..3f9d41f3715e6c9055842244e1551f8ffbaa5644 100644
--- a/board/cm-bf527/config.mk
+++ b/board/cm-bf527/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
diff --git a/board/cm-bf533/config.mk b/board/cm-bf533/config.mk
index b50e1f2c80ad2a1d698415f56a6d4437b99ef6f6..bc046f129f0d12d52225cf8fccad93e5aa688c60 100644
--- a/board/cm-bf533/config.mk
+++ b/board/cm-bf533/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
diff --git a/board/cm-bf537e/config.mk b/board/cm-bf537e/config.mk
index b50e1f2c80ad2a1d698415f56a6d4437b99ef6f6..bc046f129f0d12d52225cf8fccad93e5aa688c60 100644
--- a/board/cm-bf537e/config.mk
+++ b/board/cm-bf537e/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
diff --git a/board/cm-bf537u/config.mk b/board/cm-bf537u/config.mk
index b50e1f2c80ad2a1d698415f56a6d4437b99ef6f6..bc046f129f0d12d52225cf8fccad93e5aa688c60 100644
--- a/board/cm-bf537u/config.mk
+++ b/board/cm-bf537u/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
diff --git a/board/cm-bf548/config.mk b/board/cm-bf548/config.mk
index 66c7368f72703ab53bf32045035115df89ffd425..f071a39d75e00d66b6157ee52b48842e297c74e2 100644
--- a/board/cm-bf548/config.mk
+++ b/board/cm-bf548/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA       := --dma 6
diff --git a/board/cm-bf561/config.mk b/board/cm-bf561/config.mk
index b5170259b427d4859757bec0a5e7b11c340f6d9b..a90b193388094d464e88d29110288e1ded854d61 100644
--- a/board/cm-bf561/config.mk
+++ b/board/cm-bf561/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16
diff --git a/board/cobra5272/u-boot.lds b/board/cobra5272/u-boot.lds
index 8989880202fd64698d49cf7a474fb67892572a9f..aacc0894d95dde1272f82fe982c28b2a6dfcebbd 100644
--- a/board/cobra5272/u-boot.lds
+++ b/board/cobra5272/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/cogent/u-boot.lds.debug b/board/cogent/u-boot.lds.debug
index a2d940f048973194841651ef288ee90b4a77db46..f559df71656bb6d2af028ec4bf268706916f1993 100644
--- a/board/cogent/u-boot.lds.debug
+++ b/board/cogent/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/cray/L1/u-boot.lds.debug b/board/cray/L1/u-boot.lds.debug
index 40d2f78ead98192b41a448dae13402c3b5568c61..09c0191e5f693a085626b5cf55c916b44e91625f 100644
--- a/board/cray/L1/u-boot.lds.debug
+++ b/board/cray/L1/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     common/env_embedded.o(.text)
diff --git a/board/eltec/mhpc/u-boot.lds.debug b/board/eltec/mhpc/u-boot.lds.debug
index ad36953915fc6659838e70b850ae0e51d7757ba0..d55bf33b88d476c8e35be45a2782ece94e99241f 100644
--- a/board/eltec/mhpc/u-boot.lds.debug
+++ b/board/eltec/mhpc/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/emk/top860/u-boot.lds.debug b/board/emk/top860/u-boot.lds.debug
index 4e4943fe6d77ada6f13c528e1b2509a6166d62ef..6ca72980e30ef8a034eb111e65a5ce1f81bb709a 100644
--- a/board/emk/top860/u-boot.lds.debug
+++ b/board/emk/top860/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     . = env_offset;
diff --git a/board/esd/tasreg/u-boot.lds b/board/esd/tasreg/u-boot.lds
index 54e0169533e93c2987471631416dd5cee213e40c..f87d3cb725186496bd8f8459d86f27fde70fb485 100644
--- a/board/esd/tasreg/u-boot.lds
+++ b/board/esd/tasreg/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/esteem192e/u-boot.lds b/board/esteem192e/u-boot.lds
index 215a2c49ef8ed4ad8f6abd0e0c7cb176ae3c7c03..848eacdb2cd06cb85d576ed4bb027adff3cf5150 100644
--- a/board/esteem192e/u-boot.lds
+++ b/board/esteem192e/u-boot.lds
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/etx094/u-boot.lds b/board/etx094/u-boot.lds
index 1d34e68fd7037140e8c26b645397d6878353dfbf..d8112eb0a7417be7a201fa2ddb93c34a1639df1c 100644
--- a/board/etx094/u-boot.lds
+++ b/board/etx094/u-boot.lds
@@ -62,8 +62,8 @@ SECTIONS
     cpu/mpc8xx/cpu_init.o	(.text)
     cpu/mpc8xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/etx094/u-boot.lds.debug b/board/etx094/u-boot.lds.debug
index dd4dbfaa36484fe305a4c0b34708868399b2ecc5..12f6ce7652a3312cefc987159cde790427d85153 100644
--- a/board/etx094/u-boot.lds.debug
+++ b/board/etx094/u-boot.lds.debug
@@ -64,8 +64,8 @@ SECTIONS
     cpu/mpc8xx/serial.o	(.text)
     arch/ppc/lib/extable.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/string.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/string.o	(.text)
+    lib/crc32.o		(.text)
     common/dlmalloc.o	(.text)
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/fads/u-boot.lds.debug b/board/fads/u-boot.lds.debug
index 8d91aed3fe3856c3489081e61ca8834f97015a58..4f179c7fa704729a5f64911c06b72f3ff56673a5 100644
--- a/board/fads/u-boot.lds.debug
+++ b/board/fads/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     . = env_offset;
diff --git a/board/flagadm/u-boot.lds.debug b/board/flagadm/u-boot.lds.debug
index ad36953915fc6659838e70b850ae0e51d7757ba0..d55bf33b88d476c8e35be45a2782ece94e99241f 100644
--- a/board/flagadm/u-boot.lds.debug
+++ b/board/flagadm/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/freescale/m52277evb/u-boot.spa b/board/freescale/m52277evb/u-boot.spa
index 23d57107eed86bc5e5b0f509cbdc39d4deaf3c03..6d916d84fd837dc0eea25eba6ab92805cea5049c 100644
--- a/board/freescale/m52277evb/u-boot.spa
+++ b/board/freescale/m52277evb/u-boot.spa
@@ -58,7 +58,7 @@ SECTIONS
     cpu/mcf5227x/start.o	(.text)
     cpu/mcf5227x/libmcf5227x.a	(.text)
     arch/m68k/lib/libm68k.a		(.text)
-    lib_generic/libgeneric.a	(.text)
+    lib/libgeneric.a	(.text)
     common/cmd_mem.o		(.text)
     common/main.o		(.text)
 
diff --git a/board/freescale/m5235evb/u-boot.16 b/board/freescale/m5235evb/u-boot.16
index 940da1467c2a48b835fdb7259bde0e72dd6c9062..4e70efb2f4b79a1614e8d6e1a00e5f88c4a24a1d 100644
--- a/board/freescale/m5235evb/u-boot.16
+++ b/board/freescale/m5235evb/u-boot.16
@@ -60,7 +60,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     arch/m68k/lib/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m5235evb/u-boot.32 b/board/freescale/m5235evb/u-boot.32
index 50045e1a45b19f66230295a40e1b6f2968e201ec..cbf2249255371cc9384a932efb6704b6a99ccb8d 100644
--- a/board/freescale/m5235evb/u-boot.32
+++ b/board/freescale/m5235evb/u-boot.32
@@ -68,7 +68,7 @@ SECTIONS
     common/cmd_mem.o		(.text)
     common/console.o		(.text)
     common/main.o		(.text)
-    lib_generic/libgeneric.a	(.text)
+    lib/libgeneric.a	(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m5249evb/u-boot.lds b/board/freescale/m5249evb/u-boot.lds
index 54e0169533e93c2987471631416dd5cee213e40c..f87d3cb725186496bd8f8459d86f27fde70fb485 100644
--- a/board/freescale/m5249evb/u-boot.lds
+++ b/board/freescale/m5249evb/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m5253demo/u-boot.lds b/board/freescale/m5253demo/u-boot.lds
index e53e67de90941a82d79441e02fcbe474488c975f..455e9b8fdd7862fd0c2bfdaba43eef232d81f918 100644
--- a/board/freescale/m5253demo/u-boot.lds
+++ b/board/freescale/m5253demo/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m5253evbe/u-boot.lds b/board/freescale/m5253evbe/u-boot.lds
index 7f4dc271439f79db7e15f65f9f802cd6cae00d52..99c125cb9d411bbbd80c6d08bdad938fcbaf1e48 100644
--- a/board/freescale/m5253evbe/u-boot.lds
+++ b/board/freescale/m5253evbe/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m5271evb/u-boot.lds b/board/freescale/m5271evb/u-boot.lds
index 713b18a95b42d63c719406c49e6d95581939786b..588a1284711d73b88cbeae034d99c3b65141eba0 100644
--- a/board/freescale/m5271evb/u-boot.lds
+++ b/board/freescale/m5271evb/u-boot.lds
@@ -60,7 +60,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.ppcenv)
diff --git a/board/freescale/m5272c3/u-boot.lds b/board/freescale/m5272c3/u-boot.lds
index 446ec1be4f2a2acb4d7ea115992cc1895fa81c87..aaba5a36825bea03a69a528ddf1ec68c9cf2635d 100644
--- a/board/freescale/m5272c3/u-boot.lds
+++ b/board/freescale/m5272c3/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m5275evb/u-boot.lds b/board/freescale/m5275evb/u-boot.lds
index daf8724ae2eb0f0595a6f4912aa49e72fa64fa83..700b9f5098acaad34f7082cd3cac745c6a279dd8 100644
--- a/board/freescale/m5275evb/u-boot.lds
+++ b/board/freescale/m5275evb/u-boot.lds
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mcf52x2/start.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/string.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/string.o	(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o(.text)
diff --git a/board/freescale/m5282evb/u-boot.lds b/board/freescale/m5282evb/u-boot.lds
index f46e0251efd72a1def792b449ff01019811d62e0..e936adff16fa99b94b0b54c42d822a8b865f5fd5 100644
--- a/board/freescale/m5282evb/u-boot.lds
+++ b/board/freescale/m5282evb/u-boot.lds
@@ -57,9 +57,9 @@ SECTIONS
 
     cpu/mcf52x2/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/string.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o	(.text)
+    lib/string.o	(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o	(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o(.text)
diff --git a/board/freescale/m53017evb/u-boot.lds b/board/freescale/m53017evb/u-boot.lds
index fe0e3141f97ea95954d2b5b0d1c9aa74a49c9845..a725da15ef40157f85b4d416153489d14cf2ba74 100644
--- a/board/freescale/m53017evb/u-boot.lds
+++ b/board/freescale/m53017evb/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     cpu/mcf532x/libmcf532x.a	(.text)
     arch/m68k/lib/libm68k.a		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m5329evb/u-boot.lds b/board/freescale/m5329evb/u-boot.lds
index 0ed87ff30c4ef033add66271508eb3238f818065..bf4f1889c3132da35364dd340f44ddd3e723dd32 100644
--- a/board/freescale/m5329evb/u-boot.lds
+++ b/board/freescale/m5329evb/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     arch/m68k/lib/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m5373evb/u-boot.lds b/board/freescale/m5373evb/u-boot.lds
index 605452b70723e08b723113acfe91c03a92e7cc2c..c129ac26801206388903455dbdc4ebd22f1a52c6 100644
--- a/board/freescale/m5373evb/u-boot.lds
+++ b/board/freescale/m5373evb/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     arch/m68k/lib/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m54451evb/u-boot.spa b/board/freescale/m54451evb/u-boot.spa
index 569518b895b61e327b2bf94d986ad9a933731f8a..e63b1f2e9dcfa88818aba0d40f4fdf678af7d0c2 100644
--- a/board/freescale/m54451evb/u-boot.spa
+++ b/board/freescale/m54451evb/u-boot.spa
@@ -62,7 +62,7 @@ SECTIONS
     common/dlmalloc.o		(.text)
     common/main.o		(.text)
     common/image.o		(.text)
-    lib_generic/libgeneric.a	(.text)
+    lib/libgeneric.a	(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m54451evb/u-boot.stm b/board/freescale/m54451evb/u-boot.stm
index 1b06b12b96d1d5005715bf00f5e979ebcb2f7596..7c3f0684c1b5cb8e0524270f2fc76f381457d0d0 100644
--- a/board/freescale/m54451evb/u-boot.stm
+++ b/board/freescale/m54451evb/u-boot.stm
@@ -64,7 +64,7 @@ SECTIONS
     arch/m68k/lib/board.o			(.text)
     common/serial.o			(.text)
     common/console.o			(.text)
-    lib_generic/display_options.o	(.text)
+    lib/display_options.o	(.text)
     board/freescale/m54455evb/m54455evb.o	(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
diff --git a/board/freescale/m54455evb/u-boot.atm b/board/freescale/m54455evb/u-boot.atm
index c48dd7522924f56fbc01679c5bf1c27db7c9de2b..2dd8a231891897d4d27108269c2b820d71bc96bd 100644
--- a/board/freescale/m54455evb/u-boot.atm
+++ b/board/freescale/m54455evb/u-boot.atm
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     arch/m68k/lib/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)
diff --git a/board/freescale/m54455evb/u-boot.int b/board/freescale/m54455evb/u-boot.int
index ef0717426ad7e681b147ac39d755de241ad7439c..8e54d7918266477e40b27af2f205c1b71bf5f04b 100644
--- a/board/freescale/m54455evb/u-boot.int
+++ b/board/freescale/m54455evb/u-boot.int
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     arch/m68k/lib/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     *(.text)
     *(.fixup)
diff --git a/board/freescale/mpc8610hpcd/u-boot.lds b/board/freescale/mpc8610hpcd/u-boot.lds
index 2ad0f0e6a9701a520d8bcc4794bd26f3f1abb59d..67847f10600a8ecaf5efb6bb0f69fbddaf98dccc 100644
--- a/board/freescale/mpc8610hpcd/u-boot.lds
+++ b/board/freescale/mpc8610hpcd/u-boot.lds
@@ -57,9 +57,9 @@ SECTIONS
     cpu/mpc86xx/cpu.o (.text)
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/crc32.o (.text)
     arch/ppc/lib/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/zlib.o (.text)
     *(.text)
     *(.got1)
    }
diff --git a/board/freescale/mpc8641hpcn/u-boot.lds b/board/freescale/mpc8641hpcn/u-boot.lds
index 796828a37c66fc6156d0d257feccc1ba0cefb6a8..20e03447fe72b47f99d54efa7cbf62e0924d0d79 100644
--- a/board/freescale/mpc8641hpcn/u-boot.lds
+++ b/board/freescale/mpc8641hpcn/u-boot.lds
@@ -57,9 +57,9 @@ SECTIONS
     cpu/mpc86xx/cpu.o (.text)
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/crc32.o (.text)
     arch/ppc/lib/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/zlib.o (.text)
     drivers/bios_emulator/atibios.o (.text)
     *(.text)
     *(.got1)
diff --git a/board/genietv/u-boot.lds b/board/genietv/u-boot.lds
index 9fc71a2c5e20b8d7811e23ec8a80b28294bfdf7c..1bd1ba70c22e56575e4bd845eecc18626e5497e6 100644
--- a/board/genietv/u-boot.lds
+++ b/board/genietv/u-boot.lds
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/genietv/u-boot.lds.debug b/board/genietv/u-boot.lds.debug
index 9bb2c58f7229d25aa8de1061204529781f6335e4..c0dd67f053b46c3d05985a7279d27ca7f7e5f065 100644
--- a/board/genietv/u-boot.lds.debug
+++ b/board/genietv/u-boot.lds.debug
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds
index 1252baf41c4a2dec6f2d9b6394e0e22350b59b6c..1f6e7d6c92f89eda2c68a149f38034899500b761 100644
--- a/board/hermes/u-boot.lds
+++ b/board/hermes/u-boot.lds
@@ -61,7 +61,7 @@ SECTIONS
     arch/ppc/lib/time.o		(.text)
     arch/ppc/lib/ticks.o		(.text)
     arch/ppc/lib/cache.o		(.text)
-    lib_generic/crc32.o		(.text)
+    lib/crc32.o		(.text)
     . = env_offset;
     common/env_embedded.o(.text)
 
diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds
index cc32b4462e01847aa2cdf7c0fbe62676f5584d0b..965716f7159795844e55fd6a5bbaa6c2f85d0345 100644
--- a/board/hymod/u-boot.lds
+++ b/board/hymod/u-boot.lds
@@ -59,9 +59,9 @@ SECTIONS
 /*
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
 */
diff --git a/board/hymod/u-boot.lds.debug b/board/hymod/u-boot.lds.debug
index a2d940f048973194841651ef288ee90b4a77db46..f559df71656bb6d2af028ec4bf268706916f1993 100644
--- a/board/hymod/u-boot.lds.debug
+++ b/board/hymod/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/icu862/u-boot.lds b/board/icu862/u-boot.lds
index b614262b882e8068ea65d557883b0d9d2588416a..d7d0fb3dfc6bb611f2061a7d324d0caedd5d12db 100644
--- a/board/icu862/u-boot.lds
+++ b/board/icu862/u-boot.lds
@@ -60,9 +60,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/icu862/u-boot.lds.debug b/board/icu862/u-boot.lds.debug
index 919eb2194d4127cbbfe6189390f4fab72925dee7..282738bd59eb4570523a734335e181d149a8c5f4 100644
--- a/board/icu862/u-boot.lds.debug
+++ b/board/icu862/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     . = env_offset;
diff --git a/board/idmr/u-boot.lds b/board/idmr/u-boot.lds
index 713b18a95b42d63c719406c49e6d95581939786b..588a1284711d73b88cbeae034d99c3b65141eba0 100644
--- a/board/idmr/u-boot.lds
+++ b/board/idmr/u-boot.lds
@@ -60,7 +60,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.ppcenv)
diff --git a/board/ivm/u-boot.lds.debug b/board/ivm/u-boot.lds.debug
index 17965a05cc2c76f3212753986cfc69e1d6444a76..037785e7dfabccdce264fe21230b00dea55e1b5c 100644
--- a/board/ivm/u-boot.lds.debug
+++ b/board/ivm/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     . = env_offset;
diff --git a/board/keymile/km8xx/u-boot.lds b/board/keymile/km8xx/u-boot.lds
index 8b6305a55e60a7b6822734d964d9e6367c72632d..759072df97e0049bfb95402b3e8b6fcb35809f5a 100644
--- a/board/keymile/km8xx/u-boot.lds
+++ b/board/keymile/km8xx/u-boot.lds
@@ -59,9 +59,9 @@ SECTIONS
     cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
     arch/ppc/lib/cache.o		(.text)
     arch/ppc/lib/time.o		(.text)
 
diff --git a/board/kup/kup4k/u-boot.lds b/board/kup/kup4k/u-boot.lds
index 8e4faa15b1bdf56dc784fb17338d8ed6b337bbd1..e1233a748a7e5072fb7ce7dd7845b42b8c760a18 100644
--- a/board/kup/kup4k/u-boot.lds
+++ b/board/kup/kup4k/u-boot.lds
@@ -60,9 +60,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/kup/kup4k/u-boot.lds.debug b/board/kup/kup4k/u-boot.lds.debug
index 83fdc150118c537985664c8fc9c224e91644336c..3b61a42561af308cdb92bc4b17d7916e01780bda 100644
--- a/board/kup/kup4k/u-boot.lds.debug
+++ b/board/kup/kup4k/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/kup/kup4x/u-boot.lds b/board/kup/kup4x/u-boot.lds
index 8e4faa15b1bdf56dc784fb17338d8ed6b337bbd1..e1233a748a7e5072fb7ce7dd7845b42b8c760a18 100644
--- a/board/kup/kup4x/u-boot.lds
+++ b/board/kup/kup4x/u-boot.lds
@@ -60,9 +60,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/kup/kup4x/u-boot.lds.debug b/board/kup/kup4x/u-boot.lds.debug
index 83fdc150118c537985664c8fc9c224e91644336c..3b61a42561af308cdb92bc4b17d7916e01780bda 100644
--- a/board/kup/kup4x/u-boot.lds.debug
+++ b/board/kup/kup4x/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/lantec/u-boot.lds b/board/lantec/u-boot.lds
index 814a7a69d79d53e21de57b60db1bd2ce261f1009..50bdfb457f9699587c8a34e59ab0be8f86200ec6 100644
--- a/board/lantec/u-boot.lds
+++ b/board/lantec/u-boot.lds
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/lantec/u-boot.lds.debug b/board/lantec/u-boot.lds.debug
index 3b4799e1ef0623e1c32a458e95cffecf9965d5d9..be06235c04aa00e826776fed191878640cef2f13 100644
--- a/board/lantec/u-boot.lds.debug
+++ b/board/lantec/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/lwmon/u-boot.lds.debug b/board/lwmon/u-boot.lds.debug
index 49f897213a6fe4c17e57898122448f73347ee6ea..251ee9bbdc248d984eae460d2049ab9c52ffafd1 100644
--- a/board/lwmon/u-boot.lds.debug
+++ b/board/lwmon/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     . = env_offset;
diff --git a/board/mbx8xx/u-boot.lds.debug b/board/mbx8xx/u-boot.lds.debug
index 8d91aed3fe3856c3489081e61ca8834f97015a58..4f179c7fa704729a5f64911c06b72f3ff56673a5 100644
--- a/board/mbx8xx/u-boot.lds.debug
+++ b/board/mbx8xx/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     . = env_offset;
diff --git a/board/ml2/u-boot.lds b/board/ml2/u-boot.lds
index 0083a211d3d748e54176e35b54199c6fc1d6338a..e68cfb81a3574f657a6ed6c14f49313a1a8db54b 100644
--- a/board/ml2/u-boot.lds
+++ b/board/ml2/u-boot.lds
@@ -64,9 +64,9 @@ SECTIONS
     cpu/ppc4xx/cpu_init.o	(.text)
     cpu/ppc4xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
 /*    . = env_offset;*/
 /*    common/env_embedded.o(.text)*/
diff --git a/board/ml2/u-boot.lds.debug b/board/ml2/u-boot.lds.debug
index 40d2f78ead98192b41a448dae13402c3b5568c61..09c0191e5f693a085626b5cf55c916b44e91625f 100644
--- a/board/ml2/u-boot.lds.debug
+++ b/board/ml2/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     common/env_embedded.o(.text)
diff --git a/board/mousse/u-boot.lds b/board/mousse/u-boot.lds
index c92a2abe2c722904278d74d3a761e8cb802a2e70..f6930b538cc2e2ac1b41a8b89cb2c35bdd52d5e6 100644
--- a/board/mousse/u-boot.lds
+++ b/board/mousse/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
     cpu/mpc824x/start.o		(.text)
     arch/ppc/lib/board.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     *(.got1)
     . = ALIGN(16);
diff --git a/board/mousse/u-boot.lds.rom b/board/mousse/u-boot.lds.rom
index 9750fc5f1901071880bb401c818fe7b831fec71c..8355f335eed8f616f977fe67ea40717b1652da0b 100644
--- a/board/mousse/u-boot.lds.rom
+++ b/board/mousse/u-boot.lds.rom
@@ -55,9 +55,9 @@ SECTIONS
     cpu/mpc824x/start.o	(.text)
 	 common/board.o (.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
 		. = env_offset;
     common/env_embedded.o (.text)
diff --git a/board/mpl/pip405/u-boot.lds.debug b/board/mpl/pip405/u-boot.lds.debug
index 40d2f78ead98192b41a448dae13402c3b5568c61..09c0191e5f693a085626b5cf55c916b44e91625f 100644
--- a/board/mpl/pip405/u-boot.lds.debug
+++ b/board/mpl/pip405/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     common/env_embedded.o(.text)
diff --git a/board/netphone/u-boot.lds b/board/netphone/u-boot.lds
index 4b17a1f76512471c1af3ed4e58d86def97fa853f..8f96b1de6fdd5ca4ac3b9851bce2a96234b9ae0b 100644
--- a/board/netphone/u-boot.lds
+++ b/board/netphone/u-boot.lds
@@ -56,9 +56,9 @@ SECTIONS
     cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
     arch/ppc/lib/cache.o		(.text)
     arch/ppc/lib/time.o		(.text)
 
diff --git a/board/netphone/u-boot.lds.debug b/board/netphone/u-boot.lds.debug
index 4ef16f1ffe45d616184a6d8fe7ec0336f1a4d003..139751177c0abe97d9971d67f814c5c3f4c1aa8b 100644
--- a/board/netphone/u-boot.lds.debug
+++ b/board/netphone/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/netstar/Makefile b/board/netstar/Makefile
index c435762964f4063095edf18b9524277e37639b66..5773c13f4d892a6f7d80a34cea32e2d2dd5b85dc 100644
--- a/board/netstar/Makefile
+++ b/board/netstar/Makefile
@@ -72,7 +72,7 @@ $(obj)crcit:		$(obj)crcit.o $(obj)crc32.o
 $(obj)crcit.o:		crcit.c
 	$(HOSTCC) $(HOSTCFLAGS) -o $@ -c $<
 
-$(obj)crc32.o:		$(SRCTREE)/lib_generic/crc32.c
+$(obj)crc32.o:		$(SRCTREE)/lib/crc32.c
 	$(HOSTCC) $(HOSTCFLAGS) -DUSE_HOSTCC -I$(TOPDIR)/include \
 		-o $@ -c $<
 
diff --git a/board/netta/u-boot.lds b/board/netta/u-boot.lds
index 991d7a1a90c1d3a8bea7485f1b8bd7402c0ce9f6..ff11ad0f69ad06580777b41e76747faa8cda55d8 100644
--- a/board/netta/u-boot.lds
+++ b/board/netta/u-boot.lds
@@ -56,9 +56,9 @@ SECTIONS
     cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
     arch/ppc/lib/cache.o		(.text)
     arch/ppc/lib/time.o		(.text)
 
diff --git a/board/netta/u-boot.lds.debug b/board/netta/u-boot.lds.debug
index 4ef16f1ffe45d616184a6d8fe7ec0336f1a4d003..139751177c0abe97d9971d67f814c5c3f4c1aa8b 100644
--- a/board/netta/u-boot.lds.debug
+++ b/board/netta/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/netta2/u-boot.lds b/board/netta2/u-boot.lds
index 991d7a1a90c1d3a8bea7485f1b8bd7402c0ce9f6..ff11ad0f69ad06580777b41e76747faa8cda55d8 100644
--- a/board/netta2/u-boot.lds
+++ b/board/netta2/u-boot.lds
@@ -56,9 +56,9 @@ SECTIONS
     cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
     arch/ppc/lib/cache.o		(.text)
     arch/ppc/lib/time.o		(.text)
 
diff --git a/board/netta2/u-boot.lds.debug b/board/netta2/u-boot.lds.debug
index 4ef16f1ffe45d616184a6d8fe7ec0336f1a4d003..139751177c0abe97d9971d67f814c5c3f4c1aa8b 100644
--- a/board/netta2/u-boot.lds.debug
+++ b/board/netta2/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/netvia/u-boot.lds b/board/netvia/u-boot.lds
index 7eb01ee727014b4fa04d45f84239d3f68a2bfeec..70d5a6a0dfb88670623cdfc0ad9d93b35100a962 100644
--- a/board/netvia/u-boot.lds
+++ b/board/netvia/u-boot.lds
@@ -56,9 +56,9 @@ SECTIONS
     cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
     arch/ppc/lib/cache.o		(.text)
     arch/ppc/lib/time.o		(.text)
 
diff --git a/board/netvia/u-boot.lds.debug b/board/netvia/u-boot.lds.debug
index c3c99b35c23f1f55b7ba69712d6d07f9cad14677..bc8f32e0f8a25763f0eb7407c2c84d1ce21ad78f 100644
--- a/board/netvia/u-boot.lds.debug
+++ b/board/netvia/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/nx823/u-boot.lds.debug b/board/nx823/u-boot.lds.debug
index ad36953915fc6659838e70b850ae0e51d7757ba0..d55bf33b88d476c8e35be45a2782ece94e99241f 100644
--- a/board/nx823/u-boot.lds.debug
+++ b/board/nx823/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/purple/u-boot.lds b/board/purple/u-boot.lds
index 04a641a4739b820c8fb7672fbed51caa9ce66b23..236ece478c6a7dfbffe297032239143b6e049635 100644
--- a/board/purple/u-boot.lds
+++ b/board/purple/u-boot.lds
@@ -40,7 +40,7 @@ SECTIONS
 	  common/main.o			(.text)
 	  common/dlmalloc.o		(.text)
 	  common/cmd_boot.o		(.text)
-	  lib_generic/zlib.o		(.text)
+	  lib/zlib.o		(.text)
 	  . = DEFINED(env_offset) ? env_offset : .;
 	  common/env_embedded.o	(.ppcenv)
 
diff --git a/board/quantum/u-boot.lds b/board/quantum/u-boot.lds
index c354ff82834991558b4be4547c51593a57b971ec..09d9470f794324c35bb85a31fc9936960c840af1 100644
--- a/board/quantum/u-boot.lds
+++ b/board/quantum/u-boot.lds
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 /* XXX ?
     . = env_offset;
 */
diff --git a/board/quantum/u-boot.lds.debug b/board/quantum/u-boot.lds.debug
index ec01fe256bd3fcb89da32594c956fc8abf1579cc..dcad818927516e697bfe8f8ac8e5ee160e8da99b 100644
--- a/board/quantum/u-boot.lds.debug
+++ b/board/quantum/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/rbc823/u-boot.lds b/board/rbc823/u-boot.lds
index 6074c14ba269fb088bf26e08874beb827937f4e4..15aca6c62344bfc41b6d1748804f63898f3377fd 100644
--- a/board/rbc823/u-boot.lds
+++ b/board/rbc823/u-boot.lds
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/rmu/u-boot.lds b/board/rmu/u-boot.lds
index c354ff82834991558b4be4547c51593a57b971ec..09d9470f794324c35bb85a31fc9936960c840af1 100644
--- a/board/rmu/u-boot.lds
+++ b/board/rmu/u-boot.lds
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 /* XXX ?
     . = env_offset;
 */
diff --git a/board/rmu/u-boot.lds.debug b/board/rmu/u-boot.lds.debug
index ec01fe256bd3fcb89da32594c956fc8abf1579cc..dcad818927516e697bfe8f8ac8e5ee160e8da99b 100644
--- a/board/rmu/u-boot.lds.debug
+++ b/board/rmu/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug
index 1d8ce105e401c5215f4cf4b3ea2d857669914bc6..34dce838f178358766075cd076cd2b29fcac7151 100644
--- a/board/sandburst/karef/u-boot.lds.debug
+++ b/board/sandburst/karef/u-boot.lds.debug
@@ -66,9 +66,9 @@ SECTIONS
     cpu/ppc4xx/speed.o	(.text)
     drivers/net/4xx_enet.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
 /*    common/env_embedded.o(.text) */
 
diff --git a/board/sandburst/metrobox/u-boot.lds.debug b/board/sandburst/metrobox/u-boot.lds.debug
index bbfea131e01599f12e8169cfe2c71a382c3c6a02..fa976c2e5d4eabcc029f3e6dba7f392851a4414a 100644
--- a/board/sandburst/metrobox/u-boot.lds.debug
+++ b/board/sandburst/metrobox/u-boot.lds.debug
@@ -66,9 +66,9 @@ SECTIONS
     cpu/ppc4xx/speed.o	(.text)
     drivers/net/4xx_enet.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
 /*    common/env_embedded.o(.text) */
 
diff --git a/board/sbc8641d/u-boot.lds b/board/sbc8641d/u-boot.lds
index 648efa285bc772000473a252450b6d8a9bb5071a..7f0412464f6cbc5d7e17f910350578a0267f5344 100644
--- a/board/sbc8641d/u-boot.lds
+++ b/board/sbc8641d/u-boot.lds
@@ -57,9 +57,9 @@ SECTIONS
     cpu/mpc86xx/cpu.o (.text)
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/crc32.o (.text)
     arch/ppc/lib/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/zlib.o (.text)
     *(.text)
     *(.got1)
    }
diff --git a/board/sc3/u-boot.lds b/board/sc3/u-boot.lds
index 04b350aab7807ce2d0a7833082f31be901b5aa88..fc7464eeeaa7c71be68649fa022a38bb4b542e86 100644
--- a/board/sc3/u-boot.lds
+++ b/board/sc3/u-boot.lds
@@ -69,9 +69,9 @@ SECTIONS
     cpu/ppc4xx/cpu_init.o	(.text)
     cpu/ppc4xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
 /*    . = env_offset;*/
 /*    common/env_embedded.o(.text)*/
diff --git a/board/siemens/CCM/u-boot.lds b/board/siemens/CCM/u-boot.lds
index 0571f025a1ee7d12079332302e204912f16c0ea5..51e95d555c13316ff7acd7f306842ac0e48d1116 100644
--- a/board/siemens/CCM/u-boot.lds
+++ b/board/siemens/CCM/u-boot.lds
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/siemens/CCM/u-boot.lds.debug b/board/siemens/CCM/u-boot.lds.debug
index 29657e93efedcb0753f61d51189798e33e350255..2a6abfab3fcdcc1ac11ac1395eff92711c617b7d 100644
--- a/board/siemens/CCM/u-boot.lds.debug
+++ b/board/siemens/CCM/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 /*
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/siemens/pcu_e/u-boot.lds.debug b/board/siemens/pcu_e/u-boot.lds.debug
index 49f897213a6fe4c17e57898122448f73347ee6ea..251ee9bbdc248d984eae460d2049ab9c52ffafd1 100644
--- a/board/siemens/pcu_e/u-boot.lds.debug
+++ b/board/siemens/pcu_e/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     . = env_offset;
diff --git a/board/snmc/qs850/u-boot.lds b/board/snmc/qs850/u-boot.lds
index ce115f59e7b885f06f4f8ac531ec49e8fa7e9944..271d74a5c135811e8d25aec5bea6aecebd6d8687 100644
--- a/board/snmc/qs850/u-boot.lds
+++ b/board/snmc/qs850/u-boot.lds
@@ -59,9 +59,9 @@ SECTIONS
 	cpu/mpc8xx/traps.o		(.text)
 	common/dlmalloc.o		(.text)
 	arch/ppc/lib/ppcstring.o		(.text)
-	lib_generic/vsprintf.o	(.text)
-	lib_generic/crc32.o		(.text)
-	lib_generic/zlib.o		(.text)
+	lib/vsprintf.o	(.text)
+	lib/crc32.o		(.text)
+	lib/zlib.o		(.text)
 	arch/ppc/lib/cache.o		(.text)
 	arch/ppc/lib/time.o		(.text)
 
diff --git a/board/snmc/qs860t/u-boot.lds b/board/snmc/qs860t/u-boot.lds
index ce115f59e7b885f06f4f8ac531ec49e8fa7e9944..271d74a5c135811e8d25aec5bea6aecebd6d8687 100644
--- a/board/snmc/qs860t/u-boot.lds
+++ b/board/snmc/qs860t/u-boot.lds
@@ -59,9 +59,9 @@ SECTIONS
 	cpu/mpc8xx/traps.o		(.text)
 	common/dlmalloc.o		(.text)
 	arch/ppc/lib/ppcstring.o		(.text)
-	lib_generic/vsprintf.o	(.text)
-	lib_generic/crc32.o		(.text)
-	lib_generic/zlib.o		(.text)
+	lib/vsprintf.o	(.text)
+	lib/crc32.o		(.text)
+	lib/zlib.o		(.text)
 	arch/ppc/lib/cache.o		(.text)
 	arch/ppc/lib/time.o		(.text)
 
diff --git a/board/spc1920/u-boot.lds b/board/spc1920/u-boot.lds
index 172cfbbc88d936c479f4376a5105c4d2b74ce869..f95f695b131eb5203e4a723f8087946897c12a69 100644
--- a/board/spc1920/u-boot.lds
+++ b/board/spc1920/u-boot.lds
@@ -59,9 +59,9 @@ SECTIONS
     cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
     arch/ppc/lib/cache.o		(.text)
     arch/ppc/lib/time.o		(.text)
 
diff --git a/board/spd8xx/u-boot.lds.debug b/board/spd8xx/u-boot.lds.debug
index 8d91aed3fe3856c3489081e61ca8834f97015a58..4f179c7fa704729a5f64911c06b72f3ff56673a5 100644
--- a/board/spd8xx/u-boot.lds.debug
+++ b/board/spd8xx/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     . = env_offset;
diff --git a/board/stx/stxxtc/u-boot.lds b/board/stx/stxxtc/u-boot.lds
index 991d7a1a90c1d3a8bea7485f1b8bd7402c0ce9f6..ff11ad0f69ad06580777b41e76747faa8cda55d8 100644
--- a/board/stx/stxxtc/u-boot.lds
+++ b/board/stx/stxxtc/u-boot.lds
@@ -56,9 +56,9 @@ SECTIONS
     cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
     arch/ppc/lib/cache.o		(.text)
     arch/ppc/lib/time.o		(.text)
 
diff --git a/board/stx/stxxtc/u-boot.lds.debug b/board/stx/stxxtc/u-boot.lds.debug
index 4ef16f1ffe45d616184a6d8fe7ec0336f1a4d003..139751177c0abe97d9971d67f814c5c3f4c1aa8b 100644
--- a/board/stx/stxxtc/u-boot.lds.debug
+++ b/board/stx/stxxtc/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/svm_sc8xx/u-boot.lds b/board/svm_sc8xx/u-boot.lds
index cf782000196a2a7a44e782778253933f1245cd51..6de74887ce633448df1c3187be4616321bcaad01 100644
--- a/board/svm_sc8xx/u-boot.lds
+++ b/board/svm_sc8xx/u-boot.lds
@@ -59,9 +59,9 @@ SECTIONS
     cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
     arch/ppc/lib/cache.o		(.text)
     arch/ppc/lib/time.o		(.text)
 
diff --git a/board/svm_sc8xx/u-boot.lds.debug b/board/svm_sc8xx/u-boot.lds.debug
index ec01fe256bd3fcb89da32594c956fc8abf1579cc..dcad818927516e697bfe8f8ac8e5ee160e8da99b 100644
--- a/board/svm_sc8xx/u-boot.lds.debug
+++ b/board/svm_sc8xx/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/tcm-bf518/config.mk b/board/tcm-bf518/config.mk
index fb93531f7700f0cc66cb2f773a72587ab96bca2b..3f9d41f3715e6c9055842244e1551f8ffbaa5644 100644
--- a/board/tcm-bf518/config.mk
+++ b/board/tcm-bf518/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
diff --git a/board/tcm-bf537/config.mk b/board/tcm-bf537/config.mk
index b50e1f2c80ad2a1d698415f56a6d4437b99ef6f6..bc046f129f0d12d52225cf8fccad93e5aa688c60 100644
--- a/board/tcm-bf537/config.mk
+++ b/board/tcm-bf537/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
diff --git a/board/tqc/tqm8xx/u-boot.lds b/board/tqc/tqm8xx/u-boot.lds
index 9f452c1c8e6296e30190fc4047c535732f0df9f9..ceaac000540f8198c9172b0ed2de40ed711d3361 100644
--- a/board/tqc/tqm8xx/u-boot.lds
+++ b/board/tqc/tqm8xx/u-boot.lds
@@ -59,9 +59,9 @@ SECTIONS
     cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
     arch/ppc/lib/cache.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
diff --git a/board/tqc/tqm8xx/u-boot.lds.debug b/board/tqc/tqm8xx/u-boot.lds.debug
index a2d940f048973194841651ef288ee90b4a77db46..f559df71656bb6d2af028ec4bf268706916f1993 100644
--- a/board/tqc/tqm8xx/u-boot.lds.debug
+++ b/board/tqc/tqm8xx/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/trab/Makefile b/board/trab/Makefile
index 27d75f3a006734a813a4dc3aab3bfce26895340d..0b13dc475ee42417317491d29ae4c180b145de55 100644
--- a/board/trab/Makefile
+++ b/board/trab/Makefile
@@ -48,7 +48,7 @@ $(LIB):	$(obj).depend $(OBJS) $(SOBJS)
 $(obj)trab_fkt.srec:	$(OBJS_FKT) $(LIB)
 	$(LD) -g -Ttext $(LOAD_ADDR) -o $(<:.o=) -e trab_fkt $^ $(LIB) \
 		-L$(obj)../../examples/standalone -lstubs \
-		-L$(obj)../../lib_generic -lgeneric \
+		-L$(obj)../../lib -lgeneric \
 		$(PLATFORM_LIBS)
 	$(OBJCOPY) -O srec $(<:.o=) $@
 
diff --git a/board/trab/u-boot.lds b/board/trab/u-boot.lds
index c3d5c49a9b2b1a1e2d5c2de3255acc16db39973b..05b929f569705e75e1de0f0bd243ccf452d9ea22 100644
--- a/board/trab/u-boot.lds
+++ b/board/trab/u-boot.lds
@@ -33,9 +33,9 @@ SECTIONS
 	.text      :
 	{
 	  cpu/arm920t/start.o	(.text)
-	  lib_generic/zlib.o	(.text)
-	  lib_generic/crc32.o	(.text)
-	  lib_generic/string.o	(.text)
+	  lib/zlib.o	(.text)
+	  lib/crc32.o	(.text)
+	  lib/string.o	(.text)
 
 	. = DEFINED(env_offset) ? env_offset : .;
 	  common/env_embedded.o	(.ppcenv)
diff --git a/board/uc100/u-boot.lds b/board/uc100/u-boot.lds
index 967e4322cb7c341f2fcf96bdc3810ed3cbd60aec..960b2a582bb54a836ffc9beab5ffcaf12078cf53 100644
--- a/board/uc100/u-boot.lds
+++ b/board/uc100/u-boot.lds
@@ -59,9 +59,9 @@ SECTIONS
     cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
     arch/ppc/lib/cache.o		(.text)
     arch/ppc/lib/time.o		(.text)
 
diff --git a/board/uc100/u-boot.lds.debug b/board/uc100/u-boot.lds.debug
index edaa4020a9d6dbe175e5ac4af88f2c8898483956..116a97208dae258b88722a0456d406921812dc5e 100644
--- a/board/uc100/u-boot.lds.debug
+++ b/board/uc100/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     common/env_embedded.o(.text)
 
diff --git a/board/v37/u-boot.lds b/board/v37/u-boot.lds
index c3dd8c7abc161efb2a752a131d55c83b1b5da121..248f4887cc9137548192d3708e6218e40f6e3ec0 100644
--- a/board/v37/u-boot.lds
+++ b/board/v37/u-boot.lds
@@ -59,9 +59,9 @@ SECTIONS
     cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
     arch/ppc/lib/cache.o		(.text)
     arch/ppc/lib/time.o		(.text)
 
diff --git a/board/w7o/u-boot.lds.debug b/board/w7o/u-boot.lds.debug
index 85b1cd69dd2e6a00f9fc891592bf206ad6b1ab11..369c15a18c6abe3d39f5da9aa7b6a9d088db2127 100644
--- a/board/w7o/u-boot.lds.debug
+++ b/board/w7o/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     common/env_embedded.o(.text)
diff --git a/board/westel/amx860/u-boot.lds b/board/westel/amx860/u-boot.lds
index 0571f025a1ee7d12079332302e204912f16c0ea5..51e95d555c13316ff7acd7f306842ac0e48d1116 100644
--- a/board/westel/amx860/u-boot.lds
+++ b/board/westel/amx860/u-boot.lds
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/westel/amx860/u-boot.lds.debug b/board/westel/amx860/u-boot.lds.debug
index 919eb2194d4127cbbfe6189390f4fab72925dee7..282738bd59eb4570523a734335e181d149a8c5f4 100644
--- a/board/westel/amx860/u-boot.lds.debug
+++ b/board/westel/amx860/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     . = env_offset;
diff --git a/board/xes/xpedite1000/u-boot.lds.debug b/board/xes/xpedite1000/u-boot.lds.debug
index 0830d0aa1b4fec020618bc2185a11358f0e347df..555e1ac0321606455c4c026c6dec61b8c8afb496 100644
--- a/board/xes/xpedite1000/u-boot.lds.debug
+++ b/board/xes/xpedite1000/u-boot.lds.debug
@@ -64,9 +64,9 @@ SECTIONS
     cpu/ppc4xx/cpu_init.o	(.text)
     cpu/ppc4xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
 /*    common/env_embedded.o(.text) */
 
diff --git a/board/xes/xpedite5170/u-boot.lds b/board/xes/xpedite5170/u-boot.lds
index 648efa285bc772000473a252450b6d8a9bb5071a..7f0412464f6cbc5d7e17f910350578a0267f5344 100644
--- a/board/xes/xpedite5170/u-boot.lds
+++ b/board/xes/xpedite5170/u-boot.lds
@@ -57,9 +57,9 @@ SECTIONS
     cpu/mpc86xx/cpu.o (.text)
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/crc32.o (.text)
     arch/ppc/lib/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/zlib.o (.text)
     *(.text)
     *(.got1)
    }
diff --git a/cpu/mpc5xxx/u-boot-customlayout.lds b/cpu/mpc5xxx/u-boot-customlayout.lds
index c08c9c9232940f05ae0102f50ed123f3b52b6349..6c80139f272036c84c352129601c9851766534e6 100644
--- a/cpu/mpc5xxx/u-boot-customlayout.lds
+++ b/cpu/mpc5xxx/u-boot-customlayout.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc5xxx/start.o          (.text)
     cpu/mpc5xxx/traps.o          (.text)
-    lib_generic/crc32.o         (.text)
+    lib/crc32.o         (.text)
     arch/ppc/lib/cache.o             (.text)
     arch/ppc/lib/time.o              (.text)
 
diff --git a/examples/api/Makefile b/examples/api/Makefile
index 62751ece9609fdb8932d687679491dcf2c2efbc2..bed16f15558e9478cba89c21987cca0f25394da1 100644
--- a/examples/api/Makefile
+++ b/examples/api/Makefile
@@ -40,12 +40,12 @@ COBJ_FILES-$(CONFIG_API) += glue.o
 COBJ_FILES-$(CONFIG_API) += libgenwrap.o
 
 # Source files which exist outside the examples/api directory
-EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/crc32.o
-EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/ctype.o
-EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/div64.o
-EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/string.o
-EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/time.o
-EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/vsprintf.o
+EXT_COBJ_FILES-$(CONFIG_API) += lib/crc32.o
+EXT_COBJ_FILES-$(CONFIG_API) += lib/ctype.o
+EXT_COBJ_FILES-$(CONFIG_API) += lib/div64.o
+EXT_COBJ_FILES-$(CONFIG_API) += lib/string.o
+EXT_COBJ_FILES-$(CONFIG_API) += lib/time.o
+EXT_COBJ_FILES-$(CONFIG_API) += lib/vsprintf.o
 ifeq ($(ARCH),ppc)
 EXT_SOBJ_FILES-$(CONFIG_API) += arch/ppc/lib/ppcstring.o
 endif
@@ -75,7 +75,7 @@ $(OUTPUT):	$(OBJS)
 		$(OBJCOPY) -O binary $@ $(OUTPUT).bin 2>/dev/null
 
 # Rule to build generic library C files
-$(obj)%.o: $(SRCTREE)/lib_generic/%.c
+$(obj)%.o: $(SRCTREE)/lib/%.c
 	$(CC) -g $(CFLAGS) -c -o $@ $<
 
 # Rule to build architecture-specific library assembly files
diff --git a/examples/api/libgenwrap.c b/examples/api/libgenwrap.c
index 2b107d9797f45eaaf3bc5bee1ef7d8eac93cd62e..b435ddecba304a25d828a9495c9f4d4a64ce004c 100644
--- a/examples/api/libgenwrap.c
+++ b/examples/api/libgenwrap.c
@@ -23,7 +23,7 @@
  *
  *
  * This is is a set of wrappers/stubs that allow to use certain routines from
- * U-Boot's lib_generic in the standalone app. This way way we can re-use
+ * U-Boot's lib in the standalone app. This way way we can re-use
  * existing code e.g. operations on strings and similar.
  *
  */
diff --git a/include/common.h b/include/common.h
index 7aa910dc9871e1bfba9fda1f92bd8ef3cce06102..df956bbb410652b32ee33ddb9a1a2590f35b292b 100644
--- a/include/common.h
+++ b/include/common.h
@@ -620,22 +620,22 @@ ulong	usec2ticks    (unsigned long usec);
 ulong	ticks2usec    (unsigned long ticks);
 int	init_timebase (void);
 
-/* lib_generic/gunzip.c */
+/* lib/gunzip.c */
 int gunzip(void *, int, unsigned char *, unsigned long *);
 int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp,
 						int stoponerr, int offset);
 
-/* lib_generic/net_utils.c */
+/* lib/net_utils.c */
 #include <net.h>
 static inline IPaddr_t getenv_IPaddr (char *var)
 {
 	return (string_to_ip(getenv(var)));
 }
 
-/* lib_generic/time.c */
+/* lib/time.c */
 void	udelay        (unsigned long);
 
-/* lib_generic/vsprintf.c */
+/* lib/vsprintf.c */
 ulong	simple_strtoul(const char *cp,char **endp,unsigned int base);
 unsigned long long	simple_strtoull(const char *cp,char **endp,unsigned int base);
 long	simple_strtol(const char *cp,char **endp,unsigned int base);
@@ -645,10 +645,10 @@ int	sprintf(char * buf, const char *fmt, ...)
 		__attribute__ ((format (__printf__, 2, 3)));
 int	vsprintf(char *buf, const char *fmt, va_list args);
 
-/* lib_generic/strmhz.c */
+/* lib/strmhz.c */
 char *	strmhz(char *buf, long hz);
 
-/* lib_generic/crc32.c */
+/* lib/crc32.c */
 #include <u-boot/crc.h>
 
 /* common/console.c */
diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index 083c030179859dd91cfd1d085af6ceb1375013c3..0b94f559fd2cbfa47a10061f36183eecc07b463f 100644
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -130,7 +130,7 @@
 	cpu/blackfin/interrupt.o	(.text .text.*); \
 	cpu/blackfin/serial.o		(.text .text.*); \
 	common/dlmalloc.o		(.text .text.*); \
-	lib_generic/crc32.o		(.text .text.*); \
+	lib/crc32.o		(.text .text.*); \
 	. = DEFINED(env_offset) ? env_offset : .; \
 	common/env_embedded.o		(.text .text.*);
 #endif
diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h
index 6627a04f59ca4a9b9f1e6adcf851fea94533002a..8038c40de1b78630361a3d0e6b59e9f85afd19f7 100644
--- a/include/configs/bf537-pnav.h
+++ b/include/configs/bf537-pnav.h
@@ -116,7 +116,7 @@
 	cpu/blackfin/interrupt.o	(.text .text.*); \
 	cpu/blackfin/serial.o		(.text .text.*); \
 	common/dlmalloc.o		(.text .text.*); \
-	lib_generic/crc32.o		(.text .text.*); \
+	lib/crc32.o		(.text .text.*); \
 	. = DEFINED(env_offset) ? env_offset : .; \
 	common/env_embedded.o		(.text .text.*);
 #endif
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index d3159e59df6beae14c8a42ccb7515d4fb6b9cd60..0f8679b57e56281e56685415420acbae7e9c0325 100644
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -126,7 +126,7 @@
 	cpu/blackfin/interrupt.o	(.text .text.*); \
 	cpu/blackfin/serial.o		(.text .text.*); \
 	common/dlmalloc.o		(.text .text.*); \
-	lib_generic/crc32.o		(.text .text.*); \
+	lib/crc32.o		(.text .text.*); \
 	. = DEFINED(env_offset) ? env_offset : .; \
 	common/env_embedded.o		(.text .text.*);
 #endif
diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h
index 4ea2300f4b7ff420ae7dd0a3d29275c029d602fc..696fe29d207bcef5289bd6f06dfaf4b511d9809a 100644
--- a/include/configs/bf538f-ezkit.h
+++ b/include/configs/bf538f-ezkit.h
@@ -123,7 +123,7 @@
 	cpu/blackfin/interrupt.o	(.text .text.*); \
 	cpu/blackfin/serial.o		(.text .text.*); \
 	common/dlmalloc.o		(.text .text.*); \
-	lib_generic/crc32.o		(.text .text.*); \
+	lib/crc32.o		(.text .text.*); \
 	. = DEFINED(env_offset) ? env_offset : .; \
 	common/env_embedded.o		(.text .text.*);
 #endif
diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index 8ab38bbacb657722667aea70476ae7c0584ac765..fca6e43b479bae9d7ef1cb58503610ff337f423d 100644
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -100,8 +100,8 @@
 	cpu/blackfin/interrupt.o	(.text .text.*); \
 	cpu/blackfin/serial.o		(.text .text.*); \
 	common/dlmalloc.o		(.text .text.*); \
-	lib_generic/crc32.o		(.text .text.*); \
-	lib_generic/zlib.o		(.text .text.*); \
+	lib/crc32.o		(.text .text.*); \
+	lib/zlib.o		(.text .text.*); \
 	board/bf561-ezkit/bf561-ezkit.o	(.text .text.*); \
 	. = DEFINED(env_offset) ? env_offset : .; \
 	common/env_embedded.o		(.text .text.*);
diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index 0d68ebae2a294faffe03bd0a377ac470912a5aac..d86409fcd302d5ac781ae56cbccf54ad97f6d33c 100644
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -108,7 +108,7 @@
 	cpu/blackfin/interrupt.o	(.text .text.*); \
 	cpu/blackfin/serial.o		(.text .text.*); \
 	common/dlmalloc.o		(.text .text.*); \
-	lib_generic/crc32.o		(.text .text.*); \
+	lib/crc32.o		(.text .text.*); \
 	. = DEFINED(env_offset) ? env_offset : .; \
 	common/env_embedded.o		(.text .text.*);
 #endif
diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h
index c1179b0aee83d48a25c821c35e3e93051f05dab4..6be9dbad816142b3284da83b92e2da066fce9b02 100644
--- a/include/configs/cm-bf537u.h
+++ b/include/configs/cm-bf537u.h
@@ -109,7 +109,7 @@
 	cpu/blackfin/interrupt.o	(.text .text.*); \
 	cpu/blackfin/serial.o		(.text .text.*); \
 	common/dlmalloc.o		(.text .text.*); \
-	lib_generic/crc32.o		(.text .text.*); \
+	lib/crc32.o		(.text .text.*); \
 	. = DEFINED(env_offset) ? env_offset : .; \
 	common/env_embedded.o		(.text .text.*);
 #endif
diff --git a/include/configs/ibf-dsp561.h b/include/configs/ibf-dsp561.h
index 7c9f71e88888e4392eb94414bd1c58469c410631..6fa8cf7a9156ce82f8376c1f23ad8f0694613af8 100644
--- a/include/configs/ibf-dsp561.h
+++ b/include/configs/ibf-dsp561.h
@@ -88,8 +88,8 @@
 	cpu/blackfin/interrupt.o	(.text .text.*); \
 	cpu/blackfin/serial.o		(.text .text.*); \
 	common/dlmalloc.o		(.text .text.*); \
-	lib_generic/crc32.o		(.text .text.*); \
-	lib_generic/zlib.o		(.text .text.*); \
+	lib/crc32.o		(.text .text.*); \
+	lib/zlib.o		(.text .text.*); \
 	board/ibf-dsp561/ibf-dsp561.o	(.text .text.*); \
 	. = DEFINED(env_offset) ? env_offset : .; \
 	common/env_embedded.o		(.text .text.*);
diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index 5a5fbddac354337010060a41293a6a0c515d7b68..e9dfcc95fe0d9b45c8e11b79d7b2cbee91f753c8 100644
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -109,7 +109,7 @@
 	cpu/blackfin/interrupt.o	(.text .text.*); \
 	cpu/blackfin/serial.o		(.text .text.*); \
 	common/dlmalloc.o		(.text .text.*); \
-	lib_generic/crc32.o		(.text .text.*); \
+	lib/crc32.o		(.text .text.*); \
 	. = DEFINED(env_offset) ? env_offset : .; \
 	common/env_embedded.o		(.text .text.*);
 #endif
diff --git a/include/lzma/LzmaDec.h b/include/lzma/LzmaDec.h
index 967cdd1018255e11a269bf44261ec70459da76de..b7ef6d6bc23e46f5b75005512aee609ac91e76c4 100644
--- a/include/lzma/LzmaDec.h
+++ b/include/lzma/LzmaDec.h
@@ -26,6 +26,6 @@
 #ifndef __LZMADEC_H__FAKE__
 #define __LZMADEC_H__FAKE__
 
-#include "../../lib_generic/lzma/LzmaDec.h"
+#include "../../lib/lzma/LzmaDec.h"
 
 #endif
diff --git a/include/lzma/LzmaTools.h b/include/lzma/LzmaTools.h
index 87943c0332fdade973e4702217540be491484ca4..48b0af84d4497f023116742fbee0c7fcc91fa1df 100644
--- a/include/lzma/LzmaTools.h
+++ b/include/lzma/LzmaTools.h
@@ -26,6 +26,6 @@
 #ifndef __LZMATOOLS_H__FAKE__
 #define __LZMATOOLS_H__FAKE__
 
-#include "../../lib_generic/lzma/LzmaTools.h"
+#include "../../lib/lzma/LzmaTools.h"
 
 #endif
diff --git a/include/lzma/LzmaTypes.h b/include/lzma/LzmaTypes.h
index 86160a42b2579964b79ccaad0cc8efc6e3f6abed..740720cfe9bb27c3bc965d41c94a01e8a408adde 100644
--- a/include/lzma/LzmaTypes.h
+++ b/include/lzma/LzmaTypes.h
@@ -31,6 +31,6 @@
  */
 #define Byte LZByte
 
-#include "../../lib_generic/lzma/Types.h"
+#include "../../lib/lzma/Types.h"
 
 #endif
diff --git a/include/u-boot/crc.h b/include/u-boot/crc.h
index 61bce6791454b47945f450ac6f98354be17093f7..07badbfc5a95d170a7ea99d142abd0d2a97d5088 100644
--- a/include/u-boot/crc.h
+++ b/include/u-boot/crc.h
@@ -25,7 +25,7 @@
 #ifndef _UBOOT_CRC_H
 #define _UBOOT_CRC_H
 
-/* lib_generic/crc32.c */
+/* lib/crc32.c */
 uint32_t crc32 (uint32_t, const unsigned char *, uint);
 uint32_t crc32_wd (uint32_t, const unsigned char *, uint, uint);
 uint32_t crc32_no_comp (uint32_t, const unsigned char *, uint);
diff --git a/lib_generic/Makefile b/lib/Makefile
similarity index 100%
rename from lib_generic/Makefile
rename to lib/Makefile
diff --git a/lib_generic/addr_map.c b/lib/addr_map.c
similarity index 100%
rename from lib_generic/addr_map.c
rename to lib/addr_map.c
diff --git a/lib_generic/bzlib.c b/lib/bzlib.c
similarity index 100%
rename from lib_generic/bzlib.c
rename to lib/bzlib.c
diff --git a/lib_generic/bzlib_crctable.c b/lib/bzlib_crctable.c
similarity index 100%
rename from lib_generic/bzlib_crctable.c
rename to lib/bzlib_crctable.c
diff --git a/lib_generic/bzlib_decompress.c b/lib/bzlib_decompress.c
similarity index 100%
rename from lib_generic/bzlib_decompress.c
rename to lib/bzlib_decompress.c
diff --git a/lib_generic/bzlib_huffman.c b/lib/bzlib_huffman.c
similarity index 100%
rename from lib_generic/bzlib_huffman.c
rename to lib/bzlib_huffman.c
diff --git a/lib_generic/bzlib_private.h b/lib/bzlib_private.h
similarity index 100%
rename from lib_generic/bzlib_private.h
rename to lib/bzlib_private.h
diff --git a/lib_generic/bzlib_randtable.c b/lib/bzlib_randtable.c
similarity index 100%
rename from lib_generic/bzlib_randtable.c
rename to lib/bzlib_randtable.c
diff --git a/lib_generic/circbuf.c b/lib/circbuf.c
similarity index 100%
rename from lib_generic/circbuf.c
rename to lib/circbuf.c
diff --git a/lib_generic/crc16.c b/lib/crc16.c
similarity index 100%
rename from lib_generic/crc16.c
rename to lib/crc16.c
diff --git a/lib_generic/crc32.c b/lib/crc32.c
similarity index 100%
rename from lib_generic/crc32.c
rename to lib/crc32.c
diff --git a/lib_generic/ctype.c b/lib/ctype.c
similarity index 100%
rename from lib_generic/ctype.c
rename to lib/ctype.c
diff --git a/lib_generic/display_options.c b/lib/display_options.c
similarity index 100%
rename from lib_generic/display_options.c
rename to lib/display_options.c
diff --git a/lib_generic/div64.c b/lib/div64.c
similarity index 100%
rename from lib_generic/div64.c
rename to lib/div64.c
diff --git a/lib_generic/gunzip.c b/lib/gunzip.c
similarity index 100%
rename from lib_generic/gunzip.c
rename to lib/gunzip.c
diff --git a/lib_generic/ldiv.c b/lib/ldiv.c
similarity index 100%
rename from lib_generic/ldiv.c
rename to lib/ldiv.c
diff --git a/lib_generic/lmb.c b/lib/lmb.c
similarity index 100%
rename from lib_generic/lmb.c
rename to lib/lmb.c
diff --git a/lib_generic/lzma/LzmaDec.c b/lib/lzma/LzmaDec.c
similarity index 100%
rename from lib_generic/lzma/LzmaDec.c
rename to lib/lzma/LzmaDec.c
diff --git a/lib_generic/lzma/LzmaDec.h b/lib/lzma/LzmaDec.h
similarity index 100%
rename from lib_generic/lzma/LzmaDec.h
rename to lib/lzma/LzmaDec.h
diff --git a/lib_generic/lzma/LzmaTools.c b/lib/lzma/LzmaTools.c
similarity index 100%
rename from lib_generic/lzma/LzmaTools.c
rename to lib/lzma/LzmaTools.c
diff --git a/lib_generic/lzma/LzmaTools.h b/lib/lzma/LzmaTools.h
similarity index 100%
rename from lib_generic/lzma/LzmaTools.h
rename to lib/lzma/LzmaTools.h
diff --git a/lib_generic/lzma/Makefile b/lib/lzma/Makefile
similarity index 100%
rename from lib_generic/lzma/Makefile
rename to lib/lzma/Makefile
diff --git a/lib_generic/lzma/README.txt b/lib/lzma/README.txt
similarity index 100%
rename from lib_generic/lzma/README.txt
rename to lib/lzma/README.txt
diff --git a/lib_generic/lzma/Types.h b/lib/lzma/Types.h
similarity index 100%
rename from lib_generic/lzma/Types.h
rename to lib/lzma/Types.h
diff --git a/lib_generic/lzma/history.txt b/lib/lzma/history.txt
similarity index 100%
rename from lib_generic/lzma/history.txt
rename to lib/lzma/history.txt
diff --git a/lib_generic/lzma/import_lzmasdk.sh b/lib/lzma/import_lzmasdk.sh
similarity index 100%
rename from lib_generic/lzma/import_lzmasdk.sh
rename to lib/lzma/import_lzmasdk.sh
diff --git a/lib_generic/lzma/license.txt b/lib/lzma/license.txt
similarity index 100%
rename from lib_generic/lzma/license.txt
rename to lib/lzma/license.txt
diff --git a/lib_generic/lzma/lzma.txt b/lib/lzma/lzma.txt
similarity index 100%
rename from lib_generic/lzma/lzma.txt
rename to lib/lzma/lzma.txt
diff --git a/lib_generic/lzo/Makefile b/lib/lzo/Makefile
similarity index 100%
rename from lib_generic/lzo/Makefile
rename to lib/lzo/Makefile
diff --git a/lib_generic/lzo/lzo1x_decompress.c b/lib/lzo/lzo1x_decompress.c
similarity index 100%
rename from lib_generic/lzo/lzo1x_decompress.c
rename to lib/lzo/lzo1x_decompress.c
diff --git a/lib_generic/lzo/lzodefs.h b/lib/lzo/lzodefs.h
similarity index 100%
rename from lib_generic/lzo/lzodefs.h
rename to lib/lzo/lzodefs.h
diff --git a/lib_generic/md5.c b/lib/md5.c
similarity index 100%
rename from lib_generic/md5.c
rename to lib/md5.c
diff --git a/lib_generic/net_utils.c b/lib/net_utils.c
similarity index 100%
rename from lib_generic/net_utils.c
rename to lib/net_utils.c
diff --git a/lib_generic/rbtree.c b/lib/rbtree.c
similarity index 100%
rename from lib_generic/rbtree.c
rename to lib/rbtree.c
diff --git a/lib_generic/sha1.c b/lib/sha1.c
similarity index 100%
rename from lib_generic/sha1.c
rename to lib/sha1.c
diff --git a/lib_generic/sha256.c b/lib/sha256.c
similarity index 100%
rename from lib_generic/sha256.c
rename to lib/sha256.c
diff --git a/lib_generic/string.c b/lib/string.c
similarity index 100%
rename from lib_generic/string.c
rename to lib/string.c
diff --git a/lib_generic/strmhz.c b/lib/strmhz.c
similarity index 100%
rename from lib_generic/strmhz.c
rename to lib/strmhz.c
diff --git a/lib_generic/time.c b/lib/time.c
similarity index 100%
rename from lib_generic/time.c
rename to lib/time.c
diff --git a/lib_generic/vsprintf.c b/lib/vsprintf.c
similarity index 100%
rename from lib_generic/vsprintf.c
rename to lib/vsprintf.c
diff --git a/lib_generic/zlib.c b/lib/zlib.c
similarity index 100%
rename from lib_generic/zlib.c
rename to lib/zlib.c
diff --git a/tools/Makefile b/tools/Makefile
index 743505f9299d5ba135655d9c377d27c63ac69269..a6f11c9a2007db31f59749c0a414a26196d9cb65 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -68,9 +68,9 @@ BIN_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX)
 # Source files which exist outside the tools directory
 EXT_OBJ_FILES-y += common/env_embedded.o
 EXT_OBJ_FILES-y += common/image.o
-EXT_OBJ_FILES-y += lib_generic/crc32.o
-EXT_OBJ_FILES-y += lib_generic/md5.o
-EXT_OBJ_FILES-y += lib_generic/sha1.o
+EXT_OBJ_FILES-y += lib/crc32.o
+EXT_OBJ_FILES-y += lib/md5.o
+EXT_OBJ_FILES-y += lib/sha1.o
 
 # Source files located in the tools directory
 OBJ_FILES-$(CONFIG_LCD_LOGO) += bmp_logo.o
@@ -196,7 +196,7 @@ $(obj)ubsha1$(SFX):	$(obj)os_support.o $(obj)sha1.o $(obj)ubsha1.o
 $(obj)%.o: $(SRCTREE)/common/%.c
 	$(HOSTCC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $<
 
-$(obj)%.o: $(SRCTREE)/lib_generic/%.c
+$(obj)%.o: $(SRCTREE)/lib/%.c
 	$(HOSTCC) -g $(HOSTCFLAGS) -c -o $@ $<
 
 $(obj)%.o: $(SRCTREE)/libfdt/%.c
diff --git a/tools/env/Makefile b/tools/env/Makefile
index 9629ee58ef1298d5ef8edfad8b6e329fb61131fb..2df631e98a79fa96c1d6872f47b37cbf14f6024b 100644
--- a/tools/env/Makefile
+++ b/tools/env/Makefile
@@ -41,7 +41,7 @@ clean:
 	rm -f $(obj)fw_printenv $(obj)crc32.c
 
 $(obj)crc32.c:
-	ln -s $(src)../../lib_generic/crc32.c $(obj)crc32.c
+	ln -s $(src)../../lib/crc32.c $(obj)crc32.c
 
 #########################################################################
 
diff --git a/tools/imls/Makefile b/tools/imls/Makefile
index 9b2afb07624252240a84414d5277b4ac422b14e0..82c2728068c62e16ab6db11814fcac082de759fe 100644
--- a/tools/imls/Makefile
+++ b/tools/imls/Makefile
@@ -23,9 +23,9 @@ include $(TOPDIR)/config.mk
 BIN_FILES-y += imls
 
 # Source files which exist outside the tools/imls directory
-EXT_OBJ_FILES-y += lib_generic/crc32.o
-EXT_OBJ_FILES-y += lib_generic/md5.o
-EXT_OBJ_FILES-y += lib_generic/sha1.o
+EXT_OBJ_FILES-y += lib/crc32.o
+EXT_OBJ_FILES-y += lib/md5.o
+EXT_OBJ_FILES-y += lib/sha1.o
 EXT_OBJ_FILES-y += common/image.o
 
 # Source files located in the tools/imls directory
@@ -78,7 +78,7 @@ $(obj)imls.o: $(SRCTREE)/tools/imls/imls.c
 $(obj)%.o: $(SRCTREE)/common/%.c
 	$(CC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $<
 
-$(obj)%.o: $(SRCTREE)/lib_generic/%.c
+$(obj)%.o: $(SRCTREE)/lib/%.c
 	$(CC) -g $(HOSTCFLAGS) -c -o $@ $<
 
 $(obj)%.o: $(SRCTREE)/libfdt/%.c