Browse Source

Move arch/ppc to arch/powerpc

As discussed on the list, move "arch/ppc" to "arch/powerpc" to
better match the Linux directory structure.

Please note that this patch also changes the "ppc" target in
MAKEALL to "powerpc" to match this new infrastructure. But "ppc"
is kept as an alias for now, to not break compatibility with
scripts using this name.

Signed-off-by: Stefan Roese <sr@denx.de>
Acked-by: Wolfgang Denk <wd@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
Cc: Peter Tyser <ptyser@xes-inc.com>
Cc: Anatolij Gustschin <agust@denx.de>
Stefan Roese 14 years ago
parent
commit
a47a12becf
100 changed files with 226 additions and 224 deletions
  1. 10 4
      MAKEALL
  2. 184 188
      Makefile
  3. 8 8
      README
  4. 0 0
      api/api_platform-powerpc.c
  5. 0 0
      arch/powerpc/config.mk
  6. 0 0
      arch/powerpc/cpu/74xx_7xx/Makefile
  7. 0 0
      arch/powerpc/cpu/74xx_7xx/cache.S
  8. 0 0
      arch/powerpc/cpu/74xx_7xx/config.mk
  9. 0 0
      arch/powerpc/cpu/74xx_7xx/cpu.c
  10. 0 0
      arch/powerpc/cpu/74xx_7xx/cpu_init.c
  11. 0 0
      arch/powerpc/cpu/74xx_7xx/interrupts.c
  12. 0 0
      arch/powerpc/cpu/74xx_7xx/io.S
  13. 0 0
      arch/powerpc/cpu/74xx_7xx/kgdb.S
  14. 0 0
      arch/powerpc/cpu/74xx_7xx/speed.c
  15. 0 0
      arch/powerpc/cpu/74xx_7xx/start.S
  16. 1 1
      arch/powerpc/cpu/74xx_7xx/traps.c
  17. 0 0
      arch/powerpc/cpu/mpc512x/Makefile
  18. 1 1
      arch/powerpc/cpu/mpc512x/asm-offsets.h
  19. 1 1
      arch/powerpc/cpu/mpc512x/config.mk
  20. 0 0
      arch/powerpc/cpu/mpc512x/cpu.c
  21. 0 0
      arch/powerpc/cpu/mpc512x/cpu_init.c
  22. 0 0
      arch/powerpc/cpu/mpc512x/diu.c
  23. 0 0
      arch/powerpc/cpu/mpc512x/fixed_sdram.c
  24. 0 0
      arch/powerpc/cpu/mpc512x/i2c.c
  25. 0 0
      arch/powerpc/cpu/mpc512x/ide.c
  26. 0 0
      arch/powerpc/cpu/mpc512x/iim.c
  27. 0 0
      arch/powerpc/cpu/mpc512x/interrupts.c
  28. 0 0
      arch/powerpc/cpu/mpc512x/iopin.c
  29. 0 0
      arch/powerpc/cpu/mpc512x/pci.c
  30. 0 0
      arch/powerpc/cpu/mpc512x/serial.c
  31. 0 0
      arch/powerpc/cpu/mpc512x/speed.c
  32. 0 0
      arch/powerpc/cpu/mpc512x/start.S
  33. 0 0
      arch/powerpc/cpu/mpc512x/traps.c
  34. 1 1
      arch/powerpc/cpu/mpc512x/u-boot.lds
  35. 2 2
      arch/powerpc/cpu/mpc5xx/Makefile
  36. 1 1
      arch/powerpc/cpu/mpc5xx/config.mk
  37. 0 0
      arch/powerpc/cpu/mpc5xx/cpu.c
  38. 0 0
      arch/powerpc/cpu/mpc5xx/cpu_init.c
  39. 0 0
      arch/powerpc/cpu/mpc5xx/interrupts.c
  40. 0 0
      arch/powerpc/cpu/mpc5xx/serial.c
  41. 0 0
      arch/powerpc/cpu/mpc5xx/speed.c
  42. 0 0
      arch/powerpc/cpu/mpc5xx/spi.c
  43. 0 0
      arch/powerpc/cpu/mpc5xx/start.S
  44. 1 1
      arch/powerpc/cpu/mpc5xx/traps.c
  45. 1 1
      arch/powerpc/cpu/mpc5xx/u-boot.lds
  46. 0 0
      arch/powerpc/cpu/mpc5xxx/Makefile
  47. 1 1
      arch/powerpc/cpu/mpc5xxx/config.mk
  48. 0 0
      arch/powerpc/cpu/mpc5xxx/cpu.c
  49. 0 0
      arch/powerpc/cpu/mpc5xxx/cpu_init.c
  50. 0 0
      arch/powerpc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S
  51. 0 0
      arch/powerpc/cpu/mpc5xxx/i2c.c
  52. 0 0
      arch/powerpc/cpu/mpc5xxx/ide.c
  53. 1 1
      arch/powerpc/cpu/mpc5xxx/interrupts.c
  54. 0 0
      arch/powerpc/cpu/mpc5xxx/io.S
  55. 0 0
      arch/powerpc/cpu/mpc5xxx/loadtask.c
  56. 0 0
      arch/powerpc/cpu/mpc5xxx/pci_mpc5200.c
  57. 1 1
      arch/powerpc/cpu/mpc5xxx/serial.c
  58. 0 0
      arch/powerpc/cpu/mpc5xxx/speed.c
  59. 1 1
      arch/powerpc/cpu/mpc5xxx/start.S
  60. 1 1
      arch/powerpc/cpu/mpc5xxx/traps.c
  61. 4 4
      arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
  62. 1 1
      arch/powerpc/cpu/mpc5xxx/u-boot.lds
  63. 0 0
      arch/powerpc/cpu/mpc5xxx/usb.c
  64. 0 0
      arch/powerpc/cpu/mpc5xxx/usb_ohci.c
  65. 0 0
      arch/powerpc/cpu/mpc5xxx/usb_ohci.h
  66. 0 0
      arch/powerpc/cpu/mpc8220/Makefile
  67. 1 1
      arch/powerpc/cpu/mpc8220/config.mk
  68. 0 0
      arch/powerpc/cpu/mpc8220/cpu.c
  69. 0 0
      arch/powerpc/cpu/mpc8220/cpu_init.c
  70. 0 0
      arch/powerpc/cpu/mpc8220/dma.h
  71. 0 0
      arch/powerpc/cpu/mpc8220/dramSetup.c
  72. 0 0
      arch/powerpc/cpu/mpc8220/dramSetup.h
  73. 0 0
      arch/powerpc/cpu/mpc8220/fec.c
  74. 0 0
      arch/powerpc/cpu/mpc8220/fec.h
  75. 0 0
      arch/powerpc/cpu/mpc8220/fec_dma_tasks.S
  76. 0 0
      arch/powerpc/cpu/mpc8220/i2c.c
  77. 0 0
      arch/powerpc/cpu/mpc8220/i2cCore.c
  78. 0 0
      arch/powerpc/cpu/mpc8220/i2cCore.h
  79. 0 0
      arch/powerpc/cpu/mpc8220/interrupts.c
  80. 0 0
      arch/powerpc/cpu/mpc8220/io.S
  81. 0 0
      arch/powerpc/cpu/mpc8220/loadtask.c
  82. 0 0
      arch/powerpc/cpu/mpc8220/pci.c
  83. 0 0
      arch/powerpc/cpu/mpc8220/speed.c
  84. 1 1
      arch/powerpc/cpu/mpc8220/start.S
  85. 1 1
      arch/powerpc/cpu/mpc8220/traps.c
  86. 1 1
      arch/powerpc/cpu/mpc8220/u-boot.lds
  87. 0 0
      arch/powerpc/cpu/mpc8220/uart.c
  88. 0 0
      arch/powerpc/cpu/mpc824x/.gitignore
  89. 0 0
      arch/powerpc/cpu/mpc824x/Makefile
  90. 1 1
      arch/powerpc/cpu/mpc824x/config.mk
  91. 0 0
      arch/powerpc/cpu/mpc824x/cpu.c
  92. 0 0
      arch/powerpc/cpu/mpc824x/cpu_init.c
  93. 0 0
      arch/powerpc/cpu/mpc824x/drivers/epic.h
  94. 0 0
      arch/powerpc/cpu/mpc824x/drivers/epic/README
  95. 0 0
      arch/powerpc/cpu/mpc824x/drivers/epic/epic.h
  96. 0 0
      arch/powerpc/cpu/mpc824x/drivers/epic/epic1.c
  97. 0 0
      arch/powerpc/cpu/mpc824x/drivers/epic/epic2.S
  98. 0 0
      arch/powerpc/cpu/mpc824x/drivers/epic/epicutil.S
  99. 0 0
      arch/powerpc/cpu/mpc824x/drivers/errors.h
  100. 0 0
      arch/powerpc/cpu/mpc824x/drivers/i2c/i2c.c

+ 10 - 4
MAKEALL

@@ -489,7 +489,7 @@ LIST_TSEC="		\
 	${LIST_86xx}	\
 "
 
-LIST_ppc="		\
+LIST_powerpc="		\
 	${LIST_5xx}	\
 	${LIST_512x}	\
 	${LIST_5xxx}	\
@@ -505,6 +505,12 @@ LIST_ppc="		\
 	${LIST_7xx}	\
 "
 
+# Alias "ppc" -> "powerpc" to not break compatibility with older scripts
+# still using "ppc" instead of "powerpc"
+LIST_ppc="		\
+	${LIST_powerpc}	\
+"
+
 #########################################################################
 ## StrongARM Systems
 #########################################################################
@@ -949,8 +955,8 @@ LIST_sparc="gr_xc3s_1500	gr_cpci_ax2000	gr_ep2s60	grsim	grsim_leon2"
 
 #-----------------------------------------------------------------------
 
-#----- for now, just run PPC by default -----
-[ $# = 0 ] && set $LIST_ppc
+#----- for now, just run PowerPC by default -----
+[ $# = 0 ] && set $LIST_powerpc
 
 #-----------------------------------------------------------------------
 
@@ -1006,7 +1012,7 @@ do
 	|microblaze \
 	|mips|mips_el \
 	|nios|nios2 \
-	|ppc|5xx|5xxx|512x|8xx|8220|824x|8260|83xx|85xx|86xx|4xx|7xx|74xx|TSEC \
+	|ppc|powerpc|5xx|5xxx|512x|8xx|8220|824x|8260|83xx|85xx|86xx|4xx|7xx|74xx|TSEC \
 	|sh|sh2|sh3|sh4 \
 	|sparc \
 	|x86|I486 \

File diff suppressed because it is too large
+ 184 - 188
Makefile


+ 8 - 8
README

@@ -183,7 +183,7 @@ Directory Hierarchy:
   /nios2		Files generic to Altera NIOS2 architecture
     /cpu		CPU specific files
     /lib		Architecture specific library files
-  /ppc			Files generic to PowerPC architecture
+  /powerpc		Files generic to PowerPC architecture
     /cpu		CPU specific files
       /74xx_7xx		Files specific to Freescale MPC74xx and 7xx CPUs
       /mpc5xx		Files specific to Freescale MPC5xx CPUs
@@ -1417,7 +1417,7 @@ The following options need to be configured:
 		the CPU's i2c node address).
 
 		Now, the u-boot i2c code for the mpc8xx
-		(arch/ppc/cpu/mpc8xx/i2c.c) sets the CPU up as a master node
+		(arch/powerpc/cpu/mpc8xx/i2c.c) sets the CPU up as a master node
 		and so its address should therefore be cleared to 0 (See,
 		eg, MPC823e User's Manual p.16-473). So, set
 		CONFIG_SYS_I2C_SLAVE to 0.
@@ -1966,7 +1966,7 @@ Legacy uImage format:
 
    15	arch/<arch>/lib/bootm.c	All preparation done, transferring control to OS
 
-  -30	arch/ppc/lib/board.c	Fatal error, hang the system
+  -30	arch/powerpc/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()
 
@@ -2727,7 +2727,7 @@ Low Level (hardware related) configuration options:
   CONFIG_SYS_PCI_MSTR_MEMIO_SIZE, CONFIG_SYS_POCMR1_MASK_ATTRIB, CONFIG_SYS_PCI_MSTR_IO_LOCAL,
   CONFIG_SYS_PCI_MSTR_IO_BUS, CONFIG_SYS_CPU_PCI_IO_START, CONFIG_SYS_PCI_MSTR_IO_SIZE,
   CONFIG_SYS_POCMR2_MASK_ATTRIB: (MPC826x only)
-		Overrides the default PCI memory map in arch/ppc/cpu/mpc8260/pci.c if set.
+		Overrides the default PCI memory map in arch/powerpc/cpu/mpc8260/pci.c if set.
 
 - CONFIG_PCI_DISABLE_PCIE:
 		Disable PCI-Express on systems where it is supported but not
@@ -3373,7 +3373,7 @@ configure the Linux device drivers for use with your target hardware
 (no, we don't intend to provide a full virtual machine interface to
 Linux :-).
 
-But now you can ignore ALL boot loader code (in arch/ppc/mbxboot).
+But now you can ignore ALL boot loader code (in arch/powerpc/mbxboot).
 
 Just make sure your machine specific header file (for instance
 include/asm-ppc/tqm8xx.h) includes the same definition of the Board
@@ -3471,7 +3471,7 @@ So a typical call to build a U-Boot image would read:
 
 	-> tools/mkimage -n '2.4.4 kernel for TQM850L' \
 	> -A ppc -O linux -T kernel -C gzip -a 0 -e 0 \
-	> -d /opt/elsk/ppc_8xx/usr/src/linux-2.4.4/arch/ppc/coffboot/vmlinux.gz \
+	> -d /opt/elsk/ppc_8xx/usr/src/linux-2.4.4/arch/powerpc/coffboot/vmlinux.gz \
 	> examples/uImage.TQM850L
 	Image Name:   2.4.4 kernel for TQM850L
 	Created:      Wed Jul 19 02:34:59 2000
@@ -3495,10 +3495,10 @@ speed for memory and install an UNCOMPRESSED image instead: this
 needs more space in Flash, but boots much faster since it does not
 need to be uncompressed:
 
-	-> gunzip /opt/elsk/ppc_8xx/usr/src/linux-2.4.4/arch/ppc/coffboot/vmlinux.gz
+	-> gunzip /opt/elsk/ppc_8xx/usr/src/linux-2.4.4/arch/powerpc/coffboot/vmlinux.gz
 	-> tools/mkimage -n '2.4.4 kernel for TQM850L' \
 	> -A ppc -O linux -T kernel -C none -a 0 -e 0 \
-	> -d /opt/elsk/ppc_8xx/usr/src/linux-2.4.4/arch/ppc/coffboot/vmlinux \
+	> -d /opt/elsk/ppc_8xx/usr/src/linux-2.4.4/arch/powerpc/coffboot/vmlinux \
 	> examples/uImage.TQM850L-uncompressed
 	Image Name:   2.4.4 kernel for TQM850L
 	Created:      Wed Jul 19 02:34:59 2000

+ 0 - 0
api/api_platform-ppc.c → api/api_platform-powerpc.c


+ 0 - 0
arch/ppc/config.mk → arch/powerpc/config.mk


+ 0 - 0
arch/ppc/cpu/74xx_7xx/Makefile → arch/powerpc/cpu/74xx_7xx/Makefile


+ 0 - 0
arch/ppc/cpu/74xx_7xx/cache.S → arch/powerpc/cpu/74xx_7xx/cache.S


+ 0 - 0
arch/ppc/cpu/74xx_7xx/config.mk → arch/powerpc/cpu/74xx_7xx/config.mk


+ 0 - 0
arch/ppc/cpu/74xx_7xx/cpu.c → arch/powerpc/cpu/74xx_7xx/cpu.c


+ 0 - 0
arch/ppc/cpu/74xx_7xx/cpu_init.c → arch/powerpc/cpu/74xx_7xx/cpu_init.c


+ 0 - 0
arch/ppc/cpu/74xx_7xx/interrupts.c → arch/powerpc/cpu/74xx_7xx/interrupts.c


+ 0 - 0
arch/ppc/cpu/74xx_7xx/io.S → arch/powerpc/cpu/74xx_7xx/io.S


+ 0 - 0
arch/ppc/cpu/74xx_7xx/kgdb.S → arch/powerpc/cpu/74xx_7xx/kgdb.S


+ 0 - 0
arch/ppc/cpu/74xx_7xx/speed.c → arch/powerpc/cpu/74xx_7xx/speed.c


+ 0 - 0
arch/ppc/cpu/74xx_7xx/start.S → arch/powerpc/cpu/74xx_7xx/start.S


+ 1 - 1
arch/ppc/cpu/74xx_7xx/traps.c → arch/powerpc/cpu/74xx_7xx/traps.c

@@ -1,5 +1,5 @@
 /*
- * linux/arch/ppc/kernel/traps.c
+ * linux/arch/powerpc/kernel/traps.c
  *
  * Copyright (C) 1995-1996  Gary Thomas (gdt@linuxppc.org)
  *

+ 0 - 0
arch/ppc/cpu/mpc512x/Makefile → arch/powerpc/cpu/mpc512x/Makefile


+ 1 - 1
arch/ppc/cpu/mpc512x/asm-offsets.h → arch/powerpc/cpu/mpc512x/asm-offsets.h

@@ -1,5 +1,5 @@
 /*
- * needed for arch/ppc/cpu/mpc512x/start.S
+ * needed for arch/powerpc/cpu/mpc512x/start.S
  *
  * These should be auto-generated
  */

+ 1 - 1
arch/ppc/cpu/mpc512x/config.mk → arch/powerpc/cpu/mpc512x/config.mk

@@ -26,4 +26,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC512X -DCONFIG_E300 \
 
 # Use default linker script.
 # A board port can override this setting in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc512x/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc512x/u-boot.lds

+ 0 - 0
arch/ppc/cpu/mpc512x/cpu.c → arch/powerpc/cpu/mpc512x/cpu.c


+ 0 - 0
arch/ppc/cpu/mpc512x/cpu_init.c → arch/powerpc/cpu/mpc512x/cpu_init.c


+ 0 - 0
arch/ppc/cpu/mpc512x/diu.c → arch/powerpc/cpu/mpc512x/diu.c


+ 0 - 0
arch/ppc/cpu/mpc512x/fixed_sdram.c → arch/powerpc/cpu/mpc512x/fixed_sdram.c


+ 0 - 0
arch/ppc/cpu/mpc512x/i2c.c → arch/powerpc/cpu/mpc512x/i2c.c


+ 0 - 0
arch/ppc/cpu/mpc512x/ide.c → arch/powerpc/cpu/mpc512x/ide.c


+ 0 - 0
arch/ppc/cpu/mpc512x/iim.c → arch/powerpc/cpu/mpc512x/iim.c


+ 0 - 0
arch/ppc/cpu/mpc512x/interrupts.c → arch/powerpc/cpu/mpc512x/interrupts.c


+ 0 - 0
arch/ppc/cpu/mpc512x/iopin.c → arch/powerpc/cpu/mpc512x/iopin.c


+ 0 - 0
arch/ppc/cpu/mpc512x/pci.c → arch/powerpc/cpu/mpc512x/pci.c


+ 0 - 0
arch/ppc/cpu/mpc512x/serial.c → arch/powerpc/cpu/mpc512x/serial.c


+ 0 - 0
arch/ppc/cpu/mpc512x/speed.c → arch/powerpc/cpu/mpc512x/speed.c


+ 0 - 0
arch/ppc/cpu/mpc512x/start.S → arch/powerpc/cpu/mpc512x/start.S


+ 0 - 0
arch/ppc/cpu/mpc512x/traps.c → arch/powerpc/cpu/mpc512x/traps.c


+ 1 - 1
arch/ppc/cpu/mpc512x/u-boot.lds → arch/powerpc/cpu/mpc512x/u-boot.lds

@@ -49,7 +49,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    arch/ppc/cpu/mpc512x/start.o	(.text)
+    arch/powerpc/cpu/mpc512x/start.o	(.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);

+ 2 - 2
arch/ppc/cpu/mpc5xx/Makefile → arch/powerpc/cpu/mpc5xx/Makefile

@@ -25,11 +25,11 @@
 #
 
 #
-# File:			arch/ppc/cpu/mpc5xx/Makefile
+# File:			arch/powerpc/cpu/mpc5xx/Makefile
 #
 # Discription:		Makefile to build mpc5xx cpu configuration.
 #			Will include top config.mk which itselfs
-#			uses the definitions made in arch/ppc/cpu/mpc5xx/config.mk
+#			uses the definitions made in arch/powerpc/cpu/mpc5xx/config.mk
 #
 
 

+ 1 - 1
arch/ppc/cpu/mpc5xx/config.mk → arch/powerpc/cpu/mpc5xx/config.mk

@@ -33,4 +33,4 @@ PLATFORM_RELFLAGS +=	-fPIC -meabi
 PLATFORM_CPPFLAGS +=	-DCONFIG_5xx -ffixed-r2 -mpowerpc -msoft-float
 
 # Use default linker script.  Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xx/u-boot.lds

+ 0 - 0
arch/ppc/cpu/mpc5xx/cpu.c → arch/powerpc/cpu/mpc5xx/cpu.c


+ 0 - 0
arch/ppc/cpu/mpc5xx/cpu_init.c → arch/powerpc/cpu/mpc5xx/cpu_init.c


+ 0 - 0
arch/ppc/cpu/mpc5xx/interrupts.c → arch/powerpc/cpu/mpc5xx/interrupts.c


+ 0 - 0
arch/ppc/cpu/mpc5xx/serial.c → arch/powerpc/cpu/mpc5xx/serial.c


+ 0 - 0
arch/ppc/cpu/mpc5xx/speed.c → arch/powerpc/cpu/mpc5xx/speed.c


+ 0 - 0
arch/ppc/cpu/mpc5xx/spi.c → arch/powerpc/cpu/mpc5xx/spi.c


+ 0 - 0
arch/ppc/cpu/mpc5xx/start.S → arch/powerpc/cpu/mpc5xx/start.S


+ 1 - 1
arch/ppc/cpu/mpc5xx/traps.c → arch/powerpc/cpu/mpc5xx/traps.c

@@ -1,5 +1,5 @@
 /*
- * linux/arch/ppc/kernel/traps.c
+ * linux/arch/powerpc/kernel/traps.c
  *
  * Copyright (C) 1995-1996  Gary Thomas (gdt@linuxppc.org)
  *

+ 1 - 1
arch/ppc/cpu/mpc5xx/u-boot.lds → arch/powerpc/cpu/mpc5xx/u-boot.lds

@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    arch/ppc/cpu/mpc5xx/start.o	(.text)
+    arch/powerpc/cpu/mpc5xx/start.o	(.text)
 
     *(.text)
     *(.got1)

+ 0 - 0
arch/ppc/cpu/mpc5xxx/Makefile → arch/powerpc/cpu/mpc5xxx/Makefile


+ 1 - 1
arch/ppc/cpu/mpc5xxx/config.mk → arch/powerpc/cpu/mpc5xxx/config.mk

@@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC5xxx -ffixed-r2 \
 		     -mstring -mcpu=603e -mmultiple
 
 # Use default linker script.  Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot.lds

+ 0 - 0
arch/ppc/cpu/mpc5xxx/cpu.c → arch/powerpc/cpu/mpc5xxx/cpu.c


+ 0 - 0
arch/ppc/cpu/mpc5xxx/cpu_init.c → arch/powerpc/cpu/mpc5xxx/cpu_init.c


+ 0 - 0
arch/ppc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S → arch/powerpc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S


+ 0 - 0
arch/ppc/cpu/mpc5xxx/i2c.c → arch/powerpc/cpu/mpc5xxx/i2c.c


+ 0 - 0
arch/ppc/cpu/mpc5xxx/ide.c → arch/powerpc/cpu/mpc5xxx/ide.c


+ 1 - 1
arch/ppc/cpu/mpc5xxx/interrupts.c → arch/powerpc/cpu/mpc5xxx/interrupts.c

@@ -27,7 +27,7 @@
  * MA 02111-1307 USA
  */
 
-/* this section was ripped out of arch/ppc/syslib/mpc52xx_pic.c in the
+/* this section was ripped out of arch/powerpc/syslib/mpc52xx_pic.c in the
  * Linux 2.6 source with the following copyright.
  *
  * Based on (well, mostly copied from) the code from the 2.4 kernel by

+ 0 - 0
arch/ppc/cpu/mpc5xxx/io.S → arch/powerpc/cpu/mpc5xxx/io.S


+ 0 - 0
arch/ppc/cpu/mpc5xxx/loadtask.c → arch/powerpc/cpu/mpc5xxx/loadtask.c


+ 0 - 0
arch/ppc/cpu/mpc5xxx/pci_mpc5200.c → arch/powerpc/cpu/mpc5xxx/pci_mpc5200.c


+ 1 - 1
arch/ppc/cpu/mpc5xxx/serial.c → arch/powerpc/cpu/mpc5xxx/serial.c

@@ -21,7 +21,7 @@
  * MA 02111-1307 USA
  *
  * Hacked for MPC8260 by Murray.Jensen@cmst.csiro.au, 19-Oct-00, with
- * changes based on the file arch/ppc/mbxboot/m8260_tty.c from the
+ * changes based on the file arch/powerpc/mbxboot/m8260_tty.c from the
  * Linux/PPC sources (m8260_tty.c had no copyright info in it).
  *
  * Martin Krause, 8 Jun 2006

+ 0 - 0
arch/ppc/cpu/mpc5xxx/speed.c → arch/powerpc/cpu/mpc5xxx/speed.c


+ 1 - 1
arch/ppc/cpu/mpc5xxx/start.S → arch/powerpc/cpu/mpc5xxx/start.S

@@ -442,7 +442,7 @@ init_5xxx_core:
 	/*								*/
 	/* bits 15-19 correspond to addresses 0x00000000 to 0x0001F000	*/
 	/* incrementing by 0x1000 each time. The code below is sort of	*/
-	/* based on code in "flush_tlbs" from arch/ppc/kernel/head.S	*/
+	/* based on code in "flush_tlbs" from arch/powerpc/kernel/head.S	*/
 	/*								*/
 	/*--------------------------------------------------------------*/
 

+ 1 - 1
arch/ppc/cpu/mpc5xxx/traps.c → arch/powerpc/cpu/mpc5xxx/traps.c

@@ -1,5 +1,5 @@
 /*
- * linux/arch/ppc/kernel/traps.c
+ * linux/arch/powerpc/kernel/traps.c
  *
  * Copyright (C) 1995-1996  Gary Thomas (gdt@linuxppc.org)
  *

+ 4 - 4
arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds → arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds

@@ -55,11 +55,11 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within  */
     /* the sector layout of our flash chips!    XXX FIXME XXX   */
 
-    arch/ppc/cpu/mpc5xxx/start.o          (.text)
-    arch/ppc/cpu/mpc5xxx/traps.o          (.text)
+    arch/powerpc/cpu/mpc5xxx/start.o          (.text)
+    arch/powerpc/cpu/mpc5xxx/traps.o          (.text)
     lib/crc32.o         (.text)
-    arch/ppc/lib/cache.o             (.text)
-    arch/ppc/lib/time.o              (.text)
+    arch/powerpc/lib/cache.o             (.text)
+    arch/powerpc/lib/time.o              (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o        (.ppcenv)

+ 1 - 1
arch/ppc/cpu/mpc5xxx/u-boot.lds → arch/powerpc/cpu/mpc5xxx/u-boot.lds

@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    arch/ppc/cpu/mpc5xxx/start.o	(.text)
+    arch/powerpc/cpu/mpc5xxx/start.o	(.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);

+ 0 - 0
arch/ppc/cpu/mpc5xxx/usb.c → arch/powerpc/cpu/mpc5xxx/usb.c


+ 0 - 0
arch/ppc/cpu/mpc5xxx/usb_ohci.c → arch/powerpc/cpu/mpc5xxx/usb_ohci.c


+ 0 - 0
arch/ppc/cpu/mpc5xxx/usb_ohci.h → arch/powerpc/cpu/mpc5xxx/usb_ohci.h


+ 0 - 0
arch/ppc/cpu/mpc8220/Makefile → arch/powerpc/cpu/mpc8220/Makefile


+ 1 - 1
arch/ppc/cpu/mpc8220/config.mk → arch/powerpc/cpu/mpc8220/config.mk

@@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC8220 -ffixed-r2 \
 		     -mstring -mcpu=603e -mmultiple
 
 # Use default linker script.  Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc8220/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc8220/u-boot.lds

+ 0 - 0
arch/ppc/cpu/mpc8220/cpu.c → arch/powerpc/cpu/mpc8220/cpu.c


+ 0 - 0
arch/ppc/cpu/mpc8220/cpu_init.c → arch/powerpc/cpu/mpc8220/cpu_init.c


+ 0 - 0
arch/ppc/cpu/mpc8220/dma.h → arch/powerpc/cpu/mpc8220/dma.h


+ 0 - 0
arch/ppc/cpu/mpc8220/dramSetup.c → arch/powerpc/cpu/mpc8220/dramSetup.c


+ 0 - 0
arch/ppc/cpu/mpc8220/dramSetup.h → arch/powerpc/cpu/mpc8220/dramSetup.h


+ 0 - 0
arch/ppc/cpu/mpc8220/fec.c → arch/powerpc/cpu/mpc8220/fec.c


+ 0 - 0
arch/ppc/cpu/mpc8220/fec.h → arch/powerpc/cpu/mpc8220/fec.h


+ 0 - 0
arch/ppc/cpu/mpc8220/fec_dma_tasks.S → arch/powerpc/cpu/mpc8220/fec_dma_tasks.S


+ 0 - 0
arch/ppc/cpu/mpc8220/i2c.c → arch/powerpc/cpu/mpc8220/i2c.c


+ 0 - 0
arch/ppc/cpu/mpc8220/i2cCore.c → arch/powerpc/cpu/mpc8220/i2cCore.c


+ 0 - 0
arch/ppc/cpu/mpc8220/i2cCore.h → arch/powerpc/cpu/mpc8220/i2cCore.h


+ 0 - 0
arch/ppc/cpu/mpc8220/interrupts.c → arch/powerpc/cpu/mpc8220/interrupts.c


+ 0 - 0
arch/ppc/cpu/mpc8220/io.S → arch/powerpc/cpu/mpc8220/io.S


+ 0 - 0
arch/ppc/cpu/mpc8220/loadtask.c → arch/powerpc/cpu/mpc8220/loadtask.c


+ 0 - 0
arch/ppc/cpu/mpc8220/pci.c → arch/powerpc/cpu/mpc8220/pci.c


+ 0 - 0
arch/ppc/cpu/mpc8220/speed.c → arch/powerpc/cpu/mpc8220/speed.c


+ 1 - 1
arch/ppc/cpu/mpc8220/start.S → arch/powerpc/cpu/mpc8220/start.S

@@ -419,7 +419,7 @@ init_8220_core:
 	/*								*/
 	/* bits 15-19 correspond to addresses 0x00000000 to 0x0001F000	*/
 	/* incrementing by 0x1000 each time. The code below is sort of	*/
-	/* based on code in "flush_tlbs" from arch/ppc/kernel/head.S	*/
+	/* based on code in "flush_tlbs" from arch/powerpc/kernel/head.S	*/
 	/*								*/
 	/*--------------------------------------------------------------*/
 

+ 1 - 1
arch/ppc/cpu/mpc8220/traps.c → arch/powerpc/cpu/mpc8220/traps.c

@@ -1,5 +1,5 @@
 /*
- * linux/arch/ppc/kernel/traps.c
+ * linux/arch/powerpc/kernel/traps.c
  *
  * Copyright (C) 1995-1996  Gary Thomas (gdt@linuxppc.org)
  *

+ 1 - 1
arch/ppc/cpu/mpc8220/u-boot.lds → arch/powerpc/cpu/mpc8220/u-boot.lds

@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    arch/ppc/cpu/mpc8220/start.o	(.text)
+    arch/powerpc/cpu/mpc8220/start.o	(.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);

+ 0 - 0
arch/ppc/cpu/mpc8220/uart.c → arch/powerpc/cpu/mpc8220/uart.c


+ 0 - 0
arch/ppc/cpu/mpc824x/.gitignore → arch/powerpc/cpu/mpc824x/.gitignore


+ 0 - 0
arch/ppc/cpu/mpc824x/Makefile → arch/powerpc/cpu/mpc824x/Makefile


+ 1 - 1
arch/ppc/cpu/mpc824x/config.mk → arch/powerpc/cpu/mpc824x/config.mk

@@ -26,4 +26,4 @@ PLATFORM_RELFLAGS += -fPIC -meabi
 PLATFORM_CPPFLAGS += -DCONFIG_MPC824X -ffixed-r2 -mstring -mcpu=603e -msoft-float
 
 # Use default linker script.  Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc824x/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc824x/u-boot.lds

+ 0 - 0
arch/ppc/cpu/mpc824x/cpu.c → arch/powerpc/cpu/mpc824x/cpu.c


+ 0 - 0
arch/ppc/cpu/mpc824x/cpu_init.c → arch/powerpc/cpu/mpc824x/cpu_init.c


+ 0 - 0
arch/ppc/cpu/mpc824x/drivers/epic.h → arch/powerpc/cpu/mpc824x/drivers/epic.h


+ 0 - 0
arch/ppc/cpu/mpc824x/drivers/epic/README → arch/powerpc/cpu/mpc824x/drivers/epic/README


+ 0 - 0
arch/ppc/cpu/mpc824x/drivers/epic/epic.h → arch/powerpc/cpu/mpc824x/drivers/epic/epic.h


+ 0 - 0
arch/ppc/cpu/mpc824x/drivers/epic/epic1.c → arch/powerpc/cpu/mpc824x/drivers/epic/epic1.c


+ 0 - 0
arch/ppc/cpu/mpc824x/drivers/epic/epic2.S → arch/powerpc/cpu/mpc824x/drivers/epic/epic2.S


+ 0 - 0
arch/ppc/cpu/mpc824x/drivers/epic/epicutil.S → arch/powerpc/cpu/mpc824x/drivers/epic/epicutil.S


+ 0 - 0
arch/ppc/cpu/mpc824x/drivers/errors.h → arch/powerpc/cpu/mpc824x/drivers/errors.h


+ 0 - 0
arch/ppc/cpu/mpc824x/drivers/i2c/i2c.c → arch/powerpc/cpu/mpc824x/drivers/i2c/i2c.c


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