# HG changeset patch
# User gthomas
# Date 1024924211 0
# Node ID 1ea6a25a8bc8e22b87f2021f748cc6f4886b571c
# Parent  dbca035cc56d277933f3acfe519e822f2807a2f8
Support both old&new FLASH devices.

diff --git a/packages/devs/flash/powerpc/viper/current/ChangeLog b/packages/devs/flash/powerpc/viper/current/ChangeLog
--- a/packages/devs/flash/powerpc/viper/current/ChangeLog
+++ b/packages/devs/flash/powerpc/viper/current/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-24  Gary Thomas  <gary@chez-thomas.org>
+
+	* cdl/flash_viper.cdl: Old devices use AM29LV800 chip.
+
 2002-06-20  Gary Thomas  <gary@chez-thomas.org>
 
 	* src/flash_query.c: 
diff --git a/packages/devs/flash/powerpc/viper/current/cdl/flash_viper.cdl b/packages/devs/flash/powerpc/viper/current/cdl/flash_viper.cdl
--- a/packages/devs/flash/powerpc/viper/current/cdl/flash_viper.cdl
+++ b/packages/devs/flash/powerpc/viper/current/cdl/flash_viper.cdl
@@ -68,7 +68,7 @@ cdl_package CYGPKG_DEVS_FLASH_VIPER {
 
     implements    CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED
     requires      CYGHWR_DEVS_FLASH_AMD_AM29LV320D
-    requires      CYGHWR_DEVS_FLASH_AMD_AM29F800
+    requires      CYGHWR_DEVS_FLASH_AMD_AM29LV800
 
 }
 
diff --git a/packages/hal/powerpc/viper/current/ChangeLog b/packages/hal/powerpc/viper/current/ChangeLog
--- a/packages/hal/powerpc/viper/current/ChangeLog
+++ b/packages/hal/powerpc/viper/current/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-24  Gary Thomas  <gary@chez-thomas.org>
+
+	* misc/redboot_ROMRAM.ecm: Update for new FLASH chips.
+
 2002-06-20  Gary Thomas  <gary@chez-thomas.org>
 
 	* src/viper.S: 
diff --git a/packages/hal/powerpc/viper/current/misc/redboot_ROMRAM.ecm b/packages/hal/powerpc/viper/current/misc/redboot_ROMRAM.ecm
--- a/packages/hal/powerpc/viper/current/misc/redboot_ROMRAM.ecm
+++ b/packages/hal/powerpc/viper/current/misc/redboot_ROMRAM.ecm
@@ -18,6 +18,7 @@ cdl_configuration eCos {
     package -hardware CYGPKG_IO_SERIAL_POWERPC_QUICC_SMC current ;
     package -hardware CYGPKG_DEVS_ETH_POWERPC_FEC current ;
     package -hardware CYGPKG_DEVS_FLASH_VIPER current ;
+    package -hardware CYGPKG_DEVS_FLASH_AMD_AM29XXXXX current ;
     package -template CYGPKG_HAL current ;
     package -template CYGPKG_INFRA current ;
     package -template CYGPKG_REDBOOT current ;
@@ -70,6 +71,10 @@ cdl_option CYGOPT_REDBOOT_FIS_REDBOOT_BA
     user_value 0
 };
 
+cdl_option CYGSEM_REDBOOT_FLASH_COMBINED_FIS_AND_CONFIG {
+    user_value 1
+};
+
 cdl_option CYGBLD_ISO_STRTOK_R_HEADER {
     inferred_value 1 <cyg/libc/string/string.h>
 };
@@ -98,4 +103,12 @@ cdl_option CYGPKG_NS_DNS_BUILD {
     inferred_value 0
 };
 
+cdl_option CYGHWR_DEVS_FLASH_AMD_AM29LV320D {
+    inferred_value 1
+};
 
+cdl_option CYGHWR_DEVS_FLASH_AMD_AM29LV800 {
+    inferred_value 1
+};
+
+