This patch fixes the initialization warnings similar to the one below: cmd_i2c.o cmd_i2c.c -c cmd_i2c.c:109:1: warning: missing braces around initializer cmd_i2c.c:109:1: warning: (near initialization for 'i2c_no_probes[0]')

Signed-off-by: Sanjeev Premi premi@ti.com Cc: Albert ARIBAUD albert.u.boot@aribaud.net ---

The problem was originally found when compiling omap3_beagle[1]. All the changes were done with this bash script:

[script_here] list=search.lst [ -f ${list} ] && \rm -rf ${list}

grep CONFIG_SYS_I2C_NOPROBES ./include/configs/* | grep -v "{{" | cut -d":" -f1 > ${list}

for f in `cat ${list}` ; do echo "Fixing $f..." sed -r -i 's/(CONFIG_SYS_I2C_NOPROBES\s*){{1}(.*)}{1}/\1{{\2}}/g' "$f" done [/script_here]

Compile tested for oma3_beagle only.

[1] http://marc.info/?l=u-boot&m=131522330112799&w=2

include/configs/KAREF.h | 2 +- include/configs/METROBOX.h | 2 +- include/configs/MPC8315ERDB.h | 2 +- include/configs/MPC8323ERDB.h | 2 +- include/configs/MPC832XEMDS.h | 2 +- include/configs/MPC8360EMDS.h | 2 +- include/configs/MPC837XEMDS.h | 2 +- include/configs/MPC837XERDB.h | 2 +- include/configs/MPC8540ADS.h | 2 +- include/configs/MPC8541CDS.h | 2 +- include/configs/MPC8544DS.h | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/MPC8555CDS.h | 2 +- include/configs/MPC8560ADS.h | 2 +- include/configs/MPC8610HPCD.h | 2 +- include/configs/MPC8641HPCN.h | 2 +- include/configs/SBC8540.h | 2 +- include/configs/TQM85xx.h | 2 +- include/configs/alpr.h | 2 +- include/configs/bubinga.h | 2 +- include/configs/omap3_beagle.h | 2 +- include/configs/p3p440.h | 2 +- include/configs/redwood.h | 2 +- include/configs/sbc8349.h | 2 +- include/configs/sbc8560.h | 2 +- include/configs/sbc8641d.h | 2 +- include/configs/stxgp3.h | 2 +- include/configs/taihu.h | 2 +- include/configs/yucca.h | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h index fcf66b7..df004d1 100644 --- a/include/configs/KAREF.h +++ b/include/configs/KAREF.h @@ -139,7 +139,7 @@ #define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed 400kHz */ #define CONFIG_SYS_I2C_SLAVE 0x7F /* I2C slave address */ -#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x69}} /* Don't probe these addrs */ #define CONFIG_I2C_BUS1 1 /* Include i2c bus 1 supp */

diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h index 9b83e21..0b18e94 100644 --- a/include/configs/METROBOX.h +++ b/include/configs/METROBOX.h @@ -201,7 +201,7 @@ #define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed 400kHz */ #define CONFIG_SYS_I2C_SLAVE 0x7F /* I2C slave address */ -#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x69}} /* Don't probe these addrs */ #define CONFIG_I2C_BUS1 1 /* Include i2c bus 1 supp */

diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index a0cfd00..4285301 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -346,7 +346,7 @@ #define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x51} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x51}} /* Don't probe these addrs */ #define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_I2C2_OFFSET 0x3100

diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 4d4c758..96978a3 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -291,7 +291,7 @@ #define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x51} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x51}} /* Don't probe these addrs */ #define CONFIG_SYS_I2C_OFFSET 0x3000

/* diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index f136a8e..f490af8 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -302,7 +302,7 @@ #define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x51} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x51}} /* Don't probe these addrs */ #define CONFIG_SYS_I2C_OFFSET 0x3000

/* diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h index 49d64a5..6639274 100644 --- a/include/configs/MPC8360EMDS.h +++ b/include/configs/MPC8360EMDS.h @@ -339,7 +339,7 @@ #define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x52} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x52}} /* Don't probe these addrs */ #define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_I2C2_OFFSET 0x3100

diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index abccfd6..aa5fb28 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -328,7 +328,7 @@ #define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x51} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x51}} /* Don't probe these addrs */ #define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_I2C2_OFFSET 0x3100

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index ea3056b..124f574 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -350,7 +350,7 @@ #define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x51} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x51}} /* Don't probe these addrs */ #define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_I2C2_OFFSET 0x3100

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index e1d933e..a788c86 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -272,7 +272,7 @@ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x69}} /* Don't probe these addrs */ #define CONFIG_SYS_I2C_OFFSET 0x3000

/* RapidIO MMU */ diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 5918e64..5ed11ad 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -294,7 +294,7 @@ extern unsigned long get_clock_freq(void); #undef CONFIG_SOFT_I2C /* I2C bit-banged */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x69}} /* Don't probe these addrs */ #define CONFIG_SYS_I2C_OFFSET 0x3000

/* EEPROM */ diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index b25fb55..2cd4a05 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -246,7 +246,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x69}} /* Don't probe these addrs */ #define CONFIG_SYS_I2C_OFFSET 0x3100

/* diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index c9a0f60..ef004da 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -316,7 +316,7 @@ extern unsigned long get_clock_freq(void); #undef CONFIG_SOFT_I2C /* I2C bit-banged */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x69}} /* Don't probe these addrs */ #define CONFIG_SYS_I2C_OFFSET 0x3000

/* EEPROM */ diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index 4c580a3..88ba308 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -292,7 +292,7 @@ extern unsigned long get_clock_freq(void); #undef CONFIG_SOFT_I2C /* I2C bit-banged */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x69}} /* Don't probe these addrs */ #define CONFIG_SYS_I2C_OFFSET 0x3000

/* EEPROM */ diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index f55ef9d..4ed8e19 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -266,7 +266,7 @@ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x69}} /* Don't probe these addrs */ #define CONFIG_SYS_I2C_OFFSET 0x3000

/* RapidIO MMU */ diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 31dbc3b..29cde6d 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -259,7 +259,7 @@ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x69}} /* Don't probe these addrs */ #define CONFIG_SYS_I2C_OFFSET 0x3000

/* diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 0ddb76f..7aa0c4b 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -307,7 +307,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #undef CONFIG_SOFT_I2C /* I2C bit-banged */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x69}} /* Don't probe these addrs */ #define CONFIG_SYS_I2C_OFFSET 0x3100

/* diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h index 72559c0..41d5e89 100644 --- a/include/configs/SBC8540.h +++ b/include/configs/SBC8540.h @@ -243,7 +243,7 @@ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x69}} /* Don't probe these addrs */ #define CONFIG_SYS_I2C_OFFSET 0x3000

#define CONFIG_SYS_PCI_MEM_BASE 0xC0000000 diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h index b336723..b0b7cd8 100644 --- a/include/configs/TQM85xx.h +++ b/include/configs/TQM85xx.h @@ -323,7 +323,7 @@ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x48} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x48}} /* Don't probe these addrs */ #define CONFIG_SYS_I2C_OFFSET 0x3000

/* I2C RTC */ diff --git a/include/configs/alpr.h b/include/configs/alpr.h index d93e505..c7c9dea 100644 --- a/include/configs/alpr.h +++ b/include/configs/alpr.h @@ -126,7 +126,7 @@ #define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 100000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x69}} /* Don't probe these addrs */

/*----------------------------------------------------------------------- * I2C EEPROM (PCF8594C) diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h index da67ae3..bc6050c 100644 --- a/include/configs/bubinga.h +++ b/include/configs/bubinga.h @@ -136,7 +136,7 @@ */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */

-#define CONFIG_SYS_I2C_NOPROBES { 0x69 } /* avoid i2c probe hangup (why?) */ +#define CONFIG_SYS_I2C_NOPROBES {{ 0x69 }} /* avoid i2c probe hangup (why?) */ #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 6 /* 24C02 requires 5ms delay */

#if defined(CONFIG_CMD_EEPROM) diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 18c6deb..a891246 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -118,7 +118,7 @@ #define CONFIG_I2C_MULTI_BUS 1

/* Probe all devices */ -#define CONFIG_SYS_I2C_NOPROBES {0x0, 0x0} +#define CONFIG_SYS_I2C_NOPROBES {{0x0, 0x0}}

/* USB */ #define CONFIG_MUSB_UDC 1 diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h index 719a12a..7b8d13c 100644 --- a/include/configs/p3p440.h +++ b/include/configs/p3p440.h @@ -102,7 +102,7 @@ #define CONFIG_PPC4XX_I2C /* use PPC4xx driver */ #define CONFIG_SYS_I2C_SPEED 100000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x69}} /* Don't probe these addrs */

/*----------------------------------------------------------------------- * I2C RTC diff --git a/include/configs/redwood.h b/include/configs/redwood.h index f75ab67..8b8d5b7 100644 --- a/include/configs/redwood.h +++ b/include/configs/redwood.h @@ -116,7 +116,7 @@ #define IIC0_ALT_BOOTPROM_ADDR 0x54

/* Don't probe these addrs */ -#define CONFIG_SYS_I2C_NOPROBES {0x50, 0x52, 0x53, 0x54} +#define CONFIG_SYS_I2C_NOPROBES {{0x50, 0x52, 0x53, 0x54}}

#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 /* Bytes of address */

diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index b418cf2..4a409d4 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -286,7 +286,7 @@ #define CONFIG_FSL_I2C #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x69}} /* Don't probe these addrs */ #define CONFIG_SYS_I2C1_OFFSET 0x3000 #define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_I2C_OFFSET CONFIG_SYS_I2C2_OFFSET diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h index 435b148..e7f48b9 100644 --- a/include/configs/sbc8560.h +++ b/include/configs/sbc8560.h @@ -235,7 +235,7 @@ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x69}} /* Don't probe these addrs */ #define CONFIG_SYS_I2C_OFFSET 0x3000

#define CONFIG_SYS_PCI_MEM_BASE 0xC0000000 diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 8d9f931..58d5801 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -294,7 +294,7 @@ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x69}} /* Don't probe these addrs */ #define CONFIG_SYS_I2C_OFFSET 0x3100

/* diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h index fc3881d..1b35944 100644 --- a/include/configs/stxgp3.h +++ b/include/configs/stxgp3.h @@ -188,7 +188,7 @@ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F #if 0 -#define CONFIG_SYS_I2C_NOPROBES {0x00} /* Don't probe these addrs */ +#define CONFIG_SYS_I2C_NOPROBES {{0x00}} /* Don't probe these addrs */ #else /* I did the 'if 0' so we could keep the syntax above if ever needed. */ #undef CONFIG_SYS_I2C_NOPROBES diff --git a/include/configs/taihu.h b/include/configs/taihu.h index a3738b7..99d72ae 100644 --- a/include/configs/taihu.h +++ b/include/configs/taihu.h @@ -140,7 +140,7 @@ */ #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */

-#define CONFIG_SYS_I2C_NOPROBES { 0x69 } /* avoid i2c probe hangup (why?) */ +#define CONFIG_SYS_I2C_NOPROBES {{ 0x69 }} /* avoid i2c probe hangup (why?) */ #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 6 /* 24C02 requires 5ms delay */

#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* I2C boot EEPROM (24C02W) */ diff --git a/include/configs/yucca.h b/include/configs/yucca.h index fb684b5..8a75e9a 100644 --- a/include/configs/yucca.h +++ b/include/configs/yucca.h @@ -126,7 +126,7 @@ #define IIC0_ALT_BOOTPROM_ADDR 0x54

/* Don't probe these addrs */ -#define CONFIG_SYS_I2C_NOPROBES {0x50, 0x52, 0x53, 0x54} +#define CONFIG_SYS_I2C_NOPROBES {{0x50, 0x52, 0x53, 0x54}}

/* #if defined(CONFIG_CMD_EEPROM) */ /* #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 */ /* I2C boot EEPROM */