From da7a9057e9ff255c6a0dc271f4081429279d2bbb Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Wed, 13 Aug 2003 13:03:40 +0000 Subject: [PATCH] 2003-08-13 Marcel Telka * flash/intel.c (intel_flash_autodetect32, intel_flash_autodetect, intel_flash_autodetect8): Added support for Intel SCS command set (patch 787978, Jani Monoses). git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@507 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- libbrux/ChangeLog | 5 +++++ libbrux/NEWS | 1 + libbrux/THANKS | 4 ++++ libbrux/flash/intel.c | 12 +++++++++--- 4 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 libbrux/THANKS diff --git a/libbrux/ChangeLog b/libbrux/ChangeLog index 24ad1547..5b610e21 100644 --- a/libbrux/ChangeLog +++ b/libbrux/ChangeLog @@ -1,3 +1,8 @@ +2003-08-13 Marcel Telka + + * flash/intel.c (intel_flash_autodetect32, intel_flash_autodetect, intel_flash_autodetect8): Added + support for Intel SCS command set (patch 787978, Jani Monoses). + 2003-08-11 Marcel Telka * flash/amd.c (amd_flash_autodetect): Function renamed ... diff --git a/libbrux/NEWS b/libbrux/NEWS index 3e0c7620..443543b2 100644 --- a/libbrux/NEWS +++ b/libbrux/NEWS @@ -1,4 +1,5 @@ $Id$ +2003-08-13: Added support for Intel SCS command set (patch 787978, Jani Monoses). 2003-08-11: Added support for 1 x 8 bit AMD Flash (patch 772499, Matan Ziv-Av). 2003-06-18: Added support for 1 x 8 bit Intel Flash (patch 753295, Matan Ziv-Av). diff --git a/libbrux/THANKS b/libbrux/THANKS new file mode 100644 index 00000000..60c987a8 --- /dev/null +++ b/libbrux/THANKS @@ -0,0 +1,4 @@ +$Id$ + +Jani Monoses +Matan Ziv-Av diff --git a/libbrux/flash/intel.c b/libbrux/flash/intel.c index 3b949829..e25fa22d 100644 --- a/libbrux/flash/intel.c +++ b/libbrux/flash/intel.c @@ -58,19 +58,25 @@ static int intel_flash_program32( cfi_array_t *cfi_array, uint32_t adr, uint32_t static int intel_flash_autodetect32( cfi_array_t *cfi_array ) { - return (cfi_array->cfi_chips[0]->cfi.identification_string.pri_id_code == CFI_VENDOR_INTEL_ECS) && (bus_width( cfi_array->bus, 0 ) == 32); + return ((cfi_array->cfi_chips[0]->cfi.identification_string.pri_id_code == CFI_VENDOR_INTEL_ECS) + || (cfi_array->cfi_chips[0]->cfi.identification_string.pri_id_code == CFI_VENDOR_INTEL_SCS)) + && (bus_width( cfi_array->bus, 0 ) == 32); } static int intel_flash_autodetect( cfi_array_t *cfi_array ) { - return (cfi_array->cfi_chips[0]->cfi.identification_string.pri_id_code == CFI_VENDOR_INTEL_ECS) && (bus_width( cfi_array->bus, 0 ) == 16); + return ((cfi_array->cfi_chips[0]->cfi.identification_string.pri_id_code == CFI_VENDOR_INTEL_ECS) + || (cfi_array->cfi_chips[0]->cfi.identification_string.pri_id_code == CFI_VENDOR_INTEL_SCS)) + && (bus_width( cfi_array->bus, 0 ) == 16); } static int intel_flash_autodetect8( cfi_array_t *cfi_array ) { - return (cfi_array->cfi_chips[0]->cfi.identification_string.pri_id_code == CFI_VENDOR_INTEL_ECS) && (bus_width( cfi_array->bus, 0 ) == 8); + return ((cfi_array->cfi_chips[0]->cfi.identification_string.pri_id_code == CFI_VENDOR_INTEL_ECS) + || (cfi_array->cfi_chips[0]->cfi.identification_string.pri_id_code == CFI_VENDOR_INTEL_SCS)) + && (bus_width( cfi_array->bus, 0 ) == 8); } static void