Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash

diff --combined drivers/mtd/cfi_flash.c
index a37663eeb471b19761691636ac7dcf3eb6732c2c,616750d77e2f2ad2c47e44dc61f0bd3d81b509ca..a389cd101c2f55e62ca8ab90efaf395234d98713
--- 1/drivers/mtd/cfi_flash.c
--- 2/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@@ -11,7 -11,24 +11,7 @@@
   * Copyright (C) 2006
   * Tolunay Orkun <listmember@orkun.us>
   *
 - * See file CREDITS for list of people who contributed to this
 - * project.
 - *
 - * This program 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 of
 - * the License, or (at your option) any later version.
 - *
 - * This program 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 this program; if not, write to the Free Software
 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 - * MA 02111-1307 USA
 - *
 + * SPDX-License-Identifier:   GPL-2.0+
   */
  
  /* The DEBUG define must be before common to enable debugging */
@@@ -1803,7 -1820,7 +1803,7 @@@ static int flash_detect_legacy(phys_add
                                        break;
                                else
                                        unmap_physmem((void *)info->start[0],
-                                                     MAP_NOCACHE);
+                                                     info->portwidth);
                        }
                }