From cbf6ffe4e72ec580bc83fd1b065d0f59375c840a Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 29 Sep 2019 09:31:47 -0600 Subject: [PATCH] boards/arm/stm32f7: Remove inclusion of STM32 F7 header files from all board.h header files. --- boards/arm/stm32f7/nucleo-144/include/board.h | 15 +++++---------- boards/arm/stm32f7/stm32f746-ws/include/board.h | 11 +++-------- .../arm/stm32f7/stm32f746g-disco/include/board.h | 2 ++ .../stm32f7/stm32f746g-disco/src/stm32_bringup.c | 1 + .../arm/stm32f7/stm32f769i-disco/include/board.h | 7 ++----- boards/arm/stm32h7/nucleo-h743zi/include/board.h | 2 ++ 6 files changed, 15 insertions(+), 23 deletions(-) diff --git a/boards/arm/stm32f7/nucleo-144/include/board.h b/boards/arm/stm32f7/nucleo-144/include/board.h index a6b680aca4f..355afa11f70 100644 --- a/boards/arm/stm32f7/nucleo-144/include/board.h +++ b/boards/arm/stm32f7/nucleo-144/include/board.h @@ -1,11 +1,11 @@ /**************************************************************************** * boards/arm/stm32f7/nucleo-144/include/board.h * - * Copyright (C) 2016-2017 Gregory Nutt. All rights reserved. + * Copyright (C) 2016-2017, 2019 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt - * Mark Olsson - * David Sidrane - * Bob Feretich + * Mark Olsson + * David Sidrane + * Bob Feretich * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -49,12 +49,7 @@ # include #endif -#ifdef __KERNEL__ -#include "stm32_rcc.h" -#ifdef CONFIG_STM32F7_SDMMC1 -# include "stm32_sdmmc.h" -#endif -#endif +/* Do not include STM32 F7 header files here */ /**************************************************************************** * Pre-processor Definitions diff --git a/boards/arm/stm32f7/stm32f746-ws/include/board.h b/boards/arm/stm32f7/stm32f746-ws/include/board.h index b135ff98aa8..f0aa42831db 100644 --- a/boards/arm/stm32f7/stm32f746-ws/include/board.h +++ b/boards/arm/stm32f7/stm32f746-ws/include/board.h @@ -1,9 +1,9 @@ /**************************************************************************** * boards/arm/stm32f7/stm32f746-ws/include/board.h * - * Copyright (C) 2016 Gregory Nutt. All rights reserved. + * Copyright (C) 2016, 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt - * Author: Mark Olsson + * Mark Olsson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -47,12 +47,7 @@ # include #endif -#ifdef __KERNEL__ -#include "stm32_rcc.h" -#ifdef CONFIG_STM32F7_SDMMC1 -# include "stm32_sdmmc.h" -#endif -#endif +/* Do not include STM32 F7 header files here */ /**************************************************************************** * Pre-processor Definitions diff --git a/boards/arm/stm32f7/stm32f746g-disco/include/board.h b/boards/arm/stm32f7/stm32f746g-disco/include/board.h index 0cd0e9ba1a4..0abb51f7fa1 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/include/board.h +++ b/boards/arm/stm32f7/stm32f746g-disco/include/board.h @@ -46,6 +46,8 @@ # include #endif +/* No not include STM32 F7 header files here. */ + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c index 55bce208288..2b528c56b36 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c @@ -139,5 +139,6 @@ int stm32_bringup(void) } #endif + UNUSED(ret); /* May not be used */ return OK; } diff --git a/boards/arm/stm32f7/stm32f769i-disco/include/board.h b/boards/arm/stm32f7/stm32f769i-disco/include/board.h index baa44a080a7..f1db48cdca7 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/include/board.h +++ b/boards/arm/stm32f7/stm32f769i-disco/include/board.h @@ -1,7 +1,7 @@ /**************************************************************************** * boards/arm/stm32f7/stm32f769i-disco/include/board.h * - * Copyright (C) 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2015, 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -46,10 +46,7 @@ # include #endif -#include "stm32_rcc.h" -#if defined(CONFIG_STM32F7_SDMMC1) || defined(CONFIG_STM32F7_SDMMC2) -# include "stm32_sdmmc.h" -#endif +/* Do not include STM32F7 header files here */ /**************************************************************************** * Pre-processor Definitions diff --git a/boards/arm/stm32h7/nucleo-h743zi/include/board.h b/boards/arm/stm32h7/nucleo-h743zi/include/board.h index f05d67ff73c..6cd2593428d 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/include/board.h +++ b/boards/arm/stm32h7/nucleo-h743zi/include/board.h @@ -48,6 +48,8 @@ # include #endif +/* Do not include STM32 H7 header files here */ + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/