Rename lib_generic/ to lib/

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 <[email protected]>
jinhyhenry · Apr 13, 2010 · 78acc47 · 78acc47
1 parent ea0364f
commit 78acc47
Show file tree

Hide file tree

Showing 194 changed files with 321 additions and 321 deletions.
diff --git 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
@@ -185,7 +185,7 @@ Directory Hierarchy:
 - arch/arm/lib	Files generic to ARM	 architecture
 - arch/avr32/lib	Files generic to AVR32	 architecture
 - arch/blackfin/lib	Files generic to Blackfin architecture
-- lib_generic	Files generic to all	 architectures
+- lib	Files generic to all	 architectures
 - arch/i386/lib	Files generic to i386	 architecture
 - arch/m68k/lib	Files generic to m68k	 architecture
 - arch/microblaze/lib Files generic to microblaze architecture

diff --git a/board/BuS/EB+MCF-EV123/u-boot.lds b/board/BuS/EB+MCF-EV123/u-boot.lds
@@ -57,10 +57,10 @@ SECTIONS
 
     cpu/mcf52x2/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/string.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o	(.text)
-    lib_generic/zlib.o	(.text)
+    lib/string.o	(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o	(.text)
+    lib/zlib.o	(.text)
 
 /*    . = env_offset; */
     common/env_embedded.o(.text)

diff --git a/board/LEOX/elpt860/u-boot.lds b/board/LEOX/elpt860/u-boot.lds
@@ -67,10 +67,10 @@ SECTIONS
     cpu/mpc8xx/start.o			(.text)
     common/dlmalloc.o			(.text)
     arch/ppc/lib/ppcstring.o			(.text)
-    lib_generic/vsprintf.o		(.text)
-    lib_generic/crc32.o			(.text)
-    lib_generic/zlib.o			(.text)
-    lib_generic/string.o		(.text)
+    lib/vsprintf.o		(.text)
+    lib/crc32.o			(.text)
+    lib/zlib.o			(.text)
+    lib/string.o		(.text)
     arch/ppc/lib/cache.o			(.text)
     arch/ppc/lib/extable.o			(.text)
     arch/ppc/lib/time.o			(.text)

diff --git a/board/LEOX/elpt860/u-boot.lds.debug b/board/LEOX/elpt860/u-boot.lds.debug
@@ -66,8 +66,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o	(.text)

diff --git a/board/RPXClassic/u-boot.lds b/board/RPXClassic/u-boot.lds
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 /* XXX ?
     . = env_offset;
 */

diff --git a/board/RPXClassic/u-boot.lds.debug b/board/RPXClassic/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

diff --git a/board/RPXlite/u-boot.lds b/board/RPXlite/u-boot.lds
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 /* XXX ?
     . = env_offset;
 */

diff --git a/board/RPXlite/u-boot.lds.debug b/board/RPXlite/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

diff --git a/board/RPXlite_dw/u-boot.lds b/board/RPXlite_dw/u-boot.lds
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 /* XXX ?
     . = env_offset;
 */

diff --git a/board/RPXlite_dw/u-boot.lds.debug b/board/RPXlite_dw/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds
@@ -59,9 +59,9 @@ SECTIONS
     cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
     arch/ppc/lib/cache.o		(.text)
     arch/ppc/lib/time.o		(.text)
 

diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds
@@ -31,8 +31,8 @@ SECTIONS
 	. = ALIGN (4);
 	.text : {
 		cpu/ixp/start.o(.text)
-		lib_generic/string.o(.text)
-		lib_generic/vsprintf.o(.text)
+		lib/string.o(.text)
+		lib/vsprintf.o(.text)
 		arch/arm/lib/board.o(.text)
 		common/dlmalloc.o(.text)
 		cpu/ixp/cpu.o(.text)

diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds
@@ -31,8 +31,8 @@ SECTIONS
 	. = ALIGN (4);
 	.text : {
 		cpu/ixp/start.o(.text)
-		lib_generic/string.o(.text)
-		lib_generic/vsprintf.o(.text)
+		lib/string.o(.text)
+		lib/vsprintf.o(.text)
 		arch/arm/lib/board.o(.text)
 		common/dlmalloc.o(.text)
 		cpu/ixp/cpu.o(.text)

diff --git a/board/actux3/u-boot.lds b/board/actux3/u-boot.lds
@@ -31,8 +31,8 @@ SECTIONS
 	. = ALIGN (4);
 	.text : {
 		cpu/ixp/start.o (.text)
-		lib_generic/string.o (.text)
-		lib_generic/vsprintf.o (.text)
+		lib/string.o (.text)
+		lib/vsprintf.o (.text)
 		arch/arm/lib/board.o (.text)
 		common/dlmalloc.o (.text)
 		cpu/ixp/cpu.o (.text)

diff --git a/board/amirix/ap1000/u-boot.lds b/board/amirix/ap1000/u-boot.lds
@@ -64,9 +64,9 @@ SECTIONS
     cpu/ppc4xx/cpu_init.o	(.text)
     cpu/ppc4xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
 /*    . = env_offset;*/
 /*    common/env_embedded.o(.text)*/

diff --git a/board/astro/mcf5373l/u-boot.lds b/board/astro/mcf5373l/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     arch/m68k/lib/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)

diff --git a/board/bf518f-ezbrd/config.mk b/board/bf518f-ezbrd/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
diff --git a/board/bf526-ezbrd/config.mk b/board/bf526-ezbrd/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
diff --git a/board/bf527-ezkit/config.mk b/board/bf527-ezkit/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
diff --git a/board/bf533-ezkit/config.mk b/board/bf533-ezkit/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

diff --git a/board/bf533-stamp/config.mk b/board/bf533-stamp/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

diff --git a/board/bf537-stamp/config.mk b/board/bf537-stamp/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

diff --git a/board/bf538f-ezkit/config.mk b/board/bf538f-ezkit/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

diff --git a/board/bf548-ezkit/config.mk b/board/bf548-ezkit/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA       := --dma 6

diff --git a/board/bf561-acvilon/config.mk b/board/bf561-acvilon/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16

diff --git a/board/bf561-ezkit/config.mk b/board/bf561-ezkit/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16

diff --git a/board/c2mon/u-boot.lds b/board/c2mon/u-boot.lds
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

diff --git a/board/c2mon/u-boot.lds.debug b/board/c2mon/u-boot.lds.debug
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

diff --git a/board/cm-bf527/config.mk b/board/cm-bf527/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))
diff --git a/board/cm-bf533/config.mk b/board/cm-bf533/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

diff --git a/board/cm-bf537e/config.mk b/board/cm-bf537e/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

diff --git a/board/cm-bf537u/config.mk b/board/cm-bf537u/config.mk
@@ -26,8 +26,8 @@
 # This is not actually used for Blackfin boards so do not change it
 #TEXT_BASE = do-not-use-me
 
-CFLAGS_lib_generic += -O2
-CFLAGS_lib_generic/lzma += -O2
+CFLAGS_lib += -O2
+CFLAGS_lib/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

diff --git a/board/cm-bf548/config.mk b/board/cm-bf548/config.mk
@@ -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