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

This commit is contained in:
Wolfgang Denk
2010-05-17 23:16:08 +02:00
3 changed files with 5 additions and 2 deletions

View File

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