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 /board | |
| 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 'board')
| -rw-r--r-- | board/eNET/eNET.c | 2 | ||||
| -rw-r--r-- | board/eNET/eNET_pci.c | 2 | ||||
| -rw-r--r-- | board/eNET/eNET_start16.S | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/board/eNET/eNET.c b/board/eNET/eNET.c index 2a5636c..c4ed820 100644 --- 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> diff --git a/board/eNET/eNET_pci.c b/board/eNET/eNET_pci.c index d97387e..29d13d2 100644 --- 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) { diff --git a/board/eNET/eNET_start16.S b/board/eNET/eNET_start16.S index 77e5519..4241f6e 100644 --- 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" |