Signed-off-by: Peter Tyser ptyser@xes-inc.com --- Makefile | 8 ++------ README | 12 ++++++------ config.mk | 1 - doc/README.nios | 2 +- include/common.h | 8 ++++---- {lib_avr32 => lib/avr32}/Makefile | 0 {lib_avr32 => lib/avr32}/board.c | 0 {lib_avr32 => lib/avr32}/bootm.c | 0 {lib_avr32 => lib/avr32}/config.mk | 0 {lib_avr32 => lib/avr32}/interrupts.c | 0 {lib_avr32 => lib/avr32}/memset.S | 0 {lib_blackfin => lib/blackfin}/.gitignore | 0 {lib_blackfin => lib/blackfin}/Makefile | 0 {lib_blackfin => lib/blackfin}/board.c | 0 {lib_blackfin => lib/blackfin}/boot.c | 0 {lib_blackfin => lib/blackfin}/cache.c | 0 {lib_blackfin => lib/blackfin}/clocks.c | 0 {lib_blackfin => lib/blackfin}/config.mk | 0 {lib_blackfin => lib/blackfin}/memcmp.S | 0 {lib_blackfin => lib/blackfin}/memcpy.S | 0 {lib_blackfin => lib/blackfin}/memmove.S | 0 {lib_blackfin => lib/blackfin}/memset.S | 0 {lib_blackfin => lib/blackfin}/muldi3.c | 0 {lib_blackfin => lib/blackfin}/post.c | 0 {lib_blackfin => lib/blackfin}/string.c | 0 {lib_blackfin => lib/blackfin}/tests.c | 0 {lib_blackfin => lib/blackfin}/u-boot.lds.S | 0 {lib_microblaze => lib/microblaze}/Makefile | 0 {lib_microblaze => lib/microblaze}/board.c | 0 {lib_microblaze => lib/microblaze}/bootm.c | 0 {lib_microblaze => lib/microblaze}/cache.c | 0 {lib_microblaze => lib/microblaze}/config.mk | 0 {lib_microblaze => lib/microblaze}/time.c | 0 {lib_mips => lib/mips}/Makefile | 0 {lib_mips => lib/mips}/board.c | 0 {lib_mips => lib/mips}/bootm.c | 0 {lib_mips => lib/mips}/bootm_qemu_mips.c | 0 {lib_mips => lib/mips}/config.mk | 0 {lib_mips => lib/mips}/time.c | 0 {lib_nios => lib/nios}/Makefile | 0 {lib_nios => lib/nios}/board.c | 0 {lib_nios => lib/nios}/bootm.c | 0 {lib_nios => lib/nios}/cache.c | 0 {lib_nios => lib/nios}/config.mk | 0 {lib_nios => lib/nios}/divmod.c | 0 {lib_nios => lib/nios}/math.h | 0 {lib_nios => lib/nios}/mult.c | 0 {lib_nios => lib/nios}/time.c | 0 {lib_nios2 => lib/nios2}/Makefile | 0 {lib_nios2 => lib/nios2}/board.c | 0 {lib_nios2 => lib/nios2}/bootm.c | 0 {lib_nios2 => lib/nios2}/cache.S | 0 {lib_nios2 => lib/nios2}/config.mk | 0 {lib_nios2 => lib/nios2}/divmod.c | 0 {lib_nios2 => lib/nios2}/math.h | 0 {lib_nios2 => lib/nios2}/mult.c | 0 {lib_nios2 => lib/nios2}/time.c | 0 {lib_sh => lib/sh}/Makefile | 0 {lib_sh => lib/sh}/board.c | 0 {lib_sh => lib/sh}/bootm.c | 0 {lib_sh => lib/sh}/config.mk | 0 {lib_sh => lib/sh}/time.c | 0 {lib_sh => lib/sh}/time_sh2.c | 0 {lib_sparc => lib/sparc}/Makefile | 0 {lib_sparc => lib/sparc}/board.c | 0 {lib_sparc => lib/sparc}/bootm.c | 0 {lib_sparc => lib/sparc}/cache.c | 0 {lib_sparc => lib/sparc}/config.mk | 0 {lib_sparc => lib/sparc}/interrupts.c | 0 {lib_sparc => lib/sparc}/time.c | 0 70 files changed, 13 insertions(+), 18 deletions(-) rename {lib_avr32 => lib/avr32}/Makefile (100%) rename {lib_avr32 => lib/avr32}/board.c (100%) rename {lib_avr32 => lib/avr32}/bootm.c (100%) rename {lib_avr32 => lib/avr32}/config.mk (100%) rename {lib_avr32 => lib/avr32}/interrupts.c (100%) rename {lib_avr32 => lib/avr32}/memset.S (100%) rename {lib_blackfin => lib/blackfin}/.gitignore (100%) rename {lib_blackfin => lib/blackfin}/Makefile (100%) rename {lib_blackfin => lib/blackfin}/board.c (100%) rename {lib_blackfin => lib/blackfin}/boot.c (100%) rename {lib_blackfin => lib/blackfin}/cache.c (100%) rename {lib_blackfin => lib/blackfin}/clocks.c (100%) rename {lib_blackfin => lib/blackfin}/config.mk (100%) rename {lib_blackfin => lib/blackfin}/memcmp.S (100%) rename {lib_blackfin => lib/blackfin}/memcpy.S (100%) rename {lib_blackfin => lib/blackfin}/memmove.S (100%) rename {lib_blackfin => lib/blackfin}/memset.S (100%) rename {lib_blackfin => lib/blackfin}/muldi3.c (100%) rename {lib_blackfin => lib/blackfin}/post.c (100%) rename {lib_blackfin => lib/blackfin}/string.c (100%) rename {lib_blackfin => lib/blackfin}/tests.c (100%) rename {lib_blackfin => lib/blackfin}/u-boot.lds.S (100%) rename {lib_microblaze => lib/microblaze}/Makefile (100%) rename {lib_microblaze => lib/microblaze}/board.c (100%) rename {lib_microblaze => lib/microblaze}/bootm.c (100%) rename {lib_microblaze => lib/microblaze}/cache.c (100%) rename {lib_microblaze => lib/microblaze}/config.mk (100%) rename {lib_microblaze => lib/microblaze}/time.c (100%) rename {lib_mips => lib/mips}/Makefile (100%) rename {lib_mips => lib/mips}/board.c (100%) rename {lib_mips => lib/mips}/bootm.c (100%) rename {lib_mips => lib/mips}/bootm_qemu_mips.c (100%) rename {lib_mips => lib/mips}/config.mk (100%) rename {lib_mips => lib/mips}/time.c (100%) rename {lib_nios => lib/nios}/Makefile (100%) rename {lib_nios => lib/nios}/board.c (100%) rename {lib_nios => lib/nios}/bootm.c (100%) rename {lib_nios => lib/nios}/cache.c (100%) rename {lib_nios => lib/nios}/config.mk (100%) rename {lib_nios => lib/nios}/divmod.c (100%) rename {lib_nios => lib/nios}/math.h (100%) rename {lib_nios => lib/nios}/mult.c (100%) rename {lib_nios => lib/nios}/time.c (100%) rename {lib_nios2 => lib/nios2}/Makefile (100%) rename {lib_nios2 => lib/nios2}/board.c (100%) rename {lib_nios2 => lib/nios2}/bootm.c (100%) rename {lib_nios2 => lib/nios2}/cache.S (100%) rename {lib_nios2 => lib/nios2}/config.mk (100%) rename {lib_nios2 => lib/nios2}/divmod.c (100%) rename {lib_nios2 => lib/nios2}/math.h (100%) rename {lib_nios2 => lib/nios2}/mult.c (100%) rename {lib_nios2 => lib/nios2}/time.c (100%) rename {lib_sh => lib/sh}/Makefile (100%) rename {lib_sh => lib/sh}/board.c (100%) rename {lib_sh => lib/sh}/bootm.c (100%) rename {lib_sh => lib/sh}/config.mk (100%) rename {lib_sh => lib/sh}/time.c (100%) rename {lib_sh => lib/sh}/time_sh2.c (100%) rename {lib_sparc => lib/sparc}/Makefile (100%) rename {lib_sparc => lib/sparc}/board.c (100%) rename {lib_sparc => lib/sparc}/bootm.c (100%) rename {lib_sparc => lib/sparc}/cache.c (100%) rename {lib_sparc => lib/sparc}/config.mk (100%) rename {lib_sparc => lib/sparc}/interrupts.c (100%) rename {lib_sparc => lib/sparc}/time.c (100%)
diff --git a/Makefile b/Makefile index 7902a47..b0dd4c5 100644 --- a/Makefile +++ b/Makefile @@ -229,9 +229,5 @@ ifeq ($(CPU),ixp) LIBS += cpu/ixp/npe/libnpe.a endif -ifeq ($(SRCTREE)/lib/$(ARCH),$(wildcard $(SRCTREE)/lib/$(ARCH))) LIBS += lib/$(ARCH)/lib$(ARCH).a -else -LIBS += lib_$(ARCH)/lib$(ARCH).a -endif LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \ fs/reiserfs/libreiserfs.a fs/ext2/libext2fs.a fs/yaffs2/libyaffs2.a \ @@ -414,5 +410,5 @@ TAG_SUBDIRS += include TAG_SUBDIRS += lib_generic board/$(BOARDDIR) TAG_SUBDIRS += cpu/$(CPU) -TAG_SUBDIRS += lib_$(ARCH) +TAG_SUBDIRS += lib/$(ARCH) TAG_SUBDIRS += fs/cramfs TAG_SUBDIRS += fs/fat @@ -3608,5 +3604,5 @@ clean: $(obj)board/trab/trab_fkt $(obj)board/voiceblue/eeprom \ $(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds \ - $(obj)lib_blackfin/u-boot.lds \ + $(obj)lib/blackfin/u-boot.lds \ $(obj)cpu/blackfin/bootrom-asm-offsets.[chs] @rm -f $(obj)include/bmp_logo.h diff --git a/README b/README index 95ac65b..b88dc1c 100644 --- a/README +++ b/README @@ -183,13 +183,13 @@ Directory Hierarchy: - include Header Files - lib/arm Files generic to ARM architecture -- lib_avr32 Files generic to AVR32 architecture -- lib_blackfin Files generic to Blackfin architecture +- lib/avr32 Files generic to AVR32 architecture +- lib/blackfin Files generic to Blackfin architecture - lib_generic Files generic to all architectures - lib/i386 Files generic to i386 architecture - lib/m68k Files generic to m68k architecture -- lib_mips Files generic to MIPS architecture -- lib_nios Files generic to NIOS architecture +- lib/mips Files generic to MIPS architecture +- lib/nios Files generic to NIOS architecture - lib/ppc Files generic to PowerPC architecture -- lib_sparc Files generic to SPARC architecture +- lib/sparc Files generic to SPARC architecture - libfdt Library files to support flattened device trees - net Networking code @@ -1889,5 +1889,5 @@ Legacy uImage format: 14 common/image.c No initial ramdisk, no multifile, continue.
- 15 lib_<arch>/bootm.c All preparation done, transferring control to OS + 15 lib/<arch>/bootm.c All preparation done, transferring control to OS
-30 lib/ppc/board.c Fatal error, hang the system diff --git a/config.mk b/config.mk index b7418c5..9934f29 100644 --- a/config.mk +++ b/config.mk @@ -84,5 +84,4 @@ sinclude $(OBJTREE)/include/autoconf.mk
ifdef ARCH -sinclude $(TOPDIR)/lib_$(ARCH)/config.mk # include architecture dependend rules sinclude $(TOPDIR)/lib/$(ARCH)/config.mk # include architecture dependend rules endif diff --git a/doc/README.nios b/doc/README.nios index 7f34938..a92f72b 100644 --- a/doc/README.nios +++ b/doc/README.nios @@ -245,5 +245,5 @@ cover most of the individual functions to get you started. (gdb) directory common (gdb) directory cpu/nios - (gdb) directory lib_nios + (gdb) directory lib/nios (gdb) directory board/altera/dk1c20
diff --git a/include/common.h b/include/common.h index 6284b8a..703775e 100644 --- a/include/common.h +++ b/include/common.h @@ -221,5 +221,5 @@ void init_cmd_timeout(void); void reset_cmd_timeout(void);
-/* lib_$(ARCH)/board.c */ +/* lib/$(ARCH)/board.c */ void board_init_f (ulong) __attribute__ ((noreturn)); void board_init_r (gd_t *, ulong) __attribute__ ((noreturn)); @@ -589,5 +589,5 @@ ulong vfd_setmem (ulong); ulong video_setmem (ulong);
-/* lib_$(ARCH)/cache.c */ +/* lib/$(ARCH)/cache.c */ void flush_cache (unsigned long, unsigned long); void flush_dcache_range(unsigned long start, unsigned long stop); @@ -595,9 +595,9 @@ void invalidate_dcache_range(unsigned long start, unsigned long stop);
-/* lib_$(ARCH)/ticks.S */ +/* lib/$(ARCH)/ticks.S */ unsigned long long get_ticks(void); void wait_ticks (unsigned long);
-/* lib_$(ARCH)/time.c */ +/* lib/$(ARCH)/time.c */ void udelay (unsigned long); ulong usec2ticks (unsigned long usec); diff --git a/lib_avr32/Makefile b/lib/avr32/Makefile similarity index 100% rename from lib_avr32/Makefile rename to lib/avr32/Makefile diff --git a/lib_avr32/board.c b/lib/avr32/board.c similarity index 100% rename from lib_avr32/board.c rename to lib/avr32/board.c diff --git a/lib_avr32/bootm.c b/lib/avr32/bootm.c similarity index 100% rename from lib_avr32/bootm.c rename to lib/avr32/bootm.c diff --git a/lib_avr32/config.mk b/lib/avr32/config.mk similarity index 100% rename from lib_avr32/config.mk rename to lib/avr32/config.mk diff --git a/lib_avr32/interrupts.c b/lib/avr32/interrupts.c similarity index 100% rename from lib_avr32/interrupts.c rename to lib/avr32/interrupts.c diff --git a/lib_avr32/memset.S b/lib/avr32/memset.S similarity index 100% rename from lib_avr32/memset.S rename to lib/avr32/memset.S diff --git a/lib_blackfin/.gitignore b/lib/blackfin/.gitignore similarity index 100% rename from lib_blackfin/.gitignore rename to lib/blackfin/.gitignore diff --git a/lib_blackfin/Makefile b/lib/blackfin/Makefile similarity index 100% rename from lib_blackfin/Makefile rename to lib/blackfin/Makefile diff --git a/lib_blackfin/board.c b/lib/blackfin/board.c similarity index 100% rename from lib_blackfin/board.c rename to lib/blackfin/board.c diff --git a/lib_blackfin/boot.c b/lib/blackfin/boot.c similarity index 100% rename from lib_blackfin/boot.c rename to lib/blackfin/boot.c diff --git a/lib_blackfin/cache.c b/lib/blackfin/cache.c similarity index 100% rename from lib_blackfin/cache.c rename to lib/blackfin/cache.c diff --git a/lib_blackfin/clocks.c b/lib/blackfin/clocks.c similarity index 100% rename from lib_blackfin/clocks.c rename to lib/blackfin/clocks.c diff --git a/lib_blackfin/config.mk b/lib/blackfin/config.mk similarity index 100% rename from lib_blackfin/config.mk rename to lib/blackfin/config.mk diff --git a/lib_blackfin/memcmp.S b/lib/blackfin/memcmp.S similarity index 100% rename from lib_blackfin/memcmp.S rename to lib/blackfin/memcmp.S diff --git a/lib_blackfin/memcpy.S b/lib/blackfin/memcpy.S similarity index 100% rename from lib_blackfin/memcpy.S rename to lib/blackfin/memcpy.S diff --git a/lib_blackfin/memmove.S b/lib/blackfin/memmove.S similarity index 100% rename from lib_blackfin/memmove.S rename to lib/blackfin/memmove.S diff --git a/lib_blackfin/memset.S b/lib/blackfin/memset.S similarity index 100% rename from lib_blackfin/memset.S rename to lib/blackfin/memset.S diff --git a/lib_blackfin/muldi3.c b/lib/blackfin/muldi3.c similarity index 100% rename from lib_blackfin/muldi3.c rename to lib/blackfin/muldi3.c diff --git a/lib_blackfin/post.c b/lib/blackfin/post.c similarity index 100% rename from lib_blackfin/post.c rename to lib/blackfin/post.c diff --git a/lib_blackfin/string.c b/lib/blackfin/string.c similarity index 100% rename from lib_blackfin/string.c rename to lib/blackfin/string.c diff --git a/lib_blackfin/tests.c b/lib/blackfin/tests.c similarity index 100% rename from lib_blackfin/tests.c rename to lib/blackfin/tests.c diff --git a/lib_blackfin/u-boot.lds.S b/lib/blackfin/u-boot.lds.S similarity index 100% rename from lib_blackfin/u-boot.lds.S rename to lib/blackfin/u-boot.lds.S diff --git a/lib_microblaze/Makefile b/lib/microblaze/Makefile similarity index 100% rename from lib_microblaze/Makefile rename to lib/microblaze/Makefile diff --git a/lib_microblaze/board.c b/lib/microblaze/board.c similarity index 100% rename from lib_microblaze/board.c rename to lib/microblaze/board.c diff --git a/lib_microblaze/bootm.c b/lib/microblaze/bootm.c similarity index 100% rename from lib_microblaze/bootm.c rename to lib/microblaze/bootm.c diff --git a/lib_microblaze/cache.c b/lib/microblaze/cache.c similarity index 100% rename from lib_microblaze/cache.c rename to lib/microblaze/cache.c diff --git a/lib_microblaze/config.mk b/lib/microblaze/config.mk similarity index 100% rename from lib_microblaze/config.mk rename to lib/microblaze/config.mk diff --git a/lib_microblaze/time.c b/lib/microblaze/time.c similarity index 100% rename from lib_microblaze/time.c rename to lib/microblaze/time.c diff --git a/lib_mips/Makefile b/lib/mips/Makefile similarity index 100% rename from lib_mips/Makefile rename to lib/mips/Makefile diff --git a/lib_mips/board.c b/lib/mips/board.c similarity index 100% rename from lib_mips/board.c rename to lib/mips/board.c diff --git a/lib_mips/bootm.c b/lib/mips/bootm.c similarity index 100% rename from lib_mips/bootm.c rename to lib/mips/bootm.c diff --git a/lib_mips/bootm_qemu_mips.c b/lib/mips/bootm_qemu_mips.c similarity index 100% rename from lib_mips/bootm_qemu_mips.c rename to lib/mips/bootm_qemu_mips.c diff --git a/lib_mips/config.mk b/lib/mips/config.mk similarity index 100% rename from lib_mips/config.mk rename to lib/mips/config.mk diff --git a/lib_mips/time.c b/lib/mips/time.c similarity index 100% rename from lib_mips/time.c rename to lib/mips/time.c diff --git a/lib_nios/Makefile b/lib/nios/Makefile similarity index 100% rename from lib_nios/Makefile rename to lib/nios/Makefile diff --git a/lib_nios/board.c b/lib/nios/board.c similarity index 100% rename from lib_nios/board.c rename to lib/nios/board.c diff --git a/lib_nios/bootm.c b/lib/nios/bootm.c similarity index 100% rename from lib_nios/bootm.c rename to lib/nios/bootm.c diff --git a/lib_nios/cache.c b/lib/nios/cache.c similarity index 100% rename from lib_nios/cache.c rename to lib/nios/cache.c diff --git a/lib_nios/config.mk b/lib/nios/config.mk similarity index 100% rename from lib_nios/config.mk rename to lib/nios/config.mk diff --git a/lib_nios/divmod.c b/lib/nios/divmod.c similarity index 100% rename from lib_nios/divmod.c rename to lib/nios/divmod.c diff --git a/lib_nios/math.h b/lib/nios/math.h similarity index 100% rename from lib_nios/math.h rename to lib/nios/math.h diff --git a/lib_nios/mult.c b/lib/nios/mult.c similarity index 100% rename from lib_nios/mult.c rename to lib/nios/mult.c diff --git a/lib_nios/time.c b/lib/nios/time.c similarity index 100% rename from lib_nios/time.c rename to lib/nios/time.c diff --git a/lib_nios2/Makefile b/lib/nios2/Makefile similarity index 100% rename from lib_nios2/Makefile rename to lib/nios2/Makefile diff --git a/lib_nios2/board.c b/lib/nios2/board.c similarity index 100% rename from lib_nios2/board.c rename to lib/nios2/board.c diff --git a/lib_nios2/bootm.c b/lib/nios2/bootm.c similarity index 100% rename from lib_nios2/bootm.c rename to lib/nios2/bootm.c diff --git a/lib_nios2/cache.S b/lib/nios2/cache.S similarity index 100% rename from lib_nios2/cache.S rename to lib/nios2/cache.S diff --git a/lib_nios2/config.mk b/lib/nios2/config.mk similarity index 100% rename from lib_nios2/config.mk rename to lib/nios2/config.mk diff --git a/lib_nios2/divmod.c b/lib/nios2/divmod.c similarity index 100% rename from lib_nios2/divmod.c rename to lib/nios2/divmod.c diff --git a/lib_nios2/math.h b/lib/nios2/math.h similarity index 100% rename from lib_nios2/math.h rename to lib/nios2/math.h diff --git a/lib_nios2/mult.c b/lib/nios2/mult.c similarity index 100% rename from lib_nios2/mult.c rename to lib/nios2/mult.c diff --git a/lib_nios2/time.c b/lib/nios2/time.c similarity index 100% rename from lib_nios2/time.c rename to lib/nios2/time.c diff --git a/lib_sh/Makefile b/lib/sh/Makefile similarity index 100% rename from lib_sh/Makefile rename to lib/sh/Makefile diff --git a/lib_sh/board.c b/lib/sh/board.c similarity index 100% rename from lib_sh/board.c rename to lib/sh/board.c diff --git a/lib_sh/bootm.c b/lib/sh/bootm.c similarity index 100% rename from lib_sh/bootm.c rename to lib/sh/bootm.c diff --git a/lib_sh/config.mk b/lib/sh/config.mk similarity index 100% rename from lib_sh/config.mk rename to lib/sh/config.mk diff --git a/lib_sh/time.c b/lib/sh/time.c similarity index 100% rename from lib_sh/time.c rename to lib/sh/time.c diff --git a/lib_sh/time_sh2.c b/lib/sh/time_sh2.c similarity index 100% rename from lib_sh/time_sh2.c rename to lib/sh/time_sh2.c diff --git a/lib_sparc/Makefile b/lib/sparc/Makefile similarity index 100% rename from lib_sparc/Makefile rename to lib/sparc/Makefile diff --git a/lib_sparc/board.c b/lib/sparc/board.c similarity index 100% rename from lib_sparc/board.c rename to lib/sparc/board.c diff --git a/lib_sparc/bootm.c b/lib/sparc/bootm.c similarity index 100% rename from lib_sparc/bootm.c rename to lib/sparc/bootm.c diff --git a/lib_sparc/cache.c b/lib/sparc/cache.c similarity index 100% rename from lib_sparc/cache.c rename to lib/sparc/cache.c diff --git a/lib_sparc/config.mk b/lib/sparc/config.mk similarity index 100% rename from lib_sparc/config.mk rename to lib/sparc/config.mk diff --git a/lib_sparc/interrupts.c b/lib/sparc/interrupts.c similarity index 100% rename from lib_sparc/interrupts.c rename to lib/sparc/interrupts.c diff --git a/lib_sparc/time.c b/lib/sparc/time.c similarity index 100% rename from lib_sparc/time.c rename to lib/sparc/time.c