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

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

Browse Source
This commit is contained in:
Wolfgang Denk 2010-05-17 23:16:08 +02:00
commit 568278e336
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/cpu/mpc83xx/start.S
View File

@ -739,6 +739,7 @@ setup_bats:
* Note: requires that all cache bits in * Note: requires that all cache bits in
* HID0 are in the low half word. * HID0 are in the low half word.
*/ */
#ifndef CONFIG_NAND_SPL
.globl icache_enable .globl icache_enable
icache_enable: icache_enable:
mfspr r3, HID0 mfspr r3, HID0
@ -767,6 +768,7 @@ icache_status:
mfspr r3, HID0 mfspr r3, HID0
rlwinm r3, r3, (31 - HID0_ICE_SHIFT + 1), 31, 31 rlwinm r3, r3, (31 - HID0_ICE_SHIFT + 1), 31, 31
blr blr
#endif /* !CONFIG_NAND_SPL */
.globl dcache_enable .globl dcache_enable
dcache_enable: dcache_enable:

2
board/sheldon/simpc8313/simpc8313.c
View File

@ -33,13 +33,13 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#ifndef CONFIG_NAND_SPL
int checkboard(void) int checkboard(void)
{ {
puts("Board: Sheldon Instruments SIMPC8313\n"); puts("Board: Sheldon Instruments SIMPC8313\n");
return 0; return 0;
} }
#ifndef CONFIG_NAND_SPL
static struct pci_region pci_regions[] = { static struct pci_region pci_regions[] = {
{ {
bus_start: CONFIG_SYS_PCI1_MEM_BASE, bus_start: CONFIG_SYS_PCI1_MEM_BASE,

3
include/configs/SIMPC8313.h
View File

@ -418,7 +418,8 @@
| SICRH_ETSEC2_G \ | SICRH_ETSEC2_G \
| SICRH_TSOBI1 \ | SICRH_TSOBI1 \
| SICRH_TSOBI2 ) | SICRH_TSOBI2 )
#define CONFIG_SYS_SICRL (SICRL_USBDR \ #define CONFIG_SYS_SICRL ( SICRL_LBC \
| SICRL_USBDR \
| SICRL_ETSEC2_A ) | SICRL_ETSEC2_A )
#define CONFIG_SYS_HID0_INIT 0x000000000 #define CONFIG_SYS_HID0_INIT 0x000000000