From fe84b48a94beb88a977a88e3d14b6ea882cdc91a Mon Sep 17 00:00:00 2001
From: Marian Balakowicz <m8@semihalf.com>
Date: Mon, 3 Jul 2006 23:42:36 +0200
Subject: Cleanup config file and bootup output for Yucca board.

---
 include/asm-ppc/processor.h | 2 +-
 include/configs/yucca.h     | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'include')

diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h
index ea5b0d2b885..44b23f1eb4c 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 95de1ea0a64..be2e7db176c 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
  *----------------------------------------------------------------------*/
@@ -149,8 +148,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 +191,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 +266,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 */
-- 
cgit v1.3.1


From fbb0b559ae564d80b5ea3199ad530aa0e419a668 Mon Sep 17 00:00:00 2001
From: Marian Balakowicz <m8@semihalf.com>
Date: Tue, 4 Jul 2006 00:55:47 +0200
Subject: Add system memory to the PCI region list for AMCC PPC44x CPUs.
 Enabled it for Yucca board.

---
 CHANGELOG               |  3 +++
 cpu/ppc4xx/405gp_pci.c  | 13 +++++++++++++
 include/configs/yucca.h |  5 +++++
 3 files changed, 21 insertions(+)

(limited to 'include')

diff --git a/CHANGELOG b/CHANGELOG
index 8081859c608..afd34f17be6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Add system memory to the PCI region list for AMCC PPC44x CPUs.
+  Enabled it for Yucca board.
+
 * Cleanup config file and bootup output for Yucca board.
 
 * Fix CONFIG_440_GX define usage.
diff --git a/cpu/ppc4xx/405gp_pci.c b/cpu/ppc4xx/405gp_pci.c
index 0ccb3d81c6a..cf5eccb01fd 100644
--- a/cpu/ppc4xx/405gp_pci.c
+++ b/cpu/ppc4xx/405gp_pci.c
@@ -465,17 +465,30 @@ void pci_440_init (struct pci_controller *hose)
 	hose->first_busno = 0;
 	hose->last_busno = 0xff;
 
+	/* PCI I/O space */
 	pci_set_region(hose->regions + reg_num++,
 		       0x00000000,
 		       PCIX0_IOBASE,
 		       0x10000,
 		       PCI_REGION_IO);
 
+	/* PCI memory space */
 	pci_set_region(hose->regions + reg_num++,
 		       CFG_PCI_TARGBASE,
 		       CFG_PCI_MEMBASE,
 		       0x10000000,
 		       PCI_REGION_MEM );
+
+#if defined(CONFIG_PCI_SYS_MEM_BUS) && defined(CONFIG_PCI_SYS_MEM_PHYS) && \
+	defined(CONFIG_PCI_SYS_MEM_SIZE)
+	/* System memory space */
+	pci_set_region(hose->regions + reg_num++,
+		       CONFIG_PCI_SYS_MEM_BUS,
+		       CONFIG_PCI_SYS_MEM_PHYS,
+		       CONFIG_PCI_SYS_MEM_SIZE,
+		       PCI_REGION_MEM | PCI_REGION_MEMORY );
+#endif
+
 	hose->region_count = reg_num;
 
 	pci_setup_indirect(hose, PCIX0_CFGADR, PCIX0_CFGDATA);
diff --git a/include/configs/yucca.h b/include/configs/yucca.h
index be2e7db176c..e6d98435679 100644
--- a/include/configs/yucca.h
+++ b/include/configs/yucca.h
@@ -75,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	*/
 
-- 
cgit v1.3.1