--- a/packages/hal/arm/xscale/core/current/ChangeLog
+++ b/packages/hal/arm/xscale/core/current/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-23  Mark Salter  <msalter@redhat.com>
+
+	* include/hal_cache.h: Remove mmap-related externs which don't belong
+	here.
+
 2002-09-20  Mark Salter  <msalter@redhat.com>
 
 	* src/xscale_stub.c: Fill in holes in logic used to decide which

--- a/packages/hal/arm/xscale/core/current/include/hal_cache.h
+++ b/packages/hal/arm/xscale/core/current/include/hal_cache.h
@@ -382,17 +382,5 @@ CYG_MACRO_END
 // This feature is not available on the SA11X0.
 
 //-----------------------------------------------------------------------------
-// Now include the details of the platform's Memory Map setup:
-
-#include <cyg/hal/plf_mmap.h>
-
-// and define the (considerably less efficient) routines that are available
-// for testing the actual memory map in force.
-
-externC cyg_uint32 hal_virt_to_phys_address( cyg_uint32 vaddr );
-externC cyg_uint32 hal_phys_to_virt_address( cyg_uint32 paddr );
-externC cyg_uint32 hal_virt_to_uncached_address( cyg_uint32 vaddr );
-
-//-----------------------------------------------------------------------------
 #endif // ifndef CYGONCE_HAL_CACHE_H
 // End of hal_cache.h

--- a/packages/hal/arm/xscale/iq80321/current/ChangeLog
+++ b/packages/hal/arm/xscale/iq80321/current/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-23  Mark Salter  <msalter@redhat.com>
+
+	* include/plf_mmap.h: Remove. Not used.
+
 2002-09-19  Mark Salter  <msalter@redhat.com>
 
 	* misc/redboot_RAM.ecm: Add CYGPKG_HAL_ARM_XSCALE_CORE.

deleted file mode 100644
--- a/packages/hal/arm/xscale/iq80321/current/include/plf_mmap.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef CYGONCE_HAL_SA11X0_PLATFORM_PLF_MMAP_H
-#define CYGONCE_HAL_SA11X0_PLATFORM_PLF_MMAP_H
-/*=============================================================================
-//
-//      plf_mmap.h
-//
-//      Platform specific memory map support
-//
-//=============================================================================
-//####ECOSGPLCOPYRIGHTBEGIN####
-// -------------------------------------------
-// This file is part of eCos, the Embedded Configurable Operating System.
-// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-//
-// 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
-// Software Foundation; either version 2 or (at your option) any later version.
-//
-// eCos is distributed in the hope that it will be useful, but WITHOUT ANY
-// WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with eCos; if not, write to the Free Software Foundation, Inc.,
-// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-//
-// As a special exception, if other files instantiate templates or use macros
-// or inline functions from this file, or you compile this file and link it
-// with other works to produce a work based on this file, this file does not
-// by itself cause the resulting work to be covered by the GNU General Public
-// License. However the source code for this file must still be made available
-// in accordance with section (3) of the GNU General Public License.
-//
-// This exception does not invalidate any other reasons why a work based on
-// this file might be covered by the GNU General Public License.
-//
-// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
-// at http://sources.redhat.com/ecos/ecos-license/
-// -------------------------------------------
-//####ECOSGPLCOPYRIGHTEND####
-//=============================================================================
-//#####DESCRIPTIONBEGIN####
-//
-// Author(s):    hmt
-// Contributors: hmt
-// Date:         2001-01-04
-// Purpose:      Intel SA11x0 series platform-specific memory mapping macros
-// Description:  Macros to convert a cached, virtual address to
-//               1) an uncached adddress for the same memory (if available)
-//               2) the equivalent physical address for giving to external
-//               hardware eg. DMA engines.
-//               
-//               NB: this mapping is expressed here statically, independent
-//               of the actual mapping installed in the MMAP table.  So if
-//               someone changes that, or its initialisation is changed,
-//               then this module must change.  This is intended to be
-//               efficient at a cost of generality.  It is also intended to
-//               be called with constants (such as &my_struct) as input
-//               args, so that all the work can be done at compile time,
-//               with optimization on.
-//
-// Usage:        #include <cyg/hal/hal_cache.h>
-//		 (which includes this file itself)
-//
-//####DESCRIPTIONEND####
-//
-//===========================================================================*/
-
-#include <cyg/hal/hal_misc.h>
-
-
-//---------------------------------------------------------------------------
-#endif // CYGONCE_HAL_SA11X0_PLATFORM_PLF_MMAP_H
-// EOF plf_mmap.h