diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-07-05 10:03:52 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-07-05 10:03:52 +0200 |
| commit | 0095b787fe97a43cab575e7383ef681ecfb765f2 (patch) | |
| tree | bd41cc2589621cf90149832d6cd7046eca7ed91e /include | |
| parent | 3f7a63e6a34c5b435864c860c1563117e45d1c35 (diff) | |
| parent | ce05de295032c50e5855b11c72fe18562a872cc9 (diff) | |
| download | u-boot-imx-0095b787fe97a43cab575e7383ef681ecfb765f2.zip u-boot-imx-0095b787fe97a43cab575e7383ef681ecfb765f2.tar.gz u-boot-imx-0095b787fe97a43cab575e7383ef681ecfb765f2.tar.bz2 | |
Merge with /home/m8/git/u-boot
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/processor.h | 2 | ||||
| -rw-r--r-- | include/configs/yucca.h | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index ea5b0d2..44b23f1 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -736,7 +736,7 @@ #define PVR_440SP_RA 0x53221850 #define PVR_440SP_RB 0x53221891 #define PVR_440SPe_RA 0x53421890 -#define PVR_440SPe_RB 0x53521891 +#define PVR_440SPe_RB 0x53421891 #define PVR_601 0x00010000 #define PVR_602 0x00050000 #define PVR_603 0x00030000 diff --git a/include/configs/yucca.h b/include/configs/yucca.h index 95de1ea..e6d9843 100644 --- a/include/configs/yucca.h +++ b/include/configs/yucca.h @@ -34,7 +34,6 @@ #define DEBUG #undef DEBUG -#define CONFIG_IDENT_STRING "\nU_440SPe_V1R01 level06" /*----------------------------------------------------------------------- * High Level Configuration Options *----------------------------------------------------------------------*/ @@ -76,6 +75,11 @@ /* #define CFG_PCI_BASE_REGS 0xBEC00000 */ /* internal PCI regs */ /* #define CFG_PCI_BASE_CYCLE 0xBED00000 */ /* internal PCI regs */ +/* System RAM mapped to PCI space */ +#define CONFIG_PCI_SYS_MEM_BUS CFG_SDRAM_BASE +#define CONFIG_PCI_SYS_MEM_PHYS CFG_SDRAM_BASE +#define CONFIG_PCI_SYS_MEM_SIZE (1024 * 1024 * 1024) + #define CFG_FPGA_BASE 0xe2000000 /* epld */ #define CFG_OPER_FLASH 0xe7000000 /* SRAM - OPER Flash */ @@ -149,8 +153,8 @@ #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_BOOTARGS "console=ttyS0,115200n8 root=/dev/nfs rw" -#define CONFIG_BOOTCOMMAND "bootm E7C00000" /* autoboot command */ -#define CONFIG_BOOTDELAY -1 /* -1 to disable autoboot */ +#define CONFIG_BOOTCOMMAND "bootm E7C00000" /* autoboot command */ +#define CONFIG_BOOTDELAY -1 /* -1 to disable autoboot */ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ @@ -192,7 +196,7 @@ "ramdisk_addr=E7F20000\0" \ "load=tftp 100000 yuca/u-boot.bin\0" \ "update=protect off 2:4-7;era 2:4-7;" \ - "cp.b ${fileaddr} fffc0000 ${filesize};" \ + "cp.b ${fileaddr} FFFB0000 ${filesize};" \ "setenv filesize;saveenv\0" \ "upd=run load;run update\0" \ "" @@ -267,7 +271,7 @@ /* General PCI */ #define CONFIG_PCI /* include pci support */ #define CONFIG_PCI_PNP 1 /* do pci plug-and-play */ -#define CONFIG_PCI_SCAN_SHOW i /* show pci devices on startup */ +#define CONFIG_PCI_SCAN_SHOW 1 /* show pci devices on startup */ #undef CONFIG_PCI_CONFIG_HOST_BRIDGE /* Board-specific PCI */ |