changeset 1348:0786f4fb3f8c

* cdl/flash_e7t.cdl: * src/arm_e7t_flash.c: Updates to use the new 39VFXXX generic driver.
author asl
date Tue, 04 Nov 2003 09:37:12 +0000
parents d95bcad4f2b2
children 4444f5b3be7b
files packages/devs/flash/arm/e7t/current/ChangeLog packages/devs/flash/arm/e7t/current/cdl/flash_e7t.cdl packages/devs/flash/arm/e7t/current/src/arm_e7t_flash.c
diffstat 3 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/packages/devs/flash/arm/e7t/current/ChangeLog
+++ b/packages/devs/flash/arm/e7t/current/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-04  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* cdl/flash_e7t.cdl: 
+	* src/arm_e7t_flash.c: Updates to use the new 39VFXXX generic driver.
+
 2003-07-03  Chris Garry <cgarry@sweeneydesign.co.uk>
 
 	* src/arm_e7t_flash.h: 
--- a/packages/devs/flash/arm/e7t/current/cdl/flash_e7t.cdl
+++ b/packages/devs/flash/arm/e7t/current/cdl/flash_e7t.cdl
@@ -9,6 +9,7 @@
 ## -------------------------------------------
 ## This file is part of eCos, the Embedded Configurable Operating System.
 ## Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+## Copyright (C) 2003 Andrew Lunn
 ##
 ## eCos is free software; you can redistribute it and/or modify it under
 ## the terms of the GNU General Public License as published by the Free
@@ -59,7 +60,7 @@ cdl_package CYGPKG_DEVS_FLASH_ARM_E7T {
 
     # Arguably this should do in the generic package
     # but then there is a logic loop so you can never enable it.
-    cdl_option CYGINT_DEVS_FLASH_SST_39VF400_REQUIRED {
+    cdl_option CYGINT_DEVS_FLASH_SST_39VFXXX_REQUIRED {
         display   "E7T has SST39VF400 FLASH part fitted"
         default_value 0
         requires !CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED
--- a/packages/devs/flash/arm/e7t/current/src/arm_e7t_flash.c
+++ b/packages/devs/flash/arm/e7t/current/src/arm_e7t_flash.c
@@ -9,6 +9,7 @@
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
 // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+// Copyright (C) 2003 Andrew Lunn
 //
 // eCos is free software; you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free
@@ -63,11 +64,12 @@
 
 //--------------------------------------------------------------------------
 // Platform specific extras
+#define CYGPKG_DEVS_FLASH_SST_39VF400
 
 //--------------------------------------------------------------------------
 // Now include the driver code.
-#ifdef CYGINT_DEVS_FLASH_SST_39VF400_REQUIRED
-#include "cyg/io/flash_sst_39vf400.inl"
+#ifdef CYGINT_DEVS_FLASH_SST_39VFXXX_REQUIRED
+#include "cyg/io/flash_sst_39vfxxx.inl"
 #endif
 
 #ifdef CYGINT_DEVS_FLASH_AMD_AM29XXXXX_REQUIRED