[U-Boot] [PATCH 7/9] Move lib_generic to lib/generic

9 Jul 2009

Signed-off-by: Peter Tyser ptyser@xes-inc.com
---
 Makefile                                           |    8 ++++----
 README                                             |    2 +-
 api_examples/Makefile                              |   10 +++++-----
 api_examples/libgenwrap.c                          |    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/atum8548/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-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                           |    4 ++--
 board/cray/L1/u-boot.lds.debug                     |    4 ++--
 board/csb272/u-boot.lds                            |    4 ++--
 board/csb472/u-boot.lds                            |    4 ++--
 board/dave/PPChameleonEVB/u-boot.lds               |    4 ++--
 board/eltec/mhpc/u-boot.lds.debug                  |    4 ++--
 board/emk/top860/u-boot.lds.debug                  |    4 ++--
 board/eric/u-boot.lds                              |    4 ++--
 board/esd/ocrtc/u-boot.lds                         |    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/exbitgen/u-boot.lds                          |    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/mpc8540eval/u-boot.lds                       |    4 ++--
 board/mpl/mip405/u-boot.lds                        |    4 ++--
 board/mpl/pip405/u-boot.lds                        |    4 ++--
 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/pcs440ep/u-boot.lds                          |    2 +-
 board/pm854/u-boot.lds                             |    4 ++--
 board/pm856/u-boot.lds                             |    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                   |    4 ++--
 board/sandburst/karef/u-boot.lds.debug             |    4 ++--
 board/sandburst/metrobox/u-boot.lds                |    4 ++--
 board/sandburst/metrobox/u-boot.lds.debug          |    4 ++--
 board/sbc405/u-boot.lds                            |    4 ++--
 board/sbc8548/u-boot.lds                           |    4 ++--
 board/sbc8560/u-boot.lds                           |    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/socrates/u-boot.lds                          |    4 ++--
 board/spc1920/u-boot.lds                           |    6 +++---
 board/spd8xx/u-boot.lds.debug                      |    4 ++--
 board/stxgp3/u-boot.lds                            |    4 ++--
 board/stxssa/u-boot.lds                            |    4 ++--
 board/stxxtc/u-boot.lds                            |    6 +++---
 board/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/tqm85xx/u-boot.lds                       |    4 ++--
 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/xpedite5170/u-boot.lds                   |    4 ++--
 board/xilinx/ml300/u-boot.lds                      |    4 ++--
 board/xilinx/ml300/u-boot.lds.debug                |    4 ++--
 board/xpedite1k/u-boot.lds                         |    4 ++--
 board/xpedite1k/u-boot.lds.debug                   |    4 ++--
 cpu/mpc5xxx/u-boot-customlayout.lds                |    2 +-
 include/common.h                                   |    6 +++---
 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/ibf-dsp561.h                       |    4 ++--
 include/configs/tcm-bf537.h                        |    2 +-
 include/lzma/LzmaDecode.h                          |    2 +-
 include/lzma/LzmaTools.h                           |    2 +-
 include/lzma/LzmaTypes.h                           |    2 +-
 {lib_generic => lib/generic}/Makefile              |    0
 {lib_generic => lib/generic}/addr_map.c            |    0
 {lib_generic => lib/generic}/bzlib.c               |    0
 {lib_generic => lib/generic}/bzlib_crctable.c      |    0
 {lib_generic => lib/generic}/bzlib_decompress.c    |    0
 {lib_generic => lib/generic}/bzlib_huffman.c       |    0
 {lib_generic => lib/generic}/bzlib_private.h       |    0
 {lib_generic => lib/generic}/bzlib_randtable.c     |    0
 {lib_generic => lib/generic}/crc16.c               |    0
 {lib_generic => lib/generic}/crc32.c               |    0
 {lib_generic => lib/generic}/ctype.c               |    0
 {lib_generic => lib/generic}/display_options.c     |    0
 {lib_generic => lib/generic}/div64.c               |    0
 {lib_generic => lib/generic}/gunzip.c              |    0
 {lib_generic => lib/generic}/ldiv.c                |    0
 {lib_generic => lib/generic}/lmb.c                 |    0
 {lib_generic => lib/generic}/lzma/LGPL.txt         |    0
 {lib_generic => lib/generic}/lzma/LzmaDecode.c     |    0
 {lib_generic => lib/generic}/lzma/LzmaDecode.h     |    0
 {lib_generic => lib/generic}/lzma/LzmaTools.c      |    0
 {lib_generic => lib/generic}/lzma/LzmaTools.h      |    0
 {lib_generic => lib/generic}/lzma/LzmaTypes.h      |    0
 {lib_generic => lib/generic}/lzma/Makefile         |    0
 {lib_generic => lib/generic}/lzma/README.txt       |    0
 {lib_generic => lib/generic}/lzma/history.txt      |    0
 .../generic}/lzma/import_lzmasdk.sh                |    0
 {lib_generic => lib/generic}/lzma/lzma.txt         |    0
 {lib_generic => lib/generic}/lzo/Makefile          |    0
 .../generic}/lzo/lzo1x_decompress.c                |    0
 {lib_generic => lib/generic}/lzo/lzodefs.h         |    0
 {lib_generic => lib/generic}/md5.c                 |    0
 {lib_generic => lib/generic}/rbtree.c              |    0
 {lib_generic => lib/generic}/sha1.c                |    0
 {lib_generic => lib/generic}/sha256.c              |    0
 {lib_generic => lib/generic}/string.c              |    0
 {lib_generic => lib/generic}/strmhz.c              |    0
 {lib_generic => lib/generic}/vsprintf.c            |    0
 {lib_generic => lib/generic}/zlib.c                |    0
 tools/Makefile                                     |    8 ++++----
 tools/env/Makefile                                 |    2 +-
 tools/imls/Makefile                                |    8 ++++----
 212 files changed, 346 insertions(+), 346 deletions(-)
 rename {lib_generic => lib/generic}/Makefile (100%)
 rename {lib_generic => lib/generic}/addr_map.c (100%)
 rename {lib_generic => lib/generic}/bzlib.c (100%)
 rename {lib_generic => lib/generic}/bzlib_crctable.c (100%)
 rename {lib_generic => lib/generic}/bzlib_decompress.c (100%)
 rename {lib_generic => lib/generic}/bzlib_huffman.c (100%)
 rename {lib_generic => lib/generic}/bzlib_private.h (100%)
 rename {lib_generic => lib/generic}/bzlib_randtable.c (100%)
 rename {lib_generic => lib/generic}/crc16.c (100%)
 rename {lib_generic => lib/generic}/crc32.c (100%)
 rename {lib_generic => lib/generic}/ctype.c (100%)
 rename {lib_generic => lib/generic}/display_options.c (100%)
 rename {lib_generic => lib/generic}/div64.c (100%)
 rename {lib_generic => lib/generic}/gunzip.c (100%)
 rename {lib_generic => lib/generic}/ldiv.c (100%)
 rename {lib_generic => lib/generic}/lmb.c (100%)
 rename {lib_generic => lib/generic}/lzma/LGPL.txt (100%)
 rename {lib_generic => lib/generic}/lzma/LzmaDecode.c (100%)
 rename {lib_generic => lib/generic}/lzma/LzmaDecode.h (100%)
 rename {lib_generic => lib/generic}/lzma/LzmaTools.c (100%)
 rename {lib_generic => lib/generic}/lzma/LzmaTools.h (100%)
 rename {lib_generic => lib/generic}/lzma/LzmaTypes.h (100%)
 rename {lib_generic => lib/generic}/lzma/Makefile (100%)
 rename {lib_generic => lib/generic}/lzma/README.txt (100%)
 rename {lib_generic => lib/generic}/lzma/history.txt (100%)
 rename {lib_generic => lib/generic}/lzma/import_lzmasdk.sh (100%)
 rename {lib_generic => lib/generic}/lzma/lzma.txt (100%)
 rename {lib_generic => lib/generic}/lzo/Makefile (100%)
 rename {lib_generic => lib/generic}/lzo/lzo1x_decompress.c (100%)
 rename {lib_generic => lib/generic}/lzo/lzodefs.h (100%)
 rename {lib_generic => lib/generic}/md5.c (100%)
 rename {lib_generic => lib/generic}/rbtree.c (100%)
 rename {lib_generic => lib/generic}/sha1.c (100%)
 rename {lib_generic => lib/generic}/sha256.c (100%)
 rename {lib_generic => lib/generic}/string.c (100%)
 rename {lib_generic => lib/generic}/strmhz.c (100%)
 rename {lib_generic => lib/generic}/vsprintf.c (100%)
 rename {lib_generic => lib/generic}/zlib.c (100%)

diff --git a/Makefile b/Makefile
index b0dd4c5..d52b586 100644
--- a/Makefile
+++ b/Makefile
@@ -217,7 +217,7 @@ endif
 OBJS := $(addprefix $(obj),$(OBJS))
-LIBS  = lib_generic/libgeneric.a
-LIBS += lib_generic/lzma/liblzma.a
-LIBS += lib_generic/lzo/liblzo.a
+LIBS  = lib/generic/libgeneric.a
+LIBS += lib/generic/lzma/liblzma.a
+LIBS += lib/generic/lzo/liblzo.a
 LIBS += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \
    "board/$(VENDOR)/common/lib$(VENDOR).a"; fi)
@@ -408,5 +408,5 @@ depend dep:	$(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk
TAG_SUBDIRS += include
-TAG_SUBDIRS += lib_generic board/$(BOARDDIR)
+TAG_SUBDIRS += lib/generic board/$(BOARDDIR)
 TAG_SUBDIRS += cpu/$(CPU)
 TAG_SUBDIRS += lib/$(ARCH)
diff --git a/README b/README
index b88dc1c..33a872f 100644
--- a/README
+++ b/README
@@ -185,5 +185,5 @@ Directory Hierarchy:
 - lib/avr32	Files generic to AVR32	 architecture
 - lib/blackfin	Files generic to Blackfin architecture
-- lib_generic	Files generic to all	 architectures
+- lib/generic	Files generic to all	 architectures
 - lib/i386	Files generic to i386	 architecture
 - lib/m68k	Files generic to m68k	 architecture
diff --git a/api_examples/Makefile b/api_examples/Makefile
index 23b5e9c..db9f6ea 100644
--- a/api_examples/Makefile
+++ b/api_examples/Makefile
@@ -41,8 +41,8 @@ COBJ_FILES-$(CONFIG_API) += libgenwrap.o
# Source files which exist outside the api_examples 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/string.o
-EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/vsprintf.o
+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/string.o
+EXT_COBJ_FILES-$(CONFIG_API) += lib/generic/vsprintf.o
 ifeq ($(ARCH),ppc)
 EXT_SOBJ_FILES-$(CONFIG_API) += lib/ppc/ppcstring.o
@@ -74,5 +74,5 @@ $(OUTPUT):	$(OBJS)
# Rule to build generic library C files
-$(obj)%.o: $(SRCTREE)/lib_generic/%.c
+$(obj)%.o: $(SRCTREE)/lib/generic/%.c
    $(CC) -g $(CFLAGS) -c -o $@ $<
diff --git a/api_examples/libgenwrap.c b/api_examples/libgenwrap.c
index 2b62bad..1616f9f 100644
--- a/api_examples/libgenwrap.c
+++ b/api_examples/libgenwrap.c
@@ -24,5 +24,5 @@
  *
  * 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/generic in the standalone app. This way way we can re-use
  * existing code e.g. operations on strings and similar.
  *
diff --git a/board/BuS/EB+MCF-EV123/u-boot.lds b/board/BuS/EB+MCF-EV123/u-boot.lds
index 3450793..a9e8879 100644
--- a/board/BuS/EB+MCF-EV123/u-boot.lds
+++ b/board/BuS/EB+MCF-EV123/u-boot.lds
@@ -58,8 +58,8 @@ 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/generic/string.o	(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o	(.text)
+    lib/generic/zlib.o	(.text)
/*    . = env_offset; */
diff --git a/board/LEOX/elpt860/u-boot.lds b/board/LEOX/elpt860/u-boot.lds
index 428ad52..6c6fc96 100644
--- a/board/LEOX/elpt860/u-boot.lds
+++ b/board/LEOX/elpt860/u-boot.lds
@@ -68,8 +68,8 @@ SECTIONS
     common/dlmalloc.o			(.text)
     lib/ppc/ppcstring.o			(.text)
-    lib_generic/vsprintf.o		(.text)
-    lib_generic/crc32.o			(.text)
-    lib_generic/zlib.o			(.text)
-    lib_generic/string.o		(.text)
+    lib/generic/vsprintf.o		(.text)
+    lib/generic/crc32.o			(.text)
+    lib/generic/zlib.o			(.text)
+    lib/generic/string.o		(.text)
     lib/ppc/cache.o			(.text)
     lib/ppc/extable.o			(.text)
diff --git a/board/LEOX/elpt860/u-boot.lds.debug b/board/LEOX/elpt860/u-boot.lds.debug
index 434c9b7..0cbfe2a 100644
--- a/board/LEOX/elpt860/u-boot.lds.debug
+++ b/board/LEOX/elpt860/u-boot.lds.debug
@@ -67,6 +67,6 @@ SECTIONS
     cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/RPXClassic/u-boot.lds b/board/RPXClassic/u-boot.lds
index dd5b607..d2ec27c 100644
--- a/board/RPXClassic/u-boot.lds
+++ b/board/RPXClassic/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o	(.text)
     lib/ppc/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
 /* XXX ?
     . = env_offset;
diff --git a/board/RPXClassic/u-boot.lds.debug b/board/RPXClassic/u-boot.lds.debug
index ea85389..33813dc 100644
--- a/board/RPXClassic/u-boot.lds.debug
+++ b/board/RPXClassic/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/RPXlite/u-boot.lds b/board/RPXlite/u-boot.lds
index dd5b607..d2ec27c 100644
--- a/board/RPXlite/u-boot.lds
+++ b/board/RPXlite/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o	(.text)
     lib/ppc/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
 /* XXX ?
     . = env_offset;
diff --git a/board/RPXlite/u-boot.lds.debug b/board/RPXlite/u-boot.lds.debug
index ea85389..33813dc 100644
--- a/board/RPXlite/u-boot.lds.debug
+++ b/board/RPXlite/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/RPXlite_dw/u-boot.lds b/board/RPXlite_dw/u-boot.lds
index d8e3c0c..0ae6d26 100644
--- a/board/RPXlite_dw/u-boot.lds
+++ b/board/RPXlite_dw/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o	(.text)
     lib/ppc/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/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 0f6ae69..ede7598 100644
--- a/board/RPXlite_dw/u-boot.lds.debug
+++ b/board/RPXlite_dw/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds
index 794f0f9..b382bdd 100644
--- a/board/RRvision/u-boot.lds
+++ b/board/RRvision/u-boot.lds
@@ -60,7 +60,7 @@ SECTIONS
     common/dlmalloc.o		(.text)
     lib/ppc/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
     lib/ppc/cache.o		(.text)
     lib/ppc/time.o		(.text)
diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds
index a695056..9047815 100644
--- a/board/actux1/u-boot.lds
+++ b/board/actux1/u-boot.lds
@@ -32,6 +32,6 @@ SECTIONS
    .text : {
    	cpu/ixp/start.o(.text)
-		lib_generic/string.o(.text)
-		lib_generic/vsprintf.o(.text)
+		lib/generic/string.o(.text)
+		lib/generic/vsprintf.o(.text)
    	lib/arm/board.o(.text)
    	common/dlmalloc.o(.text)
diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds
index 4423000..d8d2fa1 100644
--- a/board/actux2/u-boot.lds
+++ b/board/actux2/u-boot.lds
@@ -32,6 +32,6 @@ SECTIONS
    .text : {
    	cpu/ixp/start.o(.text)
-		lib_generic/string.o(.text)
-		lib_generic/vsprintf.o(.text)
+		lib/generic/string.o(.text)
+		lib/generic/vsprintf.o(.text)
    	lib/arm/board.o(.text)
    	common/dlmalloc.o(.text)
diff --git a/board/actux3/u-boot.lds b/board/actux3/u-boot.lds
index 985271d..a46cc46 100644
--- a/board/actux3/u-boot.lds
+++ b/board/actux3/u-boot.lds
@@ -32,6 +32,6 @@ SECTIONS
    .text : {
    	cpu/ixp/start.o (.text)
-		lib_generic/string.o (.text)
-		lib_generic/vsprintf.o (.text)
+		lib/generic/string.o (.text)
+		lib/generic/vsprintf.o (.text)
    	lib/arm/board.o (.text)
    	common/dlmalloc.o (.text)
diff --git a/board/amirix/ap1000/u-boot.lds b/board/amirix/ap1000/u-boot.lds
index e0c25d2..5c164a8 100644
--- a/board/amirix/ap1000/u-boot.lds
+++ b/board/amirix/ap1000/u-boot.lds
@@ -65,7 +65,7 @@ SECTIONS
     cpu/ppc4xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
/*    . = env_offset;*/
diff --git a/board/atum8548/u-boot.lds b/board/atum8548/u-boot.lds
index 1342135..f21e087 100644
--- a/board/atum8548/u-boot.lds
+++ b/board/atum8548/u-boot.lds
@@ -68,7 +68,7 @@ SECTIONS
     cpu/mpc85xx/cpu.o (.text)
     cpu/mpc85xx/speed.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/generic/crc32.o (.text)
     lib/ppc/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/generic/zlib.o (.text)
     *(.text)
     *(.fixup)
diff --git a/board/bf518f-ezbrd/config.mk b/board/bf518f-ezbrd/config.mk
index f85bef5..a6416ed 100644
--- a/board/bf518f-ezbrd/config.mk
+++ b/board/bf518f-ezbrd/config.mk
@@ -27,5 +27,5 @@
 #TEXT_BASE = do-not-use-me
-CFLAGS_lib_generic += -O2
+CFLAGS_generic += -O2
 CFLAGS_lzma += -O2
diff --git a/board/bf526-ezbrd/config.mk b/board/bf526-ezbrd/config.mk
index f85bef5..a6416ed 100644
--- a/board/bf526-ezbrd/config.mk
+++ b/board/bf526-ezbrd/config.mk
@@ -27,5 +27,5 @@
 #TEXT_BASE = do-not-use-me
-CFLAGS_lib_generic += -O2
+CFLAGS_generic += -O2
 CFLAGS_lzma += -O2
diff --git a/board/bf527-ezkit/config.mk b/board/bf527-ezkit/config.mk
index f85bef5..a6416ed 100644
--- a/board/bf527-ezkit/config.mk
+++ b/board/bf527-ezkit/config.mk
@@ -27,5 +27,5 @@
 #TEXT_BASE = do-not-use-me
-CFLAGS_lib_generic += -O2
+CFLAGS_generic += -O2
 CFLAGS_lzma += -O2
diff --git a/board/bf533-ezkit/config.mk b/board/bf533-ezkit/config.mk
index 3c0b46f..bf87ab9 100644
--- a/board/bf533-ezkit/config.mk
+++ b/board/bf533-ezkit/config.mk
@@ -27,5 +27,5 @@
 #TEXT_BASE = do-not-use-me
-CFLAGS_lib_generic += -O2
+CFLAGS_generic += -O2
 CFLAGS_lzma += -O2
diff --git a/board/bf533-stamp/config.mk b/board/bf533-stamp/config.mk
index 3c0b46f..bf87ab9 100644
--- a/board/bf533-stamp/config.mk
+++ b/board/bf533-stamp/config.mk
@@ -27,5 +27,5 @@
 #TEXT_BASE = do-not-use-me
-CFLAGS_lib_generic += -O2
+CFLAGS_generic += -O2
 CFLAGS_lzma += -O2
diff --git a/board/bf537-stamp/config.mk b/board/bf537-stamp/config.mk
index bc14257..79ad79d 100644
--- a/board/bf537-stamp/config.mk
+++ b/board/bf537-stamp/config.mk
@@ -27,5 +27,5 @@
 #TEXT_BASE = do-not-use-me
-CFLAGS_lib_generic += -O2
+CFLAGS_generic += -O2
 CFLAGS_lzma += -O2
diff --git a/board/bf538f-ezkit/config.mk b/board/bf538f-ezkit/config.mk
index 3c0b46f..bf87ab9 100644
--- a/board/bf538f-ezkit/config.mk
+++ b/board/bf538f-ezkit/config.mk
@@ -27,5 +27,5 @@
 #TEXT_BASE = do-not-use-me
-CFLAGS_lib_generic += -O2
+CFLAGS_generic += -O2
 CFLAGS_lzma += -O2
diff --git a/board/bf548-ezkit/config.mk b/board/bf548-ezkit/config.mk
index 42ff946..0be9a22 100644
--- a/board/bf548-ezkit/config.mk
+++ b/board/bf548-ezkit/config.mk
@@ -27,5 +27,5 @@
 #TEXT_BASE = do-not-use-me
-CFLAGS_lib_generic += -O2
+CFLAGS_generic += -O2
 CFLAGS_lzma += -O2
diff --git a/board/bf561-ezkit/config.mk b/board/bf561-ezkit/config.mk
index cfad21a..3f318f7 100644
--- a/board/bf561-ezkit/config.mk
+++ b/board/bf561-ezkit/config.mk
@@ -27,5 +27,5 @@
 #TEXT_BASE = do-not-use-me
-CFLAGS_lib_generic += -O2
+CFLAGS_generic += -O2
 CFLAGS_lzma += -O2
diff --git a/board/c2mon/u-boot.lds b/board/c2mon/u-boot.lds
index b72e021..27ce175 100644
--- a/board/c2mon/u-boot.lds
+++ b/board/c2mon/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o	(.text)
     lib/ppc/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
. = env_offset;
diff --git a/board/c2mon/u-boot.lds.debug b/board/c2mon/u-boot.lds.debug
index dbec986..28d541f 100644
--- a/board/c2mon/u-boot.lds.debug
+++ b/board/c2mon/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/cm-bf527/config.mk b/board/cm-bf527/config.mk
index f85bef5..a6416ed 100644
--- a/board/cm-bf527/config.mk
+++ b/board/cm-bf527/config.mk
@@ -27,5 +27,5 @@
 #TEXT_BASE = do-not-use-me
-CFLAGS_lib_generic += -O2
+CFLAGS_generic += -O2
 CFLAGS_lzma += -O2
diff --git a/board/cm-bf533/config.mk b/board/cm-bf533/config.mk
index 3c0b46f..bf87ab9 100644
--- a/board/cm-bf533/config.mk
+++ b/board/cm-bf533/config.mk
@@ -27,5 +27,5 @@
 #TEXT_BASE = do-not-use-me
-CFLAGS_lib_generic += -O2
+CFLAGS_generic += -O2
 CFLAGS_lzma += -O2
diff --git a/board/cm-bf537e/config.mk b/board/cm-bf537e/config.mk
index 3c0b46f..bf87ab9 100644
--- a/board/cm-bf537e/config.mk
+++ b/board/cm-bf537e/config.mk
@@ -27,5 +27,5 @@
 #TEXT_BASE = do-not-use-me
-CFLAGS_lib_generic += -O2
+CFLAGS_generic += -O2
 CFLAGS_lzma += -O2
diff --git a/board/cm-bf548/config.mk b/board/cm-bf548/config.mk
index 0c95b39..783ae5f 100644
--- a/board/cm-bf548/config.mk
+++ b/board/cm-bf548/config.mk
@@ -27,5 +27,5 @@
 #TEXT_BASE = do-not-use-me
-CFLAGS_lib_generic += -O2
+CFLAGS_generic += -O2
 CFLAGS_lzma += -O2
diff --git a/board/cm-bf561/config.mk b/board/cm-bf561/config.mk
index cfad21a..3f318f7 100644
--- a/board/cm-bf561/config.mk
+++ b/board/cm-bf561/config.mk
@@ -27,5 +27,5 @@
 #TEXT_BASE = do-not-use-me
-CFLAGS_lib_generic += -O2
+CFLAGS_generic += -O2
 CFLAGS_lzma += -O2
diff --git a/board/cobra5272/u-boot.lds b/board/cobra5272/u-boot.lds
index e866689..b70530d 100644
--- a/board/cobra5272/u-boot.lds
+++ b/board/cobra5272/u-boot.lds
@@ -60,5 +60,5 @@ SECTIONS
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
. = DEFINED(env_offset) ? env_offset : .;
diff --git a/board/cogent/u-boot.lds.debug b/board/cogent/u-boot.lds.debug
index ea85389..33813dc 100644
--- a/board/cogent/u-boot.lds.debug
+++ b/board/cogent/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/cray/L1/u-boot.lds b/board/cray/L1/u-boot.lds
index fe69c93..60261b9 100644
--- a/board/cray/L1/u-boot.lds
+++ b/board/cray/L1/u-boot.lds
@@ -71,7 +71,7 @@ SECTIONS
     drivers/net/4xx_enet.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
/*. = env_offset;*/
diff --git a/board/cray/L1/u-boot.lds.debug b/board/cray/L1/u-boot.lds.debug
index f753355..f15011f 100644
--- a/board/cray/L1/u-boot.lds.debug
+++ b/board/cray/L1/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
diff --git a/board/csb272/u-boot.lds b/board/csb272/u-boot.lds
index 453cd3b..567bc46 100644
--- a/board/csb272/u-boot.lds
+++ b/board/csb272/u-boot.lds
@@ -71,9 +71,9 @@ SECTIONS
     drivers/net/4xx_enet.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/crc32.o		(.text)
lib/ppc/extable.o	(.text)
     lib/ppc/board.o	(.text)
-    lib_generic/zlib.o	(.text)
+    lib/generic/zlib.o	(.text)
 /*    . = env_offset;*/
 /*    common/env_embedded.o(.text)*/
diff --git a/board/csb472/u-boot.lds b/board/csb472/u-boot.lds
index 21682bb..79f77aa 100644
--- a/board/csb472/u-boot.lds
+++ b/board/csb472/u-boot.lds
@@ -71,9 +71,9 @@ SECTIONS
     drivers/net/4xx_enet.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/crc32.o		(.text)
lib/ppc/extable.o	(.text)
     lib/ppc/board.o	(.text)
-    lib_generic/zlib.o	(.text)
+    lib/generic/zlib.o	(.text)
 /*    . = env_offset;*/
 /*    common/env_embedded.o(.text)*/
diff --git a/board/dave/PPChameleonEVB/u-boot.lds b/board/dave/PPChameleonEVB/u-boot.lds
index 0468fe2..c8c8819 100644
--- a/board/dave/PPChameleonEVB/u-boot.lds
+++ b/board/dave/PPChameleonEVB/u-boot.lds
@@ -69,7 +69,7 @@ SECTIONS
     drivers/net/4xx_enet.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
*(.text)
diff --git a/board/eltec/mhpc/u-boot.lds.debug b/board/eltec/mhpc/u-boot.lds.debug
index dbec986..28d541f 100644
--- a/board/eltec/mhpc/u-boot.lds.debug
+++ b/board/eltec/mhpc/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/emk/top860/u-boot.lds.debug b/board/emk/top860/u-boot.lds.debug
index 6e168a4..c9e9080 100644
--- a/board/emk/top860/u-boot.lds.debug
+++ b/board/emk/top860/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
diff --git a/board/eric/u-boot.lds b/board/eric/u-boot.lds
index 2ab92e7..382fa66 100644
--- a/board/eric/u-boot.lds
+++ b/board/eric/u-boot.lds
@@ -71,7 +71,7 @@ SECTIONS
     drivers/net/4xx_enet.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
/*    . = env_offset;*/
diff --git a/board/esd/ocrtc/u-boot.lds b/board/esd/ocrtc/u-boot.lds
index 03c164d..d170a25 100644
--- a/board/esd/ocrtc/u-boot.lds
+++ b/board/esd/ocrtc/u-boot.lds
@@ -68,7 +68,7 @@ SECTIONS
     cpu/ppc4xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
/*    . = env_offset;*/
diff --git a/board/esd/tasreg/u-boot.lds b/board/esd/tasreg/u-boot.lds
index e072c5d..2f99597 100644
--- a/board/esd/tasreg/u-boot.lds
+++ b/board/esd/tasreg/u-boot.lds
@@ -60,5 +60,5 @@ SECTIONS
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
. = DEFINED(env_offset) ? env_offset : .;
diff --git a/board/esteem192e/u-boot.lds b/board/esteem192e/u-boot.lds
index 704de98..b6c1fb9 100644
--- a/board/esteem192e/u-boot.lds
+++ b/board/esteem192e/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o	(.text)
     lib/ppc/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
. = env_offset;
diff --git a/board/etx094/u-boot.lds b/board/etx094/u-boot.lds
index eb3d487..2fbe163 100644
--- a/board/etx094/u-boot.lds
+++ b/board/etx094/u-boot.lds
@@ -63,6 +63,6 @@ SECTIONS
     cpu/mpc8xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
. = env_offset;
diff --git a/board/etx094/u-boot.lds.debug b/board/etx094/u-boot.lds.debug
index 334b85a..f763062 100644
--- a/board/etx094/u-boot.lds.debug
+++ b/board/etx094/u-boot.lds.debug
@@ -65,6 +65,6 @@ SECTIONS
     lib/ppc/extable.o	(.text)
     lib/ppc/ppcstring.o	(.text)
-    lib_generic/string.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/string.o	(.text)
+    lib/generic/crc32.o		(.text)
     common/dlmalloc.o	(.text)
     . = env_offset;
diff --git a/board/exbitgen/u-boot.lds b/board/exbitgen/u-boot.lds
index 52d8ddd..5ced498 100644
--- a/board/exbitgen/u-boot.lds
+++ b/board/exbitgen/u-boot.lds
@@ -70,7 +70,7 @@ SECTIONS
     cpu/ppc4xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
/*    . = env_offset;*/
diff --git a/board/fads/u-boot.lds.debug b/board/fads/u-boot.lds.debug
index 515296b..87238ec 100644
--- a/board/fads/u-boot.lds.debug
+++ b/board/fads/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
diff --git a/board/flagadm/u-boot.lds.debug b/board/flagadm/u-boot.lds.debug
index dbec986..28d541f 100644
--- a/board/flagadm/u-boot.lds.debug
+++ b/board/flagadm/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/freescale/m52277evb/u-boot.spa b/board/freescale/m52277evb/u-boot.spa
index 1105456..930497e 100644
--- a/board/freescale/m52277evb/u-boot.spa
+++ b/board/freescale/m52277evb/u-boot.spa
@@ -59,5 +59,5 @@ SECTIONS
     cpu/mcf5227x/libmcf5227x.a	(.text)
     lib/m68k/libm68k.a		(.text)
-    lib_generic/libgeneric.a	(.text)
+    lib/generic/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 da9b61a..ae05375 100644
--- a/board/freescale/m5235evb/u-boot.16
+++ b/board/freescale/m5235evb/u-boot.16
@@ -61,5 +61,5 @@ SECTIONS
     lib/m68k/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
. = DEFINED(env_offset) ? env_offset : .;
diff --git a/board/freescale/m5235evb/u-boot.32 b/board/freescale/m5235evb/u-boot.32
index 99cdd78..43a6b44 100644
--- a/board/freescale/m5235evb/u-boot.32
+++ b/board/freescale/m5235evb/u-boot.32
@@ -69,5 +69,5 @@ SECTIONS
     common/console.o		(.text)
     common/main.o		(.text)
-    lib_generic/libgeneric.a	(.text)
+    lib/generic/libgeneric.a	(.text)
. = DEFINED(env_offset) ? env_offset : .;
diff --git a/board/freescale/m5249evb/u-boot.lds b/board/freescale/m5249evb/u-boot.lds
index e072c5d..2f99597 100644
--- a/board/freescale/m5249evb/u-boot.lds
+++ b/board/freescale/m5249evb/u-boot.lds
@@ -60,5 +60,5 @@ SECTIONS
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
. = DEFINED(env_offset) ? env_offset : .;
diff --git a/board/freescale/m5253demo/u-boot.lds b/board/freescale/m5253demo/u-boot.lds
index f5f334d..55a8dd9 100644
--- a/board/freescale/m5253demo/u-boot.lds
+++ b/board/freescale/m5253demo/u-boot.lds
@@ -60,5 +60,5 @@ SECTIONS
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
. = DEFINED(env_offset) ? env_offset : .;
diff --git a/board/freescale/m5253evbe/u-boot.lds b/board/freescale/m5253evbe/u-boot.lds
index 814d5c2..532d246 100644
--- a/board/freescale/m5253evbe/u-boot.lds
+++ b/board/freescale/m5253evbe/u-boot.lds
@@ -60,5 +60,5 @@ SECTIONS
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
. = DEFINED(env_offset) ? env_offset : .;
diff --git a/board/freescale/m5271evb/u-boot.lds b/board/freescale/m5271evb/u-boot.lds
index 2d1bf3a..06058fa 100644
--- a/board/freescale/m5271evb/u-boot.lds
+++ b/board/freescale/m5271evb/u-boot.lds
@@ -61,5 +61,5 @@ SECTIONS
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
. = DEFINED(env_offset) ? env_offset : .;
diff --git a/board/freescale/m5272c3/u-boot.lds b/board/freescale/m5272c3/u-boot.lds
index bde5d86..b74d611 100644
--- a/board/freescale/m5272c3/u-boot.lds
+++ b/board/freescale/m5272c3/u-boot.lds
@@ -60,5 +60,5 @@ SECTIONS
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
. = DEFINED(env_offset) ? env_offset : .;
diff --git a/board/freescale/m5275evb/u-boot.lds b/board/freescale/m5275evb/u-boot.lds
index daf8724..c3b3a87 100644
--- a/board/freescale/m5275evb/u-boot.lds
+++ b/board/freescale/m5275evb/u-boot.lds
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mcf52x2/start.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/string.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/string.o	(.text)
+    lib/generic/zlib.o		(.text)
. = DEFINED(env_offset) ? env_offset : .;
diff --git a/board/freescale/m5282evb/u-boot.lds b/board/freescale/m5282evb/u-boot.lds
index f46e025..c000a7e 100644
--- a/board/freescale/m5282evb/u-boot.lds
+++ b/board/freescale/m5282evb/u-boot.lds
@@ -58,7 +58,7 @@ 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/string.o	(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o	(.text)
. = DEFINED(env_offset) ? env_offset : .;
diff --git a/board/freescale/m53017evb/u-boot.lds b/board/freescale/m53017evb/u-boot.lds
index 52ca4f8..e057018 100644
--- a/board/freescale/m53017evb/u-boot.lds
+++ b/board/freescale/m53017evb/u-boot.lds
@@ -60,5 +60,5 @@ SECTIONS
     lib/m68k/libm68k.a		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
. = DEFINED(env_offset) ? env_offset : .;
diff --git a/board/freescale/m5329evb/u-boot.lds b/board/freescale/m5329evb/u-boot.lds
index 5c9720e..371b5cb 100644
--- a/board/freescale/m5329evb/u-boot.lds
+++ b/board/freescale/m5329evb/u-boot.lds
@@ -60,5 +60,5 @@ SECTIONS
     lib/m68k/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
. = DEFINED(env_offset) ? env_offset : .;
diff --git a/board/freescale/m5373evb/u-boot.lds b/board/freescale/m5373evb/u-boot.lds
index 30fb272..5b671f7 100644
--- a/board/freescale/m5373evb/u-boot.lds
+++ b/board/freescale/m5373evb/u-boot.lds
@@ -60,5 +60,5 @@ SECTIONS
     lib/m68k/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
. = DEFINED(env_offset) ? env_offset : .;
diff --git a/board/freescale/m54451evb/u-boot.spa b/board/freescale/m54451evb/u-boot.spa
index d568688..40d452c 100644
--- a/board/freescale/m54451evb/u-boot.spa
+++ b/board/freescale/m54451evb/u-boot.spa
@@ -60,5 +60,5 @@ SECTIONS
     lib/m68k/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
. = DEFINED(env_offset) ? env_offset : .;
diff --git a/board/freescale/m54451evb/u-boot.stm b/board/freescale/m54451evb/u-boot.stm
index 92880d9..2347065 100644
--- a/board/freescale/m54451evb/u-boot.stm
+++ b/board/freescale/m54451evb/u-boot.stm
@@ -65,5 +65,5 @@ SECTIONS
     common/serial.o			(.text)
     common/console.o			(.text)
-    lib_generic/display_options.o	(.text)
+    lib/generic/display_options.o	(.text)
     board/freescale/m54455evb/m54455evb.o	(.text)
diff --git a/board/freescale/m54455evb/u-boot.atm b/board/freescale/m54455evb/u-boot.atm
index d568688..40d452c 100644
--- a/board/freescale/m54455evb/u-boot.atm
+++ b/board/freescale/m54455evb/u-boot.atm
@@ -60,5 +60,5 @@ SECTIONS
     lib/m68k/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
. = DEFINED(env_offset) ? env_offset : .;
diff --git a/board/freescale/m54455evb/u-boot.int b/board/freescale/m54455evb/u-boot.int
index 58419c0..73c87bc 100644
--- a/board/freescale/m54455evb/u-boot.int
+++ b/board/freescale/m54455evb/u-boot.int
@@ -60,5 +60,5 @@ SECTIONS
     lib/m68k/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
*(.text)
diff --git a/board/freescale/mpc8610hpcd/u-boot.lds b/board/freescale/mpc8610hpcd/u-boot.lds
index c4e47c9..30fefd8 100644
--- a/board/freescale/mpc8610hpcd/u-boot.lds
+++ b/board/freescale/mpc8610hpcd/u-boot.lds
@@ -58,7 +58,7 @@ SECTIONS
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/generic/crc32.o (.text)
     lib/ppc/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/generic/zlib.o (.text)
     *(.text)
     *(.fixup)
diff --git a/board/freescale/mpc8641hpcn/u-boot.lds b/board/freescale/mpc8641hpcn/u-boot.lds
index ae944d0..f59af5c 100644
--- a/board/freescale/mpc8641hpcn/u-boot.lds
+++ b/board/freescale/mpc8641hpcn/u-boot.lds
@@ -58,7 +58,7 @@ SECTIONS
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/generic/crc32.o (.text)
     lib/ppc/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/generic/zlib.o (.text)
     drivers/bios_emulator/atibios.o (.text)
     *(.text)
diff --git a/board/genietv/u-boot.lds b/board/genietv/u-boot.lds
index d7f70b7..fd80ace 100644
--- a/board/genietv/u-boot.lds
+++ b/board/genietv/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o	(.text)
     lib/ppc/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
. = env_offset;
diff --git a/board/genietv/u-boot.lds.debug b/board/genietv/u-boot.lds.debug
index d3bfb36..ff91c93 100644
--- a/board/genietv/u-boot.lds.debug
+++ b/board/genietv/u-boot.lds.debug
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o	(.text)
     lib/ppc/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
. = env_offset;
diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds
index eadcaf0..d59230d 100644
--- a/board/hermes/u-boot.lds
+++ b/board/hermes/u-boot.lds
@@ -62,5 +62,5 @@ SECTIONS
     lib/ppc/ticks.o		(.text)
     lib/ppc/cache.o		(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/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 73c5e74..4cf9556 100644
--- a/board/hymod/u-boot.lds
+++ b/board/hymod/u-boot.lds
@@ -60,7 +60,7 @@ SECTIONS
     common/dlmalloc.o	(.text)
     lib/ppc/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
. = env_offset;
diff --git a/board/hymod/u-boot.lds.debug b/board/hymod/u-boot.lds.debug
index ea85389..33813dc 100644
--- a/board/hymod/u-boot.lds.debug
+++ b/board/hymod/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/icu862/u-boot.lds b/board/icu862/u-boot.lds
index 71cf813..91349b5 100644
--- a/board/icu862/u-boot.lds
+++ b/board/icu862/u-boot.lds
@@ -61,7 +61,7 @@ SECTIONS
     common/dlmalloc.o	(.text)
     lib/ppc/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
. = env_offset;
diff --git a/board/icu862/u-boot.lds.debug b/board/icu862/u-boot.lds.debug
index 23e5c46..b8e9478 100644
--- a/board/icu862/u-boot.lds.debug
+++ b/board/icu862/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
diff --git a/board/idmr/u-boot.lds b/board/idmr/u-boot.lds
index 2d1bf3a..06058fa 100644
--- a/board/idmr/u-boot.lds
+++ b/board/idmr/u-boot.lds
@@ -61,5 +61,5 @@ SECTIONS
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
. = DEFINED(env_offset) ? env_offset : .;
diff --git a/board/ivm/u-boot.lds.debug b/board/ivm/u-boot.lds.debug
index eac3d78..75970a9 100644
--- a/board/ivm/u-boot.lds.debug
+++ b/board/ivm/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
diff --git a/board/keymile/km8xx/u-boot.lds b/board/keymile/km8xx/u-boot.lds
index 0b2fc20..5fa5ee2 100644
--- a/board/keymile/km8xx/u-boot.lds
+++ b/board/keymile/km8xx/u-boot.lds
@@ -60,7 +60,7 @@ SECTIONS
     common/dlmalloc.o		(.text)
     lib/ppc/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
     lib/ppc/cache.o		(.text)
     lib/ppc/time.o		(.text)
diff --git a/board/kup/kup4k/u-boot.lds b/board/kup/kup4k/u-boot.lds
index 575e676..9f35779 100644
--- a/board/kup/kup4k/u-boot.lds
+++ b/board/kup/kup4k/u-boot.lds
@@ -61,7 +61,7 @@ SECTIONS
     common/dlmalloc.o	(.text)
     lib/ppc/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
. = env_offset;
diff --git a/board/kup/kup4k/u-boot.lds.debug b/board/kup/kup4k/u-boot.lds.debug
index 0f6ae69..ede7598 100644
--- a/board/kup/kup4k/u-boot.lds.debug
+++ b/board/kup/kup4k/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/kup/kup4x/u-boot.lds b/board/kup/kup4x/u-boot.lds
index 575e676..9f35779 100644
--- a/board/kup/kup4x/u-boot.lds
+++ b/board/kup/kup4x/u-boot.lds
@@ -61,7 +61,7 @@ SECTIONS
     common/dlmalloc.o	(.text)
     lib/ppc/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
. = env_offset;
diff --git a/board/kup/kup4x/u-boot.lds.debug b/board/kup/kup4x/u-boot.lds.debug
index 0f6ae69..ede7598 100644
--- a/board/kup/kup4x/u-boot.lds.debug
+++ b/board/kup/kup4x/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/lantec/u-boot.lds b/board/lantec/u-boot.lds
index 7e1b6ee..9e2a34b 100644
--- a/board/lantec/u-boot.lds
+++ b/board/lantec/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o	(.text)
     lib/ppc/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
. = env_offset;
diff --git a/board/lantec/u-boot.lds.debug b/board/lantec/u-boot.lds.debug
index d5e2c1d..dba3fcf 100644
--- a/board/lantec/u-boot.lds.debug
+++ b/board/lantec/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/lwmon/u-boot.lds.debug b/board/lwmon/u-boot.lds.debug
index c035d63..fd7ef72 100644
--- a/board/lwmon/u-boot.lds.debug
+++ b/board/lwmon/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
diff --git a/board/mbx8xx/u-boot.lds.debug b/board/mbx8xx/u-boot.lds.debug
index 515296b..87238ec 100644
--- a/board/mbx8xx/u-boot.lds.debug
+++ b/board/mbx8xx/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
diff --git a/board/ml2/u-boot.lds b/board/ml2/u-boot.lds
index e81d4aa..7801c1c 100644
--- a/board/ml2/u-boot.lds
+++ b/board/ml2/u-boot.lds
@@ -65,7 +65,7 @@ SECTIONS
     cpu/ppc4xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
/*    . = env_offset;*/
diff --git a/board/ml2/u-boot.lds.debug b/board/ml2/u-boot.lds.debug
index f753355..f15011f 100644
--- a/board/ml2/u-boot.lds.debug
+++ b/board/ml2/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
diff --git a/board/mousse/u-boot.lds b/board/mousse/u-boot.lds
index 7644b90..698f241 100644
--- a/board/mousse/u-boot.lds
+++ b/board/mousse/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
     lib/ppc/board.o		(.text)
     lib/ppc/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
*(.fixup)
diff --git a/board/mousse/u-boot.lds.rom b/board/mousse/u-boot.lds.rom
index 9111252..952ae26 100644
--- a/board/mousse/u-boot.lds.rom
+++ b/board/mousse/u-boot.lds.rom
@@ -56,7 +56,7 @@ SECTIONS
     common/board.o (.text)
     lib/ppc/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
. = env_offset;
diff --git a/board/mpc8540eval/u-boot.lds b/board/mpc8540eval/u-boot.lds
index cb6ff82..1bdf29b 100644
--- a/board/mpc8540eval/u-boot.lds
+++ b/board/mpc8540eval/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     cpu/mpc85xx/pci.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/generic/crc32.o (.text)
     lib/ppc/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/generic/zlib.o (.text)
     *(.text)
     *(.fixup)
diff --git a/board/mpl/mip405/u-boot.lds b/board/mpl/mip405/u-boot.lds
index 592c030..0d63e2b 100644
--- a/board/mpl/mip405/u-boot.lds
+++ b/board/mpl/mip405/u-boot.lds
@@ -75,7 +75,7 @@ SECTIONS
     drivers/net/4xx_enet.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
/*    . = env_offset;*/
diff --git a/board/mpl/pip405/u-boot.lds b/board/mpl/pip405/u-boot.lds
index 38184ad..2cf6916 100644
--- a/board/mpl/pip405/u-boot.lds
+++ b/board/mpl/pip405/u-boot.lds
@@ -70,7 +70,7 @@ SECTIONS
     cpu/ppc4xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
/*    . = env_offset;*/
diff --git a/board/mpl/pip405/u-boot.lds.debug b/board/mpl/pip405/u-boot.lds.debug
index f753355..f15011f 100644
--- a/board/mpl/pip405/u-boot.lds.debug
+++ b/board/mpl/pip405/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
diff --git a/board/netphone/u-boot.lds b/board/netphone/u-boot.lds
index fc6b123..b4cc3ff 100644
--- a/board/netphone/u-boot.lds
+++ b/board/netphone/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
     common/dlmalloc.o		(.text)
     lib/ppc/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
     lib/ppc/cache.o		(.text)
     lib/ppc/time.o		(.text)
diff --git a/board/netphone/u-boot.lds.debug b/board/netphone/u-boot.lds.debug
index d47c408..8eaa915 100644
--- a/board/netphone/u-boot.lds.debug
+++ b/board/netphone/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/netstar/Makefile b/board/netstar/Makefile
index 91bac38..9646498 100644
--- a/board/netstar/Makefile
+++ b/board/netstar/Makefile
@@ -55,5 +55,5 @@ $(obj)eeprom.srec:	$(obj)eeprom.o $(obj)eeprom_start.o
    	-o $(<:.o=) -e eeprom eeprom.o eeprom_start.o \
    	-L$(obj)../../examples -lstubs \
-		-L$(obj)../../lib_generic -lgeneric \
+		-L$(obj)../../lib/generic -lgeneric \
    	-L$(gcclibdir) -lgcc
    $(OBJCOPY) -O srec $(<:.o=) $@
@@ -76,5 +76,5 @@ $(obj)crcit.o:	crcit.c
    $(HOSTCC) $(HOST_CFLAGS) -o $@ -c $<
-$(obj)crc32.o:	$(SRCTREE)/lib_generic/crc32.c
+$(obj)crc32.o:	$(SRCTREE)/lib/generic/crc32.c
    $(HOSTCC) $(HOST_CFLAGS) -DUSE_HOSTCC -o $@ -c $<
diff --git a/board/netta/u-boot.lds b/board/netta/u-boot.lds
index 2e060ba..12db4c3 100644
--- a/board/netta/u-boot.lds
+++ b/board/netta/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
     common/dlmalloc.o		(.text)
     lib/ppc/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
     lib/ppc/cache.o		(.text)
     lib/ppc/time.o		(.text)
diff --git a/board/netta/u-boot.lds.debug b/board/netta/u-boot.lds.debug
index d47c408..8eaa915 100644
--- a/board/netta/u-boot.lds.debug
+++ b/board/netta/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/netta2/u-boot.lds b/board/netta2/u-boot.lds
index 2e060ba..12db4c3 100644
--- a/board/netta2/u-boot.lds
+++ b/board/netta2/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
     common/dlmalloc.o		(.text)
     lib/ppc/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
     lib/ppc/cache.o		(.text)
     lib/ppc/time.o		(.text)
diff --git a/board/netta2/u-boot.lds.debug b/board/netta2/u-boot.lds.debug
index d47c408..8eaa915 100644
--- a/board/netta2/u-boot.lds.debug
+++ b/board/netta2/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/netvia/u-boot.lds b/board/netvia/u-boot.lds
index 3af9e85..3d4f77d 100644
--- a/board/netvia/u-boot.lds
+++ b/board/netvia/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
     common/dlmalloc.o		(.text)
     lib/ppc/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
     lib/ppc/cache.o		(.text)
     lib/ppc/time.o		(.text)
diff --git a/board/netvia/u-boot.lds.debug b/board/netvia/u-boot.lds.debug
index 9210c43..60629b3 100644
--- a/board/netvia/u-boot.lds.debug
+++ b/board/netvia/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/nx823/u-boot.lds.debug b/board/nx823/u-boot.lds.debug
index dbec986..28d541f 100644
--- a/board/nx823/u-boot.lds.debug
+++ b/board/nx823/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/pcs440ep/u-boot.lds b/board/pcs440ep/u-boot.lds
index a4c537e..d050b4d 100644
--- a/board/pcs440ep/u-boot.lds
+++ b/board/pcs440ep/u-boot.lds
@@ -65,5 +65,5 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
     board/pcs440ep/init.o	(.text)
-    lib_generic/sha1.o		(.text)
+    lib/generic/sha1.o		(.text)
*(.text)
diff --git a/board/pm854/u-boot.lds b/board/pm854/u-boot.lds
index 11e7785..0869d3f 100644
--- a/board/pm854/u-boot.lds
+++ b/board/pm854/u-boot.lds
@@ -71,7 +71,7 @@ SECTIONS
     cpu/mpc85xx/pci.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/generic/crc32.o (.text)
     lib/ppc/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/generic/zlib.o (.text)
     *(.text)
     *(.fixup)
diff --git a/board/pm856/u-boot.lds b/board/pm856/u-boot.lds
index 19fa083..4815b3b 100644
--- a/board/pm856/u-boot.lds
+++ b/board/pm856/u-boot.lds
@@ -71,7 +71,7 @@ SECTIONS
     cpu/mpc85xx/speed.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/generic/crc32.o (.text)
     lib/ppc/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/generic/zlib.o (.text)
     *(.text)
     *(.fixup)
diff --git a/board/purple/u-boot.lds b/board/purple/u-boot.lds
index 04a641a..9dc0ce8 100644
--- a/board/purple/u-boot.lds
+++ b/board/purple/u-boot.lds
@@ -41,5 +41,5 @@ SECTIONS
      common/dlmalloc.o		(.text)
      common/cmd_boot.o		(.text)
-	  lib_generic/zlib.o		(.text)
+	  lib/generic/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 dd5b607..d2ec27c 100644
--- a/board/quantum/u-boot.lds
+++ b/board/quantum/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o	(.text)
     lib/ppc/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
 /* XXX ?
     . = env_offset;
diff --git a/board/quantum/u-boot.lds.debug b/board/quantum/u-boot.lds.debug
index 016048d..a52c06f 100644
--- a/board/quantum/u-boot.lds.debug
+++ b/board/quantum/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/rbc823/u-boot.lds b/board/rbc823/u-boot.lds
index bfdfffa..1b0567a 100644
--- a/board/rbc823/u-boot.lds
+++ b/board/rbc823/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o	(.text)
     lib/ppc/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
. = env_offset;
diff --git a/board/rmu/u-boot.lds b/board/rmu/u-boot.lds
index dd5b607..d2ec27c 100644
--- a/board/rmu/u-boot.lds
+++ b/board/rmu/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o	(.text)
     lib/ppc/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
 /* XXX ?
     . = env_offset;
diff --git a/board/rmu/u-boot.lds.debug b/board/rmu/u-boot.lds.debug
index 016048d..a52c06f 100644
--- a/board/rmu/u-boot.lds.debug
+++ b/board/rmu/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/sandburst/karef/u-boot.lds b/board/sandburst/karef/u-boot.lds
index f157d17..264db8f 100644
--- a/board/sandburst/karef/u-boot.lds
+++ b/board/sandburst/karef/u-boot.lds
@@ -77,7 +77,7 @@ SECTIONS
     drivers/net/4xx_enet.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
/*    . = env_offset;*/
diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug
index 97b3a80..653a7f4 100644
--- a/board/sandburst/karef/u-boot.lds.debug
+++ b/board/sandburst/karef/u-boot.lds.debug
@@ -67,7 +67,7 @@ SECTIONS
     drivers/net/4xx_enet.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
/*    common/env_embedded.o(.text) */
diff --git a/board/sandburst/metrobox/u-boot.lds b/board/sandburst/metrobox/u-boot.lds
index 7bd3ca4..134d697 100644
--- a/board/sandburst/metrobox/u-boot.lds
+++ b/board/sandburst/metrobox/u-boot.lds
@@ -77,7 +77,7 @@ SECTIONS
     drivers/net/4xx_enet.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
/*    . = env_offset;*/
diff --git a/board/sandburst/metrobox/u-boot.lds.debug b/board/sandburst/metrobox/u-boot.lds.debug
index 0d2674d..88fcfce 100644
--- a/board/sandburst/metrobox/u-boot.lds.debug
+++ b/board/sandburst/metrobox/u-boot.lds.debug
@@ -67,7 +67,7 @@ SECTIONS
     drivers/net/4xx_enet.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
/*    common/env_embedded.o(.text) */
diff --git a/board/sbc405/u-boot.lds b/board/sbc405/u-boot.lds
index 36d128b..7407290 100644
--- a/board/sbc405/u-boot.lds
+++ b/board/sbc405/u-boot.lds
@@ -69,7 +69,7 @@ SECTIONS
     drivers/net/4xx_enet.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
/*    . = env_offset;*/
diff --git a/board/sbc8548/u-boot.lds b/board/sbc8548/u-boot.lds
index 8cd87a6..79bf39f 100644
--- a/board/sbc8548/u-boot.lds
+++ b/board/sbc8548/u-boot.lds
@@ -70,7 +70,7 @@ SECTIONS
     cpu/mpc85xx/speed.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/generic/crc32.o (.text)
     lib/ppc/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/generic/zlib.o (.text)
     *(.text)
     *(.fixup)
diff --git a/board/sbc8560/u-boot.lds b/board/sbc8560/u-boot.lds
index 41e2b6f..a13970c 100644
--- a/board/sbc8560/u-boot.lds
+++ b/board/sbc8560/u-boot.lds
@@ -76,7 +76,7 @@ SECTIONS
     cpu/mpc85xx/speed.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/generic/crc32.o (.text)
     lib/ppc/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/generic/zlib.o (.text)
     *(.text)
     *(.fixup)
diff --git a/board/sbc8641d/u-boot.lds b/board/sbc8641d/u-boot.lds
index 2a5baa7..c593ae3 100644
--- a/board/sbc8641d/u-boot.lds
+++ b/board/sbc8641d/u-boot.lds
@@ -58,7 +58,7 @@ SECTIONS
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/generic/crc32.o (.text)
     lib/ppc/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/generic/zlib.o (.text)
     *(.text)
     *(.fixup)
diff --git a/board/sc3/u-boot.lds b/board/sc3/u-boot.lds
index 9e8213c..db7ad16 100644
--- a/board/sc3/u-boot.lds
+++ b/board/sc3/u-boot.lds
@@ -70,7 +70,7 @@ SECTIONS
     cpu/ppc4xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
/*    . = env_offset;*/
diff --git a/board/siemens/CCM/u-boot.lds b/board/siemens/CCM/u-boot.lds
index b72e021..27ce175 100644
--- a/board/siemens/CCM/u-boot.lds
+++ b/board/siemens/CCM/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o	(.text)
     lib/ppc/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
. = env_offset;
diff --git a/board/siemens/CCM/u-boot.lds.debug b/board/siemens/CCM/u-boot.lds.debug
index 88dbd38..e6bf91c 100644
--- a/board/siemens/CCM/u-boot.lds.debug
+++ b/board/siemens/CCM/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
 /*
     . = env_offset;
diff --git a/board/siemens/pcu_e/u-boot.lds.debug b/board/siemens/pcu_e/u-boot.lds.debug
index c035d63..fd7ef72 100644
--- a/board/siemens/pcu_e/u-boot.lds.debug
+++ b/board/siemens/pcu_e/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
diff --git a/board/snmc/qs850/u-boot.lds b/board/snmc/qs850/u-boot.lds
index d9e329d..4676cc0 100644
--- a/board/snmc/qs850/u-boot.lds
+++ b/board/snmc/qs850/u-boot.lds
@@ -60,7 +60,7 @@ SECTIONS
    common/dlmalloc.o		(.text)
    lib/ppc/ppcstring.o		(.text)
-	lib_generic/vsprintf.o	(.text)
-	lib_generic/crc32.o		(.text)
-	lib_generic/zlib.o		(.text)
+	lib/generic/vsprintf.o	(.text)
+	lib/generic/crc32.o		(.text)
+	lib/generic/zlib.o		(.text)
    lib/ppc/cache.o		(.text)
    lib/ppc/time.o		(.text)
diff --git a/board/snmc/qs860t/u-boot.lds b/board/snmc/qs860t/u-boot.lds
index d9e329d..4676cc0 100644
--- a/board/snmc/qs860t/u-boot.lds
+++ b/board/snmc/qs860t/u-boot.lds
@@ -60,7 +60,7 @@ SECTIONS
    common/dlmalloc.o		(.text)
    lib/ppc/ppcstring.o		(.text)
-	lib_generic/vsprintf.o	(.text)
-	lib_generic/crc32.o		(.text)
-	lib_generic/zlib.o		(.text)
+	lib/generic/vsprintf.o	(.text)
+	lib/generic/crc32.o		(.text)
+	lib/generic/zlib.o		(.text)
    lib/ppc/cache.o		(.text)
    lib/ppc/time.o		(.text)
diff --git a/board/socrates/u-boot.lds b/board/socrates/u-boot.lds
index 8f33d44..b0aada8 100644
--- a/board/socrates/u-boot.lds
+++ b/board/socrates/u-boot.lds
@@ -74,7 +74,7 @@ SECTIONS
     cpu/mpc85xx/pci.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/generic/crc32.o (.text)
     lib/ppc/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/generic/zlib.o (.text)
     *(.text)
     *(.fixup)
diff --git a/board/spc1920/u-boot.lds b/board/spc1920/u-boot.lds
index caf1f08..5550c34 100644
--- a/board/spc1920/u-boot.lds
+++ b/board/spc1920/u-boot.lds
@@ -60,7 +60,7 @@ SECTIONS
     common/dlmalloc.o		(.text)
     lib/ppc/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
     lib/ppc/cache.o		(.text)
     lib/ppc/time.o		(.text)
diff --git a/board/spd8xx/u-boot.lds.debug b/board/spd8xx/u-boot.lds.debug
index 515296b..87238ec 100644
--- a/board/spd8xx/u-boot.lds.debug
+++ b/board/spd8xx/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
diff --git a/board/stxgp3/u-boot.lds b/board/stxgp3/u-boot.lds
index 6ff1629..ce162a2 100644
--- a/board/stxgp3/u-boot.lds
+++ b/board/stxgp3/u-boot.lds
@@ -78,7 +78,7 @@ SECTIONS
     cpu/mpc85xx/speed.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/generic/crc32.o (.text)
     lib/ppc/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/generic/zlib.o (.text)
     *(.text)
     *(.fixup)
diff --git a/board/stxssa/u-boot.lds b/board/stxssa/u-boot.lds
index 3e25716..e7dff91 100644
--- a/board/stxssa/u-boot.lds
+++ b/board/stxssa/u-boot.lds
@@ -78,7 +78,7 @@ SECTIONS
     cpu/mpc85xx/speed.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/generic/crc32.o (.text)
     lib/ppc/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/generic/zlib.o (.text)
     *(.text)
     *(.fixup)
diff --git a/board/stxxtc/u-boot.lds b/board/stxxtc/u-boot.lds
index 2e060ba..12db4c3 100644
--- a/board/stxxtc/u-boot.lds
+++ b/board/stxxtc/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
     common/dlmalloc.o		(.text)
     lib/ppc/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
     lib/ppc/cache.o		(.text)
     lib/ppc/time.o		(.text)
diff --git a/board/stxxtc/u-boot.lds.debug b/board/stxxtc/u-boot.lds.debug
index d47c408..8eaa915 100644
--- a/board/stxxtc/u-boot.lds.debug
+++ b/board/stxxtc/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/svm_sc8xx/u-boot.lds b/board/svm_sc8xx/u-boot.lds
index 145541a..660b234 100644
--- a/board/svm_sc8xx/u-boot.lds
+++ b/board/svm_sc8xx/u-boot.lds
@@ -60,7 +60,7 @@ SECTIONS
     common/dlmalloc.o		(.text)
     lib/ppc/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
     lib/ppc/cache.o		(.text)
     lib/ppc/time.o		(.text)
diff --git a/board/svm_sc8xx/u-boot.lds.debug b/board/svm_sc8xx/u-boot.lds.debug
index 016048d..a52c06f 100644
--- a/board/svm_sc8xx/u-boot.lds.debug
+++ b/board/svm_sc8xx/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/tcm-bf537/config.mk b/board/tcm-bf537/config.mk
index 3c0b46f..bf87ab9 100644
--- a/board/tcm-bf537/config.mk
+++ b/board/tcm-bf537/config.mk
@@ -27,5 +27,5 @@
 #TEXT_BASE = do-not-use-me
-CFLAGS_lib_generic += -O2
+CFLAGS_generic += -O2
 CFLAGS_lzma += -O2
diff --git a/board/tqc/tqm85xx/u-boot.lds b/board/tqc/tqm85xx/u-boot.lds
index 666abf5..7961cb9 100644
--- a/board/tqc/tqm85xx/u-boot.lds
+++ b/board/tqc/tqm85xx/u-boot.lds
@@ -71,7 +71,7 @@ SECTIONS
     cpu/mpc85xx/pci.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/generic/crc32.o (.text)
     lib/ppc/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/generic/zlib.o (.text)
     *(.text)
     *(.fixup)
diff --git a/board/tqc/tqm8xx/u-boot.lds b/board/tqc/tqm8xx/u-boot.lds
index e63f593..f9e2a1f 100644
--- a/board/tqc/tqm8xx/u-boot.lds
+++ b/board/tqc/tqm8xx/u-boot.lds
@@ -60,7 +60,7 @@ SECTIONS
     common/dlmalloc.o		(.text)
     lib/ppc/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
     lib/ppc/cache.o		(.text)
diff --git a/board/tqc/tqm8xx/u-boot.lds.debug b/board/tqc/tqm8xx/u-boot.lds.debug
index ea85389..33813dc 100644
--- a/board/tqc/tqm8xx/u-boot.lds.debug
+++ b/board/tqc/tqm8xx/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
. = env_offset;
diff --git a/board/trab/Makefile b/board/trab/Makefile
index 9233f49..4897a09 100644
--- a/board/trab/Makefile
+++ b/board/trab/Makefile
@@ -51,5 +51,5 @@ $(obj)trab_fkt.srec:	$(OBJS_FKT) $(LIB)
    $(LD) -g -Ttext $(LOAD_ADDR) -o $(<:.o=) -e trab_fkt $^ $(LIB) \
    	-L$(obj)../../examples -lstubs \
-		-L$(obj)../../lib_generic -lgeneric \
+		-L$(obj)../../lib/generic -lgeneric \
    	$(obj)../../lib/arm/div0.o \
    	$(obj)../../lib/arm/_*.o
diff --git a/board/trab/u-boot.lds b/board/trab/u-boot.lds
index 2e0e721..5768f82 100644
--- a/board/trab/u-boot.lds
+++ b/board/trab/u-boot.lds
@@ -35,7 +35,7 @@ SECTIONS
      cpu/arm920t/start.o	(.text)
      lib/arm/_umodsi3.o	(.text)
-	  lib_generic/zlib.o	(.text)
-	  lib_generic/crc32.o	(.text)
-	  lib_generic/string.o	(.text)
+	  lib/generic/zlib.o	(.text)
+	  lib/generic/crc32.o	(.text)
+	  lib/generic/string.o	(.text)
. = DEFINED(env_offset) ? env_offset : .;
diff --git a/board/uc100/u-boot.lds b/board/uc100/u-boot.lds
index 3ab0eb0..ddc6320 100644
--- a/board/uc100/u-boot.lds
+++ b/board/uc100/u-boot.lds
@@ -60,7 +60,7 @@ SECTIONS
     common/dlmalloc.o		(.text)
     lib/ppc/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
     lib/ppc/cache.o		(.text)
     lib/ppc/time.o		(.text)
diff --git a/board/uc100/u-boot.lds.debug b/board/uc100/u-boot.lds.debug
index 5750657..b511542 100644
--- a/board/uc100/u-boot.lds.debug
+++ b/board/uc100/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
common/env_embedded.o(.text)
diff --git a/board/v37/u-boot.lds b/board/v37/u-boot.lds
index b9407b6..1ef4811 100644
--- a/board/v37/u-boot.lds
+++ b/board/v37/u-boot.lds
@@ -60,7 +60,7 @@ SECTIONS
     common/dlmalloc.o		(.text)
     lib/ppc/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
     lib/ppc/cache.o		(.text)
     lib/ppc/time.o		(.text)
diff --git a/board/voiceblue/Makefile b/board/voiceblue/Makefile
index e7c1cbb..e579093 100644
--- a/board/voiceblue/Makefile
+++ b/board/voiceblue/Makefile
@@ -49,5 +49,5 @@ $(obj)eeprom.srec:	$(obj)eeprom.o $(obj)eeprom_start.o
    	-o $(<:.o=) -e eeprom eeprom.o eeprom_start.o \
    	-L$(obj)../../examples -lstubs \
-		-L$(obj)../../lib_generic -lgeneric \
+		-L$(obj)../../lib/generic -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 403c29a..57ea485 100644
--- a/board/w7o/u-boot.lds.debug
+++ b/board/w7o/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
diff --git a/board/westel/amx860/u-boot.lds b/board/westel/amx860/u-boot.lds
index b72e021..27ce175 100644
--- a/board/westel/amx860/u-boot.lds
+++ b/board/westel/amx860/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o	(.text)
     lib/ppc/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
+    lib/generic/zlib.o		(.text)
. = env_offset;
diff --git a/board/westel/amx860/u-boot.lds.debug b/board/westel/amx860/u-boot.lds.debug
index 23e5c46..b8e9478 100644
--- a/board/westel/amx860/u-boot.lds.debug
+++ b/board/westel/amx860/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
diff --git a/board/xes/xpedite5170/u-boot.lds b/board/xes/xpedite5170/u-boot.lds
index b65a68d..aa3ecdf 100644
--- a/board/xes/xpedite5170/u-boot.lds
+++ b/board/xes/xpedite5170/u-boot.lds
@@ -58,7 +58,7 @@ SECTIONS
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/generic/crc32.o (.text)
     lib/ppc/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/generic/zlib.o (.text)
     *(.text)
     *(.got1)
diff --git a/board/xilinx/ml300/u-boot.lds b/board/xilinx/ml300/u-boot.lds
index d77cd49..771d088 100644
--- a/board/xilinx/ml300/u-boot.lds
+++ b/board/xilinx/ml300/u-boot.lds
@@ -67,7 +67,7 @@ SECTIONS
     drivers/net/4xx_enet.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
 */
 /*    . = env_offset;*/
diff --git a/board/xilinx/ml300/u-boot.lds.debug b/board/xilinx/ml300/u-boot.lds.debug
index f753355..f15011f 100644
--- a/board/xilinx/ml300/u-boot.lds.debug
+++ b/board/xilinx/ml300/u-boot.lds.debug
@@ -58,6 +58,6 @@ SECTIONS
     mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/vsprintf.o	(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
diff --git a/board/xpedite1k/u-boot.lds b/board/xpedite1k/u-boot.lds
index 19814df..c852186 100644
--- a/board/xpedite1k/u-boot.lds
+++ b/board/xpedite1k/u-boot.lds
@@ -75,7 +75,7 @@ SECTIONS
     cpu/ppc4xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
/*    . = env_offset;*/
diff --git a/board/xpedite1k/u-boot.lds.debug b/board/xpedite1k/u-boot.lds.debug
index f7ddf62..48c506f 100644
--- a/board/xpedite1k/u-boot.lds.debug
+++ b/board/xpedite1k/u-boot.lds.debug
@@ -65,7 +65,7 @@ SECTIONS
     cpu/ppc4xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/generic/crc32.o		(.text)
     lib/ppc/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/generic/zlib.o		(.text)
/*    common/env_embedded.o(.text) */
diff --git a/cpu/mpc5xxx/u-boot-customlayout.lds b/cpu/mpc5xxx/u-boot-customlayout.lds
index cd37491..67dcc6b 100644
--- a/cpu/mpc5xxx/u-boot-customlayout.lds
+++ b/cpu/mpc5xxx/u-boot-customlayout.lds
@@ -58,5 +58,5 @@ SECTIONS
     cpu/mpc5xxx/start.o          (.text)
     cpu/mpc5xxx/traps.o          (.text)
-    lib_generic/crc32.o         (.text)
+    lib/generic/crc32.o         (.text)
     lib/ppc/cache.o             (.text)
     lib/ppc/time.o              (.text)
diff --git a/include/common.h b/include/common.h
index 703775e..a301d36 100644
--- a/include/common.h
+++ b/include/common.h
@@ -605,5 +605,5 @@ ulong	ticks2usec    (unsigned long ticks);
 int	init_timebase (void);
-/* lib_generic/vsprintf.c */
+/* lib/generic/vsprintf.c */
 ulong	simple_strtoul(const char *cp,char **endp,unsigned int base);
 #ifdef CONFIG_SYS_64BIT_VSPRINTF
@@ -617,8 +617,8 @@ int	sprintf(char * buf, const char *fmt, ...)
 int	vsprintf(char *buf, const char *fmt, va_list args);
-/* lib_generic/strmhz.c */
+/* lib/generic/strmhz.c */
 char *	strmhz(char *buf, long hz);
-/* lib_generic/crc32.c */
+/* lib/generic/crc32.c */
 uint32_t crc32 (uint32_t, const unsigned char *, uint);
 uint32_t crc32_wd (uint32_t, const unsigned char *, uint, uint);
diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index c03561c..df37a1a 100644
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -129,5 +129,5 @@
    cpu/blackfin/serial.o		(.text .text.*); \
    common/dlmalloc.o		(.text .text.*); \
-	lib_generic/crc32.o		(.text .text.*); \
+	lib/generic/crc32.o		(.text .text.*); \
    . = DEFINED(env_offset) ? env_offset : .; \
    common/env_embedded.o		(.text .text.*);
diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h
index 0f908ef..9b70013 100644
--- a/include/configs/bf537-pnav.h
+++ b/include/configs/bf537-pnav.h
@@ -117,5 +117,5 @@
    cpu/blackfin/serial.o		(.text .text.*); \
    common/dlmalloc.o		(.text .text.*); \
-	lib_generic/crc32.o		(.text .text.*); \
+	lib/generic/crc32.o		(.text .text.*); \
    . = DEFINED(env_offset) ? env_offset : .; \
    common/env_embedded.o		(.text .text.*);
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index 0a86e83..85e1c6b 100644
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -127,5 +127,5 @@
    cpu/blackfin/serial.o		(.text .text.*); \
    common/dlmalloc.o		(.text .text.*); \
-	lib_generic/crc32.o		(.text .text.*); \
+	lib/generic/crc32.o		(.text .text.*); \
    . = DEFINED(env_offset) ? env_offset : .; \
    common/env_embedded.o		(.text .text.*);
diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h
index 535687f..0c97233 100644
--- a/include/configs/bf538f-ezkit.h
+++ b/include/configs/bf538f-ezkit.h
@@ -123,5 +123,5 @@
    cpu/blackfin/serial.o		(.text .text.*); \
    common/dlmalloc.o		(.text .text.*); \
-	lib_generic/crc32.o		(.text .text.*); \
+	lib/generic/crc32.o		(.text .text.*); \
    . = DEFINED(env_offset) ? env_offset : .; \
    common/env_embedded.o		(.text .text.*);
diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index 4779a97..d516180 100644
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -100,6 +100,6 @@
    cpu/blackfin/serial.o		(.text .text.*); \
    common/dlmalloc.o		(.text .text.*); \
-	lib_generic/crc32.o		(.text .text.*); \
-	lib_generic/zlib.o		(.text .text.*); \
+	lib/generic/crc32.o		(.text .text.*); \
+	lib/generic/zlib.o		(.text .text.*); \
    board/bf561-ezkit/bf561-ezkit.o	(.text .text.*); \
    . = DEFINED(env_offset) ? env_offset : .; \
diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index 021b631..66b4ec9 100644
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -106,5 +106,5 @@
    cpu/blackfin/serial.o		(.text .text.*); \
    common/dlmalloc.o		(.text .text.*); \
-	lib_generic/crc32.o		(.text .text.*); \
+	lib/generic/crc32.o		(.text .text.*); \
    . = DEFINED(env_offset) ? env_offset : .; \
    common/env_embedded.o		(.text .text.*);
diff --git a/include/configs/ibf-dsp561.h b/include/configs/ibf-dsp561.h
index 066859f..568407d 100644
--- a/include/configs/ibf-dsp561.h
+++ b/include/configs/ibf-dsp561.h
@@ -89,6 +89,6 @@
    cpu/blackfin/serial.o		(.text .text.*); \
    common/dlmalloc.o		(.text .text.*); \
-	lib_generic/crc32.o		(.text .text.*); \
-	lib_generic/zlib.o		(.text .text.*); \
+	lib/generic/crc32.o		(.text .text.*); \
+	lib/generic/zlib.o		(.text .text.*); \
    board/ibf-dsp561/ibf-dsp561.o	(.text .text.*); \
    . = DEFINED(env_offset) ? env_offset : .; \
diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index 9794e1b..59ebb8d 100644
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -107,5 +107,5 @@
    cpu/blackfin/serial.o		(.text .text.*); \
    common/dlmalloc.o		(.text .text.*); \
-	lib_generic/crc32.o		(.text .text.*); \
+	lib/generic/crc32.o		(.text .text.*); \
    . = DEFINED(env_offset) ? env_offset : .; \
    common/env_embedded.o		(.text .text.*);
diff --git a/include/lzma/LzmaDecode.h b/include/lzma/LzmaDecode.h
index 8fdb2c0..188265c 100644
--- a/include/lzma/LzmaDecode.h
+++ b/include/lzma/LzmaDecode.h
@@ -27,5 +27,5 @@
 #define __LZMADECODE_H__FAKE__
-#include "../../lib_generic/lzma/LzmaDecode.h"
+#include "../../lib/generic/lzma/LzmaDecode.h"
#endif
diff --git a/include/lzma/LzmaTools.h b/include/lzma/LzmaTools.h
index 7c5eea1..5133774 100644
--- a/include/lzma/LzmaTools.h
+++ b/include/lzma/LzmaTools.h
@@ -27,5 +27,5 @@
 #define __LZMATOOLS_H__FAKE__
-#include "../../lib_generic/lzma/LzmaTools.h"
+#include "../../lib/generic/lzma/LzmaTools.h"
#endif
diff --git a/include/lzma/LzmaTypes.h b/include/lzma/LzmaTypes.h
index 02daa59..855b34b 100644
--- a/include/lzma/LzmaTypes.h
+++ b/include/lzma/LzmaTypes.h
@@ -27,5 +27,5 @@
 #define __LZMATYPES_H__FAKE__
-#include "../../lib_generic/lzma/LzmaTypes.h"
+#include "../../lib/generic/lzma/LzmaTypes.h"
#endif
diff --git a/lib_generic/Makefile b/lib/generic/Makefile
similarity index 100%
rename from lib_generic/Makefile
rename to lib/generic/Makefile
diff --git a/lib_generic/addr_map.c b/lib/generic/addr_map.c
similarity index 100%
rename from lib_generic/addr_map.c
rename to lib/generic/addr_map.c
diff --git a/lib_generic/bzlib.c b/lib/generic/bzlib.c
similarity index 100%
rename from lib_generic/bzlib.c
rename to lib/generic/bzlib.c
diff --git a/lib_generic/bzlib_crctable.c b/lib/generic/bzlib_crctable.c
similarity index 100%
rename from lib_generic/bzlib_crctable.c
rename to lib/generic/bzlib_crctable.c
diff --git a/lib_generic/bzlib_decompress.c b/lib/generic/bzlib_decompress.c
similarity index 100%
rename from lib_generic/bzlib_decompress.c
rename to lib/generic/bzlib_decompress.c
diff --git a/lib_generic/bzlib_huffman.c b/lib/generic/bzlib_huffman.c
similarity index 100%
rename from lib_generic/bzlib_huffman.c
rename to lib/generic/bzlib_huffman.c
diff --git a/lib_generic/bzlib_private.h b/lib/generic/bzlib_private.h
similarity index 100%
rename from lib_generic/bzlib_private.h
rename to lib/generic/bzlib_private.h
diff --git a/lib_generic/bzlib_randtable.c b/lib/generic/bzlib_randtable.c
similarity index 100%
rename from lib_generic/bzlib_randtable.c
rename to lib/generic/bzlib_randtable.c
diff --git a/lib_generic/crc16.c b/lib/generic/crc16.c
similarity index 100%
rename from lib_generic/crc16.c
rename to lib/generic/crc16.c
diff --git a/lib_generic/crc32.c b/lib/generic/crc32.c
similarity index 100%
rename from lib_generic/crc32.c
rename to lib/generic/crc32.c
diff --git a/lib_generic/ctype.c b/lib/generic/ctype.c
similarity index 100%
rename from lib_generic/ctype.c
rename to lib/generic/ctype.c
diff --git a/lib_generic/display_options.c b/lib/generic/display_options.c
similarity index 100%
rename from lib_generic/display_options.c
rename to lib/generic/display_options.c
diff --git a/lib_generic/div64.c b/lib/generic/div64.c
similarity index 100%
rename from lib_generic/div64.c
rename to lib/generic/div64.c
diff --git a/lib_generic/gunzip.c b/lib/generic/gunzip.c
similarity index 100%
rename from lib_generic/gunzip.c
rename to lib/generic/gunzip.c
diff --git a/lib_generic/ldiv.c b/lib/generic/ldiv.c
similarity index 100%
rename from lib_generic/ldiv.c
rename to lib/generic/ldiv.c
diff --git a/lib_generic/lmb.c b/lib/generic/lmb.c
similarity index 100%
rename from lib_generic/lmb.c
rename to lib/generic/lmb.c
diff --git a/lib_generic/lzma/LGPL.txt b/lib/generic/lzma/LGPL.txt
similarity index 100%
rename from lib_generic/lzma/LGPL.txt
rename to lib/generic/lzma/LGPL.txt
diff --git a/lib_generic/lzma/LzmaDecode.c b/lib/generic/lzma/LzmaDecode.c
similarity index 100%
rename from lib_generic/lzma/LzmaDecode.c
rename to lib/generic/lzma/LzmaDecode.c
diff --git a/lib_generic/lzma/LzmaDecode.h b/lib/generic/lzma/LzmaDecode.h
similarity index 100%
rename from lib_generic/lzma/LzmaDecode.h
rename to lib/generic/lzma/LzmaDecode.h
diff --git a/lib_generic/lzma/LzmaTools.c b/lib/generic/lzma/LzmaTools.c
similarity index 100%
rename from lib_generic/lzma/LzmaTools.c
rename to lib/generic/lzma/LzmaTools.c
diff --git a/lib_generic/lzma/LzmaTools.h b/lib/generic/lzma/LzmaTools.h
similarity index 100%
rename from lib_generic/lzma/LzmaTools.h
rename to lib/generic/lzma/LzmaTools.h
diff --git a/lib_generic/lzma/LzmaTypes.h b/lib/generic/lzma/LzmaTypes.h
similarity index 100%
rename from lib_generic/lzma/LzmaTypes.h
rename to lib/generic/lzma/LzmaTypes.h
diff --git a/lib_generic/lzma/Makefile b/lib/generic/lzma/Makefile
similarity index 100%
rename from lib_generic/lzma/Makefile
rename to lib/generic/lzma/Makefile
diff --git a/lib_generic/lzma/README.txt b/lib/generic/lzma/README.txt
similarity index 100%
rename from lib_generic/lzma/README.txt
rename to lib/generic/lzma/README.txt
diff --git a/lib_generic/lzma/history.txt b/lib/generic/lzma/history.txt
similarity index 100%
rename from lib_generic/lzma/history.txt
rename to lib/generic/lzma/history.txt
diff --git a/lib_generic/lzma/import_lzmasdk.sh b/lib/generic/lzma/import_lzmasdk.sh
similarity index 100%
rename from lib_generic/lzma/import_lzmasdk.sh
rename to lib/generic/lzma/import_lzmasdk.sh
diff --git a/lib_generic/lzma/lzma.txt b/lib/generic/lzma/lzma.txt
similarity index 100%
rename from lib_generic/lzma/lzma.txt
rename to lib/generic/lzma/lzma.txt
diff --git a/lib_generic/lzo/Makefile b/lib/generic/lzo/Makefile
similarity index 100%
rename from lib_generic/lzo/Makefile
rename to lib/generic/lzo/Makefile
diff --git a/lib_generic/lzo/lzo1x_decompress.c b/lib/generic/lzo/lzo1x_decompress.c
similarity index 100%
rename from lib_generic/lzo/lzo1x_decompress.c
rename to lib/generic/lzo/lzo1x_decompress.c
diff --git a/lib_generic/lzo/lzodefs.h b/lib/generic/lzo/lzodefs.h
similarity index 100%
rename from lib_generic/lzo/lzodefs.h
rename to lib/generic/lzo/lzodefs.h
diff --git a/lib_generic/md5.c b/lib/generic/md5.c
similarity index 100%
rename from lib_generic/md5.c
rename to lib/generic/md5.c
diff --git a/lib_generic/rbtree.c b/lib/generic/rbtree.c
similarity index 100%
rename from lib_generic/rbtree.c
rename to lib/generic/rbtree.c
diff --git a/lib_generic/sha1.c b/lib/generic/sha1.c
similarity index 100%
rename from lib_generic/sha1.c
rename to lib/generic/sha1.c
diff --git a/lib_generic/sha256.c b/lib/generic/sha256.c
similarity index 100%
rename from lib_generic/sha256.c
rename to lib/generic/sha256.c
diff --git a/lib_generic/string.c b/lib/generic/string.c
similarity index 100%
rename from lib_generic/string.c
rename to lib/generic/string.c
diff --git a/lib_generic/strmhz.c b/lib/generic/strmhz.c
similarity index 100%
rename from lib_generic/strmhz.c
rename to lib/generic/strmhz.c
diff --git a/lib_generic/vsprintf.c b/lib/generic/vsprintf.c
similarity index 100%
rename from lib_generic/vsprintf.c
rename to lib/generic/vsprintf.c
diff --git a/lib_generic/zlib.c b/lib/generic/zlib.c
similarity index 100%
rename from lib_generic/zlib.c
rename to lib/generic/zlib.c
diff --git a/tools/Makefile b/tools/Makefile
index 43c284c..c9af71f 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -82,7 +82,7 @@ BIN_FILES-$(CONFIG_NETCONSOLE) += ncb$(SFX)
 # Source files which exist outside the tools directory
 EXT_OBJ_FILES-y += common/env_embedded.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/generic/crc32.o
+EXT_OBJ_FILES-y += lib/generic/md5.o
+EXT_OBJ_FILES-y += lib/generic/sha1.o
 EXT_OBJ_FILES-y += common/image.o
@@ -210,5 +210,5 @@ $(obj)%.o: $(SRCTREE)/common/%.c
    $(CC) -g $(FIT_CFLAGS) -c -o $@ $<
-$(obj)%.o: $(SRCTREE)/lib_generic/%.c
+$(obj)%.o: $(SRCTREE)/lib/generic/%.c
    $(CC) -g $(CFLAGS) -c -o $@ $<
diff --git a/tools/env/Makefile b/tools/env/Makefile
index 9629ee5..da6bef6 100644
--- a/tools/env/Makefile
+++ b/tools/env/Makefile
@@ -42,5 +42,5 @@ clean:
$(obj)crc32.c:
-	ln -s $(src)../../lib_generic/crc32.c $(obj)crc32.c
+	ln -s $(src)../../lib/generic/crc32.c $(obj)crc32.c
#########################################################################
diff --git a/tools/imls/Makefile b/tools/imls/Makefile
index 04ab31a..fa48501 100644
--- a/tools/imls/Makefile
+++ b/tools/imls/Makefile
@@ -26,7 +26,7 @@ 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/generic/crc32.o
+EXT_OBJ_FILES-y += lib/generic/md5.o
+EXT_OBJ_FILES-y += lib/generic/sha1.o
 EXT_OBJ_FILES-y += common/image.o
@@ -88,5 +88,5 @@ $(obj)%.o: $(SRCTREE)/common/%.c
    $(CC) -g $(FIT_CFLAGS) -c -o $@ $<
-$(obj)%.o: $(SRCTREE)/lib_generic/%.c
+$(obj)%.o: $(SRCTREE)/lib/generic/%.c
    $(CC) -g $(CFLAGS) -c -o $@ $<
-- 
1.6.2.1


    