diff options
| author | Peter Tyser <ptyser@xes-inc.com> | 2010-04-12 22:28:05 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-04-13 09:13:04 +0200 |
| commit | 78acc472d9719316f22e002a009a998d9ceec29d (patch) | |
| tree | aa99461b3d693cf3691869abea485091860a66d0 | |
| parent | ea0364f1bbfed1e3ea711147420875cf338fe77a (diff) | |
| download | u-boot-78acc472d9719316f22e002a009a998d9ceec29d.tar.gz u-boot-78acc472d9719316f22e002a009a998d9ceec29d.tar.bz2 u-boot-78acc472d9719316f22e002a009a998d9ceec29d.zip | |
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>
194 files changed, 321 insertions, 321 deletions
@@ -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 @@ -185,7 +185,7 @@ Directory Hierarchy: - arch/arm/lib Files generic to ARM architecture - arch/avr32/lib Files generic to AVR32 architecture - arch/blackfin/lib Files generic to Blackfin architecture -- lib_generic Files generic to all architectures +- lib Files generic to all architectures - arch/i386/lib Files generic to i386 architecture - arch/m68k/lib Files generic to m68k architecture - arch/microblaze/lib Files generic to microblaze architecture diff --git a/board/BuS/EB+MCF-EV123/u-boot.lds b/board/BuS/EB+MCF-EV123/u-boot.lds index 34507938fd..b05eacf1ac 100644 --- a/board/BuS/EB+MCF-EV123/u-boot.lds +++ b/board/BuS/EB+MCF-EV123/u-boot.lds @@ -57,10 +57,10 @@ SECTIONS cpu/mcf52x2/start.o (.text) common/dlmalloc.o (.text) - lib_generic/string.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/string.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) /* . = env_offset; */ common/env_embedded.o(.text) diff --git a/board/LEOX/elpt860/u-boot.lds b/board/LEOX/elpt860/u-boot.lds index 32778cacda..d3929ea89f 100644 --- a/board/LEOX/elpt860/u-boot.lds +++ b/board/LEOX/elpt860/u-boot.lds @@ -67,10 +67,10 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) - lib_generic/string.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) + lib/string.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/extable.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/LEOX/elpt860/u-boot.lds.debug b/board/LEOX/elpt860/u-boot.lds.debug index 5126083425..f6c21f7453 100644 --- a/board/LEOX/elpt860/u-boot.lds.debug +++ b/board/LEOX/elpt860/u-boot.lds.debug @@ -66,8 +66,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o (.text) diff --git a/board/RPXClassic/u-boot.lds b/board/RPXClassic/u-boot.lds index c354ff8283..09d9470f79 100644 --- a/board/RPXClassic/u-boot.lds +++ b/board/RPXClassic/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) /* XXX ? . = env_offset; */ diff --git a/board/RPXClassic/u-boot.lds.debug b/board/RPXClassic/u-boot.lds.debug index a2d940f048..f559df7165 100644 --- a/board/RPXClassic/u-boot.lds.debug +++ b/board/RPXClassic/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/RPXlite/u-boot.lds b/board/RPXlite/u-boot.lds index c354ff8283..09d9470f79 100644 --- a/board/RPXlite/u-boot.lds +++ b/board/RPXlite/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) /* XXX ? . = env_offset; */ diff --git a/board/RPXlite/u-boot.lds.debug b/board/RPXlite/u-boot.lds.debug index a2d940f048..f559df7165 100644 --- a/board/RPXlite/u-boot.lds.debug +++ b/board/RPXlite/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/RPXlite_dw/u-boot.lds b/board/RPXlite_dw/u-boot.lds index 89aaffff33..a099cb9d58 100644 --- a/board/RPXlite_dw/u-boot.lds +++ b/board/RPXlite_dw/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) /* XXX ? . = env_offset; */ diff --git a/board/RPXlite_dw/u-boot.lds.debug b/board/RPXlite_dw/u-boot.lds.debug index 83fdc15011..3b61a42561 100644 --- a/board/RPXlite_dw/u-boot.lds.debug +++ b/board/RPXlite_dw/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds index 88644a4591..1132fd6eb5 100644 --- a/board/RRvision/u-boot.lds +++ b/board/RRvision/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds index 1087167bae..40b5ef3bd1 100644 --- a/board/actux1/u-boot.lds +++ b/board/actux1/u-boot.lds @@ -31,8 +31,8 @@ SECTIONS . = ALIGN (4); .text : { cpu/ixp/start.o(.text) - lib_generic/string.o(.text) - lib_generic/vsprintf.o(.text) + lib/string.o(.text) + lib/vsprintf.o(.text) arch/arm/lib/board.o(.text) common/dlmalloc.o(.text) cpu/ixp/cpu.o(.text) diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds index 543af3050d..f9ab281bc0 100644 --- a/board/actux2/u-boot.lds +++ b/board/actux2/u-boot.lds @@ -31,8 +31,8 @@ SECTIONS . = ALIGN (4); .text : { cpu/ixp/start.o(.text) - lib_generic/string.o(.text) - lib_generic/vsprintf.o(.text) + lib/string.o(.text) + lib/vsprintf.o(.text) arch/arm/lib/board.o(.text) common/dlmalloc.o(.text) cpu/ixp/cpu.o(.text) diff --git a/board/actux3/u-boot.lds b/board/actux3/u-boot.lds index f63251dd96..2fc3796150 100644 --- a/board/actux3/u-boot.lds +++ b/board/actux3/u-boot.lds @@ -31,8 +31,8 @@ SECTIONS . = ALIGN (4); .text : { cpu/ixp/start.o (.text) - lib_generic/string.o (.text) - lib_generic/vsprintf.o (.text) + lib/string.o (.text) + lib/vsprintf.o (.text) arch/arm/lib/board.o (.text) common/dlmalloc.o (.text) cpu/ixp/cpu.o (.text) diff --git a/board/amirix/ap1000/u-boot.lds b/board/amirix/ap1000/u-boot.lds index 10308d5983..89ffc6d2d0 100644 --- a/board/amirix/ap1000/u-boot.lds +++ b/board/amirix/ap1000/u-boot.lds @@ -64,9 +64,9 @@ SECTIONS cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) /* . = env_offset;*/ /* common/env_embedded.o(.text)*/ diff --git a/board/astro/mcf5373l/u-boot.lds b/board/astro/mcf5373l/u-boot.lds index 7fbe16f348..73e0310156 100644 --- 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 index fb93531f77..3f9d41f371 100644 --- 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 index fb93531f77..3f9d41f371 100644 --- 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 index fb93531f77..3f9d41f371 100644 --- 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 index b50e1f2c80..bc046f129f 100644 --- 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 index b50e1f2c80..bc046f129f 100644 --- 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 index 95d0fcc08f..5766829115 100644 --- 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 index b50e1f2c80..bc046f129f 100644 --- 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 index aff12e9dc5..ce96c0d479 100644 --- 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 index b5170259b4..a90b193388 100644 --- 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 index b5170259b4..a90b193388 100644 --- 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 index 0571f025a1..51e95d555c 100644 --- a/board/c2mon/u-boot.lds +++ b/board/c2mon/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/c2mon/u-boot.lds.debug b/board/c2mon/u-boot.lds.debug index ad36953915..d55bf33b88 100644 --- a/board/c2mon/u-boot.lds.debug +++ b/board/c2mon/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/cm-bf527/config.mk b/board/cm-bf527/config.mk index fb93531f77..3f9d41f371 100644 --- 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 index b50e1f2c80..bc046f129f 100644 --- 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 index b50e1f2c80..bc046f129f 100644 --- 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 index b50e1f2c80..bc046f129f 100644 --- 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 index 66c7368f72..f071a39d75 100644 --- 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 diff --git a/board/cm-bf561/config.mk b/board/cm-bf561/config.mk index b5170259b4..a90b193388 100644 --- a/board/cm-bf561/config.mk +++ b/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 diff --git a/board/cobra5272/u-boot.lds b/board/cobra5272/u-boot.lds index 8989880202..aacc0894d9 100644 --- a/board/cobra5272/u-boot.lds +++ b/board/cobra5272/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/cogent/u-boot.lds.debug b/board/cogent/u-boot.lds.debug index a2d940f048..f559df7165 100644 --- a/board/cogent/u-boot.lds.debug +++ b/board/cogent/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/cray/L1/u-boot.lds.debug b/board/cray/L1/u-boot.lds.debug index 40d2f78ead..09c0191e5f 100644 --- a/board/cray/L1/u-boot.lds.debug +++ b/board/cray/L1/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) common/env_embedded.o(.text) diff --git a/board/eltec/mhpc/u-boot.lds.debug b/board/eltec/mhpc/u-boot.lds.debug index ad36953915..d55bf33b88 100644 --- a/board/eltec/mhpc/u-boot.lds.debug +++ b/board/eltec/mhpc/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/emk/top860/u-boot.lds.debug b/board/emk/top860/u-boot.lds.debug index 4e4943fe6d..6ca72980e3 100644 --- a/board/emk/top860/u-boot.lds.debug +++ b/board/emk/top860/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) . = env_offset; diff --git a/board/esd/tasreg/u-boot.lds b/board/esd/tasreg/u-boot.lds index 54e0169533..f87d3cb725 100644 --- a/board/esd/tasreg/u-boot.lds +++ b/board/esd/tasreg/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/esteem192e/u-boot.lds b/board/esteem192e/u-boot.lds index 215a2c49ef..848eacdb2c 100644 --- a/board/esteem192e/u-boot.lds +++ b/board/esteem192e/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/etx094/u-boot.lds b/board/etx094/u-boot.lds index 1d34e68fd7..d8112eb0a7 100644 --- a/board/etx094/u-boot.lds +++ b/board/etx094/u-boot.lds @@ -62,8 +62,8 @@ SECTIONS cpu/mpc8xx/cpu_init.o (.text) cpu/mpc8xx/speed.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/etx094/u-boot.lds.debug b/board/etx094/u-boot.lds.debug index dd4dbfaa36..12f6ce7652 100644 --- a/board/etx094/u-boot.lds.debug +++ b/board/etx094/u-boot.lds.debug @@ -64,8 +64,8 @@ SECTIONS cpu/mpc8xx/serial.o (.text) arch/ppc/lib/extable.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/string.o (.text) - lib_generic/crc32.o (.text) + lib/string.o (.text) + lib/crc32.o (.text) common/dlmalloc.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/fads/u-boot.lds.debug b/board/fads/u-boot.lds.debug index 8d91aed3fe..4f179c7fa7 100644 --- a/board/fads/u-boot.lds.debug +++ b/board/fads/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) . = env_offset; diff --git a/board/flagadm/u-boot.lds.debug b/board/flagadm/u-boot.lds.debug index ad36953915..d55bf33b88 100644 --- a/board/flagadm/u-boot.lds.debug +++ b/board/flagadm/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/freescale/m52277evb/u-boot.spa b/board/freescale/m52277evb/u-boot.spa index 23d57107ee..6d916d84fd 100644 --- a/board/freescale/m52277evb/u-boot.spa +++ b/board/freescale/m52277evb/u-boot.spa @@ -58,7 +58,7 @@ SECTIONS cpu/mcf5227x/start.o (.text) cpu/mcf5227x/libmcf5227x.a (.text) arch/m68k/lib/libm68k.a (.text) - lib_generic/libgeneric.a (.text) + lib/libgeneric.a (.text) common/cmd_mem.o (.text) common/main.o (.text) diff --git a/board/freescale/m5235evb/u-boot.16 b/board/freescale/m5235evb/u-boot.16 index 940da1467c..4e70efb2f4 100644 --- a/board/freescale/m5235evb/u-boot.16 +++ b/board/freescale/m5235evb/u-boot.16 @@ -60,7 +60,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m5235evb/u-boot.32 b/board/freescale/m5235evb/u-boot.32 index 50045e1a45..cbf2249255 100644 --- a/board/freescale/m5235evb/u-boot.32 +++ b/board/freescale/m5235evb/u-boot.32 @@ -68,7 +68,7 @@ SECTIONS common/cmd_mem.o (.text) common/console.o (.text) common/main.o (.text) - lib_generic/libgeneric.a (.text) + lib/libgeneric.a (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m5249evb/u-boot.lds b/board/freescale/m5249evb/u-boot.lds index 54e0169533..f87d3cb725 100644 --- a/board/freescale/m5249evb/u-boot.lds +++ b/board/freescale/m5249evb/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m5253demo/u-boot.lds b/board/freescale/m5253demo/u-boot.lds index e53e67de90..455e9b8fdd 100644 --- a/board/freescale/m5253demo/u-boot.lds +++ b/board/freescale/m5253demo/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m5253evbe/u-boot.lds b/board/freescale/m5253evbe/u-boot.lds index 7f4dc27143..99c125cb9d 100644 --- a/board/freescale/m5253evbe/u-boot.lds +++ b/board/freescale/m5253evbe/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m5271evb/u-boot.lds b/board/freescale/m5271evb/u-boot.lds index 713b18a95b..588a128471 100644 --- a/board/freescale/m5271evb/u-boot.lds +++ b/board/freescale/m5271evb/u-boot.lds @@ -60,7 +60,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv) diff --git a/board/freescale/m5272c3/u-boot.lds b/board/freescale/m5272c3/u-boot.lds index 446ec1be4f..aaba5a3682 100644 --- a/board/freescale/m5272c3/u-boot.lds +++ b/board/freescale/m5272c3/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m5275evb/u-boot.lds b/board/freescale/m5275evb/u-boot.lds index daf8724ae2..700b9f5098 100644 --- a/board/freescale/m5275evb/u-boot.lds +++ b/board/freescale/m5275evb/u-boot.lds @@ -57,8 +57,8 @@ SECTIONS cpu/mcf52x2/start.o (.text) common/dlmalloc.o (.text) - lib_generic/string.o (.text) - lib_generic/zlib.o (.text) + lib/string.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o(.text) diff --git a/board/freescale/m5282evb/u-boot.lds b/board/freescale/m5282evb/u-boot.lds index f46e0251ef..e936adff16 100644 --- a/board/freescale/m5282evb/u-boot.lds +++ b/board/freescale/m5282evb/u-boot.lds @@ -57,9 +57,9 @@ SECTIONS cpu/mcf52x2/start.o (.text) common/dlmalloc.o (.text) - lib_generic/string.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/string.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o(.text) diff --git a/board/freescale/m53017evb/u-boot.lds b/board/freescale/m53017evb/u-boot.lds index fe0e3141f9..a725da15ef 100644 --- a/board/freescale/m53017evb/u-boot.lds +++ b/board/freescale/m53017evb/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS cpu/mcf532x/libmcf532x.a (.text) arch/m68k/lib/libm68k.a (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m5329evb/u-boot.lds b/board/freescale/m5329evb/u-boot.lds index 0ed87ff30c..bf4f1889c3 100644 --- a/board/freescale/m5329evb/u-boot.lds +++ b/board/freescale/m5329evb/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m5373evb/u-boot.lds b/board/freescale/m5373evb/u-boot.lds index 605452b707..c129ac2680 100644 --- a/board/freescale/m5373evb/u-boot.lds +++ b/board/freescale/m5373evb/u-boot.lds @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m54451evb/u-boot.spa b/board/freescale/m54451evb/u-boot.spa index 569518b895..e63b1f2e9d 100644 --- a/board/freescale/m54451evb/u-boot.spa +++ b/board/freescale/m54451evb/u-boot.spa @@ -62,7 +62,7 @@ SECTIONS common/dlmalloc.o (.text) common/main.o (.text) common/image.o (.text) - lib_generic/libgeneric.a (.text) + lib/libgeneric.a (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m54451evb/u-boot.stm b/board/freescale/m54451evb/u-boot.stm index 1b06b12b96..7c3f0684c1 100644 --- a/board/freescale/m54451evb/u-boot.stm +++ b/board/freescale/m54451evb/u-boot.stm @@ -64,7 +64,7 @@ SECTIONS arch/m68k/lib/board.o (.text) common/serial.o (.text) common/console.o (.text) - lib_generic/display_options.o (.text) + lib/display_options.o (.text) board/freescale/m54455evb/m54455evb.o (.text) . = DEFINED(env_offset) ? env_offset : .; diff --git a/board/freescale/m54455evb/u-boot.atm b/board/freescale/m54455evb/u-boot.atm index c48dd75229..2dd8a23189 100644 --- a/board/freescale/m54455evb/u-boot.atm +++ b/board/freescale/m54455evb/u-boot.atm @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text) diff --git a/board/freescale/m54455evb/u-boot.int b/board/freescale/m54455evb/u-boot.int index ef0717426a..8e54d79182 100644 --- a/board/freescale/m54455evb/u-boot.int +++ b/board/freescale/m54455evb/u-boot.int @@ -59,7 +59,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) arch/m68k/lib/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) *(.text) *(.fixup) diff --git a/board/freescale/mpc8610hpcd/u-boot.lds b/board/freescale/mpc8610hpcd/u-boot.lds index 2ad0f0e6a9..67847f1060 100644 --- a/board/freescale/mpc8610hpcd/u-boot.lds +++ b/board/freescale/mpc8610hpcd/u-boot.lds @@ -57,9 +57,9 @@ SECTIONS cpu/mpc86xx/cpu.o (.text) cpu/mpc86xx/speed.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) *(.text) *(.got1) } diff --git a/board/freescale/mpc8641hpcn/u-boot.lds b/board/freescale/mpc8641hpcn/u-boot.lds index 796828a37c..20e03447fe 100644 --- a/board/freescale/mpc8641hpcn/u-boot.lds +++ b/board/freescale/mpc8641hpcn/u-boot.lds @@ -57,9 +57,9 @@ SECTIONS cpu/mpc86xx/cpu.o (.text) cpu/mpc86xx/speed.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) drivers/bios_emulator/atibios.o (.text) *(.text) *(.got1) diff --git a/board/genietv/u-boot.lds b/board/genietv/u-boot.lds index 9fc71a2c5e..1bd1ba70c2 100644 --- a/board/genietv/u-boot.lds +++ b/board/genietv/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/genietv/u-boot.lds.debug b/board/genietv/u-boot.lds.debug index 9bb2c58f72..c0dd67f053 100644 --- a/board/genietv/u-boot.lds.debug +++ b/board/genietv/u-boot.lds.debug @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds index 1252baf41c..1f6e7d6c92 100644 --- a/board/hermes/u-boot.lds +++ b/board/hermes/u-boot.lds @@ -61,7 +61,7 @@ SECTIONS arch/ppc/lib/time.o (.text) arch/ppc/lib/ticks.o (.text) arch/ppc/lib/cache.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds index cc32b4462e..965716f715 100644 --- a/board/hymod/u-boot.lds +++ b/board/hymod/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS /* common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; */ diff --git a/board/hymod/u-boot.lds.debug b/board/hymod/u-boot.lds.debug index a2d940f048..f559df7165 100644 --- a/board/hymod/u-boot.lds.debug +++ b/board/hymod/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/icu862/u-boot.lds b/board/icu862/u-boot.lds index b614262b88..d7d0fb3dfc 100644 --- a/board/icu862/u-boot.lds +++ b/board/icu862/u-boot.lds @@ -60,9 +60,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/icu862/u-boot.lds.debug b/board/icu862/u-boot.lds.debug index 919eb2194d..282738bd59 100644 --- a/board/icu862/u-boot.lds.debug +++ b/board/icu862/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) . = env_offset; diff --git a/board/idmr/u-boot.lds b/board/idmr/u-boot.lds index 713b18a95b..588a128471 100644 --- a/board/idmr/u-boot.lds +++ b/board/idmr/u-boot.lds @@ -60,7 +60,7 @@ SECTIONS arch/m68k/lib/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv) diff --git a/board/ivm/u-boot.lds.debug b/board/ivm/u-boot.lds.debug index 17965a05cc..037785e7df 100644 --- a/board/ivm/u-boot.lds.debug +++ b/board/ivm/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) . = env_offset; diff --git a/board/keymile/km8xx/u-boot.lds b/board/keymile/km8xx/u-boot.lds index 8b6305a55e..759072df97 100644 --- a/board/keymile/km8xx/u-boot.lds +++ b/board/keymile/km8xx/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/kup/kup4k/u-boot.lds b/board/kup/kup4k/u-boot.lds index 8e4faa15b1..e1233a748a 100644 --- a/board/kup/kup4k/u-boot.lds +++ b/board/kup/kup4k/u-boot.lds @@ -60,9 +60,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/kup/kup4k/u-boot.lds.debug b/board/kup/kup4k/u-boot.lds.debug index 83fdc15011..3b61a42561 100644 --- a/board/kup/kup4k/u-boot.lds.debug +++ b/board/kup/kup4k/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/kup/kup4x/u-boot.lds b/board/kup/kup4x/u-boot.lds index 8e4faa15b1..e1233a748a 100644 --- a/board/kup/kup4x/u-boot.lds +++ b/board/kup/kup4x/u-boot.lds @@ -60,9 +60,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/kup/kup4x/u-boot.lds.debug b/board/kup/kup4x/u-boot.lds.debug index 83fdc15011..3b61a42561 100644 --- a/board/kup/kup4x/u-boot.lds.debug +++ b/board/kup/kup4x/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/lantec/u-boot.lds b/board/lantec/u-boot.lds index 814a7a69d7..50bdfb457f 100644 --- a/board/lantec/u-boot.lds +++ b/board/lantec/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/lantec/u-boot.lds.debug b/board/lantec/u-boot.lds.debug index 3b4799e1ef..be06235c04 100644 --- a/board/lantec/u-boot.lds.debug +++ b/board/lantec/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/lwmon/u-boot.lds.debug b/board/lwmon/u-boot.lds.debug index 49f897213a..251ee9bbdc 100644 --- a/board/lwmon/u-boot.lds.debug +++ b/board/lwmon/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) . = env_offset; diff --git a/board/mbx8xx/u-boot.lds.debug b/board/mbx8xx/u-boot.lds.debug index 8d91aed3fe..4f179c7fa7 100644 --- a/board/mbx8xx/u-boot.lds.debug +++ b/board/mbx8xx/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) . = env_offset; diff --git a/board/ml2/u-boot.lds b/board/ml2/u-boot.lds index 0083a211d3..e68cfb81a3 100644 --- a/board/ml2/u-boot.lds +++ b/board/ml2/u-boot.lds @@ -64,9 +64,9 @@ SECTIONS cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) /* . = env_offset;*/ /* common/env_embedded.o(.text)*/ diff --git a/board/ml2/u-boot.lds.debug b/board/ml2/u-boot.lds.debug index 40d2f78ead..09c0191e5f 100644 --- a/board/ml2/u-boot.lds.debug +++ b/board/ml2/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) common/env_embedded.o(.text) diff --git a/board/mousse/u-boot.lds b/board/mousse/u-boot.lds index c92a2abe2c..f6930b538c 100644 --- a/board/mousse/u-boot.lds +++ b/board/mousse/u-boot.lds @@ -55,9 +55,9 @@ SECTIONS cpu/mpc824x/start.o (.text) arch/ppc/lib/board.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) *(.got1) . = ALIGN(16); diff --git a/board/mousse/u-boot.lds.rom b/board/mousse/u-boot.lds.rom index 9750fc5f19..8355f335ee 100644 --- a/board/mousse/u-boot.lds.rom +++ b/board/mousse/u-boot.lds.rom @@ -55,9 +55,9 @@ SECTIONS cpu/mpc824x/start.o (.text) common/board.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o (.text) diff --git a/board/mpl/pip405/u-boot.lds.debug b/board/mpl/pip405/u-boot.lds.debug index 40d2f78ead..09c0191e5f 100644 --- a/board/mpl/pip405/u-boot.lds.debug +++ b/board/mpl/pip405/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) common/env_embedded.o(.text) diff --git a/board/netphone/u-boot.lds b/board/netphone/u-boot.lds index 4b17a1f765..8f96b1de6f 100644 --- a/board/netphone/u-boot.lds +++ b/board/netphone/u-boot.lds @@ -56,9 +56,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/netphone/u-boot.lds.debug b/board/netphone/u-boot.lds.debug index 4ef16f1ffe..139751177c 100644 --- a/board/netphone/u-boot.lds.debug +++ b/board/netphone/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/netstar/Makefile b/board/netstar/Makefile index c435762964..5773c13f4d 100644 --- a/board/netstar/Makefile +++ b/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 $< diff --git a/board/netta/u-boot.lds b/board/netta/u-boot.lds index 991d7a1a90..ff11ad0f69 100644 --- a/board/netta/u-boot.lds +++ b/board/netta/u-boot.lds @@ -56,9 +56,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/netta/u-boot.lds.debug b/board/netta/u-boot.lds.debug index 4ef16f1ffe..139751177c 100644 --- a/board/netta/u-boot.lds.debug +++ b/board/netta/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/netta2/u-boot.lds b/board/netta2/u-boot.lds index 991d7a1a90..ff11ad0f69 100644 --- a/board/netta2/u-boot.lds +++ b/board/netta2/u-boot.lds @@ -56,9 +56,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/netta2/u-boot.lds.debug b/board/netta2/u-boot.lds.debug index 4ef16f1ffe..139751177c 100644 --- a/board/netta2/u-boot.lds.debug +++ b/board/netta2/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/netvia/u-boot.lds b/board/netvia/u-boot.lds index 7eb01ee727..70d5a6a0df 100644 --- a/board/netvia/u-boot.lds +++ b/board/netvia/u-boot.lds @@ -56,9 +56,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/netvia/u-boot.lds.debug b/board/netvia/u-boot.lds.debug index c3c99b35c2..bc8f32e0f8 100644 --- a/board/netvia/u-boot.lds.debug +++ b/board/netvia/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/nx823/u-boot.lds.debug b/board/nx823/u-boot.lds.debug index ad36953915..d55bf33b88 100644 --- a/board/nx823/u-boot.lds.debug +++ b/board/nx823/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/purple/u-boot.lds b/board/purple/u-boot.lds index 04a641a473..236ece478c 100644 --- a/board/purple/u-boot.lds +++ b/board/purple/u-boot.lds @@ -40,7 +40,7 @@ SECTIONS common/main.o (.text) common/dlmalloc.o (.text) common/cmd_boot.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv) diff --git a/board/quantum/u-boot.lds b/board/quantum/u-boot.lds index c354ff8283..09d9470f79 100644 --- a/board/quantum/u-boot.lds +++ b/board/quantum/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) /* XXX ? . = env_offset; */ diff --git a/board/quantum/u-boot.lds.debug b/board/quantum/u-boot.lds.debug index ec01fe256b..dcad818927 100644 --- a/board/quantum/u-boot.lds.debug +++ b/board/quantum/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/rbc823/u-boot.lds b/board/rbc823/u-boot.lds index 6074c14ba2..15aca6c623 100644 --- a/board/rbc823/u-boot.lds +++ b/board/rbc823/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/rmu/u-boot.lds b/board/rmu/u-boot.lds index c354ff8283..09d9470f79 100644 --- a/board/rmu/u-boot.lds +++ b/board/rmu/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) /* XXX ? . = env_offset; */ diff --git a/board/rmu/u-boot.lds.debug b/board/rmu/u-boot.lds.debug index ec01fe256b..dcad818927 100644 --- a/board/rmu/u-boot.lds.debug +++ b/board/rmu/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug index 1d8ce105e4..34dce838f1 100644 --- a/board/sandburst/karef/u-boot.lds.debug +++ b/board/sandburst/karef/u-boot.lds.debug @@ -66,9 +66,9 @@ SECTIONS cpu/ppc4xx/speed.o (.text) drivers/net/4xx_enet.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) /* common/env_embedded.o(.text) */ diff --git a/board/sandburst/metrobox/u-boot.lds.debug b/board/sandburst/metrobox/u-boot.lds.debug index bbfea131e0..fa976c2e5d 100644 --- a/board/sandburst/metrobox/u-boot.lds.debug +++ b/board/sandburst/metrobox/u-boot.lds.debug @@ -66,9 +66,9 @@ SECTIONS cpu/ppc4xx/speed.o (.text) drivers/net/4xx_enet.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) /* common/env_embedded.o(.text) */ diff --git a/board/sbc8641d/u-boot.lds b/board/sbc8641d/u-boot.lds index 648efa285b..7f0412464f 100644 --- a/board/sbc8641d/u-boot.lds +++ b/board/sbc8641d/u-boot.lds @@ -57,9 +57,9 @@ SECTIONS cpu/mpc86xx/cpu.o (.text) cpu/mpc86xx/speed.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) *(.text) *(.got1) } diff --git a/board/sc3/u-boot.lds b/board/sc3/u-boot.lds index 04b350aab7..fc7464eeea 100644 --- a/board/sc3/u-boot.lds +++ b/board/sc3/u-boot.lds @@ -69,9 +69,9 @@ SECTIONS cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) /* . = env_offset;*/ /* common/env_embedded.o(.text)*/ diff --git a/board/siemens/CCM/u-boot.lds b/board/siemens/CCM/u-boot.lds index 0571f025a1..51e95d555c 100644 --- a/board/siemens/CCM/u-boot.lds +++ b/board/siemens/CCM/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/siemens/CCM/u-boot.lds.debug b/board/siemens/CCM/u-boot.lds.debug index 29657e93ef..2a6abfab3f 100644 --- a/board/siemens/CCM/u-boot.lds.debug +++ b/board/siemens/CCM/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) /* . = env_offset; common/env_embedded.o(.text) diff --git a/board/siemens/pcu_e/u-boot.lds.debug b/board/siemens/pcu_e/u-boot.lds.debug index 49f897213a..251ee9bbdc 100644 --- a/board/siemens/pcu_e/u-boot.lds.debug +++ b/board/siemens/pcu_e/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) . = env_offset; diff --git a/board/snmc/qs850/u-boot.lds b/board/snmc/qs850/u-boot.lds index ce115f59e7..271d74a5c1 100644 --- a/board/snmc/qs850/u-boot.lds +++ b/board/snmc/qs850/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/snmc/qs860t/u-boot.lds b/board/snmc/qs860t/u-boot.lds index ce115f59e7..271d74a5c1 100644 --- a/board/snmc/qs860t/u-boot.lds +++ b/board/snmc/qs860t/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/spc1920/u-boot.lds b/board/spc1920/u-boot.lds index 172cfbbc88..f95f695b13 100644 --- a/board/spc1920/u-boot.lds +++ b/board/spc1920/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/spd8xx/u-boot.lds.debug b/board/spd8xx/u-boot.lds.debug index 8d91aed3fe..4f179c7fa7 100644 --- a/board/spd8xx/u-boot.lds.debug +++ b/board/spd8xx/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) . = env_offset; diff --git a/board/stx/stxxtc/u-boot.lds b/board/stx/stxxtc/u-boot.lds index 991d7a1a90..ff11ad0f69 100644 --- a/board/stx/stxxtc/u-boot.lds +++ b/board/stx/stxxtc/u-boot.lds @@ -56,9 +56,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/stx/stxxtc/u-boot.lds.debug b/board/stx/stxxtc/u-boot.lds.debug index 4ef16f1ffe..139751177c 100644 --- a/board/stx/stxxtc/u-boot.lds.debug +++ b/board/stx/stxxtc/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/svm_sc8xx/u-boot.lds b/board/svm_sc8xx/u-boot.lds index cf78200019..6de74887ce 100644 --- a/board/svm_sc8xx/u-boot.lds +++ b/board/svm_sc8xx/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/svm_sc8xx/u-boot.lds.debug b/board/svm_sc8xx/u-boot.lds.debug index ec01fe256b..dcad818927 100644 --- a/board/svm_sc8xx/u-boot.lds.debug +++ b/board/svm_sc8xx/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/tcm-bf518/config.mk b/board/tcm-bf518/config.mk index fb93531f77..3f9d41f371 100644 --- a/board/tcm-bf518/config.mk +++ b/board/tcm-bf518/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/tcm-bf537/config.mk b/board/tcm-bf537/config.mk index b50e1f2c80..bc046f129f 100644 --- a/board/tcm-bf537/config.mk +++ b/board/tcm-bf537/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/tqc/tqm8xx/u-boot.lds b/board/tqc/tqm8xx/u-boot.lds index 9f452c1c8e..ceaac00054 100644 --- a/board/tqc/tqm8xx/u-boot.lds +++ b/board/tqc/tqm8xx/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) . = DEFINED(env_offset) ? env_offset : .; diff --git a/board/tqc/tqm8xx/u-boot.lds.debug b/board/tqc/tqm8xx/u-boot.lds.debug index a2d940f048..f559df7165 100644 --- a/board/tqc/tqm8xx/u-boot.lds.debug +++ b/board/tqc/tqm8xx/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/trab/Makefile b/board/trab/Makefile index 27d75f3a00..0b13dc475e 100644 --- a/board/trab/Makefile +++ b/board/trab/Makefile @@ -48,7 +48,7 @@ $(LIB): $(obj).depend $(OBJS) $(SOBJS) $(obj)trab_fkt.srec: $(OBJS_FKT) $(LIB) $(LD) -g -Ttext $(LOAD_ADDR) -o $(<:.o=) -e trab_fkt $^ $(LIB) \ -L$(obj)../../examples/standalone -lstubs \ - -L$(obj)../../lib_generic -lgeneric \ + -L$(obj)../../lib -lgeneric \ $(PLATFORM_LIBS) $(OBJCOPY) -O srec $(<:.o=) $@ diff --git a/board/trab/u-boot.lds b/board/trab/u-boot.lds index c3d5c49a9b..05b929f569 100644 --- a/board/trab/u-boot.lds +++ b/board/trab/u-boot.lds @@ -33,9 +33,9 @@ SECTIONS .text : { cpu/arm920t/start.o (.text) - lib_generic/zlib.o (.text) - lib_generic/crc32.o (.text) - lib_generic/string.o (.text) + lib/zlib.o (.text) + lib/crc32.o (.text) + lib/string.o (.text) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv) diff --git a/board/uc100/u-boot.lds b/board/uc100/u-boot.lds index 967e4322cb..960b2a582b 100644 --- a/board/uc100/u-boot.lds +++ b/board/uc100/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/uc100/u-boot.lds.debug b/board/uc100/u-boot.lds.debug index edaa4020a9..116a97208d 100644 --- a/board/uc100/u-boot.lds.debug +++ b/board/uc100/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) common/env_embedded.o(.text) diff --git a/board/v37/u-boot.lds b/board/v37/u-boot.lds index c3dd8c7abc..248f4887cc 100644 --- a/board/v37/u-boot.lds +++ b/board/v37/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/board/w7o/u-boot.lds.debug b/board/w7o/u-boot.lds.debug index 85b1cd69dd..369c15a18c 100644 --- a/board/w7o/u-boot.lds.debug +++ b/board/w7o/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) common/env_embedded.o(.text) diff --git a/board/westel/amx860/u-boot.lds b/board/westel/amx860/u-boot.lds index 0571f025a1..51e95d555c 100644 --- a/board/westel/amx860/u-boot.lds +++ b/board/westel/amx860/u-boot.lds @@ -58,9 +58,9 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) arch/ppc/lib/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) + lib/zlib.o (.text) . = env_offset; common/env_embedded.o(.text) diff --git a/board/westel/amx860/u-boot.lds.debug b/board/westel/amx860/u-boot.lds.debug index 919eb2194d..282738bd59 100644 --- a/board/westel/amx860/u-boot.lds.debug +++ b/board/westel/amx860/u-boot.lds.debug @@ -57,8 +57,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/vsprintf.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) . = env_offset; diff --git a/board/xes/xpedite1000/u-boot.lds.debug b/board/xes/xpedite1000/u-boot.lds.debug index 0830d0aa1b..555e1ac032 100644 --- a/board/xes/xpedite1000/u-boot.lds.debug +++ b/board/xes/xpedite1000/u-boot.lds.debug @@ -64,9 +64,9 @@ SECTIONS cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) /* common/env_embedded.o(.text) */ diff --git a/board/xes/xpedite5170/u-boot.lds b/board/xes/xpedite5170/u-boot.lds index 648efa285b..7f0412464f 100644 --- a/board/xes/xpedite5170/u-boot.lds +++ b/board/xes/xpedite5170/u-boot.lds @@ -57,9 +57,9 @@ SECTIONS cpu/mpc86xx/cpu.o (.text) cpu/mpc86xx/speed.o (.text) common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/extable.o (.text) - lib_generic/zlib.o (.text) + lib/zlib.o (.text) *(.text) *(.got1) } diff --git a/cpu/mpc5xxx/u-boot-customlayout.lds b/cpu/mpc5xxx/u-boot-customlayout.lds index c08c9c9232..6c80139f27 100644 --- a/cpu/mpc5xxx/u-boot-customlayout.lds +++ b/cpu/mpc5xxx/u-boot-customlayout.lds @@ -57,7 +57,7 @@ SECTIONS cpu/mpc5xxx/start.o (.text) cpu/mpc5xxx/traps.o (.text) - lib_generic/crc32.o (.text) + lib/crc32.o (.text) arch/ppc/lib/cache.o (.text) arch/ppc/lib/time.o (.text) diff --git a/examples/api/Makefile b/examples/api/Makefile index 62751ece96..bed16f1555 100644 --- a/examples/api/Makefile +++ b/examples/api/Makefile @@ -40,12 +40,12 @@ COBJ_FILES-$(CONFIG_API) += glue.o COBJ_FILES-$(CONFIG_API) += libgenwrap.o # Source files which exist outside the examples/api directory -EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/crc32.o -EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/ctype.o -EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/div64.o -EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/string.o -EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/time.o -EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/vsprintf.o +EXT_COBJ_FILES-$(CONFIG_API) += lib/crc32.o +EXT_COBJ_FILES-$(CONFIG_API) += lib/ctype.o +EXT_COBJ_FILES-$(CONFIG_API) += lib/div64.o +EXT_COBJ_FILES-$(CONFIG_API) += lib/string.o +EXT_COBJ_FILES-$(CONFIG_API) += lib/time.o +EXT_COBJ_FILES-$(CONFIG_API) += lib/vsprintf.o ifeq ($(ARCH),ppc) EXT_SOBJ_FILES-$(CONFIG_API) += arch/ppc/lib/ppcstring.o endif @@ -75,7 +75,7 @@ $(OUTPUT): $(OBJS) $(OBJCOPY) -O binary $@ $(OUTPUT).bin 2>/dev/null # Rule to build generic library C files -$(obj)%.o: $(SRCTREE)/lib_generic/%.c +$(obj)%.o: $(SRCTREE)/lib/%.c $(CC) -g $(CFLAGS) -c -o $@ $< # Rule to build architecture-specific library assembly files diff --git a/examples/api/libgenwrap.c b/examples/api/libgenwrap.c index 2b107d9797..b435ddecba 100644 --- a/examples/api/libgenwrap.c +++ b/examples/api/libgenwrap.c @@ -23,7 +23,7 @@ * * * This is is a set of wrappers/stubs that allow to use certain routines from - * U-Boot's lib_generic in the standalone app. This way way we can re-use + * U-Boot's lib in the standalone app. This way way we can re-use * existing code e.g. operations on strings and similar. * */ diff --git a/include/common.h b/include/common.h index 7aa910dc98..df956bbb41 100644 --- a/include/common.h +++ b/include/common.h @@ -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 */ diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h index 083c030179..0b94f559fd 100644 --- a/include/configs/bf533-stamp.h +++ b/include/configs/bf533-stamp.h @@ -130,7 +130,7 @@ cpu/blackfin/interrupt.o (.text .text.*); \ cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ + lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text .text.*); #endif diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h index 6627a04f59..8038c40de1 100644 --- a/include/configs/bf537-pnav.h +++ b/include/configs/bf537-pnav.h @@ -116,7 +116,7 @@ cpu/blackfin/interrupt.o (.text .text.*); \ cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ + lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text .text.*); #endif diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index d3159e59df..0f8679b57e 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -126,7 +126,7 @@ cpu/blackfin/interrupt.o (.text .text.*); \ cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ + lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text .text.*); #endif diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h index 4ea2300f4b..696fe29d20 100644 --- a/include/configs/bf538f-ezkit.h +++ b/include/configs/bf538f-ezkit.h @@ -123,7 +123,7 @@ cpu/blackfin/interrupt.o (.text .text.*); \ cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ + lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text .text.*); #endif diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h index 8ab38bbacb..fca6e43b47 100644 --- a/include/configs/bf561-ezkit.h +++ b/include/configs/bf561-ezkit.h @@ -100,8 +100,8 @@ cpu/blackfin/interrupt.o (.text .text.*); \ cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ - lib_generic/zlib.o (.text .text.*); \ + lib/crc32.o (.text .text.*); \ + lib/zlib.o (.text .text.*); \ board/bf561-ezkit/bf561-ezkit.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text .text.*); diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h index 0d68ebae2a..d86409fcd3 100644 --- a/include/configs/cm-bf537e.h +++ b/include/configs/cm-bf537e.h @@ -108,7 +108,7 @@ cpu/blackfin/interrupt.o (.text .text.*); \ cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ + lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text .text.*); #endif diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h index c1179b0aee..6be9dbad81 100644 --- a/include/configs/cm-bf537u.h +++ b/include/configs/cm-bf537u.h @@ -109,7 +109,7 @@ cpu/blackfin/interrupt.o (.text .text.*); \ cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ + lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text .text.*); #endif diff --git a/include/configs/ibf-dsp561.h b/include/configs/ibf-dsp561.h index 7c9f71e888..6fa8cf7a91 100644 --- a/include/configs/ibf-dsp561.h +++ b/include/configs/ibf-dsp561.h @@ -88,8 +88,8 @@ cpu/blackfin/interrupt.o (.text .text.*); \ cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ - lib_generic/zlib.o (.text .text.*); \ + lib/crc32.o (.text .text.*); \ + lib/zlib.o (.text .text.*); \ board/ibf-dsp561/ibf-dsp561.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text .text.*); diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h index 5a5fbddac3..e9dfcc95fe 100644 --- a/include/configs/tcm-bf537.h +++ b/include/configs/tcm-bf537.h @@ -109,7 +109,7 @@ cpu/blackfin/interrupt.o (.text .text.*); \ cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ + lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text .text.*); #endif diff --git a/include/lzma/LzmaDec.h b/include/lzma/LzmaDec.h index 967cdd1018..b7ef6d6bc2 100644 --- a/include/lzma/LzmaDec.h +++ b/include/lzma/LzmaDec.h @@ -26,6 +26,6 @@ #ifndef __LZMADEC_H__FAKE__ #define __LZMADEC_H__FAKE__ -#include "../../lib_generic/lzma/LzmaDec.h" +#include "../../lib/lzma/LzmaDec.h" #endif diff --git a/include/lzma/LzmaTools.h b/include/lzma/LzmaTools.h index 87943c0332..48b0af84d4 100644 --- a/include/lzma/LzmaTools.h +++ b/include/lzma/LzmaTools.h @@ -26,6 +26,6 @@ #ifndef __LZMATOOLS_H__FAKE__ #define __LZMATOOLS_H__FAKE__ -#include "../../lib_generic/lzma/LzmaTools.h" +#include "../../lib/lzma/LzmaTools.h" #endif diff --git a/include/lzma/LzmaTypes.h b/include/lzma/LzmaTypes.h index 86160a42b2..740720cfe9 100644 --- a/include/lzma/LzmaTypes.h +++ b/include/lzma/LzmaTypes.h @@ -31,6 +31,6 @@ */ #define Byte LZByte -#include "../../lib_generic/lzma/Types.h" +#include "../../lib/lzma/Types.h" #endif diff --git a/include/u-boot/crc.h b/include/u-boot/crc.h index 61bce67914..07badbfc5a 100644 --- a/include/u-boot/crc.h +++ b/include/u-boot/crc.h @@ -25,7 +25,7 @@ #ifndef _UBOOT_CRC_H #define _UBOOT_CRC_H -/* lib_generic/crc32.c */ +/* lib/crc32.c */ uint32_t crc32 (uint32_t, const unsigned char *, uint); uint32_t crc32_wd (uint32_t, const unsigned char *, uint, uint); uint32_t crc32_no_comp (uint32_t, const unsigned char *, uint); diff --git a/lib_generic/Makefile b/lib/Makefile index c45f07ca12..c45f07ca12 100644 --- a/lib_generic/Makefile +++ b/lib/Makefile diff --git a/lib_generic/addr_map.c b/lib/addr_map.c index ff8532cf15..ff8532cf15 100644 --- a/lib_generic/addr_map.c +++ b/lib/addr_map.c diff --git a/lib_generic/bzlib.c b/lib/bzlib.c index 5844e187c0..5844e187c0 100644 --- a/lib_generic/bzlib.c +++ b/lib/bzlib.c diff --git a/lib_generic/bzlib_crctable.c b/lib/bzlib_crctable.c index 325b96643e..325b96643e 100644 --- a/lib_generic/bzlib_crctable.c +++ b/lib/bzlib_crctable.c diff --git a/lib_generic/bzlib_decompress.c b/lib/bzlib_decompress.c index 4412b8a23e..4412b8a23e 100644 --- a/lib_generic/bzlib_decompress.c +++ b/lib/bzlib_decompress.c diff --git a/lib_generic/bzlib_huffman.c b/lib/bzlib_huffman.c index 801b8ec39a..801b8ec39a 100644 --- a/lib_generic/bzlib_huffman.c +++ b/lib/bzlib_huffman.c diff --git a/lib_generic/bzlib_private.h b/lib/bzlib_private.h index 87d8f94525..87d8f94525 100644 --- a/lib_generic/bzlib_private.h +++ b/lib/bzlib_private.h diff --git a/lib_generic/bzlib_randtable.c b/lib/bzlib_randtable.c index c3dc7e4181..c3dc7e4181 100644 --- a/lib_generic/bzlib_randtable.c +++ b/lib/bzlib_randtable.c diff --git a/lib_generic/circbuf.c b/lib/circbuf.c index 2332c63717..2332c63717 100644 --- a/lib_generic/circbuf.c +++ b/lib/circbuf.c diff --git a/lib_generic/crc16.c b/lib/crc16.c index 6904365e59..6904365e59 100644 --- a/lib_generic/crc16.c +++ b/lib/crc16.c diff --git a/lib_generic/crc32.c b/lib/crc32.c index 27335a3ed9..27335a3ed9 100644 --- a/lib_generic/crc32.c +++ b/lib/crc32.c diff --git a/lib_generic/ctype.c b/lib/ctype.c index 6ed0468a21..6ed0468a21 100644 --- a/lib_generic/ctype.c +++ b/lib/ctype.c diff --git a/lib_generic/display_options.c b/lib/display_options.c index 2dc2567410..2dc2567410 100644 --- a/lib_generic/display_options.c +++ b/lib/display_options.c diff --git a/lib_generic/div64.c b/lib/div64.c index d9951b597f..d9951b597f 100644 --- a/lib_generic/div64.c +++ b/lib/div64.c diff --git a/lib_generic/gunzip.c b/lib/gunzip.c index d2b7ad4779..d2b7ad4779 100644 --- a/lib_generic/gunzip.c +++ b/lib/gunzip.c diff --git a/lib_generic/ldiv.c b/lib/ldiv.c index 5d231a2a65..5d231a2a65 100644 --- a/lib_generic/ldiv.c +++ b/lib/ldiv.c diff --git a/lib_generic/lmb.c b/lib/lmb.c index c5e75fb3bb..c5e75fb3bb 100644 --- a/lib_generic/lmb.c +++ b/lib/lmb.c diff --git a/lib_generic/lzma/LzmaDec.c b/lib/lzma/LzmaDec.c index f941da27dd..f941da27dd 100644 --- a/lib_generic/lzma/LzmaDec.c +++ b/lib/lzma/LzmaDec.c diff --git a/lib_generic/lzma/LzmaDec.h b/lib/lzma/LzmaDec.h index 7fba87f076..7fba87f076 100644 --- a/lib_generic/lzma/LzmaDec.h +++ b/lib/lzma/LzmaDec.h diff --git a/lib_generic/lzma/LzmaTools.c b/lib/lzma/LzmaTools.c index 8860bfbf3d..8860bfbf3d 100644 --- a/lib_generic/lzma/LzmaTools.c +++ b/lib/lzma/LzmaTools.c diff --git a/lib_generic/lzma/LzmaTools.h b/lib/lzma/LzmaTools.h index 2db80fc0f4..2db80fc0f4 100644 --- a/lib_generic/lzma/LzmaTools.h +++ b/lib/lzma/LzmaTools.h diff --git a/lib_generic/lzma/Makefile b/lib/lzma/Makefile index 57f03b0cd7..57f03b0cd7 100644 --- a/lib_generic/lzma/Makefile +++ b/lib/lzma/Makefile diff --git a/lib_generic/lzma/README.txt b/lib/lzma/README.txt index 23a9be2827..23a9be2827 100644 --- a/lib_generic/lzma/README.txt +++ b/lib/lzma/README.txt diff --git a/lib_generic/lzma/Types.h b/lib/lzma/Types.h index 1af5cfc4d8..1af5cfc4d8 100644 --- a/lib_generic/lzma/Types.h +++ b/lib/lzma/Types.h diff --git a/lib_generic/lzma/history.txt b/lib/lzma/history.txt index 624fb1d4b1..624fb1d4b1 100644 --- a/lib_generic/lzma/history.txt +++ b/lib/lzma/history.txt diff --git a/lib_generic/lzma/import_lzmasdk.sh b/lib/lzma/import_lzmasdk.sh index 1e0f6863aa..1e0f6863aa 100644 --- a/lib_generic/lzma/import_lzmasdk.sh +++ b/lib/lzma/import_lzmasdk.sh diff --git a/lib_generic/lzma/license.txt b/lib/lzma/license.txt index 48b9820c40..48b9820c40 100644 --- a/lib_generic/lzma/license.txt +++ b/lib/lzma/license.txt diff --git a/lib_generic/lzma/lzma.txt b/lib/lzma/lzma.txt index aa20f9dc5c..aa20f9dc5c 100644 --- a/lib_generic/lzma/lzma.txt +++ b/lib/lzma/lzma.txt diff --git a/lib_generic/lzo/Makefile b/lib/lzo/Makefile index 5dd1bf5775..5dd1bf5775 100644 --- a/lib_generic/lzo/Makefile +++ b/lib/lzo/Makefile diff --git a/lib_generic/lzo/lzo1x_decompress.c b/lib/lzo/lzo1x_decompress.c index 09bdc8f6ca..09bdc8f6ca 100644 --- a/lib_generic/lzo/lzo1x_decompress.c +++ b/lib/lzo/lzo1x_decompress.c diff --git a/lib_generic/lzo/lzodefs.h b/lib/lzo/lzodefs.h index b6d482c492..b6d482c492 100644 --- a/lib_generic/lzo/lzodefs.h +++ b/lib/lzo/lzodefs.h diff --git a/lib_generic/md5.c b/lib/md5.c index 81a09e3f90..81a09e3f90 100644 --- a/lib_generic/md5.c +++ b/lib/md5.c diff --git a/lib_generic/net_utils.c b/lib/net_utils.c index f03b098e9c..f03b098e9c 100644 --- a/lib_generic/net_utils.c +++ b/lib/net_utils.c diff --git a/lib_generic/rbtree.c b/lib/rbtree.c index 42eab49883..42eab49883 100644 --- a/lib_generic/rbtree.c +++ b/lib/rbtree.c diff --git a/lib_generic/sha1.c b/lib/sha1.c index da5bc16f3c..da5bc16f3c 100644 --- a/lib_generic/sha1.c +++ b/lib/sha1.c diff --git a/lib_generic/sha256.c b/lib/sha256.c index deb63a40b6..deb63a40b6 100644 --- a/lib_generic/sha256.c +++ b/lib/sha256.c diff --git a/lib_generic/string.c b/lib/string.c index b375b8124a..b375b8124a 100644 --- a/lib_generic/string.c +++ b/lib/string.c diff --git a/lib_generic/strmhz.c b/lib/strmhz.c index d6da1d136e..d6da1d136e 100644 --- a/lib_generic/strmhz.c +++ b/lib/strmhz.c diff --git a/lib_generic/time.c b/lib/time.c index a309c2613a..a309c2613a 100644 --- a/lib_generic/time.c +++ b/lib/time.c diff --git a/lib_generic/vsprintf.c b/lib/vsprintf.c index 8c58a93662..8c58a93662 100644 --- a/lib_generic/vsprintf.c +++ b/lib/vsprintf.c diff --git a/lib_generic/zlib.c b/lib/zlib.c index 26e5af1d8e..26e5af1d8e 100644 --- a/lib_generic/zlib.c +++ b/lib/zlib.c diff --git a/tools/Makefile b/tools/Makefile index 743505f929..a6f11c9a20 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -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 diff --git a/tools/env/Makefile b/tools/env/Makefile index 9629ee58ef..2df631e98a 100644 --- a/tools/env/Makefile +++ b/tools/env/Makefile @@ -41,7 +41,7 @@ clean: rm -f $(obj)fw_printenv $(obj)crc32.c $(obj)crc32.c: - ln -s $(src)../../lib_generic/crc32.c $(obj)crc32.c + ln -s $(src)../../lib/crc32.c $(obj)crc32.c ######################################################################### diff --git a/tools/imls/Makefile b/tools/imls/Makefile index 9b2afb0762..82c2728068 100644 --- a/tools/imls/Makefile +++ b/tools/imls/Makefile @@ -23,9 +23,9 @@ include $(TOPDIR)/config.mk BIN_FILES-y += imls # Source files which exist outside the tools/imls directory -EXT_OBJ_FILES-y += lib_generic/crc32.o -EXT_OBJ_FILES-y += lib_generic/md5.o -EXT_OBJ_FILES-y += lib_generic/sha1.o +EXT_OBJ_FILES-y += lib/crc32.o +EXT_OBJ_FILES-y += lib/md5.o +EXT_OBJ_FILES-y += lib/sha1.o EXT_OBJ_FILES-y += common/image.o # Source files located in the tools/imls directory @@ -78,7 +78,7 @@ $(obj)imls.o: $(SRCTREE)/tools/imls/imls.c $(obj)%.o: $(SRCTREE)/common/%.c $(CC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $< -$(obj)%.o: $(SRCTREE)/lib_generic/%.c +$(obj)%.o: $(SRCTREE)/lib/%.c $(CC) -g $(HOSTCFLAGS) -c -o $@ $< $(obj)%.o: $(SRCTREE)/libfdt/%.c |