Eric Lee / smarc-uboot

43
Download as
Browse Code ยป

Commit 0d01f66d235118515b5086b88f82498bc0695d6a

Authored by Ed Swarthout
Committed by Stefan Roese
1 parent df4a0796e8
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

CFI: cfi_flash write fix for AMD legacy 

The flash_unlock_seq requires a sector for AMD_LEGACY.
Fix a retcode check typeo.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Signed-off-by: Stefan Roese <sr@denx.de>

Showing 1 changed file with 5 additions and 3 deletions Side-by-side Diff

drivers/mtd/cfi_flash.c
Diff comments   View file @ 0d01f66
... ... @@ -681,7 +681,7 @@
681 681 case CFI_CMDSET_INTEL_PROG_REGIONS:
682 682 case CFI_CMDSET_INTEL_EXTENDED:
683 683 case CFI_CMDSET_INTEL_STANDARD:
684   - if ((retcode == ERR_OK)
  684 + if ((retcode != ERR_OK)
685 685 && !flash_isequal (info, sector, 0, FLASH_STATUS_DONE)) {
686 686 retcode = ERR_INVAL;
687 687 printf ("Flash %s error at address %lx\n", prompt,
... ... @@ -777,6 +777,7 @@
777 777 {
778 778 void *dstaddr;
779 779 int flag;
  780 + flash_sect_t sect;
780 781  
781 782 dstaddr = map_physmem(dest, info->portwidth, MAP_NOCACHE);
782 783  
... ... @@ -818,8 +819,9 @@
818 819 #ifdef CONFIG_FLASH_CFI_LEGACY
819 820 case CFI_CMDSET_AMD_LEGACY:
820 821 #endif
821   - flash_unlock_seq (info, 0);
822   - flash_write_cmd (info, 0, info->addr_unlock1, AMD_CMD_WRITE);
  822 + sect = find_sector(info, dest);
  823 + flash_unlock_seq (info, sect);
  824 + flash_write_cmd (info, sect, info->addr_unlock1, AMD_CMD_WRITE);
823 825 break;
824 826 }
825 827