Merge pull request #943 from riscv/remove_deprecated_gd32vf103_flash

Removed deprecated gd32vf103_flash
riscv-collab · Oct 30, 2023 · c92149a · c92149a
2 parents 89260a5 + d14b71c
commit c92149a
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 54 deletions.
diff --git a/src/flash/nor/driver.h b/src/flash/nor/driver.h
@@ -259,7 +259,6 @@ extern const struct flash_driver em357_flash;
 extern const struct flash_driver esirisc_flash;
 extern const struct flash_driver faux_flash;
 extern const struct flash_driver fespi_flash;
-extern const struct flash_driver gd32vf103_flash;
 extern const struct flash_driver fm3_flash;
 extern const struct flash_driver fm4_flash;
 extern const struct flash_driver jtagspi_flash;

diff --git a/src/flash/nor/drivers.c b/src/flash/nor/drivers.c
@@ -38,7 +38,6 @@ static const struct flash_driver * const flash_drivers[] = {
 	&fm3_flash,
 	&fm4_flash,
 	&fespi_flash,
-	&gd32vf103_flash,
 	&jtagspi_flash,
 	&kinetis_flash,
 	&kinetis_ke_flash,

diff --git a/src/flash/nor/stm32f1x.c b/src/flash/nor/stm32f1x.c
@@ -1740,55 +1740,3 @@ const struct flash_driver stm32f1x_flash = {
 	.info = get_stm32x_info,
 	.free_driver_priv = default_flash_free_driver_priv,
 };
-
-/* flash bank gd32vf103 <base> <size> 0 0 <target#>
- */
-FLASH_BANK_COMMAND_HANDLER(gd32vf103_flash_bank_command)
-{
-	struct stm32x_flash_bank *stm32x_info;
-
-	LOG_WARNING("DEPRECATED: The gd32vf103 flash target will be removed in June of 2023, please use stm32f1x instead.");
-	/* The reset code are just copy from stm32x_flash_bank_command function */
-	if (CMD_ARGC < 6)
-		return ERROR_COMMAND_SYNTAX_ERROR;
-
-	stm32x_info = malloc(sizeof(struct stm32x_flash_bank));
-
-	bank->driver_priv = stm32x_info;
-	stm32x_info->probed = false;
-	stm32x_info->has_dual_banks = false;
-	stm32x_info->can_load_options = false;
-	stm32x_info->register_base = FLASH_REG_BASE_B0;
-	stm32x_info->user_bank_size = bank->size;
-
-	/* The flash write must be aligned to a halfword boundary */
-	bank->write_start_alignment = bank->write_end_alignment = 2;
-	return ERROR_OK;
-}
-
-static const struct command_registration gd32vf103_command_handlers[] = {
-	{
-		.name = "gd32vf103",
-		.mode = COMMAND_ANY,
-		.help = "gd32vf103 flash command group (identical to flash commands from stm32f1x)",
-		.usage = "",
-		.chain = stm32f1x_exec_command_handlers,
-	},
-	COMMAND_REGISTRATION_DONE
-};
-
-const struct flash_driver gd32vf103_flash = {
-	.name = "gd32vf103",
-	.commands = gd32vf103_command_handlers,
-	.flash_bank_command = gd32vf103_flash_bank_command,
-	.erase = stm32x_erase,
-	.protect = stm32x_protect,
-	.write = stm32x_write,
-	.read = default_flash_read,
-	.probe = stm32x_probe,
-	.auto_probe = stm32x_auto_probe,
-	.erase_check = default_flash_blank_check,
-	.protect_check = stm32x_protect_check,
-	.info = get_stm32x_info,
-	.free_driver_priv = default_flash_free_driver_priv,
-};