diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-03 20:36:04 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-03 20:36:04 +0100 |
| commit | e84fb175f671d2dc9a0b2253ac28b85a2f3620cd (patch) | |
| tree | f4c11f508d0b6e2181595a887ccbb7dc004b976e /arch/x86/cpu/sc520 | |
| parent | b2b4449aa7fcbf2b3042cd9100f5857d89480812 (diff) | |
| parent | 4c1c355a68d102e900617639d702c35390564355 (diff) | |
| download | u-boot-imx-e84fb175f671d2dc9a0b2253ac28b85a2f3620cd.zip u-boot-imx-e84fb175f671d2dc9a0b2253ac28b85a2f3620cd.tar.gz u-boot-imx-e84fb175f671d2dc9a0b2253ac28b85a2f3620cd.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
* 'master' of git://git.denx.de/u-boot-x86:
x86: Fix a compiler warning in arch/x86/lib/realmode.c
x86: Remove the prototype for the unused function board_init
x86: Rename include/asm/ic to include/asm/arch-sc520
x86: turn off cache: set control register properly
Diffstat (limited to 'arch/x86/cpu/sc520')
| -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 |
7 files changed, 9 insertions, 9 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) { |