From 71127727dcff4f7e70b318d7a5eb87f0c8fcc4d7 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Mon, 31 May 2010 15:27:27 +0000 Subject: So far, we have up to 4 different names for the same thing (ignoring capitalization) CONFIG_FT2232SPI (makefile config option) FT2232_SPI_SUPPORT (#define) ft2232spi (programmer name) ft2232_spi.c (programmer file) Use CONFIG_* with underscores for makefile config options and #defines and kill the useless _SUPPORT idiom. Use lowercase names with underscores for programmer names and programmer files. With this, you can run "grep -i ft2232_spi" and find everything related to the ft2232_spi driver. Same applies to all other programmers. Corresponding to flashrom svn r1023. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Uwe Hermann --- spi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'spi.c') diff --git a/spi.c b/spi.c index 67682b5..30e0d33 100644 --- a/spi.c +++ b/spi.c @@ -40,7 +40,7 @@ const struct spi_programmer spi_programmer[] = { .write_256 = NULL, }, -#if INTERNAL_SUPPORT == 1 +#if CONFIG_INTERNAL == 1 #if defined(__i386__) || defined(__x86_64__) { /* SPI_CONTROLLER_ICH7 */ .command = ich_spi_send_command, @@ -86,7 +86,7 @@ const struct spi_programmer spi_programmer[] = { #endif #endif -#if FT2232_SPI_SUPPORT == 1 +#if CONFIG_FT2232_SPI == 1 { /* SPI_CONTROLLER_FT2232 */ .command = ft2232_spi_send_command, .multicommand = default_spi_send_multicommand, @@ -95,7 +95,7 @@ const struct spi_programmer spi_programmer[] = { }, #endif -#if DUMMY_SUPPORT == 1 +#if CONFIG_DUMMY == 1 { /* SPI_CONTROLLER_DUMMY */ .command = dummy_spi_send_command, .multicommand = default_spi_send_multicommand, @@ -104,7 +104,7 @@ const struct spi_programmer spi_programmer[] = { }, #endif -#if BUSPIRATE_SPI_SUPPORT == 1 +#if CONFIG_BUSPIRATE_SPI == 1 { /* SPI_CONTROLLER_BUSPIRATE */ .command = buspirate_spi_send_command, .multicommand = default_spi_send_multicommand, @@ -113,7 +113,7 @@ const struct spi_programmer spi_programmer[] = { }, #endif -#if DEDIPROG_SUPPORT == 1 +#if CONFIG_DEDIPROG == 1 { /* SPI_CONTROLLER_DEDIPROG */ .command = dediprog_spi_send_command, .multicommand = default_spi_send_multicommand, @@ -214,7 +214,7 @@ int spi_chip_write_256(struct flashchip *flash, uint8_t *buf) uint32_t spi_get_valid_read_addr(void) { switch (spi_controller) { -#if INTERNAL_SUPPORT == 1 +#if CONFIG_INTERNAL == 1 #if defined(__i386__) || defined(__x86_64__) case SPI_CONTROLLER_ICH7: /* Return BBAR for ICH chipsets. */ -- cgit v1.1