andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sdram preparations (#3764) 

* ports: stm32f4: not all stm32f4xx are stm32f407, let board decide

* Do not include mcuconf_community.h in port's mcuconf.h usign relative path

as override file can be provided in board directory.
This commit is contained in:
Andrey G 2022-01-10 16:31:29 +03:00 committed by GitHub
parent 0d8e4d5222
commit 2d1fb8a68c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/hw_layer/ports/stm32/stm32f4/board.h
View File

@ -64,16 +64,6 @@
*/ */
#define STM32_VDD 300U #define STM32_VDD 300U
/*
* MCU type as defined in the ST header.
* this declaration would cause stm32_registry.h to define STM32F40_41xxx and STM32F4XX automatically
*
* See also STM32F4xx_MCUCONF is defined in mcuconf.h
*/
#ifndef STM32F407xx
#define STM32F407xx
#endif
/* /*
* IO pins assignments. * IO pins assignments.
*/ */

3
firmware/hw_layer/ports/stm32/stm32f4/cfg/halconf.h
View File

@ -204,9 +204,6 @@
#define UART_USE_MUTUAL_EXCLUSION FALSE #define UART_USE_MUTUAL_EXCLUSION FALSE
#endif #endif
/* common for all STM32 */
#include "../../cfg/halconf_community.h"
#endif /* HALCONF_H */ #endif /* HALCONF_H */
/** @} */ /** @} */

3
firmware/hw_layer/ports/stm32/stm32f4/cfg/mcuconf.h
View File

@ -107,7 +107,4 @@
#include "mcuconf_common_f4_f7.h" #include "mcuconf_common_f4_f7.h"
/* common for all STM32 */
#include "../../cfg/mcuconf_community.h"
#endif /* _MCUCONF_H_ */ #endif /* _MCUCONF_H_ */

4
firmware/hw_layer/ports/stm32/stm32f4/hw_ports.mk
View File

@ -6,7 +6,6 @@ HW_LAYER_EMS += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/stm32f4xx_hal_flash.
HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/mpu_util.cpp \ HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/mpu_util.cpp \
$(PROJECT_DIR)/hw_layer/ports/stm32/stm32_adc_v2.cpp $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_adc_v2.cpp
DDEFS += -DSTM32F407xx
MCU = cortex-m4 MCU = cortex-m4
LDSCRIPT = $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/STM32F4.ld LDSCRIPT = $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/STM32F4.ld
ALLCSRC += $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c ALLCSRC += $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c
@ -15,7 +14,10 @@ CONFDIR = $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/cfg
# STM32F42x has extra memory, so change some flags so we can use it. # STM32F42x has extra memory, so change some flags so we can use it.
ifeq ($(IS_STM32F429),yes) ifeq ($(IS_STM32F429),yes)
USE_OPT += -Wl,--defsym=STM32F4_HAS_SRAM3=1 USE_OPT += -Wl,--defsym=STM32F4_HAS_SRAM3=1
DDEFS += -DSTM32F429xx
DDEFS += -DEFI_IS_F42x DDEFS += -DEFI_IS_F42x
else
DDEFS += -DSTM32F407xx
endif endif
# TODO: remove, for efifeatures.h # TODO: remove, for efifeatures.h

3
firmware/hw_layer/ports/stm32/stm32f7/cfg/halconf.h
View File

@ -215,9 +215,6 @@
#define UART_USE_MUTUAL_EXCLUSION FALSE #define UART_USE_MUTUAL_EXCLUSION FALSE
#endif #endif
/* common for all STM32 */
#include "../../cfg/halconf_community.h"
#endif /* HALCONF_H */ #endif /* HALCONF_H */
/** @} */ /** @} */

3
firmware/hw_layer/ports/stm32/stm32f7/cfg/mcuconf.h
View File

@ -159,7 +159,4 @@
#include "mcuconf_common_f4_f7.h" #include "mcuconf_common_f4_f7.h"
/* common for all STM32 */
#include "../../cfg/mcuconf_community.h"
#endif /* MCUCONF_H */ #endif /* MCUCONF_H */

3
firmware/hw_layer/ports/stm32/stm32h7/cfg/halconf.h
View File

@ -294,9 +294,6 @@
#define UART_USE_MUTUAL_EXCLUSION FALSE #define UART_USE_MUTUAL_EXCLUSION FALSE
#endif #endif
/* common for all STM32 */
#include "../../cfg/halconf_community.h"
#endif /* HALCONF_H */ #endif /* HALCONF_H */
/** @} */ /** @} */

3
firmware/hw_layer/ports/stm32/stm32h7/cfg/mcuconf.h
View File

@ -505,7 +505,4 @@
#define ENABLE_AUTO_DETECT_HSE #define ENABLE_AUTO_DETECT_HSE
/* common for all STM32 */
#include "../../cfg/mcuconf_community.h"
#endif /* MCUCONF_H */ #endif /* MCUCONF_H */