Explorar o código

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 <ptyser@xes-inc.com>
Peter Tyser %!s(int64=14) %!d(string=hai) anos
pai
achega
78acc472d9
Modificáronse 100 ficheiros con 204 adicións e 204 borrados
  1. 3 3
      Makefile
  2. 1 1
      README
  3. 4 4
      board/BuS/EB+MCF-EV123/u-boot.lds
  4. 4 4
      board/LEOX/elpt860/u-boot.lds
  5. 2 2
      board/LEOX/elpt860/u-boot.lds.debug
  6. 3 3
      board/RPXClassic/u-boot.lds
  7. 2 2
      board/RPXClassic/u-boot.lds.debug
  8. 3 3
      board/RPXlite/u-boot.lds
  9. 2 2
      board/RPXlite/u-boot.lds.debug
  10. 3 3
      board/RPXlite_dw/u-boot.lds
  11. 2 2
      board/RPXlite_dw/u-boot.lds.debug
  12. 3 3
      board/RRvision/u-boot.lds
  13. 2 2
      board/actux1/u-boot.lds
  14. 2 2
      board/actux2/u-boot.lds
  15. 2 2
      board/actux3/u-boot.lds
  16. 2 2
      board/amirix/ap1000/u-boot.lds
  17. 1 1
      board/astro/mcf5373l/u-boot.lds
  18. 2 2
      board/bf518f-ezbrd/config.mk
  19. 2 2
      board/bf526-ezbrd/config.mk
  20. 2 2
      board/bf527-ezkit/config.mk
  21. 2 2
      board/bf533-ezkit/config.mk
  22. 2 2
      board/bf533-stamp/config.mk
  23. 2 2
      board/bf537-stamp/config.mk
  24. 2 2
      board/bf538f-ezkit/config.mk
  25. 2 2
      board/bf548-ezkit/config.mk
  26. 2 2
      board/bf561-acvilon/config.mk
  27. 2 2
      board/bf561-ezkit/config.mk
  28. 3 3
      board/c2mon/u-boot.lds
  29. 2 2
      board/c2mon/u-boot.lds.debug
  30. 2 2
      board/cm-bf527/config.mk
  31. 2 2
      board/cm-bf533/config.mk
  32. 2 2
      board/cm-bf537e/config.mk
  33. 2 2
      board/cm-bf537u/config.mk
  34. 2 2
      board/cm-bf548/config.mk
  35. 2 2
      board/cm-bf561/config.mk
  36. 1 1
      board/cobra5272/u-boot.lds
  37. 2 2
      board/cogent/u-boot.lds.debug
  38. 2 2
      board/cray/L1/u-boot.lds.debug
  39. 2 2
      board/eltec/mhpc/u-boot.lds.debug
  40. 2 2
      board/emk/top860/u-boot.lds.debug
  41. 1 1
      board/esd/tasreg/u-boot.lds
  42. 3 3
      board/esteem192e/u-boot.lds
  43. 2 2
      board/etx094/u-boot.lds
  44. 2 2
      board/etx094/u-boot.lds.debug
  45. 2 2
      board/fads/u-boot.lds.debug
  46. 2 2
      board/flagadm/u-boot.lds.debug
  47. 1 1
      board/freescale/m52277evb/u-boot.spa
  48. 1 1
      board/freescale/m5235evb/u-boot.16
  49. 1 1
      board/freescale/m5235evb/u-boot.32
  50. 1 1
      board/freescale/m5249evb/u-boot.lds
  51. 1 1
      board/freescale/m5253demo/u-boot.lds
  52. 1 1
      board/freescale/m5253evbe/u-boot.lds
  53. 1 1
      board/freescale/m5271evb/u-boot.lds
  54. 1 1
      board/freescale/m5272c3/u-boot.lds
  55. 2 2
      board/freescale/m5275evb/u-boot.lds
  56. 3 3
      board/freescale/m5282evb/u-boot.lds
  57. 1 1
      board/freescale/m53017evb/u-boot.lds
  58. 1 1
      board/freescale/m5329evb/u-boot.lds
  59. 1 1
      board/freescale/m5373evb/u-boot.lds
  60. 1 1
      board/freescale/m54451evb/u-boot.spa
  61. 1 1
      board/freescale/m54451evb/u-boot.stm
  62. 1 1
      board/freescale/m54455evb/u-boot.atm
  63. 1 1
      board/freescale/m54455evb/u-boot.int
  64. 2 2
      board/freescale/mpc8610hpcd/u-boot.lds
  65. 2 2
      board/freescale/mpc8641hpcn/u-boot.lds
  66. 3 3
      board/genietv/u-boot.lds
  67. 3 3
      board/genietv/u-boot.lds.debug
  68. 1 1
      board/hermes/u-boot.lds
  69. 3 3
      board/hymod/u-boot.lds
  70. 2 2
      board/hymod/u-boot.lds.debug
  71. 3 3
      board/icu862/u-boot.lds
  72. 2 2
      board/icu862/u-boot.lds.debug
  73. 1 1
      board/idmr/u-boot.lds
  74. 2 2
      board/ivm/u-boot.lds.debug
  75. 3 3
      board/keymile/km8xx/u-boot.lds
  76. 3 3
      board/kup/kup4k/u-boot.lds
  77. 2 2
      board/kup/kup4k/u-boot.lds.debug
  78. 3 3
      board/kup/kup4x/u-boot.lds
  79. 2 2
      board/kup/kup4x/u-boot.lds.debug
  80. 3 3
      board/lantec/u-boot.lds
  81. 2 2
      board/lantec/u-boot.lds.debug
  82. 2 2
      board/lwmon/u-boot.lds.debug
  83. 2 2
      board/mbx8xx/u-boot.lds.debug
  84. 2 2
      board/ml2/u-boot.lds
  85. 2 2
      board/ml2/u-boot.lds.debug
  86. 3 3
      board/mousse/u-boot.lds
  87. 3 3
      board/mousse/u-boot.lds.rom
  88. 2 2
      board/mpl/pip405/u-boot.lds.debug
  89. 3 3
      board/netphone/u-boot.lds
  90. 2 2
      board/netphone/u-boot.lds.debug
  91. 1 1
      board/netstar/Makefile
  92. 3 3
      board/netta/u-boot.lds
  93. 2 2
      board/netta/u-boot.lds.debug
  94. 3 3
      board/netta2/u-boot.lds
  95. 2 2
      board/netta2/u-boot.lds.debug
  96. 3 3
      board/netvia/u-boot.lds
  97. 2 2
      board/netvia/u-boot.lds.debug
  98. 2 2
      board/nx823/u-boot.lds.debug
  99. 1 1
      board/purple/u-boot.lds
  100. 3 3
      board/quantum/u-boot.lds

+ 3 - 3
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

+ 1 - 1
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

+ 4 - 4
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)

+ 4 - 4
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)

+ 2 - 2
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)

+ 3 - 3
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;
 */

+ 2 - 2
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)

+ 3 - 3
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;
 */

+ 2 - 2
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)

+ 3 - 3
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;
 */

+ 2 - 2
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)

+ 3 - 3
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)
 

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)*/

+ 1 - 1
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)

+ 2 - 2
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))

+ 2 - 2
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))

+ 2 - 2
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))

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 3 - 3
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)

+ 2 - 2
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)

+ 2 - 2
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))

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
board/cm-bf561/config.mk

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

+ 1 - 1
board/cobra5272/u-boot.lds

@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)

+ 2 - 2
board/cogent/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

+ 2 - 2
board/cray/L1/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     common/env_embedded.o(.text)

+ 2 - 2
board/eltec/mhpc/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

+ 2 - 2
board/emk/top860/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     . = env_offset;

+ 1 - 1
board/esd/tasreg/u-boot.lds

@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)

+ 3 - 3
board/esteem192e/u-boot.lds

@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

+ 2 - 2
board/etx094/u-boot.lds

@@ -62,8 +62,8 @@ SECTIONS
     cpu/mpc8xx/cpu_init.o	(.text)
     cpu/mpc8xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

+ 2 - 2
board/etx094/u-boot.lds.debug

@@ -64,8 +64,8 @@ SECTIONS
     cpu/mpc8xx/serial.o	(.text)
     arch/ppc/lib/extable.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/string.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/string.o	(.text)
+    lib/crc32.o		(.text)
     common/dlmalloc.o	(.text)
     . = env_offset;
     common/env_embedded.o(.text)

+ 2 - 2
board/fads/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     . = env_offset;

+ 2 - 2
board/flagadm/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

+ 1 - 1
board/freescale/m52277evb/u-boot.spa

@@ -58,7 +58,7 @@ SECTIONS
     cpu/mcf5227x/start.o	(.text)
     cpu/mcf5227x/libmcf5227x.a	(.text)
     arch/m68k/lib/libm68k.a		(.text)
-    lib_generic/libgeneric.a	(.text)
+    lib/libgeneric.a	(.text)
     common/cmd_mem.o		(.text)
     common/main.o		(.text)
 

+ 1 - 1
board/freescale/m5235evb/u-boot.16

@@ -60,7 +60,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     arch/m68k/lib/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)

+ 1 - 1
board/freescale/m5235evb/u-boot.32

@@ -68,7 +68,7 @@ SECTIONS
     common/cmd_mem.o		(.text)
     common/console.o		(.text)
     common/main.o		(.text)
-    lib_generic/libgeneric.a	(.text)
+    lib/libgeneric.a	(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)

+ 1 - 1
board/freescale/m5249evb/u-boot.lds

@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)

+ 1 - 1
board/freescale/m5253demo/u-boot.lds

@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)

+ 1 - 1
board/freescale/m5253evbe/u-boot.lds

@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)

+ 1 - 1
board/freescale/m5271evb/u-boot.lds

@@ -60,7 +60,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.ppcenv)

+ 1 - 1
board/freescale/m5272c3/u-boot.lds

@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)

+ 2 - 2
board/freescale/m5275evb/u-boot.lds

@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mcf52x2/start.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/string.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/string.o	(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o(.text)

+ 3 - 3
board/freescale/m5282evb/u-boot.lds

@@ -57,9 +57,9 @@ SECTIONS
 
     cpu/mcf52x2/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/string.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o	(.text)
+    lib/string.o	(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o	(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o(.text)

+ 1 - 1
board/freescale/m53017evb/u-boot.lds

@@ -59,7 +59,7 @@ SECTIONS
     cpu/mcf532x/libmcf532x.a	(.text)
     arch/m68k/lib/libm68k.a		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)

+ 1 - 1
board/freescale/m5329evb/u-boot.lds

@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     arch/m68k/lib/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)

+ 1 - 1
board/freescale/m5373evb/u-boot.lds

@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     arch/m68k/lib/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)

+ 1 - 1
board/freescale/m54451evb/u-boot.spa

@@ -62,7 +62,7 @@ SECTIONS
     common/dlmalloc.o		(.text)
     common/main.o		(.text)
     common/image.o		(.text)
-    lib_generic/libgeneric.a	(.text)
+    lib/libgeneric.a	(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)

+ 1 - 1
board/freescale/m54451evb/u-boot.stm

@@ -64,7 +64,7 @@ SECTIONS
     arch/m68k/lib/board.o			(.text)
     common/serial.o			(.text)
     common/console.o			(.text)
-    lib_generic/display_options.o	(.text)
+    lib/display_options.o	(.text)
     board/freescale/m54455evb/m54455evb.o	(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;

+ 1 - 1
board/freescale/m54455evb/u-boot.atm

@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     arch/m68k/lib/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text)

+ 1 - 1
board/freescale/m54455evb/u-boot.int

@@ -59,7 +59,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     arch/m68k/lib/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     *(.text)
     *(.fixup)

+ 2 - 2
board/freescale/mpc8610hpcd/u-boot.lds

@@ -57,9 +57,9 @@ SECTIONS
     cpu/mpc86xx/cpu.o (.text)
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/crc32.o (.text)
     arch/ppc/lib/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/zlib.o (.text)
     *(.text)
     *(.got1)
    }

+ 2 - 2
board/freescale/mpc8641hpcn/u-boot.lds

@@ -57,9 +57,9 @@ SECTIONS
     cpu/mpc86xx/cpu.o (.text)
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
-    lib_generic/crc32.o (.text)
+    lib/crc32.o (.text)
     arch/ppc/lib/extable.o (.text)
-    lib_generic/zlib.o (.text)
+    lib/zlib.o (.text)
     drivers/bios_emulator/atibios.o (.text)
     *(.text)
     *(.got1)

+ 3 - 3
board/genietv/u-boot.lds

@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

+ 3 - 3
board/genietv/u-boot.lds.debug

@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

+ 1 - 1
board/hermes/u-boot.lds

@@ -61,7 +61,7 @@ SECTIONS
     arch/ppc/lib/time.o		(.text)
     arch/ppc/lib/ticks.o		(.text)
     arch/ppc/lib/cache.o		(.text)
-    lib_generic/crc32.o		(.text)
+    lib/crc32.o		(.text)
     . = env_offset;
     common/env_embedded.o(.text)
 

+ 3 - 3
board/hymod/u-boot.lds

@@ -59,9 +59,9 @@ SECTIONS
 /*
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
 */

+ 2 - 2
board/hymod/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

+ 3 - 3
board/icu862/u-boot.lds

@@ -60,9 +60,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

+ 2 - 2
board/icu862/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     . = env_offset;

+ 1 - 1
board/idmr/u-boot.lds

@@ -60,7 +60,7 @@ SECTIONS
     arch/m68k/lib/traps.o		(.text)
     cpu/mcf52x2/interrupts.o	(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.ppcenv)

+ 2 - 2
board/ivm/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     . = env_offset;

+ 3 - 3
board/keymile/km8xx/u-boot.lds

@@ -59,9 +59,9 @@ SECTIONS
     cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
     arch/ppc/lib/cache.o		(.text)
     arch/ppc/lib/time.o		(.text)
 

+ 3 - 3
board/kup/kup4k/u-boot.lds

@@ -60,9 +60,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

+ 2 - 2
board/kup/kup4k/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

+ 3 - 3
board/kup/kup4x/u-boot.lds

@@ -60,9 +60,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

+ 2 - 2
board/kup/kup4x/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

+ 3 - 3
board/lantec/u-boot.lds

@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

+ 2 - 2
board/lantec/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

+ 2 - 2
board/lwmon/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     . = env_offset;

+ 2 - 2
board/mbx8xx/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     . = env_offset;

+ 2 - 2
board/ml2/u-boot.lds

@@ -64,9 +64,9 @@ SECTIONS
     cpu/ppc4xx/cpu_init.o	(.text)
     cpu/ppc4xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
-    lib_generic/zlib.o		(.text)
+    lib/zlib.o		(.text)
 
 /*    . = env_offset;*/
 /*    common/env_embedded.o(.text)*/

+ 2 - 2
board/ml2/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     common/env_embedded.o(.text)

+ 3 - 3
board/mousse/u-boot.lds

@@ -55,9 +55,9 @@ SECTIONS
     cpu/mpc824x/start.o		(.text)
     arch/ppc/lib/board.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
     *(.got1)
     . = ALIGN(16);

+ 3 - 3
board/mousse/u-boot.lds.rom

@@ -55,9 +55,9 @@ SECTIONS
     cpu/mpc824x/start.o	(.text)
 	 common/board.o (.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 
 		. = env_offset;
     common/env_embedded.o (.text)

+ 2 - 2
board/mpl/pip405/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
 
     common/env_embedded.o(.text)

+ 3 - 3
board/netphone/u-boot.lds

@@ -56,9 +56,9 @@ SECTIONS
     cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
     arch/ppc/lib/cache.o		(.text)
     arch/ppc/lib/time.o		(.text)
 

+ 2 - 2
board/netphone/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

+ 1 - 1
board/netstar/Makefile

@@ -72,7 +72,7 @@ $(obj)crcit:		$(obj)crcit.o $(obj)crc32.o
 $(obj)crcit.o:		crcit.c
 	$(HOSTCC) $(HOSTCFLAGS) -o $@ -c $<
 
-$(obj)crc32.o:		$(SRCTREE)/lib_generic/crc32.c
+$(obj)crc32.o:		$(SRCTREE)/lib/crc32.c
 	$(HOSTCC) $(HOSTCFLAGS) -DUSE_HOSTCC -I$(TOPDIR)/include \
 		-o $@ -c $<
 

+ 3 - 3
board/netta/u-boot.lds

@@ -56,9 +56,9 @@ SECTIONS
     cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
     arch/ppc/lib/cache.o		(.text)
     arch/ppc/lib/time.o		(.text)
 

+ 2 - 2
board/netta/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

+ 3 - 3
board/netta2/u-boot.lds

@@ -56,9 +56,9 @@ SECTIONS
     cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
     arch/ppc/lib/cache.o		(.text)
     arch/ppc/lib/time.o		(.text)
 

+ 2 - 2
board/netta2/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

+ 3 - 3
board/netvia/u-boot.lds

@@ -56,9 +56,9 @@ SECTIONS
     cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
     arch/ppc/lib/cache.o		(.text)
     arch/ppc/lib/time.o		(.text)
 

+ 2 - 2
board/netvia/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

+ 2 - 2
board/nx823/u-boot.lds.debug

@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

+ 1 - 1
board/purple/u-boot.lds

@@ -40,7 +40,7 @@ SECTIONS
 	  common/main.o			(.text)
 	  common/dlmalloc.o		(.text)
 	  common/cmd_boot.o		(.text)
-	  lib_generic/zlib.o		(.text)
+	  lib/zlib.o		(.text)
 	  . = DEFINED(env_offset) ? env_offset : .;
 	  common/env_embedded.o	(.ppcenv)
 

+ 3 - 3
board/quantum/u-boot.lds

@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    lib_generic/vsprintf.o	(.text)
-    lib_generic/crc32.o		(.text)
-    lib_generic/zlib.o		(.text)
+    lib/vsprintf.o	(.text)
+    lib/crc32.o		(.text)
+    lib/zlib.o		(.text)
 /* XXX ?
     . = env_offset;
 */

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio