UNHB
/
DFI
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed board in makefile, added default make target, removed hacks in hal_mac_lld.c

This commit is contained in:
Lucas Pleß 2018-01-11 16:30:52 +01:00
parent c07f995cae
commit d18e1c5b39
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eigener_ctrl/stm32f407-olimex/Makefile
View File

@ -11,7 +11,7 @@ endif
# C specific options here (added to USE_OPT). # C specific options here (added to USE_OPT).
ifeq ($(USE_COPT),) ifeq ($(USE_COPT),)
USE_COPT = USE_COPT =
endif endif
# C++ specific options here (added to USE_OPT). # C++ specific options here (added to USE_OPT).
@ -26,7 +26,7 @@ endif
# Linker extra options here. # Linker extra options here.
ifeq ($(USE_LDOPT),) ifeq ($(USE_LDOPT),)
USE_LDOPT = USE_LDOPT =
endif endif
# Enable this if you want link time optimizations (LTO) # Enable this if you want link time optimizations (LTO)
@ -93,7 +93,7 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.m
# HAL-OSAL files (optional). # HAL-OSAL files (optional).
include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_E407/board.mk include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_E407_REV_D/board.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk
# RTOS files (optional). # RTOS files (optional).
include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/rt/rt.mk
@ -225,6 +225,10 @@ ULIBS =
# End of user defines # End of user defines
############################################################################## ##############################################################################
build/$(PROJECT).bin: build/$(PROJECT).elf
$(BIN) build/$(PROJECT).elf build/$(PROJECT).bin
upload-jlink: build/$(PROJECT).bin upload-jlink: build/$(PROJECT).bin
openocd -f interface/jlink.cfg -f target/stm32f4x.cfg -c "program build/$(PROJECT).elf verify reset exit" openocd -f interface/jlink.cfg -f target/stm32f4x.cfg -c "program build/$(PROJECT).elf verify reset exit"

8
eigener_ctrl/stm32f407-olimex/chibios/os/hal/ports/STM32/LLD/MACv1/hal_mac_lld.c
View File

@ -270,11 +270,11 @@ void mac_lld_init(void) {
rccEnableETH(false); rccEnableETH(false);
/* PHY address setup.*/ /* PHY address setup.*/
//#if defined(BOARD_PHY_ADDRESS) #if defined(BOARD_PHY_ADDRESS)
ETHD1.phyaddr = 0 << 11; ETHD1.phyaddr = 0 << 11;
//#else #else
// mii_find_phy(&ETHD1); mii_find_phy(&ETHD1);
//#endif #endif
#if defined(BOARD_PHY_RESET) #if defined(BOARD_PHY_RESET)
/* PHY board-specific reset procedure.*/ /* PHY board-specific reset procedure.*/