changeset 223:dbca035cc56d

Use generic AMD FLASH driver for Viper
author gthomas
date Thu, 20 Jun 2002 23:11:09 +0000
parents 34c1f81105e9
children 1ea6a25a8bc8
files packages/ChangeLog packages/ecos.db packages/hal/powerpc/viper/current/ChangeLog packages/hal/powerpc/viper/current/src/hal_aux.c packages/hal/powerpc/viper/current/src/viper.S
diffstat 5 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/packages/ChangeLog
+++ b/packages/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-20  Gary Thomas  <gary@chez-thomas.org>
+
+	* ecos.db: A&M Viper now uses generic AMD FLASH drivers.
+
 2002-05-08  Jesper Skov  <jskov@redhat.com>
 
 	* ecos.db: Removed special SH2 SCIF driver. The changes have been
--- a/packages/ecos.db
+++ b/packages/ecos.db
@@ -3563,6 +3563,7 @@ target viper {
                           CYGPKG_IO_SERIAL_POWERPC_QUICC_SMC
                           CYGPKG_DEVS_ETH_POWERPC_FEC
                           CYGPKG_DEVS_FLASH_VIPER
+                          CYGPKG_DEVS_FLASH_AMD_AM29XXXXX
         }
         description "
             The viper target provides the packages needed to run
--- a/packages/hal/powerpc/viper/current/ChangeLog
+++ b/packages/hal/powerpc/viper/current/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-20  Gary Thomas  <gary@chez-thomas.org>
+
+	* src/viper.S: 
+	* src/hal_aux.c: Support up to 8M of FLASH space.
+
 2002-05-30  John Dallaway  <jld@redhat.com>
 
 	* include/pkgconf/mlt*: Regenerated memory layout files.
--- a/packages/hal/powerpc/viper/current/src/hal_aux.c
+++ b/packages/hal/powerpc/viper/current/src/hal_aux.c
@@ -63,7 +63,7 @@
 // it if necessary. The regions defined below are the minimum requirements.
 CYGARC_MEMDESC_TABLE CYGBLD_ATTRIB_WEAK = {
     // Mapping for the Viper 855/860 development boards
-    CYGARC_MEMDESC_CACHE(   0xfe000000, 0x00400000 ), // ROM region
+    CYGARC_MEMDESC_CACHE(   0xfe000000, 0x00800000 ), // ROM region
     CYGARC_MEMDESC_NOCACHE( 0xff000000, 0x00100000 ), // MCP registers
     CYGARC_MEMDESC_NOCACHE( 0xfa000000, 0x00400000 ), // Control/Status+LEDs
     CYGARC_MEMDESC_CACHE(   CYGMEM_REGION_ram, CYGMEM_REGION_ram_SIZE ), // Main memory
--- a/packages/hal/powerpc/viper/current/src/viper.S
+++ b/packages/hal/powerpc/viper/current/src/viper.S
@@ -266,7 +266,7 @@ 10:
 
        	/* BOOT ROM */
         lwi	r3,0xFE000401	# 8-bit, GPCM
-        lwi	r5,0xFFF00774   # 7 wait states
+        lwi	r5,0xFF800774   # 7 wait states, up to 8MB
         stw	r3,BR0(r4)
         stw	r5,OR0(r4)