Skip to content

Commit e7df243

Browse files
zouboanAlan Carvalho de Assis
zouboan
authored and
Alan Carvalho de Assis
committed
boards/nucleo-f429zi: update CONFIG name to keep up with the CONFIG in arch/stm32
1 parent 24ce51f commit e7df243

File tree

9 files changed

+51
-51
lines changed

9 files changed

+51
-51
lines changed

‎boards/arm/stm32/nucleo-f429zi/src/Make.defs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ ifeq ($(CONFIG_MMCSD),y)
5656
CSRCS += stm32_sdio.c
5757
endif
5858

59-
ifeq ($(CONFIG_STM32F4_OTGFS),y)
59+
ifeq ($(CONFIG_STM32_OTGFS),y)
6060
CSRCS += stm32_usb.c
6161
endif
6262

63-
ifeq ($(CONFIG_STM32F4_BBSRAM),y)
63+
ifeq ($(CONFIG_STM32_BBSRAM),y)
6464
CSRCS += stm32_bbsram.c
6565
endif
6666

‎boards/arm/stm32/nucleo-f429zi/src/nucleo-144.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
#define GPIO_SPI3_CS2 (GPIO_SPI_CS | GPIO_PORTG | GPIO_PIN6)
9999
#define GPIO_SPI3_CS3 (GPIO_SPI_CS | GPIO_PORTG | GPIO_PIN7)
100100

101-
#if defined(CONFIG_STM32F4_SDMMC1) || defined(CONFIG_STM32F4_SDMMC2)
101+
#if defined(CONFIG_STM32_SDMMC1) || defined(CONFIG_STM32_SDMMC2)
102102
# define HAVE_SDIO
103103
#endif
104104

@@ -109,7 +109,7 @@
109109
#define SDIO_SLOTNO 0 /* Only one slot */
110110

111111
#ifdef HAVE_SDIO
112-
# if defined(CONFIG_STM32F4_SDMMC1)
112+
# if defined(CONFIG_STM32_SDMMC1)
113113
# define GPIO_SDMMC1_NCD (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI | GPIO_PORTC | GPIO_PIN6)
114114
# endif
115115

@@ -229,7 +229,7 @@ int stm32_sdio_initialize(void);
229229
*
230230
****************************************************************************/
231231

232-
#ifdef CONFIG_STM32F4_OTGFS
232+
#ifdef CONFIG_STM32_OTGFS
233233
void stm32_usbinitialize(void);
234234
#endif
235235

@@ -261,7 +261,7 @@ int stm32_adc_setup(void);
261261
* Name: stm32_bbsram_int
262262
****************************************************************************/
263263

264-
#ifdef CONFIG_STM32F4_BBSRAM
264+
#ifdef CONFIG_STM32_BBSRAM
265265
int stm32_bbsram_int(void);
266266
#endif
267267

‎boards/arm/stm32/nucleo-f429zi/src/stm32_adc.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@
4747
/* Up to 3 ADC interfaces are supported */
4848

4949
#if STM32F4_NADC < 3
50-
# undef CONFIG_STM32F4_ADC3
50+
# undef CONFIG_STM32_ADC3
5151
#endif
5252

5353
#if STM32F4_NADC < 2
54-
# undef CONFIG_STM32F4_ADC2
54+
# undef CONFIG_STM32_ADC2
5555
#endif
5656

5757
#if STM32F4_NADC < 1
58-
# undef CONFIG_STM32F4_ADC1
58+
# undef CONFIG_STM32_ADC1
5959
#endif
6060

61-
#if defined(CONFIG_STM32F4_ADC1) || defined(CONFIG_STM32F4_ADC2) || defined(CONFIG_STM32F4_ADC3)
62-
#ifndef CONFIG_STM32F4_ADC1
61+
#if defined(CONFIG_STM32_ADC1) || defined(CONFIG_STM32_ADC2) || defined(CONFIG_STM32_ADC3)
62+
#ifndef CONFIG_STM32_ADC1
6363
# warning "Channel information only available for ADC1"
6464
#endif
6565

@@ -76,7 +76,7 @@
7676
* {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15};
7777
*/
7878

79-
#ifdef CONFIG_STM32F4_ADC1
79+
#ifdef CONFIG_STM32_ADC1
8080
static const uint8_t g_chanlist[ADC1_NCHANNELS] =
8181
{
8282
3
@@ -114,7 +114,7 @@ static const uint32_t g_pinlist[ADC1_NCHANNELS] =
114114

115115
int stm32_adc_setup(void)
116116
{
117-
#ifdef CONFIG_STM32F4_ADC1
117+
#ifdef CONFIG_STM32_ADC1
118118
static bool initialized = false;
119119
struct adc_dev_s *adc;
120120
int ret;
@@ -163,5 +163,5 @@ int stm32_adc_setup(void)
163163
#endif
164164
}
165165

166-
#endif /* CONFIG_STM32F4_ADC1 || CONFIG_STM32F4_ADC2 || CONFIG_STM32F4_ADC3 */
166+
#endif /* CONFIG_STM32_ADC1 || CONFIG_STM32_ADC2 || CONFIG_STM32_ADC3 */
167167
#endif /* CONFIG_ADC */

‎boards/arm/stm32/nucleo-f429zi/src/stm32_appinitialize.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ int board_app_initialize(uintptr_t arg)
121121
}
122122
#endif
123123

124-
#ifdef CONFIG_STM32F4_BBSRAM
124+
#ifdef CONFIG_STM32_BBSRAM
125125
/* Initialize battery-backed RAM */
126126

127127
stm32_bbsram_int();

‎boards/arm/stm32/nucleo-f429zi/src/stm32_bbsram.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
#include "nucleo-144.h"
4747

48-
#ifdef CONFIG_STM32F4_BBSRAM
48+
#ifdef CONFIG_STM32_BBSRAM
4949

5050
/****************************************************************************
5151
* Pre-processor Definitions
@@ -306,15 +306,15 @@ static int hardfault_get_desc(struct bbsramd_s *desc)
306306
* Name: copy_reverse
307307
****************************************************************************/
308308

309-
#if defined(CONFIG_STM32F4_SAVE_CRASHDUMP)
309+
#if defined(CONFIG_STM32_SAVE_CRASHDUMP)
310310
static void copy_reverse(stack_word_t *dest, stack_word_t *src, int size)
311311
{
312312
while (size--)
313313
{
314314
*dest++ = *src--;
315315
}
316316
}
317-
#endif /* CONFIG_STM32F4_SAVE_CRASHDUMP */
317+
#endif /* CONFIG_STM32_SAVE_CRASHDUMP */
318318

319319
/****************************************************************************
320320
* Public Functions
@@ -326,7 +326,7 @@ static void copy_reverse(stack_word_t *dest, stack_word_t *src, int size)
326326

327327
int stm32_bbsram_int(void)
328328
{
329-
int filesizes[CONFIG_STM32F4_BBSRAM_FILES + 1] = BSRAM_FILE_SIZES;
329+
int filesizes[CONFIG_STM32_BBSRAM_FILES + 1] = BSRAM_FILE_SIZES;
330330
char buf[HEADER_TIME_FMT_LEN + 1];
331331
struct bbsramd_s desc;
332332
int rv;
@@ -338,7 +338,7 @@ int stm32_bbsram_int(void)
338338

339339
stm32_bbsraminitialize(BBSRAM_PATH, filesizes);
340340

341-
#if defined(CONFIG_STM32F4_SAVE_CRASHDUMP)
341+
#if defined(CONFIG_STM32_SAVE_CRASHDUMP)
342342
/* Panic Logging in Battery Backed Up Files
343343
* Do we have an hard fault in BBSRAM?
344344
*/
@@ -369,7 +369,7 @@ int stm32_bbsram_int(void)
369369
"[%s] (%d)\n", HARDFAULT_PATH, rv);
370370
}
371371
}
372-
#endif /* CONFIG_STM32F4_SAVE_CRASHDUMP */
372+
#endif /* CONFIG_STM32_SAVE_CRASHDUMP */
373373

374374
return rv;
375375
}
@@ -378,7 +378,7 @@ int stm32_bbsram_int(void)
378378
* Name: board_crashdump
379379
****************************************************************************/
380380

381-
#if defined(CONFIG_STM32F4_SAVE_CRASHDUMP)
381+
#if defined(CONFIG_STM32_SAVE_CRASHDUMP)
382382
void board_crashdump(uintptr_t sp, struct tcb_s *tcb,
383383
const char *filename, int lineno,
384384
const char *msg)
@@ -521,6 +521,6 @@ void board_crashdump(uintptr_t sp, struct tcb_s *tcb,
521521
arm_lowputc('!');
522522
}
523523
}
524-
#endif /* CONFIG_STM32F4_SAVE_CRASHDUMP */
524+
#endif /* CONFIG_STM32_SAVE_CRASHDUMP */
525525

526526
#endif /* CONFIG_STM32_BBSRAM */

‎boards/arm/stm32/nucleo-f429zi/src/stm32_boot.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void stm32_boardinitialize(void)
5555
board_autoled_initialize();
5656
#endif
5757

58-
#if defined(CONFIG_STM32F4_OTGFS) || defined(CONFIG_STM32F4_HOST)
58+
#if defined(CONFIG_STM32_OTGFS) || defined(CONFIG_STM32_HOST)
5959
stm32_usbinitialize();
6060
#endif
6161

‎boards/arm/stm32/nucleo-f429zi/src/stm32_pwm.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ int stm32_pwm_setup(void)
7171
{
7272
/* Call stm32_pwminitialize() to get an instance of the PWM interface */
7373

74-
#if defined(CONFIG_STM32F4_TIM1_PWM)
74+
#if defined(CONFIG_STM32_TIM1_PWM)
7575
pwm = stm32_pwminitialize(1);
7676
if (!pwm)
7777
{
@@ -87,7 +87,7 @@ int stm32_pwm_setup(void)
8787
}
8888
#endif
8989

90-
#if defined(CONFIG_STM32F4_TIM2_PWM)
90+
#if defined(CONFIG_STM32_TIM2_PWM)
9191
pwm = stm32_pwminitialize(2);
9292
if (!pwm)
9393
{
@@ -103,7 +103,7 @@ int stm32_pwm_setup(void)
103103
}
104104
#endif
105105

106-
#if defined(CONFIG_STM32F4_TIM3_PWM)
106+
#if defined(CONFIG_STM32_TIM3_PWM)
107107
pwm = stm32_pwminitialize(3);
108108
if (!pwm)
109109
{
@@ -119,7 +119,7 @@ int stm32_pwm_setup(void)
119119
}
120120
#endif
121121

122-
#if defined(CONFIG_STM32F4_TIM4_PWM)
122+
#if defined(CONFIG_STM32_TIM4_PWM)
123123
pwm = stm32_pwminitialize(4);
124124
if (!pwm)
125125
{

‎boards/arm/stm32/nucleo-f429zi/src/stm32_spi.c

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
* Private Data
9494
****************************************************************************/
9595

96-
#if defined(CONFIG_STM32F4_SPI1)
96+
#if defined(CONFIG_STM32_SPI1)
9797
static const uint32_t g_spi1gpio[] =
9898
{
9999
#if defined(GPIO_SPI1_CS0)
@@ -119,7 +119,7 @@ static const uint32_t g_spi1gpio[] =
119119
};
120120
#endif
121121

122-
#if defined(CONFIG_STM32F4_SPI2)
122+
#if defined(CONFIG_STM32_SPI2)
123123
static const uint32_t g_spi2gpio[] =
124124
{
125125
#if defined(GPIO_SPI2_CS0)
@@ -145,7 +145,7 @@ static const uint32_t g_spi2gpio[] =
145145
};
146146
#endif
147147

148-
#if defined(CONFIG_STM32F4_SPI3)
148+
#if defined(CONFIG_STM32_SPI3)
149149
static const uint32_t g_spi3gpio[] =
150150
{
151151
#if defined(GPIO_SPI3_CS0)
@@ -172,13 +172,13 @@ static const uint32_t g_spi3gpio[] =
172172
#endif
173173

174174
#if defined(CONFIG_NUCLEO_SPI_TEST)
175-
# if defined(CONFIG_STM32F4_SPI1)
175+
# if defined(CONFIG_STM32_SPI1)
176176
struct spi_dev_s *spi1;
177177
# endif
178-
# if defined(CONFIG_STM32F4_SPI2)
178+
# if defined(CONFIG_STM32_SPI2)
179179
struct spi_dev_s *spi2;
180180
# endif
181-
# if defined(CONFIG_STM32F4_SPI3)
181+
# if defined(CONFIG_STM32_SPI3)
182182
struct spi_dev_s *spi3;
183183
# endif
184184
#endif
@@ -199,7 +199,7 @@ void weak_function stm32_spidev_initialize(void)
199199
{
200200
/* Configure SPI CS GPIO for output */
201201

202-
#if defined(CONFIG_STM32F4_SPI1)
202+
#if defined(CONFIG_STM32_SPI1)
203203
for (int i = 0; i < nitems(g_spi1gpio); i++)
204204
{
205205
if (g_spi1gpio[i] != 0)
@@ -209,7 +209,7 @@ void weak_function stm32_spidev_initialize(void)
209209
}
210210
#endif
211211

212-
#if defined(CONFIG_STM32F4_SPI2)
212+
#if defined(CONFIG_STM32_SPI2)
213213
for (int i = 0; i < nitems(g_spi2gpio); i++)
214214
{
215215
if (g_spi2gpio[i] != 0)
@@ -219,7 +219,7 @@ void weak_function stm32_spidev_initialize(void)
219219
}
220220
#endif
221221

222-
#if defined(CONFIG_STM32F4_SPI3)
222+
#if defined(CONFIG_STM32_SPI3)
223223
for (int i = 0; i < nitems(g_spi3gpio); i++)
224224
{
225225
if (g_spi3gpio[i] != 0)
@@ -257,7 +257,7 @@ void weak_function stm32_spidev_initialize(void)
257257
*
258258
****************************************************************************/
259259

260-
#ifdef CONFIG_STM32F4_SPI1
260+
#ifdef CONFIG_STM32_SPI1
261261
void stm32_spi1select(struct spi_dev_s *dev,
262262
uint32_t devid, bool selected)
263263
{
@@ -278,7 +278,7 @@ uint8_t stm32_spi1status(struct spi_dev_s *dev, uint32_t devid)
278278
}
279279
#endif
280280

281-
#ifdef CONFIG_STM32F4_SPI2
281+
#ifdef CONFIG_STM32_SPI2
282282
void stm32_spi2select(struct spi_dev_s *dev,
283283
uint32_t devid, bool selected)
284284
{
@@ -299,7 +299,7 @@ uint8_t stm32_spi2status(struct spi_dev_s *dev, uint32_t devid)
299299
}
300300
#endif
301301

302-
#ifdef CONFIG_STM32F4_SPI3
302+
#ifdef CONFIG_STM32_SPI3
303303
void stm32_spi3select(struct spi_dev_s *dev,
304304
uint32_t devid, bool selected)
305305
{
@@ -320,7 +320,7 @@ uint8_t stm32_spi3status(struct spi_dev_s *dev, uint32_t devid)
320320
}
321321
#endif
322322

323-
#ifdef CONFIG_STM32F4_SPI4
323+
#ifdef CONFIG_STM32_SPI4
324324
void stm32_spi4select(struct spi_dev_s *dev,
325325
uint32_t devid, bool selected)
326326
{
@@ -334,7 +334,7 @@ uint8_t stm32_spi4status(struct spi_dev_s *dev, uint32_t devid)
334334
}
335335
#endif
336336

337-
#ifdef CONFIG_STM32F4_SPI5
337+
#ifdef CONFIG_STM32_SPI5
338338
void stm32_spi5select(struct spi_dev_s *dev,
339339
uint32_t devid, bool selected)
340340
{
@@ -348,7 +348,7 @@ uint8_t stm32_spi5status(struct spi_dev_s *dev, uint32_t devid)
348348
}
349349
#endif
350350

351-
#ifdef CONFIG_STM32F4_SPI6
351+
#ifdef CONFIG_STM32_SPI6
352352
void stm32_spi6select(struct spi_dev_s *dev,
353353
uint32_t devid, bool selected)
354354
{
@@ -386,42 +386,42 @@ uint8_t stm32_spi6status(struct spi_dev_s *dev, uint32_t devid)
386386
****************************************************************************/
387387

388388
#ifdef CONFIG_SPI_CMDDATA
389-
#ifdef CONFIG_STM32F4_SPI1
389+
#ifdef CONFIG_STM32_SPI1
390390
int stm32_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd)
391391
{
392392
return -ENODEV;
393393
}
394394
#endif
395395

396-
#ifdef CONFIG_STM32F4_SPI2
396+
#ifdef CONFIG_STM32_SPI2
397397
int stm32_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd)
398398
{
399399
return -ENODEV;
400400
}
401401
#endif
402402

403-
#ifdef CONFIG_STM32F4_SPI3
403+
#ifdef CONFIG_STM32_SPI3
404404
int stm32_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd)
405405
{
406406
return -ENODEV;
407407
}
408408
#endif
409409

410-
#ifdef CONFIG_STM32F4_SPI4
410+
#ifdef CONFIG_STM32_SPI4
411411
int stm32_spi4cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd)
412412
{
413413
return -ENODEV;
414414
}
415415
#endif
416416

417-
#ifdef CONFIG_STM32F4_SPI5
417+
#ifdef CONFIG_STM32_SPI5
418418
int stm32_spi5cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd)
419419
{
420420
return -ENODEV;
421421
}
422422
#endif
423423

424-
#ifdef CONFIG_STM32F4_SPI6
424+
#ifdef CONFIG_STM32_SPI6
425425
int stm32_spi6cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd)
426426
{
427427
return -ENODEV;

0 commit comments

Comments
 (0)