flash/nor: remove useless setting of bus_width and chip_width

The flash/nor subsystem uses bus_width and chip_width for CFI
external flash only. Drop setting these values for internal flash.

Change-Id: I64e79ab38b6e39e845ff96fbf4f60145e3b9690a
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: https://review.openocd.org/c/openocd/+/7098
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>

diff --git a/src/flash/nor/at91sam7.c b/src/flash/nor/at91sam7.c
index fac8bb3787d0895abe4dfd218baa63da03a43cd5..e18635b6df298d8e2be41e5c3fcfd5ba13b4bff6 100644 (file)
--- a/src/flash/nor/at91sam7.c
+++ b/src/flash/nor/at91sam7.c
@@ -576,8 +576,6 @@ static int at91sam7_read_part_info(struct flash_bank *bank)
                t_bank->bank_number = bnk;
                t_bank->base = base_address + bnk * bank_size;
                t_bank->size = bank_size;
-               t_bank->chip_width = 0;
-               t_bank->bus_width = 4;
                t_bank->num_sectors = sectors_num;
 
                /* allocate sectors */
@@ -691,8 +689,6 @@ FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command)
        uint32_t bank_size;
        uint32_t ext_freq = 0;
 
-       unsigned int chip_width;
-       unsigned int bus_width;
        unsigned int banks_num;
        unsigned int num_sectors;
 
@@ -716,9 +712,6 @@ FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command)
 
        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], base_address);
 
-       COMMAND_PARSE_NUMBER(uint, CMD_ARGV[3], chip_width);
-       COMMAND_PARSE_NUMBER(uint, CMD_ARGV[4], bus_width);
-
        COMMAND_PARSE_NUMBER(uint, CMD_ARGV[8], banks_num);
        COMMAND_PARSE_NUMBER(uint, CMD_ARGV[9], num_sectors);
        COMMAND_PARSE_NUMBER(u16, CMD_ARGV[10], pages_per_sector);
@@ -732,7 +725,7 @@ FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command)
                at91sam7_info->ext_freq = ext_freq;
        }
 
-       if ((bus_width == 0) || (banks_num == 0) || (num_sectors == 0) ||
+       if ((banks_num == 0) || (num_sectors == 0) ||
                        (pages_per_sector == 0) || (page_size == 0) || (num_nvmbits == 0)) {
                at91sam7_info->flash_autodetection = 1;
                return ERROR_OK;
@@ -761,8 +754,6 @@ FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command)
                t_bank->bank_number = bnk;
                t_bank->base = base_address + bnk * bank_size;
                t_bank->size = bank_size;
-               t_bank->chip_width = chip_width;
-               t_bank->bus_width = bus_width;
                t_bank->num_sectors = num_sectors;
 
                /* allocate sectors */

diff --git a/src/flash/nor/psoc6.c b/src/flash/nor/psoc6.c
index ce615fc2a031faf06f8b4ddb6feb27a78516b99e..da07d84871532ae796306ad6c9670781eaf9f433 100644 (file)
--- a/src/flash/nor/psoc6.c
+++ b/src/flash/nor/psoc6.c
@@ -591,8 +591,7 @@ static int psoc6_probe(struct flash_bank *bank)
 
        unsigned int num_sectors = bank_size / row_sz;
        bank->size = bank_size;
-       bank->chip_width = 4;
-       bank->bus_width = 4;
+
        bank->erased_value = 0;
        bank->default_padded_value = 0;
 

diff --git a/src/flash/nor/tms470.c b/src/flash/nor/tms470.c
index 7b24fff1cda38b02329656ebb0736cbe22a95681..9fffae90aeeb2e9fc017f5cb945bdf169b11beaf 100644 (file)
--- a/src/flash/nor/tms470.c
+++ b/src/flash/nor/tms470.c
@@ -248,9 +248,6 @@ static int tms470_read_part_info(struct flash_bank *bank)
        target_write_u32(target, 0xFFFFFFE4, 0x00000000);
        target_write_u32(target, 0xFFFFFFE0, 0x00000000);
 
-       bank->chip_width = 32;
-       bank->bus_width = 32;
-
        LOG_INFO("Identified %s, ver=%d, core=%s, nvmem=%s.",
                part_name,
                (int)(silicon_version),