leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-x86

Browse Source 
* '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
This commit is contained in:
Wolfgang Denk 2011-11-03 20:36:04 +01:00
commit e84fb175f6
17 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/cpu/sc520/sc520.c
View File

@ -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;

2
arch/x86/cpu/sc520/sc520_car.S
View File

@ -23,7 +23,7 @@
#include <config.h>
#include <asm/processor-flags.h>
#include <asm/ic/sc520.h>
#include <asm/arch/sc520.h>
.section .text

4
arch/x86/cpu/sc520/sc520_pci.c
View File

@ -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;

2
arch/x86/cpu/sc520/sc520_reset.c
View File

@ -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;

2
arch/x86/cpu/sc520/sc520_sdram.c
View File

@ -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;

4
arch/x86/cpu/sc520/sc520_ssi.c
View File

@ -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)
{

2
arch/x86/cpu/sc520/sc520_timer.c
View File

@ -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)
{

2
arch/x86/cpu/start16.S
View File

@ -50,7 +50,7 @@ board_init16_ret:
/* Turn of cache (this might require a 486-class CPU) */
movl %cr0, %eax
orl $(X86_CR0_NW & X86_CR0_CD), %eax
orl $(X86_CR0_NW | X86_CR0_CD), %eax
movl %eax, %cr0
wbinvd

0
arch/x86/include/asm/ic/pci.h → arch/x86/include/asm/arch-sc520/pci.h
View File

0
arch/x86/include/asm/ic/sc520.h → arch/x86/include/asm/arch-sc520/sc520.h
View File

0
arch/x86/include/asm/ic/ssi.h → arch/x86/include/asm/arch-sc520/ssi.h
View File

1
arch/x86/include/asm/u-boot-x86.h
View File

@ -42,7 +42,6 @@ int dram_init_f(void);
int cpu_init_interrupts(void);
/* board/.../... */
int board_init(void);
int dram_init(void);
void setup_pcat_compatibility(void);

2
arch/x86/lib/realmode.c
View File

@ -41,7 +41,7 @@ int realmode_setup(void)
if (realmode_size > (REALMODE_MAILBOX - (char *)REALMODE_BASE)) {
printf("realmode switch too large (%ld bytes, max is %d)\n",
realmode_size,
(REALMODE_MAILBOX - (char *)REALMODE_BASE));
(int)(REALMODE_MAILBOX - (char *)REALMODE_BASE));
return -1;
}

1
arch/x86/lib/zimage.c
View File

@ -35,7 +35,6 @@
#include <asm/realmode.h>
#include <asm/byteorder.h>
#include <asm/bootparam.h>
#include <asm/ic/sc520.h>
/*
* Memory lay-out:

2
board/eNET/eNET.c
View File

@ -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>

2
board/eNET/eNET_pci.c
View File

@ -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)
{

4
board/eNET/eNET_start16.S
View File

@ -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"