Rename lib_generic/ to lib/
authorPeter Tyser <ptyser@xes-inc.com>
Tue, 13 Apr 2010 03:28:05 +0000 (22:28 -0500)
committerWolfgang Denk <wd@denx.de>
Tue, 13 Apr 2010 07:13:04 +0000 (09:13 +0200)
Now that the other architecture-specific lib directories have been
moved out of the top-level directory there's not much reason to have the
'_generic' suffix on the common lib directory.

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

index de8a4cd..0b70dca 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -183,9 +183,9 @@ endif
 
 OBJS := $(addprefix $(obj),$(OBJS))
 
-LIBS  = lib_generic/libgeneric.a
-LIBS += lib_generic/lzma/liblzma.a
-LIBS += lib_generic/lzo/liblzo.a
+LIBS  = lib/libgeneric.a
+LIBS += lib/lzma/liblzma.a
+LIBS += lib/lzo/liblzo.a
 LIBS += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \
        "board/$(VENDOR)/common/lib$(VENDOR).a"; fi)
 LIBS += $(CPUDIR)/lib$(CPU).a
diff --git a/README b/README
index dc2103f..e1d58bd 100644 (file)
--- a/README
+++ b/README
@@ -185,7 +185,7 @@ Directory Hierarchy:
 - arch/arm/lib Files generic to ARM     architecture
 - arch/avr32/lib       Files generic to AVR32   architecture
 - arch/blackfin/lib    Files generic to Blackfin architecture
-- lib_generic  Files generic to all     architectures
+- lib  Files generic to all     architectures
 - arch/i386/lib        Files generic to i386    architecture
 - arch/m68k/lib        Files generic to m68k    architecture
 - arch/microblaze/lib Files generic to microblaze architecture
index 3450793..b05eacf 100644 (file)
@@ -57,10 +57,10 @@ SECTIONS
 
     cpu/mcf52x2/start.o        (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/string.o       (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o        (.text)
-    lib_generic/zlib.o (.text)
+    lib/string.o       (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o        (.text)
+    lib/zlib.o (.text)
 
 /*    . = env_offset; */
     common/env_embedded.o(.text)
index 32778ca..d3929ea 100644 (file)
@@ -67,10 +67,10 @@ SECTIONS
     cpu/mpc8xx/start.o                 (.text)
     common/dlmalloc.o                  (.text)
     arch/ppc/lib/ppcstring.o                   (.text)
-    lib_generic/vsprintf.o             (.text)
-    lib_generic/crc32.o                        (.text)
-    lib_generic/zlib.o                 (.text)
-    lib_generic/string.o               (.text)
+    lib/vsprintf.o             (.text)
+    lib/crc32.o                        (.text)
+    lib/zlib.o                 (.text)
+    lib/string.o               (.text)
     arch/ppc/lib/cache.o                       (.text)
     arch/ppc/lib/extable.o                     (.text)
     arch/ppc/lib/time.o                        (.text)
index 5126083..f6c21f7 100644 (file)
@@ -66,8 +66,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o         (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o      (.text)
index c354ff8..09d9470 100644 (file)
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
     arch/ppc/lib/ppcstring.o   (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 /* XXX ?
     . = env_offset;
 */
index a2d940f..f559df7 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index c354ff8..09d9470 100644 (file)
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
     arch/ppc/lib/ppcstring.o   (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 /* XXX ?
     . = env_offset;
 */
index a2d940f..f559df7 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 89aafff..a099cb9 100644 (file)
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
     arch/ppc/lib/ppcstring.o   (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 /* XXX ?
     . = env_offset;
 */
index 83fdc15..3b61a42 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 88644a4..1132fd6 100644 (file)
@@ -59,9 +59,9 @@ SECTIONS
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     arch/ppc/lib/ppcstring.o           (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
     arch/ppc/lib/cache.o               (.text)
     arch/ppc/lib/time.o                (.text)
 
index 1087167..40b5ef3 100644 (file)
@@ -31,8 +31,8 @@ SECTIONS
        . = ALIGN (4);
        .text : {
                cpu/ixp/start.o(.text)
-               lib_generic/string.o(.text)
-               lib_generic/vsprintf.o(.text)
+               lib/string.o(.text)
+               lib/vsprintf.o(.text)
                arch/arm/lib/board.o(.text)
                common/dlmalloc.o(.text)
                cpu/ixp/cpu.o(.text)
index 543af30..f9ab281 100644 (file)
@@ -31,8 +31,8 @@ SECTIONS
        . = ALIGN (4);
        .text : {
                cpu/ixp/start.o(.text)
-               lib_generic/string.o(.text)
-               lib_generic/vsprintf.o(.text)
+               lib/string.o(.text)
+               lib/vsprintf.o(.text)
                arch/arm/lib/board.o(.text)
                common/dlmalloc.o(.text)
                cpu/ixp/cpu.o(.text)
index f63251d..2fc3796 100644 (file)
@@ -31,8 +31,8 @@ SECTIONS
        . = ALIGN (4);
        .text : {
                cpu/ixp/start.o (.text)
-               lib_generic/string.o (.text)
-               lib_generic/vsprintf.o (.text)
+               lib/string.o (.text)
+               lib/vsprintf.o (.text)
                arch/arm/lib/board.o (.text)
                common/dlmalloc.o (.text)
                cpu/ixp/cpu.o (.text)
index 10308d5..89ffc6d 100644 (file)
@@ -64,9 +64,9 @@ SECTIONS
     cpu/ppc4xx/cpu_init.o      (.text)
     cpu/ppc4xx/speed.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/crc32.o                (.text)
+    lib/crc32.o                (.text)
     arch/ppc/lib/extable.o     (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
 /*    . = env_offset;*/
 /*    common/env_embedded.o(.text)*/
index 7fbe16f..73e0310 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o              (.text)
     arch/m68k/lib/interrupts.o (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
index fb93531..3f9d41f 100644 (file)
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
index fb93531..3f9d41f 100644 (file)
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
index fb93531..3f9d41f 100644 (file)
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
index b50e1f2..bc046f1 100644 (file)
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
index b50e1f2..bc046f1 100644 (file)
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
index 95d0fcc..5766829 100644 (file)
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
index b50e1f2..bc046f1 100644 (file)
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
index aff12e9..ce96c0d 100644 (file)
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA       := --dma 6
index b517025..a90b193 100644 (file)
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16
index b517025..a90b193 100644 (file)
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16
index 0571f02..51e95d5 100644 (file)
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
     arch/ppc/lib/ppcstring.o   (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index ad36953..d55bf33 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index fb93531..3f9d41f 100644 (file)
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
index b50e1f2..bc046f1 100644 (file)
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
index b50e1f2..bc046f1 100644 (file)
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
index b50e1f2..bc046f1 100644 (file)
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
index 66c7368..f071a39 100644 (file)
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA       := --dma 6
index b517025..a90b193 100644 (file)
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16
index 8989880..aacc089 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o              (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
index a2d940f..f559df7 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 40d2f78..09c0191 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     mpc8xx/start.o     (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
     arch/ppc/lib/extable.o     (.text)
 
     common/env_embedded.o(.text)
index ad36953..d55bf33 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 4e4943f..6ca7298 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
     arch/ppc/lib/extable.o     (.text)
 
     . = env_offset;
index 54e0169..f87d3cb 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o              (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
index 215a2c4..848eacd 100644 (file)
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
     arch/ppc/lib/ppcstring.o   (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 1d34e68..d8112eb 100644 (file)
@@ -62,8 +62,8 @@ SECTIONS
     cpu/mpc8xx/cpu_init.o      (.text)
     cpu/mpc8xx/speed.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index dd4dbfa..12f6ce7 100644 (file)
@@ -64,8 +64,8 @@ SECTIONS
     cpu/mpc8xx/serial.o        (.text)
     arch/ppc/lib/extable.o     (.text)
     arch/ppc/lib/ppcstring.o   (.text)
-    lib_generic/string.o       (.text)
-    lib_generic/crc32.o                (.text)
+    lib/string.o       (.text)
+    lib/crc32.o                (.text)
     common/dlmalloc.o  (.text)
     . = env_offset;
     common/env_embedded.o(.text)
index 8d91aed..4f179c7 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
     arch/ppc/lib/extable.o     (.text)
 
     . = env_offset;
index ad36953..d55bf33 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 23d5710..6d916d8 100644 (file)
@@ -58,7 +58,7 @@ SECTIONS
     cpu/mcf5227x/start.o       (.text)
     cpu/mcf5227x/libmcf5227x.a (.text)
     arch/m68k/lib/libm68k.a            (.text)
-    lib_generic/libgeneric.a   (.text)
+    lib/libgeneric.a   (.text)
     common/cmd_mem.o           (.text)
     common/main.o              (.text)
 
index 940da14..4e70efb 100644 (file)
@@ -60,7 +60,7 @@ SECTIONS
     arch/m68k/lib/traps.o              (.text)
     arch/m68k/lib/interrupts.o (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
index 50045e1..cbf2249 100644 (file)
@@ -68,7 +68,7 @@ SECTIONS
     common/cmd_mem.o           (.text)
     common/console.o           (.text)
     common/main.o              (.text)
-    lib_generic/libgeneric.a   (.text)
+    lib/libgeneric.a   (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
index 54e0169..f87d3cb 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o              (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
index e53e67d..455e9b8 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o              (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
index 7f4dc27..99c125c 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o              (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
index 713b18a..588a128 100644 (file)
@@ -60,7 +60,7 @@ SECTIONS
     arch/m68k/lib/traps.o              (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.ppcenv)
index 446ec1b..aaba5a3 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o              (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
index daf8724..700b9f5 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mcf52x2/start.o                (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/string.o       (.text)
-    lib_generic/zlib.o         (.text)
+    lib/string.o       (.text)
+    lib/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o(.text)
index f46e025..e936adf 100644 (file)
@@ -57,9 +57,9 @@ SECTIONS
 
     cpu/mcf52x2/start.o        (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/string.o       (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o        (.text)
+    lib/string.o       (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o        (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o(.text)
index fe0e314..a725da1 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     cpu/mcf532x/libmcf532x.a   (.text)
     arch/m68k/lib/libm68k.a            (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
index 0ed87ff..bf4f188 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o              (.text)
     arch/m68k/lib/interrupts.o (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
index 605452b..c129ac2 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o              (.text)
     arch/m68k/lib/interrupts.o (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
index 569518b..e63b1f2 100644 (file)
@@ -62,7 +62,7 @@ SECTIONS
     common/dlmalloc.o          (.text)
     common/main.o              (.text)
     common/image.o             (.text)
-    lib_generic/libgeneric.a   (.text)
+    lib/libgeneric.a   (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
index 1b06b12..7c3f068 100644 (file)
@@ -64,7 +64,7 @@ SECTIONS
     arch/m68k/lib/board.o                      (.text)
     common/serial.o                    (.text)
     common/console.o                   (.text)
-    lib_generic/display_options.o      (.text)
+    lib/display_options.o      (.text)
     board/freescale/m54455evb/m54455evb.o      (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
index c48dd75..2dd8a23 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o              (.text)
     arch/m68k/lib/interrupts.o (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
index ef07174..8e54d79 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o              (.text)
     arch/m68k/lib/interrupts.o (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
     *(.text)
     *(.fixup)
index 2ad0f0e..67847f1 100644 (file)
@@ -57,9 +57,9 @@ SECTIONS
     cpu/mpc86xx/cpu.o (.text)
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/crc32.o (.text)
     arch/ppc/lib/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/zlib.o (.text)
     *(.text)
     *(.got1)
    }
index 796828a..20e0344 100644 (file)
@@ -57,9 +57,9 @@ SECTIONS
     cpu/mpc86xx/cpu.o (.text)
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/crc32.o (.text)
     arch/ppc/lib/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/zlib.o (.text)
     drivers/bios_emulator/atibios.o (.text)
     *(.text)
     *(.got1)
index 9fc71a2..1bd1ba7 100644 (file)
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
     arch/ppc/lib/ppcstring.o   (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 9bb2c58..c0dd67f 100644 (file)
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
     arch/ppc/lib/ppcstring.o   (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 1252baf..1f6e7d6 100644 (file)
@@ -61,7 +61,7 @@ SECTIONS
     arch/ppc/lib/time.o                (.text)
     arch/ppc/lib/ticks.o               (.text)
     arch/ppc/lib/cache.o               (.text)
-    lib_generic/crc32.o                (.text)
+    lib/crc32.o                (.text)
     . = env_offset;
     common/env_embedded.o(.text)
 
index cc32b44..965716f 100644 (file)
@@ -59,9 +59,9 @@ SECTIONS
 /*
     common/dlmalloc.o  (.text)
     arch/ppc/lib/ppcstring.o   (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 
     . = env_offset;
 */
index a2d940f..f559df7 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index b614262..d7d0fb3 100644 (file)
@@ -60,9 +60,9 @@ SECTIONS
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
     arch/ppc/lib/ppcstring.o   (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 919eb21..282738b 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
     arch/ppc/lib/extable.o     (.text)
 
     . = env_offset;
index 713b18a..588a128 100644 (file)
@@ -60,7 +60,7 @@ SECTIONS
     arch/m68k/lib/traps.o              (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.ppcenv)
index 17965a0..037785e 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
     arch/ppc/lib/extable.o     (.text)
 
     . = env_offset;
index 8b6305a..759072d 100644 (file)
@@ -59,9 +59,9 @@ SECTIONS
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     arch/ppc/lib/ppcstring.o           (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
     arch/ppc/lib/cache.o               (.text)
     arch/ppc/lib/time.o                (.text)
 
index 8e4faa1..e1233a7 100644 (file)
@@ -60,9 +60,9 @@ SECTIONS
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
     arch/ppc/lib/ppcstring.o   (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 83fdc15..3b61a42 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 8e4faa1..e1233a7 100644 (file)
@@ -60,9 +60,9 @@ SECTIONS
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
     arch/ppc/lib/ppcstring.o   (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 83fdc15..3b61a42 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 814a7a6..50bdfb4 100644 (file)
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
     arch/ppc/lib/ppcstring.o   (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 3b4799e..be06235 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 49f8972..251ee9b 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
     arch/ppc/lib/extable.o     (.text)
 
     . = env_offset;
index 8d91aed..4f179c7 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
     arch/ppc/lib/extable.o     (.text)
 
     . = env_offset;
index 0083a21..e68cfb8 100644 (file)
@@ -64,9 +64,9 @@ SECTIONS
     cpu/ppc4xx/cpu_init.o      (.text)
     cpu/ppc4xx/speed.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/crc32.o                (.text)
+    lib/crc32.o                (.text)
     arch/ppc/lib/extable.o     (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
 /*    . = env_offset;*/
 /*    common/env_embedded.o(.text)*/
index 40d2f78..09c0191 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     mpc8xx/start.o     (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
     arch/ppc/lib/extable.o     (.text)
 
     common/env_embedded.o(.text)
index c92a2ab..f6930b5 100644 (file)
@@ -55,9 +55,9 @@ SECTIONS
     cpu/mpc824x/start.o                (.text)
     arch/ppc/lib/board.o               (.text)
     arch/ppc/lib/ppcstring.o           (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 
     *(.got1)
     . = ALIGN(16);
index 9750fc5..8355f33 100644 (file)
@@ -55,9 +55,9 @@ SECTIONS
     cpu/mpc824x/start.o        (.text)
         common/board.o (.text)
     arch/ppc/lib/ppcstring.o   (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 
                . = env_offset;
     common/env_embedded.o (.text)
index 40d2f78..09c0191 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     mpc8xx/start.o     (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
     arch/ppc/lib/extable.o     (.text)
 
     common/env_embedded.o(.text)
index 4b17a1f..8f96b1d 100644 (file)
@@ -56,9 +56,9 @@ SECTIONS
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     arch/ppc/lib/ppcstring.o           (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
     arch/ppc/lib/cache.o               (.text)
     arch/ppc/lib/time.o                (.text)
 
index 4ef16f1..1397511 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o         (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index c435762..5773c13 100644 (file)
@@ -72,7 +72,7 @@ $(obj)crcit:          $(obj)crcit.o $(obj)crc32.o
 $(obj)crcit.o:         crcit.c
        $(HOSTCC) $(HOSTCFLAGS) -o $@ -c $<
 
-$(obj)crc32.o:         $(SRCTREE)/lib_generic/crc32.c
+$(obj)crc32.o:         $(SRCTREE)/lib/crc32.c
        $(HOSTCC) $(HOSTCFLAGS) -DUSE_HOSTCC -I$(TOPDIR)/include \
                -o $@ -c $<
 
index 991d7a1..ff11ad0 100644 (file)
@@ -56,9 +56,9 @@ SECTIONS
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     arch/ppc/lib/ppcstring.o           (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
     arch/ppc/lib/cache.o               (.text)
     arch/ppc/lib/time.o                (.text)
 
index 4ef16f1..1397511 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o         (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 991d7a1..ff11ad0 100644 (file)
@@ -56,9 +56,9 @@ SECTIONS
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     arch/ppc/lib/ppcstring.o           (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
     arch/ppc/lib/cache.o               (.text)
     arch/ppc/lib/time.o                (.text)
 
index 4ef16f1..1397511 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o         (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 7eb01ee..70d5a6a 100644 (file)
@@ -56,9 +56,9 @@ SECTIONS
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     arch/ppc/lib/ppcstring.o           (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
     arch/ppc/lib/cache.o               (.text)
     arch/ppc/lib/time.o                (.text)
 
index c3c99b3..bc8f32e 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o         (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index ad36953..d55bf33 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 04a641a..236ece4 100644 (file)
@@ -40,7 +40,7 @@ SECTIONS
          common/main.o                 (.text)
          common/dlmalloc.o             (.text)
          common/cmd_boot.o             (.text)
-         lib_generic/zlib.o            (.text)
+         lib/zlib.o            (.text)
          . = DEFINED(env_offset) ? env_offset : .;
          common/env_embedded.o (.ppcenv)
 
index c354ff8..09d9470 100644 (file)
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
     arch/ppc/lib/ppcstring.o   (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 /* XXX ?
     . = env_offset;
 */
index ec01fe2..dcad818 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 6074c14..15aca6c 100644 (file)
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
     arch/ppc/lib/ppcstring.o   (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index c354ff8..09d9470 100644 (file)
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
     arch/ppc/lib/ppcstring.o   (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 /* XXX ?
     . = env_offset;
 */
index ec01fe2..dcad818 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 1d8ce10..34dce83 100644 (file)
@@ -66,9 +66,9 @@ SECTIONS
     cpu/ppc4xx/speed.o (.text)
     drivers/net/4xx_enet.o     (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/crc32.o                (.text)
+    lib/crc32.o                (.text)
     arch/ppc/lib/extable.o     (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
 /*    common/env_embedded.o(.text) */
 
index bbfea13..fa976c2 100644 (file)
@@ -66,9 +66,9 @@ SECTIONS
     cpu/ppc4xx/speed.o (.text)
     drivers/net/4xx_enet.o     (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/crc32.o                (.text)
+    lib/crc32.o                (.text)
     arch/ppc/lib/extable.o     (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
 /*    common/env_embedded.o(.text) */
 
index 648efa2..7f04124 100644 (file)
@@ -57,9 +57,9 @@ SECTIONS
     cpu/mpc86xx/cpu.o (.text)
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/crc32.o (.text)
     arch/ppc/lib/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/zlib.o (.text)
     *(.text)
     *(.got1)
    }
index 04b350a..fc7464e 100644 (file)
@@ -69,9 +69,9 @@ SECTIONS
     cpu/ppc4xx/cpu_init.o      (.text)
     cpu/ppc4xx/speed.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/crc32.o                (.text)
+    lib/crc32.o                (.text)
     arch/ppc/lib/extable.o     (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
 /*    . = env_offset;*/
 /*    common/env_embedded.o(.text)*/
index 0571f02..51e95d5 100644 (file)
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
     arch/ppc/lib/ppcstring.o   (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 29657e9..2a6abfa 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 /*
     . = env_offset;
     common/env_embedded.o(.text)
index 49f8972..251ee9b 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
     arch/ppc/lib/extable.o     (.text)
 
     . = env_offset;
index ce115f5..271d74a 100644 (file)
@@ -59,9 +59,9 @@ SECTIONS
        cpu/mpc8xx/traps.o              (.text)
        common/dlmalloc.o               (.text)
        arch/ppc/lib/ppcstring.o                (.text)
-       lib_generic/vsprintf.o  (.text)
-       lib_generic/crc32.o             (.text)
-       lib_generic/zlib.o              (.text)
+       lib/vsprintf.o  (.text)
+       lib/crc32.o             (.text)
+       lib/zlib.o              (.text)
        arch/ppc/lib/cache.o            (.text)
        arch/ppc/lib/time.o             (.text)
 
index ce115f5..271d74a 100644 (file)
@@ -59,9 +59,9 @@ SECTIONS
        cpu/mpc8xx/traps.o              (.text)
        common/dlmalloc.o               (.text)
        arch/ppc/lib/ppcstring.o                (.text)
-       lib_generic/vsprintf.o  (.text)
-       lib_generic/crc32.o             (.text)
-       lib_generic/zlib.o              (.text)
+       lib/vsprintf.o  (.text)
+       lib/crc32.o             (.text)
+       lib/zlib.o              (.text)
        arch/ppc/lib/cache.o            (.text)
        arch/ppc/lib/time.o             (.text)
 
index 172cfbb..f95f695 100644 (file)
@@ -59,9 +59,9 @@ SECTIONS
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     arch/ppc/lib/ppcstring.o           (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
     arch/ppc/lib/cache.o               (.text)
     arch/ppc/lib/time.o                (.text)
 
index 8d91aed..4f179c7 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
     arch/ppc/lib/extable.o     (.text)
 
     . = env_offset;
index 991d7a1..ff11ad0 100644 (file)
@@ -56,9 +56,9 @@ SECTIONS
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     arch/ppc/lib/ppcstring.o           (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
     arch/ppc/lib/cache.o               (.text)
     arch/ppc/lib/time.o                (.text)
 
index 4ef16f1..1397511 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o         (.text)
     common/dlmalloc.o          (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index cf78200..6de7488 100644 (file)
@@ -59,9 +59,9 @@ SECTIONS
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     arch/ppc/lib/ppcstring.o           (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
     arch/ppc/lib/cache.o               (.text)
     arch/ppc/lib/time.o                (.text)
 
index ec01fe2..dcad818 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index fb93531..3f9d41f 100644 (file)
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
index b50e1f2..bc046f1 100644 (file)
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
index 9f452c1..ceaac00 100644 (file)
@@ -59,9 +59,9 @@ SECTIONS
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     arch/ppc/lib/ppcstring.o           (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
     arch/ppc/lib/cache.o               (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
index a2d940f..f559df7 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 27d75f3..0b13dc4 100644 (file)
@@ -48,7 +48,7 @@ $(LIB):       $(obj).depend $(OBJS) $(SOBJS)
 $(obj)trab_fkt.srec:   $(OBJS_FKT) $(LIB)
        $(LD) -g -Ttext $(LOAD_ADDR) -o $(<:.o=) -e trab_fkt $^ $(LIB) \
                -L$(obj)../../examples/standalone -lstubs \
-               -L$(obj)../../lib_generic -lgeneric \
+               -L$(obj)../../lib -lgeneric \
                $(PLATFORM_LIBS)
        $(OBJCOPY) -O srec $(<:.o=) $@
 
index c3d5c49..05b929f 100644 (file)
@@ -33,9 +33,9 @@ SECTIONS
        .text      :
        {
          cpu/arm920t/start.o   (.text)
-         lib_generic/zlib.o    (.text)
-         lib_generic/crc32.o   (.text)
-         lib_generic/string.o  (.text)
+         lib/zlib.o    (.text)
+         lib/crc32.o   (.text)
+         lib/string.o  (.text)
 
        . = DEFINED(env_offset) ? env_offset : .;
          common/env_embedded.o (.ppcenv)
index 967e432..960b2a5 100644 (file)
@@ -59,9 +59,9 @@ SECTIONS
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     arch/ppc/lib/ppcstring.o           (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
     arch/ppc/lib/cache.o               (.text)
     arch/ppc/lib/time.o                (.text)
 
index edaa402..116a972 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
 
     common/env_embedded.o(.text)
 
index c3dd8c7..248f488 100644 (file)
@@ -59,9 +59,9 @@ SECTIONS
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     arch/ppc/lib/ppcstring.o           (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
     arch/ppc/lib/cache.o               (.text)
     arch/ppc/lib/time.o                (.text)
 
index 85b1cd6..369c15a 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     mpc8xx/start.o     (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
     arch/ppc/lib/extable.o     (.text)
 
     common/env_embedded.o(.text)
index 0571f02..51e95d5 100644 (file)
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
     arch/ppc/lib/ppcstring.o   (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
-    lib_generic/zlib.o         (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
+    lib/zlib.o         (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 919eb21..282738b 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/vsprintf.o     (.text)
-    lib_generic/crc32.o                (.text)
+    lib/vsprintf.o     (.text)
+    lib/crc32.o                (.text)
     arch/ppc/lib/extable.o     (.text)
 
     . = env_offset;
index 0830d0a..555e1ac 100644 (file)
@@ -64,9 +64,9 @@ SECTIONS
     cpu/ppc4xx/cpu_init.o      (.text)
     cpu/ppc4xx/speed.o (.text)
     common/dlmalloc.o  (.text)
-    lib_generic/crc32.o                (.text)
+    lib/crc32.o                (.text)
     arch/ppc/lib/extable.o     (.text)
-    lib_generic/zlib.o         (.text)
+    lib/zlib.o         (.text)
 
 /*    common/env_embedded.o(.text) */
 
index 648efa2..7f04124 100644 (file)
@@ -57,9 +57,9 @@ SECTIONS
     cpu/mpc86xx/cpu.o (.text)
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/crc32.o (.text)
     arch/ppc/lib/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/zlib.o (.text)
     *(.text)
     *(.got1)
    }
index c08c9c9..6c80139 100644 (file)
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc5xxx/start.o          (.text)
     cpu/mpc5xxx/traps.o          (.text)
-    lib_generic/crc32.o         (.text)
+    lib/crc32.o         (.text)
     arch/ppc/lib/cache.o             (.text)
     arch/ppc/lib/time.o              (.text)
 
index 62751ec..bed16f1 100644 (file)
@@ -40,12 +40,12 @@ COBJ_FILES-$(CONFIG_API) += glue.o
 COBJ_FILES-$(CONFIG_API) += libgenwrap.o
 
 # Source files which exist outside the examples/api directory
-EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/crc32.o
-EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/ctype.o
-EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/div64.o
-EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/string.o
-EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/time.o
-EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/vsprintf.o
+EXT_COBJ_FILES-$(CONFIG_API) += lib/crc32.o
+EXT_COBJ_FILES-$(CONFIG_API) += lib/ctype.o
+EXT_COBJ_FILES-$(CONFIG_API) += lib/div64.o
+EXT_COBJ_FILES-$(CONFIG_API) += lib/string.o
+EXT_COBJ_FILES-$(CONFIG_API) += lib/time.o
+EXT_COBJ_FILES-$(CONFIG_API) += lib/vsprintf.o
 ifeq ($(ARCH),ppc)
 EXT_SOBJ_FILES-$(CONFIG_API) += arch/ppc/lib/ppcstring.o
 endif
@@ -75,7 +75,7 @@ $(OUTPUT):    $(OBJS)
                $(OBJCOPY) -O binary $@ $(OUTPUT).bin 2>/dev/null
 
 # Rule to build generic library C files
-$(obj)%.o: $(SRCTREE)/lib_generic/%.c
+$(obj)%.o: $(SRCTREE)/lib/%.c
        $(CC) -g $(CFLAGS) -c -o $@ $<
 
 # Rule to build architecture-specific library assembly files
index 2b107d9..b435dde 100644 (file)
@@ -23,7 +23,7 @@
  *
  *
  * This is is a set of wrappers/stubs that allow to use certain routines from
- * U-Boot's lib_generic in the standalone app. This way way we can re-use
+ * U-Boot's lib in the standalone app. This way way we can re-use
  * existing code e.g. operations on strings and similar.
  *
  */
index 7aa910d..df956bb 100644 (file)
@@ -620,22 +620,22 @@ ulong     usec2ticks    (unsigned long usec);
 ulong  ticks2usec    (unsigned long ticks);
 int    init_timebase (void);
 
-/* lib_generic/gunzip.c */
+/* lib/gunzip.c */
 int gunzip(void *, int, unsigned char *, unsigned long *);
 int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp,
                                                int stoponerr, int offset);
 
-/* lib_generic/net_utils.c */
+/* lib/net_utils.c */
 #include <net.h>
 static inline IPaddr_t getenv_IPaddr (char *var)
 {
        return (string_to_ip(getenv(var)));
 }
 
-/* lib_generic/time.c */
+/* lib/time.c */
 void   udelay        (unsigned long);
 
-/* lib_generic/vsprintf.c */
+/* lib/vsprintf.c */
 ulong  simple_strtoul(const char *cp,char **endp,unsigned int base);
 unsigned long long     simple_strtoull(const char *cp,char **endp,unsigned int base);
 long   simple_strtol(const char *cp,char **endp,unsigned int base);
@@ -645,10 +645,10 @@ int       sprintf(char * buf, const char *fmt, ...)
                __attribute__ ((format (__printf__, 2, 3)));
 int    vsprintf(char *buf, const char *fmt, va_list args);
 
-/* lib_generic/strmhz.c */
+/* lib/strmhz.c */
 char * strmhz(char *buf, long hz);
 
-/* lib_generic/crc32.c */
+/* lib/crc32.c */
 #include <u-boot/crc.h>
 
 /* common/console.c */
index 083c030..0b94f55 100644 (file)
        cpu/blackfin/interrupt.o        (.text .text.*); \
        cpu/blackfin/serial.o           (.text .text.*); \
        common/dlmalloc.o               (.text .text.*); \
-       lib_generic/crc32.o             (.text .text.*); \
+       lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \
        common/env_embedded.o           (.text .text.*);
 #endif
index 6627a04..8038c40 100644 (file)
        cpu/blackfin/interrupt.o        (.text .text.*); \
        cpu/blackfin/serial.o           (.text .text.*); \
        common/dlmalloc.o               (.text .text.*); \
-       lib_generic/crc32.o             (.text .text.*); \
+       lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \
        common/env_embedded.o           (.text .text.*);
 #endif
index d3159e5..0f8679b 100644 (file)
        cpu/blackfin/interrupt.o        (.text .text.*); \
        cpu/blackfin/serial.o           (.text .text.*); \
        common/dlmalloc.o               (.text .text.*); \
-       lib_generic/crc32.o             (.text .text.*); \
+       lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \
        common/env_embedded.o           (.text .text.*);
 #endif
index 4ea2300..696fe29 100644 (file)
        cpu/blackfin/interrupt.o        (.text .text.*); \
        cpu/blackfin/serial.o           (.text .text.*); \
        common/dlmalloc.o               (.text .text.*); \
-       lib_generic/crc32.o             (.text .text.*); \
+       lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \
        common/env_embedded.o           (.text .text.*);
 #endif
index 8ab38bb..fca6e43 100644 (file)
        cpu/blackfin/interrupt.o        (.text .text.*); \
        cpu/blackfin/serial.o           (.text .text.*); \
        common/dlmalloc.o               (.text .text.*); \
-       lib_generic/crc32.o             (.text .text.*); \
-       lib_generic/zlib.o              (.text .text.*); \
+       lib/crc32.o             (.text .text.*); \
+       lib/zlib.o              (.text .text.*); \
        board/bf561-ezkit/bf561-ezkit.o (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \
        common/env_embedded.o           (.text .text.*);
index 0d68eba..d86409f 100644 (file)
        cpu/blackfin/interrupt.o        (.text .text.*); \
        cpu/blackfin/serial.o           (.text .text.*); \
        common/dlmalloc.o               (.text .text.*); \
-       lib_generic/crc32.o             (.text .text.*); \
+       lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \
        common/env_embedded.o           (.text .text.*);
 #endif
index c1179b0..6be9dba 100644 (file)
        cpu/blackfin/interrupt.o        (.text .text.*); \
        cpu/blackfin/serial.o           (.text .text.*); \
        common/dlmalloc.o               (.text .text.*); \
-       lib_generic/crc32.o             (.text .text.*); \
+       lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \
        common/env_embedded.o           (.text .text.*);
 #endif
index 7c9f71e..6fa8cf7 100644 (file)
@@ -88,8 +88,8 @@
        cpu/blackfin/interrupt.o        (.text .text.*); \
        cpu/blackfin/serial.o           (.text .text.*); \
        common/dlmalloc.o               (.text .text.*); \
-       lib_generic/crc32.o             (.text .text.*); \
-       lib_generic/zlib.o              (.text .text.*); \
+       lib/crc32.o             (.text .text.*); \
+       lib/zlib.o              (.text .text.*); \
        board/ibf-dsp561/ibf-dsp561.o   (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \
        common/env_embedded.o           (.text .text.*);
index 5a5fbdd..e9dfcc9 100644 (file)
        cpu/blackfin/interrupt.o        (.text .text.*); \
        cpu/blackfin/serial.o           (.text .text.*); \
        common/dlmalloc.o               (.text .text.*); \
-       lib_generic/crc32.o             (.text .text.*); \
+       lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \
        common/env_embedded.o           (.text .text.*);
 #endif
index 967cdd1..b7ef6d6 100644 (file)
@@ -26,6 +26,6 @@
 #ifndef __LZMADEC_H__FAKE__
 #define __LZMADEC_H__FAKE__
 
-#include "../../lib_generic/lzma/LzmaDec.h"
+#include "../../lib/lzma/LzmaDec.h"
 
 #endif
index 87943c0..48b0af8 100644 (file)
@@ -26,6 +26,6 @@
 #ifndef __LZMATOOLS_H__FAKE__
 #define __LZMATOOLS_H__FAKE__
 
-#include "../../lib_generic/lzma/LzmaTools.h"
+#include "../../lib/lzma/LzmaTools.h"
 
 #endif
index 86160a4..740720c 100644 (file)
@@ -31,6 +31,6 @@
  */
 #define Byte LZByte
 
-#include "../../lib_generic/lzma/Types.h"
+#include "../../lib/lzma/Types.h"
 
 #endif
index 61bce67..07badbf 100644 (file)
@@ -25,7 +25,7 @@
 #ifndef _UBOOT_CRC_H
 #define _UBOOT_CRC_H
 
-/* lib_generic/crc32.c */
+/* lib/crc32.c */
 uint32_t crc32 (uint32_t, const unsigned char *, uint);
 uint32_t crc32_wd (uint32_t, const unsigned char *, uint, uint);
 uint32_t crc32_no_comp (uint32_t, const unsigned char *, uint);
similarity index 100%
rename from lib_generic/Makefile
rename to lib/Makefile
similarity index 100%
rename from lib_generic/addr_map.c
rename to lib/addr_map.c
similarity index 100%
rename from lib_generic/bzlib.c
rename to lib/bzlib.c
similarity index 100%
rename from lib_generic/circbuf.c
rename to lib/circbuf.c
similarity index 100%
rename from lib_generic/crc16.c
rename to lib/crc16.c
similarity index 100%
rename from lib_generic/crc32.c
rename to lib/crc32.c
similarity index 100%
rename from lib_generic/ctype.c
rename to lib/ctype.c
similarity index 100%
rename from lib_generic/div64.c
rename to lib/div64.c
similarity index 100%
rename from lib_generic/gunzip.c
rename to lib/gunzip.c
similarity index 100%
rename from lib_generic/ldiv.c
rename to lib/ldiv.c
similarity index 100%
rename from lib_generic/lmb.c
rename to lib/lmb.c
similarity index 100%
rename from lib_generic/lzma/Makefile
rename to lib/lzma/Makefile
similarity index 100%
rename from lib_generic/lzma/Types.h
rename to lib/lzma/Types.h
similarity index 100%
rename from lib_generic/lzma/lzma.txt
rename to lib/lzma/lzma.txt
similarity index 100%
rename from lib_generic/lzo/Makefile
rename to lib/lzo/Makefile
similarity index 100%
rename from lib_generic/lzo/lzodefs.h
rename to lib/lzo/lzodefs.h
similarity index 100%
rename from lib_generic/md5.c
rename to lib/md5.c
similarity index 100%
rename from lib_generic/net_utils.c
rename to lib/net_utils.c
similarity index 100%
rename from lib_generic/rbtree.c
rename to lib/rbtree.c
similarity index 100%
rename from lib_generic/sha1.c
rename to lib/sha1.c
similarity index 100%
rename from lib_generic/sha256.c
rename to lib/sha256.c
similarity index 100%
rename from lib_generic/string.c
rename to lib/string.c
similarity index 100%
rename from lib_generic/strmhz.c
rename to lib/strmhz.c
similarity index 100%
rename from lib_generic/time.c
rename to lib/time.c
similarity index 100%
rename from lib_generic/vsprintf.c
rename to lib/vsprintf.c
similarity index 100%
rename from lib_generic/zlib.c
rename to lib/zlib.c
index 743505f..a6f11c9 100644 (file)
@@ -68,9 +68,9 @@ BIN_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX)
 # Source files which exist outside the tools directory
 EXT_OBJ_FILES-y += common/env_embedded.o
 EXT_OBJ_FILES-y += common/image.o
-EXT_OBJ_FILES-y += lib_generic/crc32.o
-EXT_OBJ_FILES-y += lib_generic/md5.o
-EXT_OBJ_FILES-y += lib_generic/sha1.o
+EXT_OBJ_FILES-y += lib/crc32.o
+EXT_OBJ_FILES-y += lib/md5.o
+EXT_OBJ_FILES-y += lib/sha1.o
 
 # Source files located in the tools directory
 OBJ_FILES-$(CONFIG_LCD_LOGO) += bmp_logo.o
@@ -196,7 +196,7 @@ $(obj)ubsha1$(SFX): $(obj)os_support.o $(obj)sha1.o $(obj)ubsha1.o
 $(obj)%.o: $(SRCTREE)/common/%.c
        $(HOSTCC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $<
 
-$(obj)%.o: $(SRCTREE)/lib_generic/%.c
+$(obj)%.o: $(SRCTREE)/lib/%.c
        $(HOSTCC) -g $(HOSTCFLAGS) -c -o $@ $<
 
 $(obj)%.o: $(SRCTREE)/libfdt/%.c
index 9629ee5..2df631e 100644 (file)
@@ -41,7 +41,7 @@ clean:
        rm -f $(obj)fw_printenv $(obj)crc32.c
 
 $(obj)crc32.c:
-       ln -s $(src)../../lib_generic/crc32.c $(obj)crc32.c
+       ln -s $(src)../../lib/crc32.c $(obj)crc32.c
 
 #########################################################################
 
index 9b2afb0..82c2728 100644 (file)
@@ -23,9 +23,9 @@ include $(TOPDIR)/config.mk
 BIN_FILES-y += imls
 
 # Source files which exist outside the tools/imls directory
-EXT_OBJ_FILES-y += lib_generic/crc32.o
-EXT_OBJ_FILES-y += lib_generic/md5.o
-EXT_OBJ_FILES-y += lib_generic/sha1.o
+EXT_OBJ_FILES-y += lib/crc32.o
+EXT_OBJ_FILES-y += lib/md5.o
+EXT_OBJ_FILES-y += lib/sha1.o
 EXT_OBJ_FILES-y += common/image.o
 
 # Source files located in the tools/imls directory
@@ -78,7 +78,7 @@ $(obj)imls.o: $(SRCTREE)/tools/imls/imls.c
 $(obj)%.o: $(SRCTREE)/common/%.c
        $(CC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $<
 
-$(obj)%.o: $(SRCTREE)/lib_generic/%.c
+$(obj)%.o: $(SRCTREE)/lib/%.c
        $(CC) -g $(HOSTCFLAGS) -c -o $@ $<
 
 $(obj)%.o: $(SRCTREE)/libfdt/%.c