stm32f1x: fix bug in flash loader and restrict instruction set to armv6-m

[fw/openocd] / src / flash / nand / driver.h

diff --git a/src/flash/nand/driver.h b/src/flash/nand/driver.h
index 545a731ba25e374ee359d509595a73eb67da9e1b..04ec64fcfbdd2869af213fa31a2e2719fe85b637 100644 (file)
--- a/src/flash/nand/driver.h
+++ b/src/flash/nand/driver.h
@@ -35,16 +35,16 @@ struct nand_device;
 struct nand_flash_controller
 {
        /** Driver name that is used to select it from configuration files. */
-       char *name;
+       const char *name;
+
+       /** Usage of flash command registration. */
+       const char *usage;
 
     const struct command_registration *commands;
 
        /** NAND device command called when driver is instantiated during configuration. */
        __NAND_DEVICE_COMMAND((*nand_device_command));
 
-       /** Register controller specific commands as a TCL interface to the driver. */
-       int (*register_commands)(struct command_context *cmd_ctx);
-
        /** Initialize the NAND device. */
        int (*init)(struct nand_device *nand);
 
@@ -75,9 +75,6 @@ struct nand_flash_controller
        /** Read a page from the NAND device. */
        int (*read_page)(struct nand_device *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
 
-       /** Check if the controller is ready for more instructions with timeout. */
-       int (*controller_ready)(struct nand_device *nand, int timeout);
-
        /** Check if the NAND device is ready for more instructions with timeout. */
        int (*nand_ready)(struct nand_device *nand, int timeout);
 };
@@ -86,7 +83,7 @@ struct nand_flash_controller
 
 /**
  * Find a NAND flash controller by name.
- * @param The name of the NAND controller to find.
+ * @param name Identifies the NAND controller to find.
  * @returns The nand_flash_controller named @c name, or NULL if not found.
  */
 struct nand_flash_controller *nand_driver_find_by_name(const char *name);