[U-Boot] [PATCH 02/17] Rename lib_generic/ to lib/

Peter Tyser ptyser at xes-inc.com
Mon Dec 14 00:04:25 CET 2009


Now that the other architecture-specific lib directories have been
moved out of the top-level directory there's not much to have the
_generic suffix on the common lib directory.

Signed-off-by: Peter Tyser <ptyser at xes-inc.com>
---
 Makefile                                    |    8 ++++----
 README                                      |    2 +-
 board/BuS/EB+MCF-EV123/u-boot.lds           |    8 ++++----
 board/LEOX/elpt860/u-boot.lds               |    8 ++++----
 board/LEOX/elpt860/u-boot.lds.debug         |    4 ++--
 board/RPXClassic/u-boot.lds                 |    6 +++---
 board/RPXClassic/u-boot.lds.debug           |    4 ++--
 board/RPXlite/u-boot.lds                    |    6 +++---
 board/RPXlite/u-boot.lds.debug              |    4 ++--
 board/RPXlite_dw/u-boot.lds                 |    6 +++---
 board/RPXlite_dw/u-boot.lds.debug           |    4 ++--
 board/RRvision/u-boot.lds                   |    6 +++---
 board/actux1/u-boot.lds                     |    4 ++--
 board/actux2/u-boot.lds                     |    4 ++--
 board/actux3/u-boot.lds                     |    4 ++--
 board/amirix/ap1000/u-boot.lds              |    4 ++--
 board/bf518f-ezbrd/config.mk                |    2 +-
 board/bf526-ezbrd/config.mk                 |    2 +-
 board/bf527-ezkit/config.mk                 |    2 +-
 board/bf533-ezkit/config.mk                 |    2 +-
 board/bf533-stamp/config.mk                 |    2 +-
 board/bf537-stamp/config.mk                 |    2 +-
 board/bf538f-ezkit/config.mk                |    2 +-
 board/bf548-ezkit/config.mk                 |    2 +-
 board/bf561-ezkit/config.mk                 |    2 +-
 board/c2mon/u-boot.lds                      |    6 +++---
 board/c2mon/u-boot.lds.debug                |    4 ++--
 board/cm-bf527/config.mk                    |    2 +-
 board/cm-bf533/config.mk                    |    2 +-
 board/cm-bf537e/config.mk                   |    2 +-
 board/cm-bf537u/config.mk                   |    2 +-
 board/cm-bf548/config.mk                    |    2 +-
 board/cm-bf561/config.mk                    |    2 +-
 board/cobra5272/u-boot.lds                  |    2 +-
 board/cogent/u-boot.lds.debug               |    4 ++--
 board/cray/L1/u-boot.lds.debug              |    4 ++--
 board/eltec/mhpc/u-boot.lds.debug           |    4 ++--
 board/emk/top860/u-boot.lds.debug           |    4 ++--
 board/esd/tasreg/u-boot.lds                 |    2 +-
 board/esteem192e/u-boot.lds                 |    6 +++---
 board/etx094/u-boot.lds                     |    4 ++--
 board/etx094/u-boot.lds.debug               |    4 ++--
 board/fads/u-boot.lds.debug                 |    4 ++--
 board/flagadm/u-boot.lds.debug              |    4 ++--
 board/freescale/m52277evb/u-boot.spa        |    2 +-
 board/freescale/m5235evb/u-boot.16          |    2 +-
 board/freescale/m5235evb/u-boot.32          |    2 +-
 board/freescale/m5249evb/u-boot.lds         |    2 +-
 board/freescale/m5253demo/u-boot.lds        |    2 +-
 board/freescale/m5253evbe/u-boot.lds        |    2 +-
 board/freescale/m5271evb/u-boot.lds         |    2 +-
 board/freescale/m5272c3/u-boot.lds          |    2 +-
 board/freescale/m5275evb/u-boot.lds         |    4 ++--
 board/freescale/m5282evb/u-boot.lds         |    6 +++---
 board/freescale/m53017evb/u-boot.lds        |    2 +-
 board/freescale/m5329evb/u-boot.lds         |    2 +-
 board/freescale/m5373evb/u-boot.lds         |    2 +-
 board/freescale/m54451evb/u-boot.spa        |    2 +-
 board/freescale/m54451evb/u-boot.stm        |    2 +-
 board/freescale/m54455evb/u-boot.atm        |    2 +-
 board/freescale/m54455evb/u-boot.int        |    2 +-
 board/freescale/mpc8610hpcd/u-boot.lds      |    4 ++--
 board/freescale/mpc8641hpcn/u-boot.lds      |    4 ++--
 board/genietv/u-boot.lds                    |    6 +++---
 board/genietv/u-boot.lds.debug              |    6 +++---
 board/hermes/u-boot.lds                     |    2 +-
 board/hymod/u-boot.lds                      |    6 +++---
 board/hymod/u-boot.lds.debug                |    4 ++--
 board/icu862/u-boot.lds                     |    6 +++---
 board/icu862/u-boot.lds.debug               |    4 ++--
 board/idmr/u-boot.lds                       |    2 +-
 board/ivm/u-boot.lds.debug                  |    4 ++--
 board/keymile/km8xx/u-boot.lds              |    6 +++---
 board/kup/kup4k/u-boot.lds                  |    6 +++---
 board/kup/kup4k/u-boot.lds.debug            |    4 ++--
 board/kup/kup4x/u-boot.lds                  |    6 +++---
 board/kup/kup4x/u-boot.lds.debug            |    4 ++--
 board/lantec/u-boot.lds                     |    6 +++---
 board/lantec/u-boot.lds.debug               |    4 ++--
 board/lwmon/u-boot.lds.debug                |    4 ++--
 board/mbx8xx/u-boot.lds.debug               |    4 ++--
 board/ml2/u-boot.lds                        |    4 ++--
 board/ml2/u-boot.lds.debug                  |    4 ++--
 board/mousse/u-boot.lds                     |    6 +++---
 board/mousse/u-boot.lds.rom                 |    6 +++---
 board/mpl/pip405/u-boot.lds.debug           |    4 ++--
 board/netphone/u-boot.lds                   |    6 +++---
 board/netphone/u-boot.lds.debug             |    4 ++--
 board/netstar/Makefile                      |    4 ++--
 board/netta/u-boot.lds                      |    6 +++---
 board/netta/u-boot.lds.debug                |    4 ++--
 board/netta2/u-boot.lds                     |    6 +++---
 board/netta2/u-boot.lds.debug               |    4 ++--
 board/netvia/u-boot.lds                     |    6 +++---
 board/netvia/u-boot.lds.debug               |    4 ++--
 board/nx823/u-boot.lds.debug                |    4 ++--
 board/purple/u-boot.lds                     |    2 +-
 board/quantum/u-boot.lds                    |    6 +++---
 board/quantum/u-boot.lds.debug              |    4 ++--
 board/rbc823/u-boot.lds                     |    6 +++---
 board/rmu/u-boot.lds                        |    6 +++---
 board/rmu/u-boot.lds.debug                  |    4 ++--
 board/sandburst/karef/u-boot.lds.debug      |    4 ++--
 board/sandburst/metrobox/u-boot.lds.debug   |    4 ++--
 board/sbc8641d/u-boot.lds                   |    4 ++--
 board/sc3/u-boot.lds                        |    4 ++--
 board/siemens/CCM/u-boot.lds                |    6 +++---
 board/siemens/CCM/u-boot.lds.debug          |    4 ++--
 board/siemens/pcu_e/u-boot.lds.debug        |    4 ++--
 board/snmc/qs850/u-boot.lds                 |    6 +++---
 board/snmc/qs860t/u-boot.lds                |    6 +++---
 board/spc1920/u-boot.lds                    |    6 +++---
 board/spd8xx/u-boot.lds.debug               |    4 ++--
 board/stx/stxxtc/u-boot.lds                 |    6 +++---
 board/stx/stxxtc/u-boot.lds.debug           |    4 ++--
 board/svm_sc8xx/u-boot.lds                  |    6 +++---
 board/svm_sc8xx/u-boot.lds.debug            |    4 ++--
 board/tcm-bf537/config.mk                   |    2 +-
 board/tqc/tqm8xx/u-boot.lds                 |    6 +++---
 board/tqc/tqm8xx/u-boot.lds.debug           |    4 ++--
 board/trab/Makefile                         |    2 +-
 board/trab/u-boot.lds                       |    6 +++---
 board/uc100/u-boot.lds                      |    6 +++---
 board/uc100/u-boot.lds.debug                |    4 ++--
 board/v37/u-boot.lds                        |    6 +++---
 board/voiceblue/Makefile                    |    2 +-
 board/w7o/u-boot.lds.debug                  |    4 ++--
 board/westel/amx860/u-boot.lds              |    6 +++---
 board/westel/amx860/u-boot.lds.debug        |    4 ++--
 board/xes/xpedite1000/u-boot.lds.debug      |    4 ++--
 board/xes/xpedite5170/u-boot.lds            |    4 ++--
 board/xilinx/ml300/u-boot.lds               |    4 ++--
 board/xilinx/ml300/u-boot.lds.debug         |    4 ++--
 cpu/mpc5xxx/u-boot-customlayout.lds         |    2 +-
 examples/api/Makefile                       |   14 +++++++-------
 examples/api/libgenwrap.c                   |    2 +-
 include/common.h                            |    8 ++++----
 include/configs/bf533-stamp.h               |    2 +-
 include/configs/bf537-pnav.h                |    2 +-
 include/configs/bf537-stamp.h               |    2 +-
 include/configs/bf538f-ezkit.h              |    2 +-
 include/configs/bf561-ezkit.h               |    4 ++--
 include/configs/cm-bf537e.h                 |    2 +-
 include/configs/cm-bf537u.h                 |    2 +-
 include/configs/ibf-dsp561.h                |    4 ++--
 include/configs/tcm-bf537.h                 |    2 +-
 include/lzma/LzmaDec.h                      |    2 +-
 include/lzma/LzmaTools.h                    |    2 +-
 include/lzma/LzmaTypes.h                    |    2 +-
 include/u-boot/crc.h                        |    2 +-
 {lib_generic => lib}/Makefile               |    0
 {lib_generic => lib}/addr_map.c             |    0
 {lib_generic => lib}/bzlib.c                |    0
 {lib_generic => lib}/bzlib_crctable.c       |    0
 {lib_generic => lib}/bzlib_decompress.c     |    0
 {lib_generic => lib}/bzlib_huffman.c        |    0
 {lib_generic => lib}/bzlib_private.h        |    0
 {lib_generic => lib}/bzlib_randtable.c      |    0
 {lib_generic => lib}/circbuf.c              |    0
 {lib_generic => lib}/crc16.c                |    0
 {lib_generic => lib}/crc32.c                |    0
 {lib_generic => lib}/ctype.c                |    0
 {lib_generic => lib}/display_options.c      |    0
 {lib_generic => lib}/div64.c                |    0
 {lib_generic => lib}/gunzip.c               |    0
 {lib_generic => lib}/ldiv.c                 |    0
 {lib_generic => lib}/lmb.c                  |    0
 {lib_generic => lib}/lzma/LzmaDec.c         |    0
 {lib_generic => lib}/lzma/LzmaDec.h         |    0
 {lib_generic => lib}/lzma/LzmaTools.c       |    0
 {lib_generic => lib}/lzma/LzmaTools.h       |    0
 {lib_generic => lib}/lzma/Makefile          |    0
 {lib_generic => lib}/lzma/README.txt        |    0
 {lib_generic => lib}/lzma/Types.h           |    0
 {lib_generic => lib}/lzma/history.txt       |    0
 {lib_generic => lib}/lzma/import_lzmasdk.sh |    0
 {lib_generic => lib}/lzma/license.txt       |    0
 {lib_generic => lib}/lzma/lzma.txt          |    0
 {lib_generic => lib}/lzo/Makefile           |    0
 {lib_generic => lib}/lzo/lzo1x_decompress.c |    0
 {lib_generic => lib}/lzo/lzodefs.h          |    0
 {lib_generic => lib}/md5.c                  |    0
 {lib_generic => lib}/rbtree.c               |    0
 {lib_generic => lib}/sha1.c                 |    0
 {lib_generic => lib}/sha256.c               |    0
 {lib_generic => lib}/string.c               |    0
 {lib_generic => lib}/strmhz.c               |    0
 {lib_generic => lib}/time.c                 |    0
 {lib_generic => lib}/vsprintf.c             |    0
 {lib_generic => lib}/zlib.c                 |    0
 tools/Makefile                              |    8 ++++----
 tools/env/Makefile                          |    2 +-
 tools/imls/Makefile                         |    8 ++++----
 193 files changed, 305 insertions(+), 305 deletions(-)
 rename {lib_generic => lib}/Makefile (100%)
 rename {lib_generic => lib}/addr_map.c (100%)
 rename {lib_generic => lib}/bzlib.c (100%)
 rename {lib_generic => lib}/bzlib_crctable.c (100%)
 rename {lib_generic => lib}/bzlib_decompress.c (100%)
 rename {lib_generic => lib}/bzlib_huffman.c (100%)
 rename {lib_generic => lib}/bzlib_private.h (100%)
 rename {lib_generic => lib}/bzlib_randtable.c (100%)
 rename {lib_generic => lib}/circbuf.c (100%)
 rename {lib_generic => lib}/crc16.c (100%)
 rename {lib_generic => lib}/crc32.c (100%)
 rename {lib_generic => lib}/ctype.c (100%)
 rename {lib_generic => lib}/display_options.c (100%)
 rename {lib_generic => lib}/div64.c (100%)
 rename {lib_generic => lib}/gunzip.c (100%)
 rename {lib_generic => lib}/ldiv.c (100%)
 rename {lib_generic => lib}/lmb.c (100%)
 rename {lib_generic => lib}/lzma/LzmaDec.c (100%)
 rename {lib_generic => lib}/lzma/LzmaDec.h (100%)
 rename {lib_generic => lib}/lzma/LzmaTools.c (100%)
 rename {lib_generic => lib}/lzma/LzmaTools.h (100%)
 rename {lib_generic => lib}/lzma/Makefile (100%)
 rename {lib_generic => lib}/lzma/README.txt (100%)
 rename {lib_generic => lib}/lzma/Types.h (100%)
 rename {lib_generic => lib}/lzma/history.txt (100%)
 rename {lib_generic => lib}/lzma/import_lzmasdk.sh (100%)
 rename {lib_generic => lib}/lzma/license.txt (100%)
 rename {lib_generic => lib}/lzma/lzma.txt (100%)
 rename {lib_generic => lib}/lzo/Makefile (100%)
 rename {lib_generic => lib}/lzo/lzo1x_decompress.c (100%)
 rename {lib_generic => lib}/lzo/lzodefs.h (100%)
 rename {lib_generic => lib}/md5.c (100%)
 rename {lib_generic => lib}/rbtree.c (100%)
 rename {lib_generic => lib}/sha1.c (100%)
 rename {lib_generic => lib}/sha256.c (100%)
 rename {lib_generic => lib}/string.c (100%)
 rename {lib_generic => lib}/strmhz.c (100%)
 rename {lib_generic => lib}/time.c (100%)
 rename {lib_generic => lib}/vsprintf.c (100%)
 rename {lib_generic => lib}/zlib.c (100%)

diff --git a/Makefile b/Makefile
index 4b4040b..c13aa0a 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 += cpu/$(CPU)/lib$(CPU).a
@@ -403,7 +403,7 @@ depend dep:	$(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk
 		for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir _depend ; done
 
 TAG_SUBDIRS += include
-TAG_SUBDIRS += lib_generic board/$(BOARDDIR)
+TAG_SUBDIRS += lib board/$(BOARDDIR)
 TAG_SUBDIRS += cpu/$(CPU)
 TAG_SUBDIRS += arch/$(ARCH)/lib
 TAG_SUBDIRS += fs/cramfs
diff --git a/README b/README
index 4ddd6c7..b230e40 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 3450793..b05eacf 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 32778ca..d3929ea 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 5126083..f6c21f7 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 c354ff8..09d9470 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 a2d940f..f559df7 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 c354ff8..09d9470 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 a2d940f..f559df7 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 89aafff..a099cb9 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 83fdc15..3b61a42 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 88644a4..1132fd6 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 1087167..40b5ef3 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 543af30..f9ab281 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 f63251d..2fc3796 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 10308d5..89ffc6d 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/bf518f-ezbrd/config.mk b/board/bf518f-ezbrd/config.mk
index f85bef5..e0c459e 100644
--- a/board/bf518f-ezbrd/config.mk
+++ b/board/bf518f-ezbrd/config.mk
@@ -26,7 +26,7 @@
 # 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 += -O2
 CFLAGS_lzma += -O2
 
 # Set some default LDR flags based on boot mode.
diff --git a/board/bf526-ezbrd/config.mk b/board/bf526-ezbrd/config.mk
index f85bef5..e0c459e 100644
--- a/board/bf526-ezbrd/config.mk
+++ b/board/bf526-ezbrd/config.mk
@@ -26,7 +26,7 @@
 # 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 += -O2
 CFLAGS_lzma += -O2
 
 # Set some default LDR flags based on boot mode.
diff --git a/board/bf527-ezkit/config.mk b/board/bf527-ezkit/config.mk
index f85bef5..e0c459e 100644
--- a/board/bf527-ezkit/config.mk
+++ b/board/bf527-ezkit/config.mk
@@ -26,7 +26,7 @@
 # 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 += -O2
 CFLAGS_lzma += -O2
 
 # Set some default LDR flags based on boot mode.
diff --git a/board/bf533-ezkit/config.mk b/board/bf533-ezkit/config.mk
index 3c0b46f..8470f7d 100644
--- a/board/bf533-ezkit/config.mk
+++ b/board/bf533-ezkit/config.mk
@@ -26,7 +26,7 @@
 # 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 += -O2
 CFLAGS_lzma += -O2
 
 # Set some default LDR flags based on boot mode.
diff --git a/board/bf533-stamp/config.mk b/board/bf533-stamp/config.mk
index 3c0b46f..8470f7d 100644
--- a/board/bf533-stamp/config.mk
+++ b/board/bf533-stamp/config.mk
@@ -26,7 +26,7 @@
 # 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 += -O2
 CFLAGS_lzma += -O2
 
 # Set some default LDR flags based on boot mode.
diff --git a/board/bf537-stamp/config.mk b/board/bf537-stamp/config.mk
index bc14257..9408baa 100644
--- a/board/bf537-stamp/config.mk
+++ b/board/bf537-stamp/config.mk
@@ -26,7 +26,7 @@
 # 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 += -O2
 CFLAGS_lzma += -O2
 
 # Set some default LDR flags based on boot mode.
diff --git a/board/bf538f-ezkit/config.mk b/board/bf538f-ezkit/config.mk
index 3c0b46f..8470f7d 100644
--- a/board/bf538f-ezkit/config.mk
+++ b/board/bf538f-ezkit/config.mk
@@ -26,7 +26,7 @@
 # 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 += -O2
 CFLAGS_lzma += -O2
 
 # Set some default LDR flags based on boot mode.
diff --git a/board/bf548-ezkit/config.mk b/board/bf548-ezkit/config.mk
index 42ff946..f6a8274 100644
--- a/board/bf548-ezkit/config.mk
+++ b/board/bf548-ezkit/config.mk
@@ -26,7 +26,7 @@
 # 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 += -O2
 CFLAGS_lzma += -O2
 
 # Set some default LDR flags based on boot mode.
diff --git a/board/bf561-ezkit/config.mk b/board/bf561-ezkit/config.mk
index cfad21a..d498313 100644
--- a/board/bf561-ezkit/config.mk
+++ b/board/bf561-ezkit/config.mk
@@ -26,7 +26,7 @@
 # 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 += -O2
 CFLAGS_lzma += -O2
 
 # Set some default LDR flags based on boot mode.
diff --git a/board/c2mon/u-boot.lds b/board/c2mon/u-boot.lds
index 0571f02..51e95d5 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 ad36953..d55bf33 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 f85bef5..e0c459e 100644
--- a/board/cm-bf527/config.mk
+++ b/board/cm-bf527/config.mk
@@ -26,7 +26,7 @@
 # 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 += -O2
 CFLAGS_lzma += -O2
 
 # Set some default LDR flags based on boot mode.
diff --git a/board/cm-bf533/config.mk b/board/cm-bf533/config.mk
index 3c0b46f..8470f7d 100644
--- a/board/cm-bf533/config.mk
+++ b/board/cm-bf533/config.mk
@@ -26,7 +26,7 @@
 # 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 += -O2
 CFLAGS_lzma += -O2
 
 # Set some default LDR flags based on boot mode.
diff --git a/board/cm-bf537e/config.mk b/board/cm-bf537e/config.mk
index 3c0b46f..8470f7d 100644
--- a/board/cm-bf537e/config.mk
+++ b/board/cm-bf537e/config.mk
@@ -26,7 +26,7 @@
 # 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 += -O2
 CFLAGS_lzma += -O2
 
 # Set some default LDR flags based on boot mode.
diff --git a/board/cm-bf537u/config.mk b/board/cm-bf537u/config.mk
index 3c0b46f..8470f7d 100644
--- a/board/cm-bf537u/config.mk
+++ b/board/cm-bf537u/config.mk
@@ -26,7 +26,7 @@
 # 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 += -O2
 CFLAGS_lzma += -O2
 
 # Set some default LDR flags based on boot mode.
diff --git a/board/cm-bf548/config.mk b/board/cm-bf548/config.mk
index 0c95b39..fda519a 100644
--- a/board/cm-bf548/config.mk
+++ b/board/cm-bf548/config.mk
@@ -26,7 +26,7 @@
 # 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 += -O2
 CFLAGS_lzma += -O2
 
 # Set some default LDR flags based on boot mode.
diff --git a/board/cm-bf561/config.mk b/board/cm-bf561/config.mk
index cfad21a..d498313 100644
--- a/board/cm-bf561/config.mk
+++ b/board/cm-bf561/config.mk
@@ -26,7 +26,7 @@
 # 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 += -O2
 CFLAGS_lzma += -O2
 
 # Set some default LDR flags based on boot mode.
diff --git a/board/cobra5272/u-boot.lds b/board/cobra5272/u-boot.lds
index 8989880..aacc089 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 a2d940f..f559df7 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 40d2f78..09c0191 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 ad36953..d55bf33 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 4e4943f..6ca7298 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 54e0169..f87d3cb 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 215a2c4..848eacd 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 1d34e68..d8112eb 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 dd4dbfa..12f6ce7 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 8d91aed..4f179c7 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 ad36953..d55bf33 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 23d5710..6d916d8 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 940da14..4e70efb 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 50045e1..cbf2249 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 54e0169..f87d3cb 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 e53e67d..455e9b8 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 7f4dc27..99c125c 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 713b18a..588a128 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 446ec1b..aaba5a3 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 daf8724..700b9f5 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 f46e025..e936adf 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 fe0e314..a725da1 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 0ed87ff..bf4f188 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 605452b..c129ac2 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 569518b..e63b1f2 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 1b06b12..7c3f068 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 c48dd75..2dd8a23 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 ef07174..8e54d79 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 2ad0f0e..67847f1 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 796828a..20e0344 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 9fc71a2..1bd1ba7 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 9bb2c58..c0dd67f 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 1252baf..1f6e7d6 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 cc32b44..965716f 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 a2d940f..f559df7 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 b614262..d7d0fb3 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 919eb21..282738b 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 713b18a..588a128 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 17965a0..037785e 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 8b6305a..759072d 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 8e4faa1..e1233a7 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 83fdc15..3b61a42 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 8e4faa1..e1233a7 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 83fdc15..3b61a42 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 814a7a6..50bdfb4 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 3b4799e..be06235 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 49f8972..251ee9b 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 8d91aed..4f179c7 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 0083a21..e68cfb8 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 40d2f78..09c0191 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 c92a2ab..f6930b5 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 9750fc5..8355f33 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 40d2f78..09c0191 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 4b17a1f..8f96b1d 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 4ef16f1..1397511 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 11578b7..ffb5c53 100644
--- a/board/netstar/Makefile
+++ b/board/netstar/Makefile
@@ -54,7 +54,7 @@ $(obj)eeprom.srec:	$(obj)eeprom.o $(obj)eeprom_start.o $(obj)u-boot.lds
 	cd $(lnk) && $(LD) -T $(obj)u-boot.lds -g -Ttext $(LOAD_ADDR) \
 		-o $(<:.o=) -e eeprom eeprom.o eeprom_start.o \
 		-L$(obj)../../examples/standalone -lstubs \
-		-L$(obj)../../lib_generic -lgeneric \
+		-L$(obj)../../lib -lgeneric \
 		-L$(gcclibdir) -lgcc
 	$(OBJCOPY) -O srec $(<:.o=) $@
 
@@ -75,7 +75,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 -o $@ -c $<
 
 $(obj)u-boot.lds: $(LDSCRIPT)
diff --git a/board/netta/u-boot.lds b/board/netta/u-boot.lds
index 991d7a1..ff11ad0 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 4ef16f1..1397511 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 991d7a1..ff11ad0 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 4ef16f1..1397511 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 7eb01ee..70d5a6a 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 c3c99b3..bc8f32e 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 ad36953..d55bf33 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 04a641a..236ece4 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 c354ff8..09d9470 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 ec01fe2..dcad818 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 6074c14..15aca6c 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 c354ff8..09d9470 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 ec01fe2..dcad818 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 1d8ce10..34dce83 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 bbfea13..fa976c2 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 648efa2..7f04124 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 04b350a..fc7464e 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 0571f02..51e95d5 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 29657e9..2a6abfa 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 49f8972..251ee9b 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 ce115f5..271d74a 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 ce115f5..271d74a 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 172cfbb..f95f695 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 8d91aed..4f179c7 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 991d7a1..ff11ad0 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 4ef16f1..1397511 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 cf78200..6de7488 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 ec01fe2..dcad818 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-bf537/config.mk b/board/tcm-bf537/config.mk
index 3c0b46f..8470f7d 100644
--- a/board/tcm-bf537/config.mk
+++ b/board/tcm-bf537/config.mk
@@ -26,7 +26,7 @@
 # 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 += -O2
 CFLAGS_lzma += -O2
 
 # Set some default LDR flags based on boot mode.
diff --git a/board/tqc/tqm8xx/u-boot.lds b/board/tqc/tqm8xx/u-boot.lds
index 9f452c1..ceaac00 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 a2d940f..f559df7 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 27d75f3..0b13dc4 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 c3d5c49..05b929f 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 967e432..960b2a5 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 edaa402..116a972 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 c3dd8c7..248f488 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/voiceblue/Makefile b/board/voiceblue/Makefile
index 121c717..b44e378 100644
--- a/board/voiceblue/Makefile
+++ b/board/voiceblue/Makefile
@@ -48,7 +48,7 @@ $(obj)eeprom.srec:	$(obj)eeprom.o $(obj)eeprom_start.o $(obj)u-boot.lds
 	cd $(lnk) && $(LD) -T $(obj)u-boot.lds -g -Ttext $(LOAD_ADDR) \
 		-o $(<:.o=) -e eeprom eeprom.o eeprom_start.o \
 		-L$(obj)../../examples/standalone -lstubs \
-		-L$(obj)../../lib_generic -lgeneric \
+		-L$(obj)../../lib -lgeneric \
 		-L$(gcclibdir) -lgcc
 	$(OBJCOPY) -O srec $(<:.o=) $@
 
diff --git a/board/w7o/u-boot.lds.debug b/board/w7o/u-boot.lds.debug
index 85b1cd6..369c15a 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 0571f02..51e95d5 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 919eb21..282738b 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 0830d0a..555e1ac 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 648efa2..7f04124 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/board/xilinx/ml300/u-boot.lds b/board/xilinx/ml300/u-boot.lds
index da803a6..384edaf 100644
--- a/board/xilinx/ml300/u-boot.lds
+++ b/board/xilinx/ml300/u-boot.lds
@@ -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)
 */
 /*    . = env_offset;*/
 /*    common/env_embedded.o(.text)*/
diff --git a/board/xilinx/ml300/u-boot.lds.debug b/board/xilinx/ml300/u-boot.lds.debug
index 40d2f78..09c0191 100644
--- a/board/xilinx/ml300/u-boot.lds.debug
+++ b/board/xilinx/ml300/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/cpu/mpc5xxx/u-boot-customlayout.lds b/cpu/mpc5xxx/u-boot-customlayout.lds
index c08c9c9..6c80139 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 62751ec..bed16f1 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 2b107d9..655a90e 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 d582eed..abf354e 100644
--- a/include/common.h
+++ b/include/common.h
@@ -612,10 +612,10 @@ ulong	usec2ticks    (unsigned long usec);
 ulong	ticks2usec    (unsigned long ticks);
 int	init_timebase (void);
 
-/* 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);
@@ -625,10 +625,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 0006b02..06b4dee 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 0f908ef..f1872ec 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 74b9ecd..fa46551 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 c4d899d..0464943 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 a1fa80b..1cc6a6e 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 34d4299..b2a08e3 100644
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -105,7 +105,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 d1870a8..cd729a8 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 066859f..0108120 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 9794e1b..7c68bcf 100644
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -106,7 +106,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 967cdd1..b7ef6d6 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 87943c0..48b0af8 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 86160a4..740720c 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 61bce67..07badbf 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/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 5b8c3c3..7a06cda 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -59,9 +59,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
@@ -182,7 +182,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 $@ $<
 
 $(LIBFDT_OBJS):
diff --git a/tools/env/Makefile b/tools/env/Makefile
index 9629ee5..2df631e 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 9b2afb0..82c2728 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
-- 
1.6.2-rc2.GIT



More information about the U-Boot mailing list