diff options
| author | Graeme Russ <graeme.russ@gmail.com> | 2011-08-04 22:05:09 +1000 |
|---|---|---|
| committer | Graeme Russ <graeme.russ@gmail.com> | 2011-11-02 20:49:17 +1100 |
| commit | 3c7db1beace50a95c2f32f80552dc7c7aca5561b (patch) | |
| tree | 00b96c95ede04c36fd9e8dbefb984fca42a62d04 /arch/x86 | |
| parent | 7b3d5380eea55f5b2e21c592b256b7077698f766 (diff) | |
| download | u-boot-imx-3c7db1beace50a95c2f32f80552dc7c7aca5561b.zip u-boot-imx-3c7db1beace50a95c2f32f80552dc7c7aca5561b.tar.gz u-boot-imx-3c7db1beace50a95c2f32f80552dc7c7aca5561b.tar.bz2 | |
x86: Rename include/asm/ic to include/asm/arch-sc520
Also include some trivial related cleanups
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/cpu/sc520/sc520.c | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/sc520/sc520_car.S | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/sc520/sc520_pci.c | 4 | ||||
| -rw-r--r-- | arch/x86/cpu/sc520/sc520_reset.c | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/sc520/sc520_sdram.c | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/sc520/sc520_ssi.c | 4 | ||||
| -rw-r--r-- | arch/x86/cpu/sc520/sc520_timer.c | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/arch-sc520/pci.h (renamed from arch/x86/include/asm/ic/pci.h) | 0 | ||||
| -rw-r--r-- | arch/x86/include/asm/arch-sc520/sc520.h (renamed from arch/x86/include/asm/ic/sc520.h) | 0 | ||||
| -rw-r--r-- | arch/x86/include/asm/arch-sc520/ssi.h (renamed from arch/x86/include/asm/ic/ssi.h) | 0 | ||||
| -rw-r--r-- | arch/x86/lib/zimage.c | 1 |
11 files changed, 9 insertions, 10 deletions
diff --git a/arch/x86/cpu/sc520/sc520.c b/arch/x86/cpu/sc520/sc520.c index e37c403..4892c01 100644 --- 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; diff --git a/arch/x86/cpu/sc520/sc520_car.S b/arch/x86/cpu/sc520/sc520_car.S index a33f94f..7cac4d1 100644 --- 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 diff --git a/arch/x86/cpu/sc520/sc520_pci.c b/arch/x86/cpu/sc520/sc520_pci.c index 32d4802..e26793a 100644 --- 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; diff --git a/arch/x86/cpu/sc520/sc520_reset.c b/arch/x86/cpu/sc520/sc520_reset.c index 18890c3..137af97 100644 --- 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; diff --git a/arch/x86/cpu/sc520/sc520_sdram.c b/arch/x86/cpu/sc520/sc520_sdram.c index f3623f5..57e4e7d 100644 --- 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; diff --git a/arch/x86/cpu/sc520/sc520_ssi.c b/arch/x86/cpu/sc520/sc520_ssi.c index 47aa80b..3a6a858 100644 --- 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) { diff --git a/arch/x86/cpu/sc520/sc520_timer.c b/arch/x86/cpu/sc520/sc520_timer.c index 5cccda1..05bc9c1 100644 --- 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) { diff --git a/arch/x86/include/asm/ic/pci.h b/arch/x86/include/asm/arch-sc520/pci.h index 12ba656..12ba656 100644 --- a/arch/x86/include/asm/ic/pci.h +++ b/arch/x86/include/asm/arch-sc520/pci.h diff --git a/arch/x86/include/asm/ic/sc520.h b/arch/x86/include/asm/arch-sc520/sc520.h index 5ac9bb8..5ac9bb8 100644 --- a/arch/x86/include/asm/ic/sc520.h +++ b/arch/x86/include/asm/arch-sc520/sc520.h diff --git a/arch/x86/include/asm/ic/ssi.h b/arch/x86/include/asm/arch-sc520/ssi.h index bd48eab..bd48eab 100644 --- a/arch/x86/include/asm/ic/ssi.h +++ b/arch/x86/include/asm/arch-sc520/ssi.h diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index 6682e0d..d2dd6fd 100644 --- 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: |