x86: Rename include/asm/ic to include/asm/arch-sc520

Also include some trivial related cleanups
14 years ago · 3c7db1beac
parent 7b3d5380ee
commit 3c7db1beac
14 changed files with 12 additions and 15 deletions
--- a/arch/x86/cpu/sc520/sc520.c
+++ b/arch/x86/cpu/sc520/sc520.c
@ -27,7 +27,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/processor-flags.h>
-#include <asm/ic/sc520.h>
+#include <asm/arch/sc520.h>

 DECLARE_GLOBAL_DATA_PTR;

--- a/arch/x86/cpu/sc520/sc520_car.S
+++ b/arch/x86/cpu/sc520/sc520_car.S
@ -23,7 +23,7 @@

 #include <config.h>
 #include <asm/processor-flags.h>
-#include <asm/ic/sc520.h>
+#include <asm/arch/sc520.h>

 .section .text

--- a/arch/x86/cpu/sc520/sc520_pci.c
+++ b/arch/x86/cpu/sc520/sc520_pci.c
@ -28,8 +28,8 @@
 #include <pci.h>
 #include <asm/io.h>
 #include <asm/pci.h>
-#include <asm/ic/pci.h>
-#include <asm/ic/sc520.h>
+#include <asm/arch/pci.h>
+#include <asm/arch/sc520.h>

 static struct {
 	u8 priority;
--- a/arch/x86/cpu/sc520/sc520_reset.c
+++ b/arch/x86/cpu/sc520/sc520_reset.c
@ -26,7 +26,7 @@

 #include <common.h>
 #include <asm/io.h>
-#include <asm/ic/sc520.h>
+#include <asm/arch/sc520.h>

 DECLARE_GLOBAL_DATA_PTR;

--- a/arch/x86/cpu/sc520/sc520_sdram.c
+++ b/arch/x86/cpu/sc520/sc520_sdram.c
@ -24,7 +24,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/processor-flags.h>
-#include <asm/ic/sc520.h>
+#include <asm/arch/sc520.h>

 DECLARE_GLOBAL_DATA_PTR;

--- a/arch/x86/cpu/sc520/sc520_ssi.c
+++ b/arch/x86/cpu/sc520/sc520_ssi.c
@ -23,8 +23,8 @@

 #include <common.h>
 #include <asm/io.h>
-#include <asm/ic/ssi.h>
-#include <asm/ic/sc520.h>
+#include <asm/arch/ssi.h>
+#include <asm/arch/sc520.h>

 int ssi_set_interface(int freq, int lsb_first, int inv_clock, int inv_phase)
 {
--- a/arch/x86/cpu/sc520/sc520_timer.c
+++ b/arch/x86/cpu/sc520/sc520_timer.c
@ -27,7 +27,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/interrupt.h>
-#include <asm/ic/sc520.h>
+#include <asm/arch/sc520.h>

 void sc520_timer_isr(void)
 {
--- a/arch/x86/include/asm/arch-sc520/pci.h
+++ b/arch/x86/include/asm/arch-sc520/pci.h
--- a/arch/x86/include/asm/arch-sc520/sc520.h
+++ b/arch/x86/include/asm/arch-sc520/sc520.h
--- a/arch/x86/include/asm/arch-sc520/ssi.h
+++ b/arch/x86/include/asm/arch-sc520/ssi.h
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@ -35,7 +35,6 @@
 #include <asm/realmode.h>
 #include <asm/byteorder.h>
 #include <asm/bootparam.h>
-#include <asm/ic/sc520.h>

 /*
 * Memory lay-out:
--- a/board/eNET/eNET.c
+++ b/board/eNET/eNET.c
@ -23,7 +23,7 @@

 #include <common.h>
 #include <asm/io.h>
-#include <asm/ic/sc520.h>
+#include <asm/arch/sc520.h>
 #include <net.h>
 #include <netdev.h>

--- a/board/eNET/eNET_pci.c
+++ b/board/eNET/eNET_pci.c
@ -27,7 +27,7 @@
 #include <common.h>
 #include <pci.h>
 #include <asm/pci.h>
-#include <asm/ic/pci.h>
+#include <asm/arch/pci.h>

 static void pci_enet_fixup_irq(struct pci_controller *hose, pci_dev_t dev)
 {
--- a/board/eNET/eNET_start16.S
+++ b/board/eNET/eNET_start16.S
@ -27,11 +27,9 @@
 * that is used by U-boot to its final destination.
 */

-/* #include <asm/ic/sc520_defs.h> */
-
 #include "config.h"
 #include "hardware.h"
-#include <asm/ic/sc520.h>
+#include <asm/arch/sc520.h>

 .text
 .section .start16, "ax"