Browse Source

Move lib_$ARCH directories to arch/$ARCH/lib

Also move lib_$ARCH/config.mk to arch/$ARCH/config.mk

This change is intended to clean up the top-level directory structure
and more closely mimic Linux's directory organization.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Peter Tyser 14 years ago
parent
commit
ea0364f1bb
100 changed files with 20 additions and 20 deletions
  1. 3 3
      Makefile
  2. 14 14
      README
  3. 2 2
      arch/arm/config.mk
  4. 0 0
      arch/arm/lib/Makefile
  5. 0 0
      arch/arm/lib/_ashldi3.S
  6. 0 0
      arch/arm/lib/_ashrdi3.S
  7. 0 0
      arch/arm/lib/_divsi3.S
  8. 0 0
      arch/arm/lib/_lshrdi3.S
  9. 0 0
      arch/arm/lib/_modsi3.S
  10. 0 0
      arch/arm/lib/_udivsi3.S
  11. 0 0
      arch/arm/lib/_umodsi3.S
  12. 0 0
      arch/arm/lib/board.c
  13. 0 0
      arch/arm/lib/bootm.c
  14. 0 0
      arch/arm/lib/cache-cp15.c
  15. 0 0
      arch/arm/lib/cache.c
  16. 0 0
      arch/arm/lib/div0.c
  17. 0 0
      arch/arm/lib/eabi_compat.c
  18. 0 0
      arch/arm/lib/interrupts.c
  19. 0 0
      arch/arm/lib/reset.c
  20. 0 0
      arch/avr32/config.mk
  21. 0 0
      arch/avr32/lib/Makefile
  22. 0 0
      arch/avr32/lib/board.c
  23. 0 0
      arch/avr32/lib/bootm.c
  24. 0 0
      arch/avr32/lib/interrupts.c
  25. 0 0
      arch/avr32/lib/memset.S
  26. 1 1
      arch/blackfin/config.mk
  27. 0 0
      arch/blackfin/lib/.gitignore
  28. 0 0
      arch/blackfin/lib/Makefile
  29. 0 0
      arch/blackfin/lib/__kgdb.S
  30. 0 0
      arch/blackfin/lib/board.c
  31. 0 0
      arch/blackfin/lib/boot.c
  32. 0 0
      arch/blackfin/lib/cache.c
  33. 0 0
      arch/blackfin/lib/clocks.c
  34. 0 0
      arch/blackfin/lib/cmd_cache_dump.c
  35. 0 0
      arch/blackfin/lib/ins.S
  36. 0 0
      arch/blackfin/lib/kgdb.c
  37. 0 0
      arch/blackfin/lib/kgdb.h
  38. 0 0
      arch/blackfin/lib/memcmp.S
  39. 0 0
      arch/blackfin/lib/memcpy.S
  40. 0 0
      arch/blackfin/lib/memmove.S
  41. 0 0
      arch/blackfin/lib/memset.S
  42. 0 0
      arch/blackfin/lib/muldi3.c
  43. 0 0
      arch/blackfin/lib/outs.S
  44. 0 0
      arch/blackfin/lib/post.c
  45. 0 0
      arch/blackfin/lib/string.c
  46. 0 0
      arch/blackfin/lib/tests.c
  47. 0 0
      arch/blackfin/lib/u-boot.lds.S
  48. 0 0
      arch/i386/config.mk
  49. 0 0
      arch/i386/lib/Makefile
  50. 0 0
      arch/i386/lib/bios.S
  51. 0 0
      arch/i386/lib/bios.h
  52. 0 0
      arch/i386/lib/bios_pci.S
  53. 0 0
      arch/i386/lib/bios_setup.c
  54. 0 0
      arch/i386/lib/board.c
  55. 0 0
      arch/i386/lib/bootm.c
  56. 0 0
      arch/i386/lib/interrupts.c
  57. 0 0
      arch/i386/lib/pcat_interrupts.c
  58. 0 0
      arch/i386/lib/pcat_timer.c
  59. 0 0
      arch/i386/lib/pci.c
  60. 0 0
      arch/i386/lib/pci_type1.c
  61. 0 0
      arch/i386/lib/realmode.c
  62. 0 0
      arch/i386/lib/realmode_switch.S
  63. 0 0
      arch/i386/lib/timer.c
  64. 0 0
      arch/i386/lib/video.c
  65. 0 0
      arch/i386/lib/video_bios.c
  66. 0 0
      arch/i386/lib/zimage.c
  67. 0 0
      arch/m68k/config.mk
  68. 0 0
      arch/m68k/lib/Makefile
  69. 0 0
      arch/m68k/lib/board.c
  70. 0 0
      arch/m68k/lib/bootm.c
  71. 0 0
      arch/m68k/lib/cache.c
  72. 0 0
      arch/m68k/lib/interrupts.c
  73. 0 0
      arch/m68k/lib/time.c
  74. 0 0
      arch/m68k/lib/traps.c
  75. 0 0
      arch/microblaze/config.mk
  76. 0 0
      arch/microblaze/lib/Makefile
  77. 0 0
      arch/microblaze/lib/board.c
  78. 0 0
      arch/microblaze/lib/bootm.c
  79. 0 0
      arch/microblaze/lib/cache.c
  80. 0 0
      arch/microblaze/lib/time.c
  81. 0 0
      arch/mips/config.mk
  82. 0 0
      arch/mips/lib/Makefile
  83. 0 0
      arch/mips/lib/board.c
  84. 0 0
      arch/mips/lib/bootm.c
  85. 0 0
      arch/mips/lib/bootm_qemu_mips.c
  86. 0 0
      arch/mips/lib/time.c
  87. 0 0
      arch/nios/config.mk
  88. 0 0
      arch/nios/lib/Makefile
  89. 0 0
      arch/nios/lib/board.c
  90. 0 0
      arch/nios/lib/bootm.c
  91. 0 0
      arch/nios/lib/cache.c
  92. 0 0
      arch/nios/lib/divmod.c
  93. 0 0
      arch/nios/lib/math.h
  94. 0 0
      arch/nios/lib/mult.c
  95. 0 0
      arch/nios/lib/time.c
  96. 0 0
      arch/nios2/config.mk
  97. 0 0
      arch/nios2/lib/Makefile
  98. 0 0
      arch/nios2/lib/board.c
  99. 0 0
      arch/nios2/lib/bootm.c
  100. 0 0
      arch/nios2/lib/cache.S

+ 3 - 3
Makefile

@@ -195,7 +195,7 @@ endif
 ifeq ($(CPU),ixp)
 LIBS += cpu/ixp/npe/libnpe.a
 endif
-LIBS += lib_$(ARCH)/lib$(ARCH).a
+LIBS += arch/$(ARCH)/lib/lib$(ARCH).a
 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 \
 	fs/ubifs/libubifs.a
@@ -257,7 +257,7 @@ LIBBOARD := $(addprefix $(obj),$(LIBBOARD))
 # Add GCC lib
 ifdef USE_PRIVATE_LIBGCC
 ifeq ("$(USE_PRIVATE_LIBGCC)", "yes")
-PLATFORM_LIBGCC = -L $(OBJTREE)/lib_$(ARCH) -lgcc
+PLATFORM_LIBGCC = -L $(OBJTREE)/arch/$(ARCH)/lib -lgcc
 else
 PLATFORM_LIBGCC = -L $(USE_PRIVATE_LIBGCC) -lgcc
 endif
@@ -3743,7 +3743,7 @@ clean:
 	       $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin}	  \
 	       $(obj)board/trab/trab_fkt   $(obj)board/voiceblue/eeprom   \
 	       $(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds  \
-	       $(obj)lib_blackfin/u-boot.lds				  \
+	       $(obj)arch/blackfin/lib/u-boot.lds				  \
 	       $(obj)u-boot.lds						  \
 	       $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
 	@rm -f $(obj)include/bmp_logo.h

+ 14 - 14
README

@@ -182,19 +182,19 @@ Directory Hierarchy:
 - examples	Example code for standalone applications, etc.
 - fs		Filesystem code (cramfs, ext2, jffs2, etc.)
 - include	Header Files
-- lib_arm	Files generic to ARM	 architecture
-- lib_avr32	Files generic to AVR32	 architecture
-- lib_blackfin	Files generic to Blackfin architecture
+- 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_i386	Files generic to i386	 architecture
-- lib_m68k	Files generic to m68k	 architecture
-- lib_microblaze Files generic to microblaze architecture
-- lib_mips	Files generic to MIPS	 architecture
-- lib_nios	Files generic to NIOS	 architecture
-- lib_nios2	Files generic to NIOS2	 architecture
-- lib_ppc	Files generic to PowerPC architecture
-- lib_sh	Files generic to SH	 architecture
-- lib_sparc	Files generic to SPARC	 architecture
+- arch/i386/lib	Files generic to i386	 architecture
+- arch/m68k/lib	Files generic to m68k	 architecture
+- arch/microblaze/lib Files generic to microblaze architecture
+- arch/mips/lib	Files generic to MIPS	 architecture
+- arch/nios/lib	Files generic to NIOS	 architecture
+- arch/nios/lib2	Files generic to NIOS2	 architecture
+- arch/ppc/lib	Files generic to PowerPC architecture
+- arch/sh/lib	Files generic to SH	 architecture
+- arch/sparc/lib	Files generic to SPARC	 architecture
 - libfdt	Library files to support flattened device trees
 - net		Networking code
 - post		Power On Self Test
@@ -1940,9 +1940,9 @@ Legacy uImage format:
    13	common/image.c		Start multifile image verification
    14	common/image.c		No initial ramdisk, no multifile, continue.
 
-   15	lib_<arch>/bootm.c	All preparation done, transferring control to OS
+   15	arch/<arch>/lib/bootm.c	All preparation done, transferring control to OS
 
-  -30	lib_ppc/board.c		Fatal error, hang the system
+  -30	arch/ppc/lib/board.c		Fatal error, hang the system
   -31	post/post.c		POST test failed, detected by post_output_backlog()
   -32	post/post.c		POST test failed, detected by post_run_single()
 

+ 2 - 2
lib_arm/config.mk → arch/arm/config.mk

@@ -59,8 +59,8 @@ PLATFORM_CPPFLAGS += $(call cc-option,\
 # For EABI, make sure to provide raise()
 ifneq (,$(findstring -mabi=aapcs-linux,$(PLATFORM_CPPFLAGS)))
 # This file is parsed several times; make sure to add only once.
-ifeq (,$(findstring lib_arm/eabi_compat.o,$(PLATFORM_LIBS)))
-PLATFORM_LIBS += $(OBJTREE)/lib_arm/eabi_compat.o
+ifeq (,$(findstring arch/arm/lib/eabi_compat.o,$(PLATFORM_LIBS)))
+PLATFORM_LIBS += $(OBJTREE)/arch/arm/lib/eabi_compat.o
 endif
 endif
 LDSCRIPT := $(SRCTREE)/$(CPUDIR)/u-boot.lds

+ 0 - 0
lib_arm/Makefile → arch/arm/lib/Makefile


+ 0 - 0
lib_arm/_ashldi3.S → arch/arm/lib/_ashldi3.S


+ 0 - 0
lib_arm/_ashrdi3.S → arch/arm/lib/_ashrdi3.S


+ 0 - 0
lib_arm/_divsi3.S → arch/arm/lib/_divsi3.S


+ 0 - 0
lib_arm/_lshrdi3.S → arch/arm/lib/_lshrdi3.S


+ 0 - 0
lib_arm/_modsi3.S → arch/arm/lib/_modsi3.S


+ 0 - 0
lib_arm/_udivsi3.S → arch/arm/lib/_udivsi3.S


+ 0 - 0
lib_arm/_umodsi3.S → arch/arm/lib/_umodsi3.S


+ 0 - 0
lib_arm/board.c → arch/arm/lib/board.c


+ 0 - 0
lib_arm/bootm.c → arch/arm/lib/bootm.c


+ 0 - 0
lib_arm/cache-cp15.c → arch/arm/lib/cache-cp15.c


+ 0 - 0
lib_arm/cache.c → arch/arm/lib/cache.c


+ 0 - 0
lib_arm/div0.c → arch/arm/lib/div0.c


+ 0 - 0
lib_arm/eabi_compat.c → arch/arm/lib/eabi_compat.c


+ 0 - 0
lib_arm/interrupts.c → arch/arm/lib/interrupts.c


+ 0 - 0
lib_arm/reset.c → arch/arm/lib/reset.c


+ 0 - 0
lib_avr32/config.mk → arch/avr32/config.mk


+ 0 - 0
lib_avr32/Makefile → arch/avr32/lib/Makefile


+ 0 - 0
lib_avr32/board.c → arch/avr32/lib/board.c


+ 0 - 0
lib_avr32/bootm.c → arch/avr32/lib/bootm.c


+ 0 - 0
lib_avr32/interrupts.c → arch/avr32/lib/interrupts.c


+ 0 - 0
lib_avr32/memset.S → arch/avr32/lib/memset.S


+ 1 - 1
lib_blackfin/config.mk → arch/blackfin/config.mk

@@ -68,5 +68,5 @@ endif
 LDR_FLAGS += $(LDR_FLAGS-y)
 
 ifeq ($(wildcard $(TOPDIR)/board/$(BOARD)/u-boot.lds*),)
-LDSCRIPT = $(obj)lib_$(ARCH)/u-boot.lds.S
+LDSCRIPT = $(obj)arch/$(ARCH)/lib/u-boot.lds.S
 endif

+ 0 - 0
lib_blackfin/.gitignore → arch/blackfin/lib/.gitignore


+ 0 - 0
lib_blackfin/Makefile → arch/blackfin/lib/Makefile


+ 0 - 0
lib_blackfin/__kgdb.S → arch/blackfin/lib/__kgdb.S


+ 0 - 0
lib_blackfin/board.c → arch/blackfin/lib/board.c


+ 0 - 0
lib_blackfin/boot.c → arch/blackfin/lib/boot.c


+ 0 - 0
lib_blackfin/cache.c → arch/blackfin/lib/cache.c


+ 0 - 0
lib_blackfin/clocks.c → arch/blackfin/lib/clocks.c


+ 0 - 0
lib_blackfin/cmd_cache_dump.c → arch/blackfin/lib/cmd_cache_dump.c


+ 0 - 0
lib_blackfin/ins.S → arch/blackfin/lib/ins.S


+ 0 - 0
lib_blackfin/kgdb.c → arch/blackfin/lib/kgdb.c


+ 0 - 0
lib_blackfin/kgdb.h → arch/blackfin/lib/kgdb.h


+ 0 - 0
lib_blackfin/memcmp.S → arch/blackfin/lib/memcmp.S


+ 0 - 0
lib_blackfin/memcpy.S → arch/blackfin/lib/memcpy.S


+ 0 - 0
lib_blackfin/memmove.S → arch/blackfin/lib/memmove.S


+ 0 - 0
lib_blackfin/memset.S → arch/blackfin/lib/memset.S


+ 0 - 0
lib_blackfin/muldi3.c → arch/blackfin/lib/muldi3.c


+ 0 - 0
lib_blackfin/outs.S → arch/blackfin/lib/outs.S


+ 0 - 0
lib_blackfin/post.c → arch/blackfin/lib/post.c


+ 0 - 0
lib_blackfin/string.c → arch/blackfin/lib/string.c


+ 0 - 0
lib_blackfin/tests.c → arch/blackfin/lib/tests.c


+ 0 - 0
lib_blackfin/u-boot.lds.S → arch/blackfin/lib/u-boot.lds.S


+ 0 - 0
lib_i386/config.mk → arch/i386/config.mk


+ 0 - 0
lib_i386/Makefile → arch/i386/lib/Makefile


+ 0 - 0
lib_i386/bios.S → arch/i386/lib/bios.S


+ 0 - 0
lib_i386/bios.h → arch/i386/lib/bios.h


+ 0 - 0
lib_i386/bios_pci.S → arch/i386/lib/bios_pci.S


+ 0 - 0
lib_i386/bios_setup.c → arch/i386/lib/bios_setup.c


+ 0 - 0
lib_i386/board.c → arch/i386/lib/board.c


+ 0 - 0
lib_i386/bootm.c → arch/i386/lib/bootm.c


+ 0 - 0
lib_i386/interrupts.c → arch/i386/lib/interrupts.c


+ 0 - 0
lib_i386/pcat_interrupts.c → arch/i386/lib/pcat_interrupts.c


+ 0 - 0
lib_i386/pcat_timer.c → arch/i386/lib/pcat_timer.c


+ 0 - 0
lib_i386/pci.c → arch/i386/lib/pci.c


+ 0 - 0
lib_i386/pci_type1.c → arch/i386/lib/pci_type1.c


+ 0 - 0
lib_i386/realmode.c → arch/i386/lib/realmode.c


+ 0 - 0
lib_i386/realmode_switch.S → arch/i386/lib/realmode_switch.S


+ 0 - 0
lib_i386/timer.c → arch/i386/lib/timer.c


+ 0 - 0
lib_i386/video.c → arch/i386/lib/video.c


+ 0 - 0
lib_i386/video_bios.c → arch/i386/lib/video_bios.c


+ 0 - 0
lib_i386/zimage.c → arch/i386/lib/zimage.c


+ 0 - 0
lib_m68k/config.mk → arch/m68k/config.mk


+ 0 - 0
lib_m68k/Makefile → arch/m68k/lib/Makefile


+ 0 - 0
lib_m68k/board.c → arch/m68k/lib/board.c


+ 0 - 0
lib_m68k/bootm.c → arch/m68k/lib/bootm.c


+ 0 - 0
lib_m68k/cache.c → arch/m68k/lib/cache.c


+ 0 - 0
lib_m68k/interrupts.c → arch/m68k/lib/interrupts.c


+ 0 - 0
lib_m68k/time.c → arch/m68k/lib/time.c


+ 0 - 0
lib_m68k/traps.c → arch/m68k/lib/traps.c


+ 0 - 0
lib_microblaze/config.mk → arch/microblaze/config.mk


+ 0 - 0
lib_microblaze/Makefile → arch/microblaze/lib/Makefile


+ 0 - 0
lib_microblaze/board.c → arch/microblaze/lib/board.c


+ 0 - 0
lib_microblaze/bootm.c → arch/microblaze/lib/bootm.c


+ 0 - 0
lib_microblaze/cache.c → arch/microblaze/lib/cache.c


+ 0 - 0
lib_microblaze/time.c → arch/microblaze/lib/time.c


+ 0 - 0
lib_mips/config.mk → arch/mips/config.mk


+ 0 - 0
lib_mips/Makefile → arch/mips/lib/Makefile


+ 0 - 0
lib_mips/board.c → arch/mips/lib/board.c


+ 0 - 0
lib_mips/bootm.c → arch/mips/lib/bootm.c


+ 0 - 0
lib_mips/bootm_qemu_mips.c → arch/mips/lib/bootm_qemu_mips.c


+ 0 - 0
lib_mips/time.c → arch/mips/lib/time.c


+ 0 - 0
lib_nios/config.mk → arch/nios/config.mk


+ 0 - 0
lib_nios/Makefile → arch/nios/lib/Makefile


+ 0 - 0
lib_nios/board.c → arch/nios/lib/board.c


+ 0 - 0
lib_nios/bootm.c → arch/nios/lib/bootm.c


+ 0 - 0
lib_nios/cache.c → arch/nios/lib/cache.c


+ 0 - 0
lib_nios/divmod.c → arch/nios/lib/divmod.c


+ 0 - 0
lib_nios/math.h → arch/nios/lib/math.h


+ 0 - 0
lib_nios/mult.c → arch/nios/lib/mult.c


+ 0 - 0
lib_nios/time.c → arch/nios/lib/time.c


+ 0 - 0
lib_nios2/config.mk → arch/nios2/config.mk


+ 0 - 0
lib_nios2/Makefile → arch/nios2/lib/Makefile


+ 0 - 0
lib_nios2/board.c → arch/nios2/lib/board.c


+ 0 - 0
lib_nios2/bootm.c → arch/nios2/lib/bootm.c


+ 0 - 0
lib_nios2/cache.S → arch/nios2/lib/cache.S


Some files were not shown because too many files changed in this diff