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>

diff --git a/Makefile b/Makefile
index 8e3eb9938d63176baaa41ae2ba835484e3f1fc68..de8a4cdba3f3962728fc7bd09f35f93e7c345830 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -195,7 +195,7 @@ endif
 ifeq ($(CPU),ixp)
 LIBS += cpu/ixp/npe/libnpe.a
 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
 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")
 # 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
 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)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
               $(obj)u-boot.lds                                           \
               $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
        @rm -f $(obj)include/bmp_logo.h

diff --git a/README b/README
index bb13bc62a37e3892ade156979fa9f2f69f92dc3b..dc2103fd4338e94fa976b97db8d3240b5117d9cf 100644 (file)
--- a/README
+++ b/README
@@ -182,19 +182,19 @@ Directory Hierarchy:
 - examples     Example code for standalone applications, etc.
 - fs           Filesystem code (cramfs, ext2, jffs2, etc.)
 - include      Header Files
 - 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_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
 - 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.
 
    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()
 
   -31  post/post.c             POST test failed, detected by post_output_backlog()
   -32  post/post.c             POST test failed, detected by post_run_single()
 

diff --git a/lib_arm/config.mk b/arch/arm/config.mk
similarity index 94%
rename from lib_arm/config.mk
rename to arch/arm/config.mk
index 8dd4dccf368c0d75b6a9ce8f763f6e9afc8e6c65..e10dafca583ce2b2294626b282804262fd29ae67 100644 (file)
--- a/lib_arm/config.mk
+++ b/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.
 # 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
 endif
 endif
 LDSCRIPT := $(SRCTREE)/$(CPUDIR)/u-boot.lds

diff --git a/lib_arm/Makefile b/arch/arm/lib/Makefile
similarity index 100%
rename from lib_arm/Makefile
rename to arch/arm/lib/Makefile

diff --git a/lib_arm/_ashldi3.S b/arch/arm/lib/_ashldi3.S
similarity index 100%
rename from lib_arm/_ashldi3.S
rename to arch/arm/lib/_ashldi3.S

diff --git a/lib_arm/_ashrdi3.S b/arch/arm/lib/_ashrdi3.S
similarity index 100%
rename from lib_arm/_ashrdi3.S
rename to arch/arm/lib/_ashrdi3.S

diff --git a/lib_arm/_divsi3.S b/arch/arm/lib/_divsi3.S
similarity index 100%
rename from lib_arm/_divsi3.S
rename to arch/arm/lib/_divsi3.S

diff --git a/lib_arm/_lshrdi3.S b/arch/arm/lib/_lshrdi3.S
similarity index 100%
rename from lib_arm/_lshrdi3.S
rename to arch/arm/lib/_lshrdi3.S

diff --git a/lib_arm/_modsi3.S b/arch/arm/lib/_modsi3.S
similarity index 100%
rename from lib_arm/_modsi3.S
rename to arch/arm/lib/_modsi3.S

diff --git a/lib_arm/_udivsi3.S b/arch/arm/lib/_udivsi3.S
similarity index 100%
rename from lib_arm/_udivsi3.S
rename to arch/arm/lib/_udivsi3.S

diff --git a/lib_arm/_umodsi3.S b/arch/arm/lib/_umodsi3.S
similarity index 100%
rename from lib_arm/_umodsi3.S
rename to arch/arm/lib/_umodsi3.S

diff --git a/lib_arm/board.c b/arch/arm/lib/board.c
similarity index 100%
rename from lib_arm/board.c
rename to arch/arm/lib/board.c

diff --git a/lib_arm/bootm.c b/arch/arm/lib/bootm.c
similarity index 100%
rename from lib_arm/bootm.c
rename to arch/arm/lib/bootm.c

diff --git a/lib_arm/cache-cp15.c b/arch/arm/lib/cache-cp15.c
similarity index 100%
rename from lib_arm/cache-cp15.c
rename to arch/arm/lib/cache-cp15.c

diff --git a/lib_arm/cache.c b/arch/arm/lib/cache.c
similarity index 100%
rename from lib_arm/cache.c
rename to arch/arm/lib/cache.c

diff --git a/lib_arm/div0.c b/arch/arm/lib/div0.c
similarity index 100%
rename from lib_arm/div0.c
rename to arch/arm/lib/div0.c

diff --git a/lib_arm/eabi_compat.c b/arch/arm/lib/eabi_compat.c
similarity index 100%
rename from lib_arm/eabi_compat.c
rename to arch/arm/lib/eabi_compat.c

diff --git a/lib_arm/interrupts.c b/arch/arm/lib/interrupts.c
similarity index 100%
rename from lib_arm/interrupts.c
rename to arch/arm/lib/interrupts.c

diff --git a/lib_arm/reset.c b/arch/arm/lib/reset.c
similarity index 100%
rename from lib_arm/reset.c
rename to arch/arm/lib/reset.c

diff --git a/lib_avr32/config.mk b/arch/avr32/config.mk
similarity index 100%
rename from lib_avr32/config.mk
rename to arch/avr32/config.mk

diff --git a/lib_avr32/Makefile b/arch/avr32/lib/Makefile
similarity index 100%
rename from lib_avr32/Makefile
rename to arch/avr32/lib/Makefile

diff --git a/lib_avr32/board.c b/arch/avr32/lib/board.c
similarity index 100%
rename from lib_avr32/board.c
rename to arch/avr32/lib/board.c

diff --git a/lib_avr32/bootm.c b/arch/avr32/lib/bootm.c
similarity index 100%
rename from lib_avr32/bootm.c
rename to arch/avr32/lib/bootm.c

diff --git a/lib_avr32/interrupts.c b/arch/avr32/lib/interrupts.c
similarity index 100%
rename from lib_avr32/interrupts.c
rename to arch/avr32/lib/interrupts.c

diff --git a/lib_avr32/memset.S b/arch/avr32/lib/memset.S
similarity index 100%
rename from lib_avr32/memset.S
rename to arch/avr32/lib/memset.S

diff --git a/lib_blackfin/config.mk b/arch/blackfin/config.mk
similarity index 97%
rename from lib_blackfin/config.mk
rename to arch/blackfin/config.mk
index 3ecade9aa438a2be88a9de827d5e881e4a88f492..137834e7eed093b901dbf57178d483d95f1931f9 100644 (file)
--- a/lib_blackfin/config.mk
+++ b/arch/blackfin/config.mk
@@ -68,5 +68,5 @@ endif
 LDR_FLAGS += $(LDR_FLAGS-y)
 
 ifeq ($(wildcard $(TOPDIR)/board/$(BOARD)/u-boot.lds*),)
 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
 endif

diff --git a/lib_blackfin/.gitignore b/arch/blackfin/lib/.gitignore
similarity index 100%
rename from lib_blackfin/.gitignore
rename to arch/blackfin/lib/.gitignore

diff --git a/lib_blackfin/Makefile b/arch/blackfin/lib/Makefile
similarity index 100%
rename from lib_blackfin/Makefile
rename to arch/blackfin/lib/Makefile

diff --git a/lib_blackfin/__kgdb.S b/arch/blackfin/lib/__kgdb.S
similarity index 100%
rename from lib_blackfin/__kgdb.S
rename to arch/blackfin/lib/__kgdb.S

diff --git a/lib_blackfin/board.c b/arch/blackfin/lib/board.c
similarity index 100%
rename from lib_blackfin/board.c
rename to arch/blackfin/lib/board.c

diff --git a/lib_blackfin/boot.c b/arch/blackfin/lib/boot.c
similarity index 100%
rename from lib_blackfin/boot.c
rename to arch/blackfin/lib/boot.c

diff --git a/lib_blackfin/cache.c b/arch/blackfin/lib/cache.c
similarity index 100%
rename from lib_blackfin/cache.c
rename to arch/blackfin/lib/cache.c

diff --git a/lib_blackfin/clocks.c b/arch/blackfin/lib/clocks.c
similarity index 100%
rename from lib_blackfin/clocks.c
rename to arch/blackfin/lib/clocks.c

diff --git a/lib_blackfin/cmd_cache_dump.c b/arch/blackfin/lib/cmd_cache_dump.c
similarity index 100%
rename from lib_blackfin/cmd_cache_dump.c
rename to arch/blackfin/lib/cmd_cache_dump.c

diff --git a/lib_blackfin/ins.S b/arch/blackfin/lib/ins.S
similarity index 100%
rename from lib_blackfin/ins.S
rename to arch/blackfin/lib/ins.S

diff --git a/lib_blackfin/kgdb.c b/arch/blackfin/lib/kgdb.c
similarity index 100%
rename from lib_blackfin/kgdb.c
rename to arch/blackfin/lib/kgdb.c

diff --git a/lib_blackfin/kgdb.h b/arch/blackfin/lib/kgdb.h
similarity index 100%
rename from lib_blackfin/kgdb.h
rename to arch/blackfin/lib/kgdb.h

diff --git a/lib_blackfin/memcmp.S b/arch/blackfin/lib/memcmp.S
similarity index 100%
rename from lib_blackfin/memcmp.S
rename to arch/blackfin/lib/memcmp.S

diff --git a/lib_blackfin/memcpy.S b/arch/blackfin/lib/memcpy.S
similarity index 100%
rename from lib_blackfin/memcpy.S
rename to arch/blackfin/lib/memcpy.S

diff --git a/lib_blackfin/memmove.S b/arch/blackfin/lib/memmove.S
similarity index 100%
rename from lib_blackfin/memmove.S
rename to arch/blackfin/lib/memmove.S

diff --git a/lib_blackfin/memset.S b/arch/blackfin/lib/memset.S
similarity index 100%
rename from lib_blackfin/memset.S
rename to arch/blackfin/lib/memset.S

diff --git a/lib_blackfin/muldi3.c b/arch/blackfin/lib/muldi3.c
similarity index 100%
rename from lib_blackfin/muldi3.c
rename to arch/blackfin/lib/muldi3.c

diff --git a/lib_blackfin/outs.S b/arch/blackfin/lib/outs.S
similarity index 100%
rename from lib_blackfin/outs.S
rename to arch/blackfin/lib/outs.S

diff --git a/lib_blackfin/post.c b/arch/blackfin/lib/post.c
similarity index 100%
rename from lib_blackfin/post.c
rename to arch/blackfin/lib/post.c

diff --git a/lib_blackfin/string.c b/arch/blackfin/lib/string.c
similarity index 100%
rename from lib_blackfin/string.c
rename to arch/blackfin/lib/string.c

diff --git a/lib_blackfin/tests.c b/arch/blackfin/lib/tests.c
similarity index 100%
rename from lib_blackfin/tests.c
rename to arch/blackfin/lib/tests.c

diff --git a/lib_blackfin/u-boot.lds.S b/arch/blackfin/lib/u-boot.lds.S
similarity index 100%
rename from lib_blackfin/u-boot.lds.S
rename to arch/blackfin/lib/u-boot.lds.S

diff --git a/lib_i386/config.mk b/arch/i386/config.mk
similarity index 100%
rename from lib_i386/config.mk
rename to arch/i386/config.mk

diff --git a/lib_i386/Makefile b/arch/i386/lib/Makefile
similarity index 100%
rename from lib_i386/Makefile
rename to arch/i386/lib/Makefile

diff --git a/lib_i386/bios.S b/arch/i386/lib/bios.S
similarity index 100%
rename from lib_i386/bios.S
rename to arch/i386/lib/bios.S

diff --git a/lib_i386/bios.h b/arch/i386/lib/bios.h
similarity index 100%
rename from lib_i386/bios.h
rename to arch/i386/lib/bios.h

diff --git a/lib_i386/bios_pci.S b/arch/i386/lib/bios_pci.S
similarity index 100%
rename from lib_i386/bios_pci.S
rename to arch/i386/lib/bios_pci.S

diff --git a/lib_i386/bios_setup.c b/arch/i386/lib/bios_setup.c
similarity index 100%
rename from lib_i386/bios_setup.c
rename to arch/i386/lib/bios_setup.c

diff --git a/lib_i386/board.c b/arch/i386/lib/board.c
similarity index 100%
rename from lib_i386/board.c
rename to arch/i386/lib/board.c

diff --git a/lib_i386/bootm.c b/arch/i386/lib/bootm.c
similarity index 100%
rename from lib_i386/bootm.c
rename to arch/i386/lib/bootm.c

diff --git a/lib_i386/interrupts.c b/arch/i386/lib/interrupts.c
similarity index 100%
rename from lib_i386/interrupts.c
rename to arch/i386/lib/interrupts.c

diff --git a/lib_i386/pcat_interrupts.c b/arch/i386/lib/pcat_interrupts.c
similarity index 100%
rename from lib_i386/pcat_interrupts.c
rename to arch/i386/lib/pcat_interrupts.c

diff --git a/lib_i386/pcat_timer.c b/arch/i386/lib/pcat_timer.c
similarity index 100%
rename from lib_i386/pcat_timer.c
rename to arch/i386/lib/pcat_timer.c

diff --git a/lib_i386/pci.c b/arch/i386/lib/pci.c
similarity index 100%
rename from lib_i386/pci.c
rename to arch/i386/lib/pci.c

diff --git a/lib_i386/pci_type1.c b/arch/i386/lib/pci_type1.c
similarity index 100%
rename from lib_i386/pci_type1.c
rename to arch/i386/lib/pci_type1.c

diff --git a/lib_i386/realmode.c b/arch/i386/lib/realmode.c
similarity index 100%
rename from lib_i386/realmode.c
rename to arch/i386/lib/realmode.c

diff --git a/lib_i386/realmode_switch.S b/arch/i386/lib/realmode_switch.S
similarity index 100%
rename from lib_i386/realmode_switch.S
rename to arch/i386/lib/realmode_switch.S

diff --git a/lib_i386/timer.c b/arch/i386/lib/timer.c
similarity index 100%
rename from lib_i386/timer.c
rename to arch/i386/lib/timer.c

diff --git a/lib_i386/video.c b/arch/i386/lib/video.c
similarity index 100%
rename from lib_i386/video.c
rename to arch/i386/lib/video.c

diff --git a/lib_i386/video_bios.c b/arch/i386/lib/video_bios.c
similarity index 100%
rename from lib_i386/video_bios.c
rename to arch/i386/lib/video_bios.c

diff --git a/lib_i386/zimage.c b/arch/i386/lib/zimage.c
similarity index 100%
rename from lib_i386/zimage.c
rename to arch/i386/lib/zimage.c

diff --git a/lib_m68k/config.mk b/arch/m68k/config.mk
similarity index 100%
rename from lib_m68k/config.mk
rename to arch/m68k/config.mk

diff --git a/lib_m68k/Makefile b/arch/m68k/lib/Makefile
similarity index 100%
rename from lib_m68k/Makefile
rename to arch/m68k/lib/Makefile

diff --git a/lib_m68k/board.c b/arch/m68k/lib/board.c
similarity index 100%
rename from lib_m68k/board.c
rename to arch/m68k/lib/board.c

diff --git a/lib_m68k/bootm.c b/arch/m68k/lib/bootm.c
similarity index 100%
rename from lib_m68k/bootm.c
rename to arch/m68k/lib/bootm.c

diff --git a/lib_m68k/cache.c b/arch/m68k/lib/cache.c
similarity index 100%
rename from lib_m68k/cache.c
rename to arch/m68k/lib/cache.c

diff --git a/lib_m68k/interrupts.c b/arch/m68k/lib/interrupts.c
similarity index 100%
rename from lib_m68k/interrupts.c
rename to arch/m68k/lib/interrupts.c

diff --git a/lib_m68k/time.c b/arch/m68k/lib/time.c
similarity index 100%
rename from lib_m68k/time.c
rename to arch/m68k/lib/time.c

diff --git a/lib_m68k/traps.c b/arch/m68k/lib/traps.c
similarity index 100%
rename from lib_m68k/traps.c
rename to arch/m68k/lib/traps.c

diff --git a/lib_microblaze/config.mk b/arch/microblaze/config.mk
similarity index 100%
rename from lib_microblaze/config.mk
rename to arch/microblaze/config.mk

diff --git a/lib_microblaze/Makefile b/arch/microblaze/lib/Makefile
similarity index 100%
rename from lib_microblaze/Makefile
rename to arch/microblaze/lib/Makefile

diff --git a/lib_microblaze/board.c b/arch/microblaze/lib/board.c
similarity index 100%
rename from lib_microblaze/board.c
rename to arch/microblaze/lib/board.c

diff --git a/lib_microblaze/bootm.c b/arch/microblaze/lib/bootm.c
similarity index 100%
rename from lib_microblaze/bootm.c
rename to arch/microblaze/lib/bootm.c

diff --git a/lib_microblaze/cache.c b/arch/microblaze/lib/cache.c
similarity index 100%
rename from lib_microblaze/cache.c
rename to arch/microblaze/lib/cache.c

diff --git a/lib_microblaze/time.c b/arch/microblaze/lib/time.c
similarity index 100%
rename from lib_microblaze/time.c
rename to arch/microblaze/lib/time.c

diff --git a/lib_mips/config.mk b/arch/mips/config.mk
similarity index 100%
rename from lib_mips/config.mk
rename to arch/mips/config.mk

diff --git a/lib_mips/Makefile b/arch/mips/lib/Makefile
similarity index 100%
rename from lib_mips/Makefile
rename to arch/mips/lib/Makefile

diff --git a/lib_mips/board.c b/arch/mips/lib/board.c
similarity index 100%
rename from lib_mips/board.c
rename to arch/mips/lib/board.c

diff --git a/lib_mips/bootm.c b/arch/mips/lib/bootm.c
similarity index 100%
rename from lib_mips/bootm.c
rename to arch/mips/lib/bootm.c

diff --git a/lib_mips/bootm_qemu_mips.c b/arch/mips/lib/bootm_qemu_mips.c
similarity index 100%
rename from lib_mips/bootm_qemu_mips.c
rename to arch/mips/lib/bootm_qemu_mips.c

diff --git a/lib_mips/time.c b/arch/mips/lib/time.c
similarity index 100%
rename from lib_mips/time.c
rename to arch/mips/lib/time.c

diff --git a/lib_nios/config.mk b/arch/nios/config.mk
similarity index 100%
rename from lib_nios/config.mk
rename to arch/nios/config.mk

diff --git a/lib_nios/Makefile b/arch/nios/lib/Makefile
similarity index 100%
rename from lib_nios/Makefile
rename to arch/nios/lib/Makefile

diff --git a/lib_nios/board.c b/arch/nios/lib/board.c
similarity index 100%
rename from lib_nios/board.c
rename to arch/nios/lib/board.c

diff --git a/lib_nios/bootm.c b/arch/nios/lib/bootm.c
similarity index 100%
rename from lib_nios/bootm.c
rename to arch/nios/lib/bootm.c

diff --git a/lib_nios/cache.c b/arch/nios/lib/cache.c
similarity index 100%
rename from lib_nios/cache.c
rename to arch/nios/lib/cache.c

diff --git a/lib_nios/divmod.c b/arch/nios/lib/divmod.c
similarity index 100%
rename from lib_nios/divmod.c
rename to arch/nios/lib/divmod.c

diff --git a/lib_nios/math.h b/arch/nios/lib/math.h
similarity index 100%
rename from lib_nios/math.h
rename to arch/nios/lib/math.h

diff --git a/lib_nios/mult.c b/arch/nios/lib/mult.c
similarity index 100%
rename from lib_nios/mult.c
rename to arch/nios/lib/mult.c

diff --git a/lib_nios/time.c b/arch/nios/lib/time.c
similarity index 100%
rename from lib_nios/time.c
rename to arch/nios/lib/time.c

diff --git a/lib_nios2/config.mk b/arch/nios2/config.mk
similarity index 100%
rename from lib_nios2/config.mk
rename to arch/nios2/config.mk

diff --git a/lib_nios2/Makefile b/arch/nios2/lib/Makefile
similarity index 100%
rename from lib_nios2/Makefile
rename to arch/nios2/lib/Makefile

diff --git a/lib_nios2/board.c b/arch/nios2/lib/board.c
similarity index 100%
rename from lib_nios2/board.c
rename to arch/nios2/lib/board.c

diff --git a/lib_nios2/bootm.c b/arch/nios2/lib/bootm.c
similarity index 100%
rename from lib_nios2/bootm.c
rename to arch/nios2/lib/bootm.c

diff --git a/lib_nios2/cache.S b/arch/nios2/lib/cache.S
similarity index 100%
rename from lib_nios2/cache.S
rename to arch/nios2/lib/cache.S

diff --git a/lib_nios2/divmod.c b/arch/nios2/lib/divmod.c
similarity index 100%
rename from lib_nios2/divmod.c
rename to arch/nios2/lib/divmod.c

diff --git a/lib_nios2/math.h b/arch/nios2/lib/math.h
similarity index 100%
rename from lib_nios2/math.h
rename to arch/nios2/lib/math.h

diff --git a/lib_nios2/mult.c b/arch/nios2/lib/mult.c
similarity index 100%
rename from lib_nios2/mult.c
rename to arch/nios2/lib/mult.c

diff --git a/lib_nios2/time.c b/arch/nios2/lib/time.c
similarity index 100%
rename from lib_nios2/time.c
rename to arch/nios2/lib/time.c

diff --git a/lib_ppc/config.mk b/arch/ppc/config.mk
similarity index 100%
rename from lib_ppc/config.mk
rename to arch/ppc/config.mk

diff --git a/lib_ppc/Makefile b/arch/ppc/lib/Makefile
similarity index 100%
rename from lib_ppc/Makefile
rename to arch/ppc/lib/Makefile

diff --git a/lib_ppc/bat_rw.c b/arch/ppc/lib/bat_rw.c
similarity index 100%
rename from lib_ppc/bat_rw.c
rename to arch/ppc/lib/bat_rw.c

diff --git a/lib_ppc/board.c b/arch/ppc/lib/board.c
similarity index 100%
rename from lib_ppc/board.c
rename to arch/ppc/lib/board.c

diff --git a/lib_ppc/bootm.c b/arch/ppc/lib/bootm.c
similarity index 100%
rename from lib_ppc/bootm.c
rename to arch/ppc/lib/bootm.c

diff --git a/lib_ppc/cache.c b/arch/ppc/lib/cache.c
similarity index 100%
rename from lib_ppc/cache.c
rename to arch/ppc/lib/cache.c

diff --git a/lib_ppc/extable.c b/arch/ppc/lib/extable.c
similarity index 100%
rename from lib_ppc/extable.c
rename to arch/ppc/lib/extable.c

diff --git a/lib_ppc/interrupts.c b/arch/ppc/lib/interrupts.c
similarity index 100%
rename from lib_ppc/interrupts.c
rename to arch/ppc/lib/interrupts.c

diff --git a/lib_ppc/kgdb.c b/arch/ppc/lib/kgdb.c
similarity index 100%
rename from lib_ppc/kgdb.c
rename to arch/ppc/lib/kgdb.c

diff --git a/lib_ppc/ppccache.S b/arch/ppc/lib/ppccache.S
similarity index 100%
rename from lib_ppc/ppccache.S
rename to arch/ppc/lib/ppccache.S

diff --git a/lib_ppc/ppcstring.S b/arch/ppc/lib/ppcstring.S
similarity index 100%
rename from lib_ppc/ppcstring.S
rename to arch/ppc/lib/ppcstring.S

diff --git a/lib_ppc/reloc.S b/arch/ppc/lib/reloc.S
similarity index 100%
rename from lib_ppc/reloc.S
rename to arch/ppc/lib/reloc.S

diff --git a/lib_ppc/ticks.S b/arch/ppc/lib/ticks.S
similarity index 100%
rename from lib_ppc/ticks.S
rename to arch/ppc/lib/ticks.S

diff --git a/lib_ppc/time.c b/arch/ppc/lib/time.c
similarity index 100%
rename from lib_ppc/time.c
rename to arch/ppc/lib/time.c

diff --git a/lib_sh/config.mk b/arch/sh/config.mk
similarity index 100%
rename from lib_sh/config.mk
rename to arch/sh/config.mk

diff --git a/lib_sh/Makefile b/arch/sh/lib/Makefile
similarity index 100%
rename from lib_sh/Makefile
rename to arch/sh/lib/Makefile

diff --git a/lib_sh/board.c b/arch/sh/lib/board.c
similarity index 100%
rename from lib_sh/board.c
rename to arch/sh/lib/board.c

diff --git a/lib_sh/bootm.c b/arch/sh/lib/bootm.c
similarity index 100%
rename from lib_sh/bootm.c
rename to arch/sh/lib/bootm.c

diff --git a/lib_sh/time.c b/arch/sh/lib/time.c
similarity index 100%
rename from lib_sh/time.c
rename to arch/sh/lib/time.c

diff --git a/lib_sh/time_sh2.c b/arch/sh/lib/time_sh2.c
similarity index 100%
rename from lib_sh/time_sh2.c
rename to arch/sh/lib/time_sh2.c

diff --git a/lib_sparc/config.mk b/arch/sparc/config.mk
similarity index 100%
rename from lib_sparc/config.mk
rename to arch/sparc/config.mk

diff --git a/lib_sparc/Makefile b/arch/sparc/lib/Makefile
similarity index 100%
rename from lib_sparc/Makefile
rename to arch/sparc/lib/Makefile

diff --git a/lib_sparc/board.c b/arch/sparc/lib/board.c
similarity index 100%
rename from lib_sparc/board.c
rename to arch/sparc/lib/board.c

diff --git a/lib_sparc/bootm.c b/arch/sparc/lib/bootm.c
similarity index 100%
rename from lib_sparc/bootm.c
rename to arch/sparc/lib/bootm.c

diff --git a/lib_sparc/cache.c b/arch/sparc/lib/cache.c
similarity index 100%
rename from lib_sparc/cache.c
rename to arch/sparc/lib/cache.c

diff --git a/lib_sparc/interrupts.c b/arch/sparc/lib/interrupts.c
similarity index 100%
rename from lib_sparc/interrupts.c
rename to arch/sparc/lib/interrupts.c

diff --git a/lib_sparc/time.c b/arch/sparc/lib/time.c
similarity index 100%
rename from lib_sparc/time.c
rename to arch/sparc/lib/time.c

diff --git a/board/LEOX/elpt860/u-boot.lds b/board/LEOX/elpt860/u-boot.lds
index 3c44b3ef2956e313b80c0cb061f433b7e1d6c473..32778cacdaec336917d4e86fa627d489c7ca8d00 100644 (file)
--- a/board/LEOX/elpt860/u-boot.lds
+++ b/board/LEOX/elpt860/u-boot.lds
@@ -66,15 +66,15 @@ SECTIONS
 
     cpu/mpc8xx/start.o                 (.text)
     common/dlmalloc.o                  (.text)
 
     cpu/mpc8xx/start.o                 (.text)
     common/dlmalloc.o                  (.text)

-    lib_ppc/ppcstring.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_generic/vsprintf.o             (.text)
     lib_generic/crc32.o                        (.text)
     lib_generic/zlib.o                 (.text)
     lib_generic/string.o               (.text)

-    lib_ppc/cache.o                    (.text)
-    lib_ppc/extable.o                  (.text)
-    lib_ppc/time.o                     (.text)
-    lib_ppc/ticks.o                    (.text)
+    arch/ppc/lib/cache.o                       (.text)
+    arch/ppc/lib/extable.o                     (.text)
+    arch/ppc/lib/time.o                        (.text)
+    arch/ppc/lib/ticks.o                       (.text)

 
     . = env_offset;
     common/env_embedded.o              (.text)
 
     . = env_offset;
     common/env_embedded.o              (.text)

diff --git a/board/RPXClassic/u-boot.lds b/board/RPXClassic/u-boot.lds
index 47247ec8133cc8c7ccb60ee747369c73a9fe1963..c354ff82834991558b4be4547c51593a57b971ec 100644 (file)
--- a/board/RPXClassic/u-boot.lds
+++ b/board/RPXClassic/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/RPXlite/u-boot.lds b/board/RPXlite/u-boot.lds
index 47247ec8133cc8c7ccb60ee747369c73a9fe1963..c354ff82834991558b4be4547c51593a57b971ec 100644 (file)
--- a/board/RPXlite/u-boot.lds
+++ b/board/RPXlite/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/RPXlite_dw/u-boot.lds b/board/RPXlite_dw/u-boot.lds
index 7ae7be0c02c77b8ce91b59c80e569d5d41700d11..89aaffff33c97e6e652c39acece6c529f2e54138 100644 (file)
--- a/board/RPXlite_dw/u-boot.lds
+++ b/board/RPXlite_dw/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds
index f22b25fc3d027730a59dabd26a9215a3a05308a7..88644a4591fa8bca2f13038602e179035eb45b0e 100644 (file)
--- a/board/RRvision/u-boot.lds
+++ b/board/RRvision/u-boot.lds
@@ -58,12 +58,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

-    lib_ppc/cache.o            (.text)
-    lib_ppc/time.o             (.text)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)

 
     . = env_offset;
     common/env_embedded.o      (.ppcenv)
 
     . = env_offset;
     common/env_embedded.o      (.ppcenv)

diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds
index 836775f0feec6e8e26dae16012a3643b8d035dc0..1087167bae344d285e0cdc8d6ecc2e34ff5104e3 100644 (file)
--- a/board/actux1/u-boot.lds
+++ b/board/actux1/u-boot.lds
@@ -33,7 +33,7 @@ SECTIONS
                cpu/ixp/start.o(.text)
                lib_generic/string.o(.text)
                lib_generic/vsprintf.o(.text)
                cpu/ixp/start.o(.text)
                lib_generic/string.o(.text)
                lib_generic/vsprintf.o(.text)

-               lib_arm/board.o(.text)
+               arch/arm/lib/board.o(.text)

                common/dlmalloc.o(.text)
                cpu/ixp/cpu.o(.text)
                . = env_offset;
                common/dlmalloc.o(.text)
                cpu/ixp/cpu.o(.text)
                . = env_offset;

diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds
index 0752656b5973fa7085b3b62c6b180b2f1926c7ec..543af3050d1b43aabac7119e2ef1c7c63f174616 100644 (file)
--- a/board/actux2/u-boot.lds
+++ b/board/actux2/u-boot.lds
@@ -33,7 +33,7 @@ SECTIONS
                cpu/ixp/start.o(.text)
                lib_generic/string.o(.text)
                lib_generic/vsprintf.o(.text)
                cpu/ixp/start.o(.text)
                lib_generic/string.o(.text)
                lib_generic/vsprintf.o(.text)

-               lib_arm/board.o(.text)
+               arch/arm/lib/board.o(.text)

                common/dlmalloc.o(.text)
                cpu/ixp/cpu.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 a69e7db9ca20d75141ffa8302bb40875278ebf68..f63251dd9689505576c6015a41ace9e80aeb5e09 100644 (file)
--- a/board/actux3/u-boot.lds
+++ b/board/actux3/u-boot.lds
@@ -33,7 +33,7 @@ SECTIONS
                cpu/ixp/start.o (.text)
                lib_generic/string.o (.text)
                lib_generic/vsprintf.o (.text)
                cpu/ixp/start.o (.text)
                lib_generic/string.o (.text)
                lib_generic/vsprintf.o (.text)

-               lib_arm/board.o (.text)
+               arch/arm/lib/board.o (.text)

                common/dlmalloc.o (.text)
                cpu/ixp/cpu.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 707203d60f81b3342bf59aec5abf1c202d29993f..10308d598354db344bf914e8d1c1b813656cc44e 100644 (file)
--- a/board/amirix/ap1000/u-boot.lds
+++ b/board/amirix/ap1000/u-boot.lds
@@ -65,7 +65,7 @@ SECTIONS
     cpu/ppc4xx/speed.o (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)
     cpu/ppc4xx/speed.o (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)

-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)

     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/

diff --git a/board/astro/mcf5373l/u-boot.lds b/board/astro/mcf5373l/u-boot.lds
index a9a4e0a233ad5e08f949fb504927fc8637fb5f43..7fbe16f3481cc014bc3b628671ffe5216f7e8d14 100644 (file)
--- a/board/astro/mcf5373l/u-boot.lds
+++ b/board/astro/mcf5373l/u-boot.lds
@@ -56,8 +56,8 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf532x/start.o                (.text)
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf532x/start.o                (.text)

-    lib_m68k/traps.o           (.text)
-    lib_m68k/interrupts.o      (.text)
+    arch/m68k/lib/traps.o              (.text)
+    arch/m68k/lib/interrupts.o (.text)

     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 

diff --git a/board/c2mon/u-boot.lds b/board/c2mon/u-boot.lds
index 2d0efb31612e0fea52537b1d056cd6f0f9766b05..0571f025a1ee7d12079332302e204912f16c0ea5 100644 (file)
--- a/board/c2mon/u-boot.lds
+++ b/board/c2mon/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/cobra5272/u-boot.lds b/board/cobra5272/u-boot.lds
index 7e716bb09a6ed55c0833619848b6686968305c33..8989880202fd64698d49cf7a474fb67892572a9f 100644 (file)
--- a/board/cobra5272/u-boot.lds
+++ b/board/cobra5272/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
     cpu/mcf52x2/start.o                (.text)
     cpu/mcf52x2/cpu_init.o     (.text)
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
     cpu/mcf52x2/start.o                (.text)
     cpu/mcf52x2/cpu_init.o     (.text)

-    lib_m68k/traps.o           (.text)
+    arch/m68k/lib/traps.o              (.text)

     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/cray/L1/u-boot.lds.debug b/board/cray/L1/u-boot.lds.debug
index 970628d556e8fdba15828e260d057cda44f7a2de..40d2f78ead98192b41a448dae13402c3b5568c61 100644 (file)
--- a/board/cray/L1/u-boot.lds.debug
+++ b/board/cray/L1/u-boot.lds.debug
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)

-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)

 
     common/env_embedded.o(.text)
 
 
     common/env_embedded.o(.text)
 

diff --git a/board/emk/top860/u-boot.lds.debug b/board/emk/top860/u-boot.lds.debug
index bfe85134e5dc3b3b75b59e5807214450f886e52f..4e4943fe6d77ada6f13c528e1b2509a6166d62ef 100644 (file)
--- a/board/emk/top860/u-boot.lds.debug
+++ b/board/emk/top860/u-boot.lds.debug
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)

-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)

 
     . = env_offset;
     common/env_embedded.o(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

diff --git a/board/esd/tasreg/u-boot.lds b/board/esd/tasreg/u-boot.lds
index e3230b9f20a935d8553d38d5745e6dbb74c849fc..54e0169533e93c2987471631416dd5cee213e40c 100644 (file)
--- a/board/esd/tasreg/u-boot.lds
+++ b/board/esd/tasreg/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)

-    lib_m68k/traps.o           (.text)
+    arch/m68k/lib/traps.o              (.text)

     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/esteem192e/u-boot.lds b/board/esteem192e/u-boot.lds
index 3e4490ec492840eae97d62878ea49d5eed2c5d48..215a2c49ef8ed4ad8f6abd0e0c7cb176ae3c7c03 100644 (file)
--- a/board/esteem192e/u-boot.lds
+++ b/board/esteem192e/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/etx094/u-boot.lds.debug b/board/etx094/u-boot.lds.debug
index 1af61fb2b5afcad6b24212b0b7c9e0734371a42f..dd4dbfaa36484fe305a4c0b34708868399b2ecc5 100644 (file)
--- a/board/etx094/u-boot.lds.debug
+++ b/board/etx094/u-boot.lds.debug
@@ -62,8 +62,8 @@ SECTIONS
     cpu/mpc8xx/cpu_init.o      (.text)
     cpu/mpc8xx/speed.o (.text)
     cpu/mpc8xx/serial.o        (.text)
     cpu/mpc8xx/cpu_init.o      (.text)
     cpu/mpc8xx/speed.o (.text)
     cpu/mpc8xx/serial.o        (.text)

-    lib_ppc/extable.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/extable.o     (.text)
+    arch/ppc/lib/ppcstring.o   (.text)

     lib_generic/string.o       (.text)
     lib_generic/crc32.o                (.text)
     common/dlmalloc.o  (.text)
     lib_generic/string.o       (.text)
     lib_generic/crc32.o                (.text)
     common/dlmalloc.o  (.text)

diff --git a/board/fads/u-boot.lds.debug b/board/fads/u-boot.lds.debug
index 0a3b958fad657a6eb38149d7c43051db67701f8b..8d91aed3fe3856c3489081e61ca8834f97015a58 100644 (file)
--- a/board/fads/u-boot.lds.debug
+++ b/board/fads/u-boot.lds.debug
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)

-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)

 
     . = env_offset;
     common/env_embedded.o(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

diff --git a/board/freescale/m5208evbe/u-boot.lds b/board/freescale/m5208evbe/u-boot.lds
index bc9d5cd0d6e9bd142472f598baedc82e2239fd70..3877527d873d2dda5ec252383c55e34c0732054d 100644 (file)
--- a/board/freescale/m5208evbe/u-boot.lds
+++ b/board/freescale/m5208evbe/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mcf52x2/start.o                (.text)
     cpu/mcf52x2/libmcf52x2.a   (.text)
 
     cpu/mcf52x2/start.o                (.text)
     cpu/mcf52x2/libmcf52x2.a   (.text)

-    lib_m68k/libm68k.a         (.text)
+    arch/m68k/lib/libm68k.a            (.text)

     common/dlmalloc.o          (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/dlmalloc.o          (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;

diff --git a/board/freescale/m52277evb/u-boot.spa b/board/freescale/m52277evb/u-boot.spa
index 7ae70d455fa15283804fda84f7a01e57ad1321d2..23d57107eed86bc5e5b0f509cbdc39d4deaf3c03 100644 (file)
--- a/board/freescale/m52277evb/u-boot.spa
+++ b/board/freescale/m52277evb/u-boot.spa
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mcf5227x/start.o       (.text)
     cpu/mcf5227x/libmcf5227x.a (.text)
 
     cpu/mcf5227x/start.o       (.text)
     cpu/mcf5227x/libmcf5227x.a (.text)

-    lib_m68k/libm68k.a         (.text)
+    arch/m68k/lib/libm68k.a            (.text)

     lib_generic/libgeneric.a   (.text)
     common/cmd_mem.o           (.text)
     common/main.o              (.text)
     lib_generic/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 c134884375dedb224d784024efdf46bbc1a6c550..940da1467c2a48b835fdb7259bde0e72dd6c9062 100644 (file)
--- a/board/freescale/m5235evb/u-boot.16
+++ b/board/freescale/m5235evb/u-boot.16
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mcf523x/start.o                (.text)
     cpu/mcf523x/cpu_init.o     (.text)
 
     cpu/mcf523x/start.o                (.text)
     cpu/mcf523x/cpu_init.o     (.text)

-    lib_m68k/traps.o           (.text)
-    lib_m68k/interrupts.o      (.text)
+    arch/m68k/lib/traps.o              (.text)
+    arch/m68k/lib/interrupts.o (.text)

     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 

diff --git a/board/freescale/m5235evb/u-boot.32 b/board/freescale/m5235evb/u-boot.32
index 53c337df893e3efe580f99ff89514fa0b24ec261..50045e1a45b19f66230295a40e1b6f2968e201ec 100644 (file)
--- a/board/freescale/m5235evb/u-boot.32
+++ b/board/freescale/m5235evb/u-boot.32
@@ -60,7 +60,7 @@ SECTIONS
     cpu/mcf523x/cpu_init.o     (.text)
     cpu/mcf523x/interrupts.o   (.text)
     cpu/mcf523x/speed.o                (.text)
     cpu/mcf523x/cpu_init.o     (.text)
     cpu/mcf523x/interrupts.o   (.text)
     cpu/mcf523x/speed.o                (.text)

-    lib_m68k/libm68k.a         (.text)
+    arch/m68k/lib/libm68k.a            (.text)

     common/dlmalloc.o          (.text)
     common/cmd_bootm.o         (.text)
     common/cmd_flash.o         (.text)
     common/dlmalloc.o          (.text)
     common/cmd_bootm.o         (.text)
     common/cmd_flash.o         (.text)

diff --git a/board/freescale/m5249evb/u-boot.lds b/board/freescale/m5249evb/u-boot.lds
index e3230b9f20a935d8553d38d5745e6dbb74c849fc..54e0169533e93c2987471631416dd5cee213e40c 100644 (file)
--- a/board/freescale/m5249evb/u-boot.lds
+++ b/board/freescale/m5249evb/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)

-    lib_m68k/traps.o           (.text)
+    arch/m68k/lib/traps.o              (.text)

     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/freescale/m5253demo/u-boot.lds b/board/freescale/m5253demo/u-boot.lds
index 6cb5ee05f30a53d23e9dd24d25ae3f50a7211a19..e53e67de90941a82d79441e02fcbe474488c975f 100644 (file)
--- a/board/freescale/m5253demo/u-boot.lds
+++ b/board/freescale/m5253demo/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)

-    lib_m68k/traps.o           (.text)
+    arch/m68k/lib/traps.o              (.text)

     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/freescale/m5253evbe/u-boot.lds b/board/freescale/m5253evbe/u-boot.lds
index 132fccf1046a7536cf3d834d82fdb32e8e5962b5..7f4dc271439f79db7e15f65f9f802cd6cae00d52 100644 (file)
--- a/board/freescale/m5253evbe/u-boot.lds
+++ b/board/freescale/m5253evbe/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)

-    lib_m68k/traps.o           (.text)
+    arch/m68k/lib/traps.o              (.text)

     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/freescale/m5271evb/u-boot.lds b/board/freescale/m5271evb/u-boot.lds
index 00c1f2a52e09ec1f4ed1cbd3dcfb2e62499459de..713b18a95b42d63c719406c49e6d95581939786b 100644 (file)
--- a/board/freescale/m5271evb/u-boot.lds
+++ b/board/freescale/m5271evb/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)

-    lib_m68k/traps.o           (.text)
+    arch/m68k/lib/traps.o              (.text)

     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/freescale/m5272c3/u-boot.lds b/board/freescale/m5272c3/u-boot.lds
index 9d20b228cb9293c02465fd4123db757a2c13a45e..446ec1be4f2a2acb4d7ea115992cc1895fa81c87 100644 (file)
--- a/board/freescale/m5272c3/u-boot.lds
+++ b/board/freescale/m5272c3/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)

-    lib_m68k/traps.o           (.text)
+    arch/m68k/lib/traps.o              (.text)

     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/freescale/m53017evb/u-boot.lds b/board/freescale/m53017evb/u-boot.lds
index c79d06c64a4c336f883f18f215453e040cd1e7f2..fe0e3141f97ea95954d2b5b0d1c9aa74a49c9845 100644 (file)
--- a/board/freescale/m53017evb/u-boot.lds
+++ b/board/freescale/m53017evb/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mcf532x/start.o                (.text)
     cpu/mcf532x/libmcf532x.a   (.text)
 
     cpu/mcf532x/start.o                (.text)
     cpu/mcf532x/libmcf532x.a   (.text)

-    lib_m68k/libm68k.a         (.text)
+    arch/m68k/lib/libm68k.a            (.text)

     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 

diff --git a/board/freescale/m5329evb/u-boot.lds b/board/freescale/m5329evb/u-boot.lds
index af310988ff85e966e2b1d2f2117ebd415a5cb664..0ed87ff30c4ef033add66271508eb3238f818065 100644 (file)
--- a/board/freescale/m5329evb/u-boot.lds
+++ b/board/freescale/m5329evb/u-boot.lds
@@ -56,8 +56,8 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf532x/start.o                (.text)
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf532x/start.o                (.text)

-    lib_m68k/traps.o           (.text)
-    lib_m68k/interrupts.o      (.text)
+    arch/m68k/lib/traps.o              (.text)
+    arch/m68k/lib/interrupts.o (.text)

     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 

diff --git a/board/freescale/m5373evb/u-boot.lds b/board/freescale/m5373evb/u-boot.lds
index dff74b65430890e0ed6b29e6e9551ee2ab4aa698..605452b70723e08b723113acfe91c03a92e7cc2c 100644 (file)
--- a/board/freescale/m5373evb/u-boot.lds
+++ b/board/freescale/m5373evb/u-boot.lds
@@ -56,8 +56,8 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf532x/start.o                (.text)
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf532x/start.o                (.text)

-    lib_m68k/traps.o           (.text)
-    lib_m68k/interrupts.o      (.text)
+    arch/m68k/lib/traps.o              (.text)
+    arch/m68k/lib/interrupts.o (.text)

     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 

diff --git a/board/freescale/m54451evb/u-boot.spa b/board/freescale/m54451evb/u-boot.spa
index d8caefad6498fba33a17d8e43aa9da862f167819..569518b895b61e327b2bf94d986ad9a933731f8a 100644 (file)
--- a/board/freescale/m54451evb/u-boot.spa
+++ b/board/freescale/m54451evb/u-boot.spa
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mcf5445x/start.o               (.text)
     cpu/mcf5445x/libmcf5445x.a (.text)
 
     cpu/mcf5445x/start.o               (.text)
     cpu/mcf5445x/libmcf5445x.a (.text)

-    lib_m68k/libm68k.a         (.text)
+    arch/m68k/lib/libm68k.a            (.text)

     common/cmd_flash.o         (.text)
     common/dlmalloc.o          (.text)
     common/main.o              (.text)
     common/cmd_flash.o         (.text)
     common/dlmalloc.o          (.text)
     common/main.o              (.text)

diff --git a/board/freescale/m54451evb/u-boot.stm b/board/freescale/m54451evb/u-boot.stm
index e9eac67b90ed074977434d759c05976448aa30cd..1b06b12b96d1d5005715bf00f5e979ebcb2f7596 100644 (file)
--- a/board/freescale/m54451evb/u-boot.stm
+++ b/board/freescale/m54451evb/u-boot.stm
@@ -61,7 +61,7 @@ SECTIONS
     cpu/mcf5445x/dspi.o                        (.text)
     cpu/mcf5445x/interrupt.o           (.text)
     cpu/mcf5445x/speed.o               (.text)
     cpu/mcf5445x/dspi.o                        (.text)
     cpu/mcf5445x/interrupt.o           (.text)
     cpu/mcf5445x/speed.o               (.text)

-    lib_m68k/board.o                   (.text)
+    arch/m68k/lib/board.o                      (.text)

     common/serial.o                    (.text)
     common/console.o                   (.text)
     lib_generic/display_options.o      (.text)
     common/serial.o                    (.text)
     common/console.o                   (.text)
     lib_generic/display_options.o      (.text)

diff --git a/board/freescale/m54455evb/u-boot.atm b/board/freescale/m54455evb/u-boot.atm
index 08e184c1e66cbcdffa69ae0ee43f274bf22d0c4c..c48dd7522924f56fbc01679c5bf1c27db7c9de2b 100644 (file)
--- a/board/freescale/m54455evb/u-boot.atm
+++ b/board/freescale/m54455evb/u-boot.atm
@@ -56,8 +56,8 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf5445x/start.o               (.text)
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf5445x/start.o               (.text)

-    lib_m68k/traps.o           (.text)
-    lib_m68k/interrupts.o      (.text)
+    arch/m68k/lib/traps.o              (.text)
+    arch/m68k/lib/interrupts.o (.text)

     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 

diff --git a/board/freescale/m54455evb/u-boot.int b/board/freescale/m54455evb/u-boot.int
index 4d504a22f1ea5835c4efb632f4dd9ac51e19ea78..ef0717426ad7e681b147ac39d755de241ad7439c 100644 (file)
--- a/board/freescale/m54455evb/u-boot.int
+++ b/board/freescale/m54455evb/u-boot.int
@@ -56,8 +56,8 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf5445x/start.o               (.text)
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf5445x/start.o               (.text)

-    lib_m68k/traps.o           (.text)
-    lib_m68k/interrupts.o      (.text)
+    arch/m68k/lib/traps.o              (.text)
+    arch/m68k/lib/interrupts.o (.text)

     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 

diff --git a/board/freescale/m547xevb/u-boot.lds b/board/freescale/m547xevb/u-boot.lds
index a3014bd104f0912a3a0d980ff2791b6fc5a3185a..5f28a10baad3863c2b964b88c57279d79340a427 100644 (file)
--- a/board/freescale/m547xevb/u-boot.lds
+++ b/board/freescale/m547xevb/u-boot.lds
@@ -56,8 +56,8 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf547x_8x/start.o             (.text)
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf547x_8x/start.o             (.text)

-    lib_m68k/traps.o           (.text)
-    lib_m68k/interrupts.o      (.text)
+    arch/m68k/lib/traps.o              (.text)
+    arch/m68k/lib/interrupts.o (.text)

     common/dlmalloc.o          (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/dlmalloc.o          (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;

diff --git a/board/freescale/m548xevb/u-boot.lds b/board/freescale/m548xevb/u-boot.lds
index a3014bd104f0912a3a0d980ff2791b6fc5a3185a..5f28a10baad3863c2b964b88c57279d79340a427 100644 (file)
--- a/board/freescale/m548xevb/u-boot.lds
+++ b/board/freescale/m548xevb/u-boot.lds
@@ -56,8 +56,8 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf547x_8x/start.o             (.text)
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf547x_8x/start.o             (.text)

-    lib_m68k/traps.o           (.text)
-    lib_m68k/interrupts.o      (.text)
+    arch/m68k/lib/traps.o              (.text)
+    arch/m68k/lib/interrupts.o (.text)

     common/dlmalloc.o          (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/dlmalloc.o          (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;

diff --git a/board/freescale/mpc7448hpc2/tsi108_init.c b/board/freescale/mpc7448hpc2/tsi108_init.c
index 74bb564ed9d1dc8f3770f7f689c438415187b2af..c6a3ade2c37a1fb8cfcf90a61b190238ecd93a71 100644 (file)
--- a/board/freescale/mpc7448hpc2/tsi108_init.c
+++ b/board/freescale/mpc7448hpc2/tsi108_init.c
@@ -323,7 +323,7 @@ int board_early_init_r (void)
         * We will over-ride the env_init called in board_init_f
         * This is really a work-around because, the HLP bank 1
         * where NVRAM resides is not visible during board_init_f
         * We will over-ride the env_init called in board_init_f
         * This is really a work-around because, the HLP bank 1
         * where NVRAM resides is not visible during board_init_f

-        * (lib_ppc/board.c)
+        * (arch/ppc/lib/board.c)

         * Alternatively, we could use the I2C EEPROM at start-up to configure
         * and enable all HLP banks and not just HLP 0 as is being done for
         * Taiga Rev. 2.
         * Alternatively, we could use the I2C EEPROM at start-up to configure
         * and enable all HLP banks and not just HLP 0 as is being done for
         * Taiga Rev. 2.

diff --git a/board/freescale/mpc8610hpcd/u-boot.lds b/board/freescale/mpc8610hpcd/u-boot.lds
index b573807fe92352dbc32bd85b4b35e9f1695d38d3..2ad0f0e6a9701a520d8bcc4794bd26f3f1abb59d 100644 (file)
--- a/board/freescale/mpc8610hpcd/u-boot.lds
+++ b/board/freescale/mpc8610hpcd/u-boot.lds
@@ -58,7 +58,7 @@ SECTIONS
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
     lib_generic/crc32.o (.text)
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
     lib_generic/crc32.o (.text)

-    lib_ppc/extable.o (.text)
+    arch/ppc/lib/extable.o (.text)

     lib_generic/zlib.o (.text)
     *(.text)
     *(.got1)
     lib_generic/zlib.o (.text)
     *(.text)
     *(.got1)

diff --git a/board/freescale/mpc8641hpcn/u-boot.lds b/board/freescale/mpc8641hpcn/u-boot.lds
index 2b98b5a9cc76e53d25ebc99ee906209b9ca2f0a9..796828a37c66fc6156d0d257feccc1ba0cefb6a8 100644 (file)
--- a/board/freescale/mpc8641hpcn/u-boot.lds
+++ b/board/freescale/mpc8641hpcn/u-boot.lds
@@ -58,7 +58,7 @@ SECTIONS
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
     lib_generic/crc32.o (.text)
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
     lib_generic/crc32.o (.text)

-    lib_ppc/extable.o (.text)
+    arch/ppc/lib/extable.o (.text)

     lib_generic/zlib.o (.text)
     drivers/bios_emulator/atibios.o (.text)
     *(.text)
     lib_generic/zlib.o (.text)
     drivers/bios_emulator/atibios.o (.text)
     *(.text)

diff --git a/board/freescale/mx31ads/u-boot.lds b/board/freescale/mx31ads/u-boot.lds
index 3182aa675e1c101e67e760db87027f13e4fe4d51..6f5bda4572110d9ac3adabf82afc769e78da76fa 100644 (file)
--- a/board/freescale/mx31ads/u-boot.lds
+++ b/board/freescale/mx31ads/u-boot.lds
@@ -39,7 +39,7 @@ SECTIONS
 
          cpu/arm1136/start.o                   (.text)
          board/freescale/mx31ads/libmx31ads.a  (.text)
 
          cpu/arm1136/start.o                   (.text)
          board/freescale/mx31ads/libmx31ads.a  (.text)

-         lib_arm/libarm.a                      (.text)
+         arch/arm/lib/libarm.a                 (.text)

          net/libnet.a                          (.text)
          drivers/mtd/libmtd.a                  (.text)
 
          net/libnet.a                          (.text)
          drivers/mtd/libmtd.a                  (.text)
 

diff --git a/board/genietv/u-boot.lds b/board/genietv/u-boot.lds
index 716efcdd0ba47be755e055a5489b79c09c842f7c..9fc71a2c5e20b8d7811e23ec8a80b28294bfdf7c 100644 (file)
--- a/board/genietv/u-boot.lds
+++ b/board/genietv/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/genietv/u-boot.lds.debug b/board/genietv/u-boot.lds.debug
index 3568e6de691f626be9549de6b1611d359f5f7fb6..9bb2c58f7229d25aa8de1061204529781f6335e4 100644 (file)
--- a/board/genietv/u-boot.lds.debug
+++ b/board/genietv/u-boot.lds.debug
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds
index 7b74cb7d5f60c45655d50b790ebf551c3ecdb32d..1252baf41c4a2dec6f2d9b6394e0e22350b59b6c 100644 (file)
--- a/board/hermes/u-boot.lds
+++ b/board/hermes/u-boot.lds
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     common/dlmalloc.o          (.text)
     cpu/mpc8xx/interrupts.o    (.text)
     cpu/mpc8xx/start.o         (.text)
     common/dlmalloc.o          (.text)
     cpu/mpc8xx/interrupts.o    (.text)

-    lib_ppc/time.o             (.text)
-    lib_ppc/ticks.o            (.text)
-    lib_ppc/cache.o            (.text)
+    arch/ppc/lib/time.o                (.text)
+    arch/ppc/lib/ticks.o               (.text)
+    arch/ppc/lib/cache.o               (.text)

     lib_generic/crc32.o                (.text)
     . = env_offset;
     common/env_embedded.o(.text)
     lib_generic/crc32.o                (.text)
     . = env_offset;
     common/env_embedded.o(.text)

diff --git a/board/hermes/u-boot.lds.debug b/board/hermes/u-boot.lds.debug
index 38012069319476ed6756e2615bafe5aca17f4949..dc810beaec789ca87e2206b0ff5e1b84e6f3a5f5 100644 (file)
--- a/board/hermes/u-boot.lds.debug
+++ b/board/hermes/u-boot.lds.debug
@@ -56,10 +56,10 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mpc8xx/start.o (.text)
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mpc8xx/start.o (.text)

-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)

     cpu/mpc8xx/interrupts.o (.text)
     cpu/mpc8xx/interrupts.o (.text)

-    lib_ppc/time.o             (.text)
-    lib_ppc/ticks.o            (.text)
+    arch/ppc/lib/time.o                (.text)
+    arch/ppc/lib/ticks.o               (.text)

     . = env_offset;
     common/env_embedded.o(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
 

diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds
index 52d66a2df306dc56c05284ba5b965be178889bf4..cc32b4462e01847aa2cdf7c0fbe62676f5584d0b 100644 (file)
--- a/board/hymod/u-boot.lds
+++ b/board/hymod/u-boot.lds
@@ -58,7 +58,7 @@ SECTIONS
     cpu/mpc8260/start.o        (.text)
 /*
     common/dlmalloc.o  (.text)
     cpu/mpc8260/start.o        (.text)
 /*
     common/dlmalloc.o  (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/icu862/u-boot.lds b/board/icu862/u-boot.lds
index b43be81b6906f1115535ffaa367a858146086b25..b614262b882e8068ea65d557883b0d9d2588416a 100644 (file)
--- a/board/icu862/u-boot.lds
+++ b/board/icu862/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
 /*
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
 /*
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/icu862/u-boot.lds.debug b/board/icu862/u-boot.lds.debug
index 653e0be45cef70bd23bc54046cbab4e3656a8702..919eb2194d4127cbbfe6189390f4fab72925dee7 100644 (file)
--- a/board/icu862/u-boot.lds.debug
+++ b/board/icu862/u-boot.lds.debug
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)

-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)

 
     . = env_offset;
     common/env_embedded.o(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

diff --git a/board/idmr/u-boot.lds b/board/idmr/u-boot.lds
index 00c1f2a52e09ec1f4ed1cbd3dcfb2e62499459de..713b18a95b42d63c719406c49e6d95581939786b 100644 (file)
--- a/board/idmr/u-boot.lds
+++ b/board/idmr/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)

-    lib_m68k/traps.o           (.text)
+    arch/m68k/lib/traps.o              (.text)

     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/ip860/u-boot.lds b/board/ip860/u-boot.lds
index a786bf23e1083de967df0e4be9675cfb3a95a814..bbc7139e532025a2bbe4aa6dde4460a8d9bc4ed1 100644 (file)
--- a/board/ip860/u-boot.lds
+++ b/board/ip860/u-boot.lds
@@ -57,10 +57,10 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)

-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)

     cpu/mpc8xx/interrupts.o (.text)
     cpu/mpc8xx/interrupts.o (.text)

-    lib_ppc/time.o             (.text)
-    lib_ppc/ticks.o            (.text)
+    arch/ppc/lib/time.o                (.text)
+    arch/ppc/lib/ticks.o               (.text)

 /**
     . = env_offset;
     common/env_embedded.o(.text)
 /**
     . = env_offset;
     common/env_embedded.o(.text)

diff --git a/board/ip860/u-boot.lds.debug b/board/ip860/u-boot.lds.debug
index dc2f6e12f5e746d103f12e512698075f8bd5b579..fc8fe6cec2b571e93ff8c11cde1e8601cd7fe4c1 100644 (file)
--- a/board/ip860/u-boot.lds.debug
+++ b/board/ip860/u-boot.lds.debug
@@ -56,10 +56,10 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mpc8xx/start.o (.text)
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mpc8xx/start.o (.text)

-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)

     cpu/mpc8xx/interrupts.o (.text)
     cpu/mpc8xx/interrupts.o (.text)

-    lib_ppc/time.o             (.text)
-    lib_ppc/ticks.o            (.text)
+    arch/ppc/lib/time.o                (.text)
+    arch/ppc/lib/ticks.o               (.text)

 /**
     . = env_offset;
     common/env_embedded.o(.text)
 /**
     . = env_offset;
     common/env_embedded.o(.text)

diff --git a/board/ivm/u-boot.lds.debug b/board/ivm/u-boot.lds.debug
index b5206c50fd90dee6e9d5249b67827ea204a41b52..17965a05cc2c76f3212753986cfc69e1d6444a76 100644 (file)
--- a/board/ivm/u-boot.lds.debug
+++ b/board/ivm/u-boot.lds.debug
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)

-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)

 
     . = env_offset;
     common/env_embedded.o(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

diff --git a/board/jse/jse.c b/board/jse/jse.c
index 1849ca47d77f01f902841ac7345c509429d7cc89..e4c7b9dd94a54e98bbde5cd65322737b6e5428ae 100644 (file)
--- a/board/jse/jse.c
+++ b/board/jse/jse.c
@@ -26,7 +26,7 @@
 
 /*
  * This function is run very early, out of flash, and before devices are
 
 /*
  * This function is run very early, out of flash, and before devices are

- * initialized. It is called by lib_ppc/board.c:board_init_f by virtue
+ * initialized. It is called by arch/ppc/lib/board.c:board_init_f by virtue

  * of being in the init_sequence array.
  *
  * The SDRAM has been initialized already -- start.S:start called
  * of being in the init_sequence array.
  *
  * The SDRAM has been initialized already -- start.S:start called


@@ -85,7 +85,7 @@ int board_pre_init (void)
 #endif
 
 /*
 #endif
 
 /*

- * This function is also called by lib_ppc/board.c:board_init_f (it is
+ * This function is also called by arch/ppc/lib/board.c:board_init_f (it is

  * also in the init_sequence array) but later. Many more things are
  * configured, but we are still running from flash.
  */
  * also in the init_sequence array) but later. Many more things are
  * configured, but we are still running from flash.
  */


@@ -149,7 +149,7 @@ int checkboard (void)
 /* **** No more functions called by board_init_f. **** */
 
 /*
 /* **** No more functions called by board_init_f. **** */
 
 /*

- * This function is called by lib_ppc/board.c:board_init_r. At this
+ * This function is called by arch/ppc/lib/board.c:board_init_r. At this

  * point, basic setup is done, U-Boot has been moved into SDRAM and
  * PCI has been set up. From here we done late setup.
  */
  * point, basic setup is done, U-Boot has been moved into SDRAM and
  * PCI has been set up. From here we done late setup.
  */

diff --git a/board/jse/sdram.c b/board/jse/sdram.c
index 88fdd84130f9159d03f267ffd76f5ffe7bdd5ae8..a12ebde2367ce81c1e616a7a54c396876caaa45c 100644 (file)
--- a/board/jse/sdram.c
+++ b/board/jse/sdram.c
@@ -27,7 +27,7 @@
 /*
  * this is even after checkboard. It returns the size of the SDRAM
  * that we have installed. This function is called by board_init_f
 /*
  * this is even after checkboard. It returns the size of the SDRAM
  * that we have installed. This function is called by board_init_f

- * in lib_ppc/board.c to initialize the memory and return what I
+ * in arch/ppc/lib/board.c to initialize the memory and return what I

  * found.
  */
 phys_size_t initdram (int board_type)
  * found.
  */
 phys_size_t initdram (int board_type)

diff --git a/board/keymile/km8xx/u-boot.lds b/board/keymile/km8xx/u-boot.lds
index a8057f225bf003517e86e66457cc43db402a14ea..8b6305a55e60a7b6822734d964d9e6367c72632d 100644 (file)
--- a/board/keymile/km8xx/u-boot.lds
+++ b/board/keymile/km8xx/u-boot.lds
@@ -58,12 +58,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

-    lib_ppc/cache.o            (.text)
-    lib_ppc/time.o             (.text)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)

 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.ppcenv)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.ppcenv)

diff --git a/board/kup/kup4k/u-boot.lds b/board/kup/kup4k/u-boot.lds
index 79b886af2168c18df2844917eaf2ede40753523c..8e4faa15b1bdf56dc784fb17338d8ed6b337bbd1 100644 (file)
--- a/board/kup/kup4k/u-boot.lds
+++ b/board/kup/kup4k/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
 /*
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
 /*
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/kup/kup4x/u-boot.lds b/board/kup/kup4x/u-boot.lds
index 79b886af2168c18df2844917eaf2ede40753523c..8e4faa15b1bdf56dc784fb17338d8ed6b337bbd1 100644 (file)
--- a/board/kup/kup4x/u-boot.lds
+++ b/board/kup/kup4x/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
 /*
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
 /*
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/lantec/u-boot.lds b/board/lantec/u-boot.lds
index 854ed689322a74e368a687b24552f2e30060bbe5..814a7a69d79d53e21de57b60db1bd2ce261f1009 100644 (file)
--- a/board/lantec/u-boot.lds
+++ b/board/lantec/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/lwmon/u-boot.lds.debug b/board/lwmon/u-boot.lds.debug
index 987c4ddb9ba65db57fb967d35fa48feb804a98cb..49f897213a6fe4c17e57898122448f73347ee6ea 100644 (file)
--- a/board/lwmon/u-boot.lds.debug
+++ b/board/lwmon/u-boot.lds.debug
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)

-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)

 
     . = env_offset;
     common/env_embedded.o(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

diff --git a/board/mbx8xx/u-boot.lds.debug b/board/mbx8xx/u-boot.lds.debug
index 0a3b958fad657a6eb38149d7c43051db67701f8b..8d91aed3fe3856c3489081e61ca8834f97015a58 100644 (file)
--- a/board/mbx8xx/u-boot.lds.debug
+++ b/board/mbx8xx/u-boot.lds.debug
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)

-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)

 
     . = env_offset;
     common/env_embedded.o(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

diff --git a/board/ml2/u-boot.lds b/board/ml2/u-boot.lds
index 8fea3be41b09201ac3ae5699b52666b733c9c9a1..0083a211d3d748e54176e35b54199c6fc1d6338a 100644 (file)
--- a/board/ml2/u-boot.lds
+++ b/board/ml2/u-boot.lds
@@ -65,7 +65,7 @@ SECTIONS
     cpu/ppc4xx/speed.o (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)
     cpu/ppc4xx/speed.o (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)

-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)

     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/

diff --git a/board/ml2/u-boot.lds.debug b/board/ml2/u-boot.lds.debug
index 970628d556e8fdba15828e260d057cda44f7a2de..40d2f78ead98192b41a448dae13402c3b5568c61 100644 (file)
--- a/board/ml2/u-boot.lds.debug
+++ b/board/ml2/u-boot.lds.debug
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)

-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)

 
     common/env_embedded.o(.text)
 
 
     common/env_embedded.o(.text)
 

diff --git a/board/mousse/u-boot.lds b/board/mousse/u-boot.lds
index 5100542e733592cb6a585414a9f315444d7ffddb..c92a2abe2c722904278d74d3a761e8cb802a2e70 100644 (file)
--- a/board/mousse/u-boot.lds
+++ b/board/mousse/u-boot.lds
@@ -53,8 +53,8 @@ SECTIONS
   .text      :
   {
     cpu/mpc824x/start.o                (.text)
   .text      :
   {
     cpu/mpc824x/start.o                (.text)

-    lib_ppc/board.o            (.text)
-    lib_ppc/ppcstring.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_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/mousse/u-boot.lds.rom b/board/mousse/u-boot.lds.rom
index f79c39f71617d5c72a447433bab6d70df7987e88..9750fc5f1901071880bb401c818fe7b831fec71c 100644 (file)
--- a/board/mousse/u-boot.lds.rom
+++ b/board/mousse/u-boot.lds.rom
@@ -54,7 +54,7 @@ SECTIONS
   {
     cpu/mpc824x/start.o        (.text)
         common/board.o (.text)
   {
     cpu/mpc824x/start.o        (.text)
         common/board.o (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/mpl/pip405/u-boot.lds.debug b/board/mpl/pip405/u-boot.lds.debug
index 970628d556e8fdba15828e260d057cda44f7a2de..40d2f78ead98192b41a448dae13402c3b5568c61 100644 (file)
--- a/board/mpl/pip405/u-boot.lds.debug
+++ b/board/mpl/pip405/u-boot.lds.debug
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)

-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)

 
     common/env_embedded.o(.text)
 
 
     common/env_embedded.o(.text)
 

diff --git a/board/netphone/u-boot.lds b/board/netphone/u-boot.lds
index d64274b683cde9079d19bd2d698b36b7ac8cbf58..4b17a1f76512471c1af3ed4e58d86def97fa853f 100644 (file)
--- a/board/netphone/u-boot.lds
+++ b/board/netphone/u-boot.lds
@@ -55,12 +55,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

-    lib_ppc/cache.o            (.text)
-    lib_ppc/time.o             (.text)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)

 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)

diff --git a/board/netstal/hcu4/hcu4.c b/board/netstal/hcu4/hcu4.c
index 8efbc23c897dadf32d4f26ba9611eee89114a8c8..3f07ff1263eb6b5dfd86d45dc875ad0fbbe0f652 100644 (file)
--- a/board/netstal/hcu4/hcu4.c
+++ b/board/netstal/hcu4/hcu4.c
@@ -34,7 +34,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 /*
  * This function is run very early, out of flash, and before devices are
 
 /*
  * This function is run very early, out of flash, and before devices are

- * initialized. It is called by lib_ppc/board.c:board_init_f by virtue
+ * initialized. It is called by arch/ppc/lib/board.c:board_init_f by virtue

  * of being in the init_sequence array.
  *
  * The SDRAM has been initialized already -- start.S:start called
  * of being in the init_sequence array.
  *
  * The SDRAM has been initialized already -- start.S:start called

diff --git a/board/netstal/hcu5/README.txt b/board/netstal/hcu5/README.txt
index f64987637a883c1c1e2d4ccfb2a7bf6dbe7c4232..0a54f9aee1c12e8dd8e5b95098a43f9802ef8865 100644 (file)
--- a/board/netstal/hcu5/README.txt
+++ b/board/netstal/hcu5/README.txt
@@ -109,7 +109,7 @@ _start:
        call cpu_init_f /* run low-level CPU init code     (from Flash) */
 
     call cpu_init_f
        call cpu_init_f /* run low-level CPU init code     (from Flash) */
 
     call cpu_init_f

-    board_init_f: (lib_ppc\board.c)
+    board_init_f: (arch/ppc/lib\board.c)

        init_sequence defines a list of function to be called
            board_early_init_f: (board/netstal/hcu5/hcu5.c)
                We are using Bootstrap-Option A
        init_sequence defines a list of function to be called
            board_early_init_f: (board/netstal/hcu5/hcu5.c)
                We are using Bootstrap-Option A


@@ -141,7 +141,7 @@ _start:
 From now on our copy is in RAM and we will run from there,
        starting with board_init_r
 -------------------------------------------------------
 From now on our copy is in RAM and we will run from there,
        starting with board_init_r
 -------------------------------------------------------

-    board_init_r: (lib_ppc\board.c)
+    board_init_r: (arch/ppc/lib\board.c)

        setup bd function pointers
        trap_init
        flash_init: (board/netstal/hcu5/flash.c)
        setup bd function pointers
        trap_init
        flash_init: (board/netstal/hcu5/flash.c)


@@ -162,7 +162,7 @@ Most of the HW specific code for the HCU5 may be found in
 include/configs/hcu5.h
 board/netstal/hcu5/*
 cpu/ppc4xx/*
 include/configs/hcu5.h
 board/netstal/hcu5/*
 cpu/ppc4xx/*

-lib_ppc/*
+arch/ppc/lib/*

 include/ppc440.h
 
 Drivers for serial etc are found under drivers/
 include/ppc440.h
 
 Drivers for serial etc are found under drivers/

diff --git a/board/netstal/hcu5/hcu5.c b/board/netstal/hcu5/hcu5.c
index c545cc01ea760fb64a1a32dad41e32edc7e363b0..90433fe82d58ac1e813d82767441b53c3f04c65d 100644 (file)
--- a/board/netstal/hcu5/hcu5.c
+++ b/board/netstal/hcu5/hcu5.c
@@ -49,7 +49,7 @@ extern flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
 
 /*
  * This function is run very early, out of flash, and before devices are
 
 /*
  * This function is run very early, out of flash, and before devices are

- * initialized. It is called by lib_ppc/board.c:board_init_f by virtue
+ * initialized. It is called by arch/ppc/lib/board.c:board_init_f by virtue

  * of being in the init_sequence array.
  *
  * The SDRAM has been initialized already -- start.S:start called
  * of being in the init_sequence array.
  *
  * The SDRAM has been initialized already -- start.S:start called

diff --git a/board/netstal/mcu25/mcu25.c b/board/netstal/mcu25/mcu25.c
index c66ab97ac5b35b16e75797d925f428a00f589392..cc2f99874eaf134f8bea3840f928b89170271e8c 100644 (file)
--- a/board/netstal/mcu25/mcu25.c
+++ b/board/netstal/mcu25/mcu25.c
@@ -39,7 +39,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 /*
  * This function is run very early, out of flash, and before devices are
 
 /*
  * This function is run very early, out of flash, and before devices are

- * initialized. It is called by lib_ppc/board.c:board_init_f by virtue
+ * initialized. It is called by arch/ppc/lib/board.c:board_init_f by virtue

  * of being in the init_sequence array.
  *
  * The SDRAM has been initialized already -- start.S:start called
  * of being in the init_sequence array.
  *
  * The SDRAM has been initialized already -- start.S:start called

diff --git a/board/netta/u-boot.lds b/board/netta/u-boot.lds
index 860c887c25de03e229b2e2e1e6b998dbecbcd881..991d7a1a90c1d3a8bea7485f1b8bd7402c0ce9f6 100644 (file)
--- a/board/netta/u-boot.lds
+++ b/board/netta/u-boot.lds
@@ -55,12 +55,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

-    lib_ppc/cache.o            (.text)
-    lib_ppc/time.o             (.text)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)

 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)

diff --git a/board/netta2/u-boot.lds b/board/netta2/u-boot.lds
index 860c887c25de03e229b2e2e1e6b998dbecbcd881..991d7a1a90c1d3a8bea7485f1b8bd7402c0ce9f6 100644 (file)
--- a/board/netta2/u-boot.lds
+++ b/board/netta2/u-boot.lds
@@ -55,12 +55,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

-    lib_ppc/cache.o            (.text)
-    lib_ppc/time.o             (.text)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)

 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)

diff --git a/board/netvia/u-boot.lds b/board/netvia/u-boot.lds
index a7d290ae88de3a4ef80e75ec1a66782c3b607107..7eb01ee727014b4fa04d45f84239d3f68a2bfeec 100644 (file)
--- a/board/netvia/u-boot.lds
+++ b/board/netvia/u-boot.lds
@@ -55,12 +55,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

-    lib_ppc/cache.o            (.text)
-    lib_ppc/time.o             (.text)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)

 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)

diff --git a/board/quantum/u-boot.lds b/board/quantum/u-boot.lds
index 47247ec8133cc8c7ccb60ee747369c73a9fe1963..c354ff82834991558b4be4547c51593a57b971ec 100644 (file)
--- a/board/quantum/u-boot.lds
+++ b/board/quantum/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/rbc823/u-boot.lds b/board/rbc823/u-boot.lds
index e0ea600d28c976c330f39830755752985fb11244..6074c14ba269fb088bf26e08874beb827937f4e4 100644 (file)
--- a/board/rbc823/u-boot.lds
+++ b/board/rbc823/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/rmu/u-boot.lds b/board/rmu/u-boot.lds
index 47247ec8133cc8c7ccb60ee747369c73a9fe1963..c354ff82834991558b4be4547c51593a57b971ec 100644 (file)
--- a/board/rmu/u-boot.lds
+++ b/board/rmu/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug
index 48fd579162f4d1b3b34532950d8ecaca87097200..1d8ce105e401c5215f4cf4b3ea2d857669914bc6 100644 (file)
--- a/board/sandburst/karef/u-boot.lds.debug
+++ b/board/sandburst/karef/u-boot.lds.debug
@@ -67,7 +67,7 @@ SECTIONS
     drivers/net/4xx_enet.o     (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)
     drivers/net/4xx_enet.o     (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)

-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)

     lib_generic/zlib.o         (.text)
 
 /*    common/env_embedded.o(.text) */
     lib_generic/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 4bc5ceac026767e76e7719cd2ef8aab9dacdc74d..bbfea131e01599f12e8169cfe2c71a382c3c6a02 100644 (file)
--- a/board/sandburst/metrobox/u-boot.lds.debug
+++ b/board/sandburst/metrobox/u-boot.lds.debug
@@ -67,7 +67,7 @@ SECTIONS
     drivers/net/4xx_enet.o     (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)
     drivers/net/4xx_enet.o     (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)

-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)

     lib_generic/zlib.o         (.text)
 
 /*    common/env_embedded.o(.text) */
     lib_generic/zlib.o         (.text)
 
 /*    common/env_embedded.o(.text) */

diff --git a/board/sbc8641d/u-boot.lds b/board/sbc8641d/u-boot.lds
index b71a7d6e580bbd1f9835aadc06f7b9e731e53daf..648efa285bc772000473a252450b6d8a9bb5071a 100644 (file)
--- a/board/sbc8641d/u-boot.lds
+++ b/board/sbc8641d/u-boot.lds
@@ -58,7 +58,7 @@ SECTIONS
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
     lib_generic/crc32.o (.text)
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
     lib_generic/crc32.o (.text)

-    lib_ppc/extable.o (.text)
+    arch/ppc/lib/extable.o (.text)

     lib_generic/zlib.o (.text)
     *(.text)
     *(.got1)
     lib_generic/zlib.o (.text)
     *(.text)
     *(.got1)

diff --git a/board/sc3/u-boot.lds b/board/sc3/u-boot.lds
index 16dc384015884e0df01eabd4b58d55d5dbda813c..04b350aab7807ce2d0a7833082f31be901b5aa88 100644 (file)
--- a/board/sc3/u-boot.lds
+++ b/board/sc3/u-boot.lds
@@ -70,7 +70,7 @@ SECTIONS
     cpu/ppc4xx/speed.o (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)
     cpu/ppc4xx/speed.o (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)

-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)

     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/

diff --git a/board/siemens/CCM/u-boot.lds b/board/siemens/CCM/u-boot.lds
index 2d0efb31612e0fea52537b1d056cd6f0f9766b05..0571f025a1ee7d12079332302e204912f16c0ea5 100644 (file)
--- a/board/siemens/CCM/u-boot.lds
+++ b/board/siemens/CCM/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/siemens/IAD210/u-boot.lds b/board/siemens/IAD210/u-boot.lds
index 104b44ccffbfbbe91e3bbfb8a250f659d9513f8a..877cf9ae01608466e7a4de9165de6e281ed0413f 100644 (file)
--- a/board/siemens/IAD210/u-boot.lds
+++ b/board/siemens/IAD210/u-boot.lds
@@ -57,9 +57,9 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)

-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)

     cpu/mpc8xx/interrupts.o (.text)
     cpu/mpc8xx/interrupts.o (.text)

-    lib_ppc/time.o             (.text)
+    arch/ppc/lib/time.o                (.text)

     . = env_offset;
     common/env_embedded.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 987c4ddb9ba65db57fb967d35fa48feb804a98cb..49f897213a6fe4c17e57898122448f73347ee6ea 100644 (file)
--- a/board/siemens/pcu_e/u-boot.lds.debug
+++ b/board/siemens/pcu_e/u-boot.lds.debug
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)

-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)

 
     . = env_offset;
     common/env_embedded.o(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

diff --git a/board/snmc/qs850/u-boot.lds b/board/snmc/qs850/u-boot.lds
index 9ef2c201a263c97cdbfbd4296cdf854b505e47c8..ce115f59e7b885f06f4f8ac531ec49e8fa7e9944 100644 (file)
--- a/board/snmc/qs850/u-boot.lds
+++ b/board/snmc/qs850/u-boot.lds
@@ -58,12 +58,12 @@ SECTIONS
        cpu/mpc8xx/start.o              (.text)
        cpu/mpc8xx/traps.o              (.text)
        common/dlmalloc.o               (.text)
        cpu/mpc8xx/start.o              (.text)
        cpu/mpc8xx/traps.o              (.text)
        common/dlmalloc.o               (.text)

-       lib_ppc/ppcstring.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/vsprintf.o  (.text)
        lib_generic/crc32.o             (.text)
        lib_generic/zlib.o              (.text)

-       lib_ppc/cache.o         (.text)
-       lib_ppc/time.o          (.text)
+       arch/ppc/lib/cache.o            (.text)
+       arch/ppc/lib/time.o             (.text)

 
     . = DEFINED(env_offset) ? env_offset : .;
        common/env_embedded.o   (.ppcenv)
 
     . = DEFINED(env_offset) ? env_offset : .;
        common/env_embedded.o   (.ppcenv)

diff --git a/board/snmc/qs860t/u-boot.lds b/board/snmc/qs860t/u-boot.lds
index 9ef2c201a263c97cdbfbd4296cdf854b505e47c8..ce115f59e7b885f06f4f8ac531ec49e8fa7e9944 100644 (file)
--- a/board/snmc/qs860t/u-boot.lds
+++ b/board/snmc/qs860t/u-boot.lds
@@ -58,12 +58,12 @@ SECTIONS
        cpu/mpc8xx/start.o              (.text)
        cpu/mpc8xx/traps.o              (.text)
        common/dlmalloc.o               (.text)
        cpu/mpc8xx/start.o              (.text)
        cpu/mpc8xx/traps.o              (.text)
        common/dlmalloc.o               (.text)

-       lib_ppc/ppcstring.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/vsprintf.o  (.text)
        lib_generic/crc32.o             (.text)
        lib_generic/zlib.o              (.text)

-       lib_ppc/cache.o         (.text)
-       lib_ppc/time.o          (.text)
+       arch/ppc/lib/cache.o            (.text)
+       arch/ppc/lib/time.o             (.text)

 
     . = DEFINED(env_offset) ? env_offset : .;
        common/env_embedded.o   (.ppcenv)
 
     . = DEFINED(env_offset) ? env_offset : .;
        common/env_embedded.o   (.ppcenv)

diff --git a/board/spc1920/u-boot.lds b/board/spc1920/u-boot.lds
index d6711b5bf2c511b2df0b99025edb2f22a7bba711..172cfbbc88d936c479f4376a5105c4d2b74ce869 100644 (file)
--- a/board/spc1920/u-boot.lds
+++ b/board/spc1920/u-boot.lds
@@ -58,12 +58,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

-    lib_ppc/cache.o            (.text)
-    lib_ppc/time.o             (.text)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)

 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.ppcenv)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.ppcenv)

diff --git a/board/spd8xx/u-boot.lds.debug b/board/spd8xx/u-boot.lds.debug
index 0a3b958fad657a6eb38149d7c43051db67701f8b..8d91aed3fe3856c3489081e61ca8834f97015a58 100644 (file)
--- a/board/spd8xx/u-boot.lds.debug
+++ b/board/spd8xx/u-boot.lds.debug
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)

-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)

 
     . = env_offset;
     common/env_embedded.o(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

diff --git a/board/stx/stxssa/stxssa.c b/board/stx/stxssa/stxssa.c
index 73dddf3e0c94822da588e6d0832fa9d0904089e9..678ec5850f662926eddbc5c49c3f552ccba84b3a 100644 (file)
--- a/board/stx/stxssa/stxssa.c
+++ b/board/stx/stxssa/stxssa.c
@@ -259,7 +259,7 @@ board_early_init_f(void)
 #endif
 
        /* Why is the phy reset done _after_ the ethernet
 #endif
 
        /* Why is the phy reset done _after_ the ethernet

-        * initialization in lib_ppc/board.c?
+        * initialization in arch/ppc/lib/board.c?

         * Do it here so it's done before the TSECs are used.
         */
        reset_phy();
         * Do it here so it's done before the TSECs are used.
         */
        reset_phy();

diff --git a/board/stx/stxxtc/u-boot.lds b/board/stx/stxxtc/u-boot.lds
index 860c887c25de03e229b2e2e1e6b998dbecbcd881..991d7a1a90c1d3a8bea7485f1b8bd7402c0ce9f6 100644 (file)
--- a/board/stx/stxxtc/u-boot.lds
+++ b/board/stx/stxxtc/u-boot.lds
@@ -55,12 +55,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

-    lib_ppc/cache.o            (.text)
-    lib_ppc/time.o             (.text)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)

 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)

diff --git a/board/svm_sc8xx/u-boot.lds b/board/svm_sc8xx/u-boot.lds
index 02aa9dd9876958a792dd4f09acb41ca079dc52a5..cf782000196a2a7a44e782778253933f1245cd51 100644 (file)
--- a/board/svm_sc8xx/u-boot.lds
+++ b/board/svm_sc8xx/u-boot.lds
@@ -58,12 +58,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

-    lib_ppc/cache.o            (.text)
-    lib_ppc/time.o             (.text)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)

 
     . = env_offset;
     common/env_embedded.o      (.ppcenv)
 
     . = env_offset;
     common/env_embedded.o      (.ppcenv)

diff --git a/board/tqc/tqm8xx/u-boot.lds b/board/tqc/tqm8xx/u-boot.lds
index 2df8d8459c7115cf26db3d2c687aafd9153a4dd4..9f452c1c8e6296e30190fc4047c535732f0df9f9 100644 (file)
--- a/board/tqc/tqm8xx/u-boot.lds
+++ b/board/tqc/tqm8xx/u-boot.lds
@@ -58,11 +58,11 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

-    lib_ppc/cache.o            (.text)
+    arch/ppc/lib/cache.o               (.text)

 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.ppcenv)
 
     . = 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 e3ea52aededf106850ea72d3024a2e8be5700de7..967e4322cb7c341f2fcf96bdc3810ed3cbd60aec 100644 (file)
--- a/board/uc100/u-boot.lds
+++ b/board/uc100/u-boot.lds
@@ -58,12 +58,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

-    lib_ppc/cache.o            (.text)
-    lib_ppc/time.o             (.text)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)

 
     common/env_embedded.o      (.text)
 
 
     common/env_embedded.o      (.text)
 

diff --git a/board/v37/u-boot.lds b/board/v37/u-boot.lds
index 6f2ea9a613d5b3c9f10e91a482d31cecfe08925f..c3dd8c7abc161efb2a752a131d55c83b1b5da121 100644 (file)
--- a/board/v37/u-boot.lds
+++ b/board/v37/u-boot.lds
@@ -58,12 +58,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

-    lib_ppc/cache.o            (.text)
-    lib_ppc/time.o             (.text)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)

 
 /*
     . = env_offset;
 
 /*
     . = env_offset;

diff --git a/board/w7o/u-boot.lds.debug b/board/w7o/u-boot.lds.debug
index 8bb4929a461c67777f2be8220813d5dfce011e98..85b1cd69dd2e6a00f9fc891592bf206ad6b1ab11 100644 (file)
--- a/board/w7o/u-boot.lds.debug
+++ b/board/w7o/u-boot.lds.debug
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)

-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)

 
     common/env_embedded.o(.text)
 
 
     common/env_embedded.o(.text)
 

diff --git a/board/westel/amx860/u-boot.lds b/board/westel/amx860/u-boot.lds
index 2d0efb31612e0fea52537b1d056cd6f0f9766b05..0571f025a1ee7d12079332302e204912f16c0ea5 100644 (file)
--- a/board/westel/amx860/u-boot.lds
+++ b/board/westel/amx860/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)

-    lib_ppc/ppcstring.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/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)

diff --git a/board/westel/amx860/u-boot.lds.debug b/board/westel/amx860/u-boot.lds.debug
index 653e0be45cef70bd23bc54046cbab4e3656a8702..919eb2194d4127cbbfe6189390f4fab72925dee7 100644 (file)
--- a/board/westel/amx860/u-boot.lds.debug
+++ b/board/westel/amx860/u-boot.lds.debug
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)

-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)

 
     . = env_offset;
     common/env_embedded.o(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)

diff --git a/board/xes/xpedite1000/u-boot.lds.debug b/board/xes/xpedite1000/u-boot.lds.debug
index d00834eef37c745f8a31f99021f2e17c5f453d1b..0830d0aa1b4fec020618bc2185a11358f0e347df 100644 (file)
--- a/board/xes/xpedite1000/u-boot.lds.debug
+++ b/board/xes/xpedite1000/u-boot.lds.debug
@@ -65,7 +65,7 @@ SECTIONS
     cpu/ppc4xx/speed.o (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)
     cpu/ppc4xx/speed.o (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)

-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)

     lib_generic/zlib.o         (.text)
 
 /*    common/env_embedded.o(.text) */
     lib_generic/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 b71a7d6e580bbd1f9835aadc06f7b9e731e53daf..648efa285bc772000473a252450b6d8a9bb5071a 100644 (file)
--- a/board/xes/xpedite5170/u-boot.lds
+++ b/board/xes/xpedite5170/u-boot.lds
@@ -58,7 +58,7 @@ SECTIONS
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
     lib_generic/crc32.o (.text)
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
     lib_generic/crc32.o (.text)

-    lib_ppc/extable.o (.text)
+    arch/ppc/lib/extable.o (.text)

     lib_generic/zlib.o (.text)
     *(.text)
     *(.got1)
     lib_generic/zlib.o (.text)
     *(.text)
     *(.got1)

diff --git a/config.mk b/config.mk
index 1a61dbb7fa0c78797f54f085fd98a1acbd61bc93..85b524eada7fdfd01872d04cbc438cdc37567429 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -114,7 +114,7 @@ sinclude $(OBJTREE)/include/autoconf.mk
 # so calculate CPUDIR before including ARCH/SOC/CPU config.mk files.
 CPUDIR=cpu/$(CPU)
 
 # so calculate CPUDIR before including ARCH/SOC/CPU config.mk files.
 CPUDIR=cpu/$(CPU)
 

-sinclude $(TOPDIR)/lib_$(ARCH)/config.mk       # include architecture dependend rules
+sinclude $(TOPDIR)/arch/$(ARCH)/config.mk      # include architecture dependend rules

 sinclude $(TOPDIR)/$(CPUDIR)/config.mk         # include  CPU  specific rules
 
 ifdef  SOC
 sinclude $(TOPDIR)/$(CPUDIR)/config.mk         # include  CPU  specific rules
 
 ifdef  SOC

diff --git a/cpu/mpc5xxx/u-boot-customlayout.lds b/cpu/mpc5xxx/u-boot-customlayout.lds
index c34008661973061733068239af84dd6faaf2f0c2..c08c9c9232940f05ae0102f50ed123f3b52b6349 100644 (file)
--- a/cpu/mpc5xxx/u-boot-customlayout.lds
+++ b/cpu/mpc5xxx/u-boot-customlayout.lds
@@ -58,8 +58,8 @@ SECTIONS
     cpu/mpc5xxx/start.o          (.text)
     cpu/mpc5xxx/traps.o          (.text)
     lib_generic/crc32.o         (.text)
     cpu/mpc5xxx/start.o          (.text)
     cpu/mpc5xxx/traps.o          (.text)
     lib_generic/crc32.o         (.text)

-    lib_ppc/cache.o             (.text)
-    lib_ppc/time.o              (.text)
+    arch/ppc/lib/cache.o             (.text)
+    arch/ppc/lib/time.o              (.text)

 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o        (.ppcenv)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o        (.ppcenv)

diff --git a/doc/README.LED b/doc/README.LED
index 94e552aa03d97b99eb499d3dc58d49487cdea9f2..c3bcb3ac8099631c83052eef042b965f5fc5b0f9 100644 (file)
--- a/doc/README.LED
+++ b/doc/README.LED
@@ -69,7 +69,7 @@ yellow_LED_off
 blue_LED_on
 blue_LED_off
 
 blue_LED_on
 blue_LED_off
 

-These are weakly defined in lib_arm/board.c to noops. Where applicable, define
+These are weakly defined in arch/arm/lib/board.c to noops. Where applicable, define

 these functions in the board specific source.
 
 TBD : Describe older board dependent macros similar to what is done for
 these functions in the board specific source.
 
 TBD : Describe older board dependent macros similar to what is done for

diff --git a/doc/README.alaska8220 b/doc/README.alaska8220
index 0bd68d9628b8a203729cb85dbd9b82846519e065..279dac69f5ce97f6381d011f30700143a25650bb 100644 (file)
--- a/doc/README.alaska8220
+++ b/doc/README.alaska8220
@@ -22,7 +22,7 @@ Changed files:
 - include/asm-ppc/global_data.h added global variables - inp_clk, pci_clk,
                            vco_clk, pev_clk, flb_clk, and bExtUart
 
 - include/asm-ppc/global_data.h added global variables - inp_clk, pci_clk,
                            vco_clk, pev_clk, flb_clk, and bExtUart
 

-- lib_ppc/board.c          added CONFIG_MPC8220 support
+- arch/ppc/lib/board.c     added CONFIG_MPC8220 support

 
 - net/eth.c                added FEC support for MPC8220
 
 
 - net/eth.c                added FEC support for MPC8220
 

diff --git a/doc/README.m52277evb b/doc/README.m52277evb
index 40f9028c6f2bca12e7e3b023f9d225ec7eaf7257..f30b45e1c9140c6b2d9153758d6360ccf16023cd 100644 (file)
--- a/doc/README.m52277evb
+++ b/doc/README.m52277evb
@@ -53,12 +53,12 @@ Changed files:
 
 - include/configs/M52277EVB.h          Board specific configuration file
 
 
 - include/configs/M52277EVB.h          Board specific configuration file
 

-- lib_m68k/board.c                     board init function
-- lib_m68k/cache.c
-- lib_m68k/interrupts                  Coldfire common interrupt functions
-- lib_m68k/m68k_linux.c
-- lib_m68k/time.c                      Timer functions (Dma timer and PIT)
-- lib_m68k/traps.c                     Exception init code
+- arch/m68k/lib/board.c                        board init function
+- arch/m68k/lib/cache.c
+- arch/m68k/lib/interrupts                     Coldfire common interrupt functions
+- arch/m68k/lib/m68k_linux.c
+- arch/m68k/lib/time.c                 Timer functions (Dma timer and PIT)
+- arch/m68k/lib/traps.c                        Exception init code

 
 1 MCF52277 specific Options/Settings
 ====================================
 
 1 MCF52277 specific Options/Settings
 ====================================

diff --git a/doc/README.m53017evb b/doc/README.m53017evb
index 60cfa95af3c0d7667fff8316108aa57e33e8acc5..780a8038a53d6f1d4d7095700a34b010afef5956 100644 (file)
--- a/doc/README.m53017evb
+++ b/doc/README.m53017evb
@@ -51,12 +51,12 @@ Changed files:
 
 - include/configs/M53017EVB.h          Board specific configuration file
 
 
 - include/configs/M53017EVB.h          Board specific configuration file
 

-- lib_m68k/board.c                     board init function
-- lib_m68k/cache.c
-- lib_m68k/interrupts                  Coldfire common interrupt functions
-- lib_m68k/m68k_linux.c
-- lib_m68k/time.c                      Timer functions (Dma timer and PIT)
-- lib_m68k/traps.c                     Exception init code
+- arch/m68k/lib/board.c                        board init function
+- arch/m68k/lib/cache.c
+- arch/m68k/lib/interrupts                     Coldfire common interrupt functions
+- arch/m68k/lib/m68k_linux.c
+- arch/m68k/lib/time.c                 Timer functions (Dma timer and PIT)
+- arch/m68k/lib/traps.c                        Exception init code

 
 1 MCF5301x specific Options/Settings
 ====================================
 
 1 MCF5301x specific Options/Settings
 ====================================

diff --git a/doc/README.m5373evb b/doc/README.m5373evb
index 55917489338417dbf09403dd539bc2337a94e4f7..24a659b18e063ffb2ddc42da27848e8c4ce54581 100644 (file)
--- a/doc/README.m5373evb
+++ b/doc/README.m5373evb
@@ -50,12 +50,12 @@ Changed files:
 
 - include/configs/M5373EVB.h           Board specific configuration file
 
 
 - include/configs/M5373EVB.h           Board specific configuration file
 

-- lib_m68k/board.c                     board init function
-- lib_m68k/cache.c
-- lib_m68k/interrupts                  Coldfire common interrupt functions
-- lib_m68k/m68k_linux.c
-- lib_m68k/time.c                      Timer functions (Dma timer and PIT)
-- lib_m68k/traps.c                     Exception init code
+- arch/m68k/lib/board.c                        board init function
+- arch/m68k/lib/cache.c
+- arch/m68k/lib/interrupts                     Coldfire common interrupt functions
+- arch/m68k/lib/m68k_linux.c
+- arch/m68k/lib/time.c                 Timer functions (Dma timer and PIT)
+- arch/m68k/lib/traps.c                        Exception init code

 
 1 MCF5373 specific Options/Settings
 ====================================
 
 1 MCF5373 specific Options/Settings
 ====================================

diff --git a/doc/README.m54455evb b/doc/README.m54455evb
index 1888e166253c1eb92dfaedb7855106f74e5502a0..257bcd5a1fea80e14be114ed3b0a48a772f05c86 100644 (file)
--- a/doc/README.m54455evb
+++ b/doc/README.m54455evb
@@ -52,12 +52,12 @@ Changed files:
 
 - include/configs/M54455EVB.h  Board specific configuration file
 
 
 - include/configs/M54455EVB.h  Board specific configuration file
 

-- lib_m68k/board.c                     board init function
-- lib_m68k/cache.c
-- lib_m68k/interrupts                  Coldfire common interrupt functions
-- lib_m68k/m68k_linux.c
-- lib_m68k/time.c                      Timer functions (Dma timer and PIT)
-- lib_m68k/traps.c                     Exception init code
+- arch/m68k/lib/board.c                        board init function
+- arch/m68k/lib/cache.c
+- arch/m68k/lib/interrupts                     Coldfire common interrupt functions
+- arch/m68k/lib/m68k_linux.c
+- arch/m68k/lib/time.c                 Timer functions (Dma timer and PIT)
+- arch/m68k/lib/traps.c                        Exception init code

 
 - rtc/mcfrtc.c                         Realtime clock Driver
 
 
 - rtc/mcfrtc.c                         Realtime clock Driver
 

diff --git a/doc/README.m5475evb b/doc/README.m5475evb
index f3a1d7b28b2b453f477b9b2558d369233bcba894..b61dfba3cdd86d3fa6579214db1c3f17cb03a27f 100644 (file)
--- a/doc/README.m5475evb
+++ b/doc/README.m5475evb
@@ -58,11 +58,11 @@ Changed files:
 
 - include/configs/M5475EVB.h           Board specific configuration file
 
 
 - include/configs/M5475EVB.h           Board specific configuration file
 

-- lib_m68k/board.c                     board init function
-- lib_m68k/cache.c
-- lib_m68k/interrupts                  Coldfire common interrupt functions
-- lib_m68k/m68k_linux.c
-- lib_m68k/traps.c                     Exception init code
+- arch/m68k/lib/board.c                        board init function
+- arch/m68k/lib/cache.c
+- arch/m68k/lib/interrupts                     Coldfire common interrupt functions
+- arch/m68k/lib/m68k_linux.c
+- arch/m68k/lib/traps.c                        Exception init code

 
 1 MCF547x specific Options/Settings
 ====================================
 
 1 MCF547x specific Options/Settings
 ====================================

diff --git a/doc/README.mpc5xx b/doc/README.mpc5xx
index 07be8637fa72fe9a997f4fec399606532636e43a..2e121746ddcc4aa4e1975559f96cd9bcd086b945 100644 (file)
--- a/doc/README.mpc5xx
+++ b/doc/README.mpc5xx
@@ -34,9 +34,9 @@ u-boot-0.2.0/include/mpc5xx.h
 u-boot-0.2.0/include/status_led.h
 u-boot-0.2.0/include/asm-ppc/u-boot.h
 u-boot-0.2.0/include/asm-ppc/5xx_immap.h
 u-boot-0.2.0/include/status_led.h
 u-boot-0.2.0/include/asm-ppc/u-boot.h
 u-boot-0.2.0/include/asm-ppc/5xx_immap.h

-u-boot-0.2.0/lib_ppc/board.c
-u-boot-0.2.0/lib_ppc/cache.c
-u-boot-0.2.0/lib_ppc/time.c
+u-boot-0.2.0/arch/ppc/lib/board.c
+u-boot-0.2.0/arch/ppc/lib/cache.c
+u-boot-0.2.0/arch/ppc/lib/time.c

 u-boot-0.2.0/Makefile
 u-boot-0.2.0/CREDITS
 u-boot-0.2.0/doc/README.mpc5xx
 u-boot-0.2.0/Makefile
 u-boot-0.2.0/CREDITS
 u-boot-0.2.0/doc/README.mpc5xx

diff --git a/doc/README.nios b/doc/README.nios
index 7f349380810def91f731231e94a8755359c6b64d..da30ff5ae4e711cbff1f2f6129f1da9ec9d3f684 100644 (file)
--- a/doc/README.nios
+++ b/doc/README.nios
@@ -244,7 +244,7 @@ cover most of the individual functions to get you started.
 
                (gdb) directory common
                (gdb) directory cpu/nios
 
                (gdb) directory common
                (gdb) directory cpu/nios

-               (gdb) directory lib_nios
+               (gdb) directory arch/nios/lib

                (gdb) directory board/altera/dk1c20
 
        Note that the last command is for the DK1C20 board only. If you
                (gdb) directory board/altera/dk1c20
 
        Note that the last command is for the DK1C20 board only. If you

diff --git a/doc/TODO-i386 b/doc/TODO-i386
index 84113f8112c9443827a41970fd667b76eaa4d13b..2261f4a1f34f3e6f66fb3394e6e1f79940dbcf71 100644 (file)
--- a/doc/TODO-i386
+++ b/doc/TODO-i386
@@ -8,7 +8,7 @@ i386 port missing features:
 * re-entry of protected mode from real mode, should be added to realmode_switch.S 
   (and used by INT 10h and INT 16h handlers for console I/O during early
    linux boot...) 
 * re-entry of protected mode from real mode, should be added to realmode_switch.S 
   (and used by INT 10h and INT 16h handlers for console I/O during early
    linux boot...) 

-* missing functions in lib_i386 and cpu/i386
+* missing functions in arch/i386/lib and cpu/i386

 * speaker beep interface
 
 
 * speaker beep interface
 
 

diff --git a/examples/api/Makefile b/examples/api/Makefile
index d4c5ca2559f431d12494a4350b4645430d9efef9..62751ece9609fdb8932d687679491dcf2c2efbc2 100644 (file)
--- a/examples/api/Makefile
+++ b/examples/api/Makefile
@@ -47,7 +47,7 @@ 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
 ifeq ($(ARCH),ppc)
 EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/time.o
 EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/vsprintf.o
 ifeq ($(ARCH),ppc)

-EXT_SOBJ_FILES-$(CONFIG_API) += lib_ppc/ppcstring.o
+EXT_SOBJ_FILES-$(CONFIG_API) += arch/ppc/lib/ppcstring.o

 endif
 
 # Create a list of source files so their dependencies can be auto-generated
 endif
 
 # Create a list of source files so their dependencies can be auto-generated


@@ -79,7 +79,7 @@ $(obj)%.o: $(SRCTREE)/lib_generic/%.c
        $(CC) -g $(CFLAGS) -c -o $@ $<
 
 # Rule to build architecture-specific library assembly files
        $(CC) -g $(CFLAGS) -c -o $@ $<
 
 # Rule to build architecture-specific library assembly files

-$(obj)%.o: $(SRCTREE)/lib_$(ARCH)/%.S
+$(obj)%.o: $(SRCTREE)/arch/$(ARCH)/lib/%.S

        $(CC) -g $(CFLAGS) -c -o $@ $<
 
 #########################################################################
        $(CC) -g $(CFLAGS) -c -o $@ $<
 
 #########################################################################

diff --git a/include/asm-i386/interrupt.h b/include/asm-i386/interrupt.h
index 3e2674af683d5d99fdbe9248620e9db8166593ae..8d324d9f37a4299d46db93a7aac4e1b7b62ffdc1 100644 (file)
--- a/include/asm-i386/interrupt.h
+++ b/include/asm-i386/interrupt.h
@@ -30,7 +30,7 @@
 /* cpu/i386/interrupts.c */
 void set_vector(u8 intnum, void *routine);
 
 /* cpu/i386/interrupts.c */
 void set_vector(u8 intnum, void *routine);
 

-/* lib_i386/interupts.c */
+/* arch/i386/lib/interupts.c */

 void disable_irq(int irq);
 void enable_irq(int irq);
 
 void disable_irq(int irq);
 void enable_irq(int irq);
 

diff --git a/include/asm-i386/u-boot-i386.h b/include/asm-i386/u-boot-i386.h
index 7c99c8c57dfbe203b357a82caf981d4de91fd2dc..a08632d2d312cdaa4d9187e199f6f08426dcfa62 100644 (file)
--- a/include/asm-i386/u-boot-i386.h
+++ b/include/asm-i386/u-boot-i386.h
@@ -33,7 +33,7 @@ void timer_isr(void *);
 typedef void (timer_fnc_t) (void);
 int register_timer_isr (timer_fnc_t *isr_func);
 
 typedef void (timer_fnc_t) (void);
 int register_timer_isr (timer_fnc_t *isr_func);
 

-/* Architecture specific - can be in cpu/i386/, lib_i386/, or $(BOARD)/ */
+/* Architecture specific - can be in cpu/i386/, arch/i386/lib/, or $(BOARD)/ */

 int timer_init(void);
 
 /* cpu/.../interrupts.c */
 int timer_init(void);
 
 /* cpu/.../interrupts.c */


@@ -46,7 +46,7 @@ int dram_init(void);
 void isa_unmap_rom(u32 addr);
 u32 isa_map_rom(u32 bus_addr, int size);
 
 void isa_unmap_rom(u32 addr);
 u32 isa_map_rom(u32 bus_addr, int size);
 

-/* lib_i386/... */
+/* arch/i386/lib/... */

 int video_bios_init(void);
 int video_init(void);
 
 int video_bios_init(void);
 int video_init(void);
 

diff --git a/include/common.h b/include/common.h
index a133e3479a48fa0c8e8a232650baf902049f82b2..7aa910dc9871e1bfba9fda1f92bd8ef3cce06102 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -230,7 +230,7 @@ int parse_line (char *, char *[]);
 void   init_cmd_timeout(void);
 void   reset_cmd_timeout(void);
 
 void   init_cmd_timeout(void);
 void   reset_cmd_timeout(void);
 

-/* lib_$(ARCH)/board.c */
+/* arch/$(ARCH)/lib/board.c */

 void   board_init_f  (ulong) __attribute__ ((noreturn));
 void   board_init_r  (gd_t *, ulong) __attribute__ ((noreturn));
 int    checkboard    (void);
 void   board_init_f  (ulong) __attribute__ ((noreturn));
 void   board_init_r  (gd_t *, ulong) __attribute__ ((noreturn));
 int    checkboard    (void);


@@ -604,17 +604,17 @@ ulong     vfd_setmem (ulong);
 /* $(CPU)/.../video.c */
 ulong  video_setmem (ulong);
 
 /* $(CPU)/.../video.c */
 ulong  video_setmem (ulong);
 

-/* lib_$(ARCH)/cache.c */
+/* arch/$(ARCH)/lib/cache.c */

 void   flush_cache   (unsigned long, unsigned long);
 void   flush_dcache_range(unsigned long start, unsigned long stop);
 void   invalidate_dcache_range(unsigned long start, unsigned long stop);
 
 
 void   flush_cache   (unsigned long, unsigned long);
 void   flush_dcache_range(unsigned long start, unsigned long stop);
 void   invalidate_dcache_range(unsigned long start, unsigned long stop);
 
 

-/* lib_$(ARCH)/ticks.S */
+/* arch/$(ARCH)/lib/ticks.S */

 unsigned long long get_ticks(void);
 void   wait_ticks    (unsigned long);
 
 unsigned long long get_ticks(void);
 void   wait_ticks    (unsigned long);
 

-/* lib_$(ARCH)/time.c */
+/* arch/$(ARCH)/lib/time.c */

 void   __udelay      (unsigned long);
 ulong  usec2ticks    (unsigned long usec);
 ulong  ticks2usec    (unsigned long ticks);
 void   __udelay      (unsigned long);
 ulong  usec2ticks    (unsigned long usec);
 ulong  ticks2usec    (unsigned long ticks);

diff --git a/include/configs/B2.h b/include/configs/B2.h
index f51a26115c404774b748aa34c9fcfefb153623bf..ca7350dc40dcc6d2885bcbee6cb9176ef9b5a277 100644 (file)
--- a/include/configs/B2.h
+++ b/include/configs/B2.h
@@ -207,7 +207,7 @@
 */
 
 /*
 */
 
 /*

-       Linux TAGs (see lib_arm/armlinux.c)
+       Linux TAGs (see arch/arm/lib/armlinux.c)

 */
 #define CONFIG_CMDLINE_TAG
 #undef CONFIG_SETUP_MEMORY_TAGS
 */
 #define CONFIG_CMDLINE_TAG
 #undef CONFIG_SETUP_MEMORY_TAGS

diff --git a/nand_spl/board/freescale/mpc8313erdb/Makefile b/nand_spl/board/freescale/mpc8313erdb/Makefile
index a13e7e2f1fbf760d7be7b467c1e29a44787febd9..ee1dc4b298f25c8057b0cdc53c2b4896bc326d79 100644 (file)
--- a/nand_spl/board/freescale/mpc8313erdb/Makefile
+++ b/nand_spl/board/freescale/mpc8313erdb/Makefile
@@ -84,13 +84,13 @@ $(obj)nand_init.c:
        ln -sf $(SRCTREE)/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
 
 $(obj)cache.c:
        ln -sf $(SRCTREE)/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
 
 $(obj)cache.c:

-       ln -sf $(SRCTREE)/lib_ppc/cache.c $(obj)cache.c
+       ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c

 
 $(obj)time.c:
 
 $(obj)time.c:

-       ln -sf $(SRCTREE)/lib_ppc/time.c $(obj)time.c
+       ln -sf $(SRCTREE)/arch/ppc/lib/time.c $(obj)time.c

 
 $(obj)ticks.S:
 
 $(obj)ticks.S:

-       ln -sf $(SRCTREE)/lib_ppc/ticks.S $(obj)ticks.S
+       ln -sf $(SRCTREE)/arch/ppc/lib/ticks.S $(obj)ticks.S

 
 #########################################################################
 
 
 #########################################################################
 

diff --git a/nand_spl/board/freescale/mpc8315erdb/Makefile b/nand_spl/board/freescale/mpc8315erdb/Makefile
index a13e7e2f1fbf760d7be7b467c1e29a44787febd9..ee1dc4b298f25c8057b0cdc53c2b4896bc326d79 100644 (file)
--- a/nand_spl/board/freescale/mpc8315erdb/Makefile
+++ b/nand_spl/board/freescale/mpc8315erdb/Makefile
@@ -84,13 +84,13 @@ $(obj)nand_init.c:
        ln -sf $(SRCTREE)/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
 
 $(obj)cache.c:
        ln -sf $(SRCTREE)/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
 
 $(obj)cache.c:

-       ln -sf $(SRCTREE)/lib_ppc/cache.c $(obj)cache.c
+       ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c

 
 $(obj)time.c:
 
 $(obj)time.c:

-       ln -sf $(SRCTREE)/lib_ppc/time.c $(obj)time.c
+       ln -sf $(SRCTREE)/arch/ppc/lib/time.c $(obj)time.c

 
 $(obj)ticks.S:
 
 $(obj)ticks.S:

-       ln -sf $(SRCTREE)/lib_ppc/ticks.S $(obj)ticks.S
+       ln -sf $(SRCTREE)/arch/ppc/lib/ticks.S $(obj)ticks.S

 
 #########################################################################
 
 
 #########################################################################
 

diff --git a/nand_spl/board/freescale/mpc8536ds/Makefile b/nand_spl/board/freescale/mpc8536ds/Makefile
index be0caaa7b3d2255e0b4a25ed7e5b88b61511e950..ff8b8be6a4181dc9af8d8f67a01cf67e5614821b 100644 (file)
--- a/nand_spl/board/freescale/mpc8536ds/Makefile
+++ b/nand_spl/board/freescale/mpc8536ds/Makefile
@@ -64,7 +64,7 @@ $(nandobj)u-boot-spl: $(OBJS)
 
 $(obj)cache.c:
        @rm -f $(obj)cache.c
 
 $(obj)cache.c:
        @rm -f $(obj)cache.c

-       ln -sf $(SRCTREE)/lib_ppc/cache.c $(obj)cache.c
+       ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c

 
 $(obj)cpu_init_early.c:
        @rm -f $(obj)cpu_init_early.c
 
 $(obj)cpu_init_early.c:
        @rm -f $(obj)cpu_init_early.c

diff --git a/nand_spl/board/freescale/mpc8569mds/Makefile b/nand_spl/board/freescale/mpc8569mds/Makefile
index be0caaa7b3d2255e0b4a25ed7e5b88b61511e950..ff8b8be6a4181dc9af8d8f67a01cf67e5614821b 100644 (file)
--- a/nand_spl/board/freescale/mpc8569mds/Makefile
+++ b/nand_spl/board/freescale/mpc8569mds/Makefile
@@ -64,7 +64,7 @@ $(nandobj)u-boot-spl: $(OBJS)
 
 $(obj)cache.c:
        @rm -f $(obj)cache.c
 
 $(obj)cache.c:
        @rm -f $(obj)cache.c

-       ln -sf $(SRCTREE)/lib_ppc/cache.c $(obj)cache.c
+       ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c

 
 $(obj)cpu_init_early.c:
        @rm -f $(obj)cpu_init_early.c
 
 $(obj)cpu_init_early.c:
        @rm -f $(obj)cpu_init_early.c

diff --git a/nand_spl/board/freescale/p1_p2_rdb/Makefile b/nand_spl/board/freescale/p1_p2_rdb/Makefile
index be0caaa7b3d2255e0b4a25ed7e5b88b61511e950..ff8b8be6a4181dc9af8d8f67a01cf67e5614821b 100644 (file)
--- a/nand_spl/board/freescale/p1_p2_rdb/Makefile
+++ b/nand_spl/board/freescale/p1_p2_rdb/Makefile
@@ -64,7 +64,7 @@ $(nandobj)u-boot-spl: $(OBJS)
 
 $(obj)cache.c:
        @rm -f $(obj)cache.c
 
 $(obj)cache.c:
        @rm -f $(obj)cache.c

-       ln -sf $(SRCTREE)/lib_ppc/cache.c $(obj)cache.c
+       ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c

 
 $(obj)cpu_init_early.c:
        @rm -f $(obj)cpu_init_early.c
 
 $(obj)cpu_init_early.c:
        @rm -f $(obj)cpu_init_early.c

diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile
index 6920fe886b5a651a0e629c92f3cf78531672cb12..48c22f84b11feaadbcf68f2361147d480c392551 100644 (file)
--- a/nand_spl/board/sheldon/simpc8313/Makefile
+++ b/nand_spl/board/sheldon/simpc8313/Makefile
@@ -90,15 +90,15 @@ $(obj)nand_init.c:
 
 $(obj)cache.c:
        @rm -f $@
 
 $(obj)cache.c:
        @rm -f $@

-       ln -s $(SRCTREE)/lib_ppc/cache.c $@
+       ln -s $(SRCTREE)/arch/ppc/lib/cache.c $@

 
 $(obj)time.c:
        @rm -f $@
 
 $(obj)time.c:
        @rm -f $@

-       ln -s $(SRCTREE)/lib_ppc/time.c $@
+       ln -s $(SRCTREE)/arch/ppc/lib/time.c $@

 
 $(obj)ticks.S:
        @rm -f $@
 
 $(obj)ticks.S:
        @rm -f $@

-       ln -s $(SRCTREE)/lib_ppc/ticks.S $@
+       ln -s $(SRCTREE)/arch/ppc/lib/ticks.S $@

 
 #########################################################################
 
 
 #########################################################################