Commit 78acc472 authored by Peter Tyser's avatar Peter Tyser Committed by Wolfgang Denk

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: 's avatarPeter Tyser <ptyser@xes-inc.com>
parent ea0364f1
......@@ -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
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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;
*/
......
......@@ -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)
......
......@@ -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;
*/
......
......@@ -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)
......
......@@ -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;
*/
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)*/
......
......@@ -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)
......
......@@ -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))
......@@ -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))
......@@ -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))
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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)
......
......@@ -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)
......
......@@ -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))
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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;
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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;
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -62,7 +62,7 @@ SECTIONS
common/dlmalloc.o (.text)
common/main.o (.text)
common/image.o (.text)