diff options
Diffstat (limited to 'demos/STM32/RT-STM32-LWIP-FATFS-USB')
3 files changed, 24 insertions, 57 deletions
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f107_goldbull b/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f107_goldbull index a1e691ec2..3f5ba0ad6 100644 --- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f107_goldbull +++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f107_goldbull @@ -90,6 +90,9 @@ DEPDIR   := ./.dep-stm32f107_goldbull  # Imported source files and paths
  CHIBIOS = ../../..
 +
 +# Licensing files.
 +include $(CHIBIOS)/os/license/license.mk
  # Startup files.
  include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk
  # HAL-OSAL files (optional).
 @@ -114,18 +117,8 @@ LDSCRIPT= $(STARTUPLD)/STM32F107xC.ld  # C sources that can be compiled in ARM or THUMB mode depending on the global
  # setting.
 -CSRC = $(STARTUPSRC) \
 -       $(KERNSRC) \
 -       $(PORTSRC) \
 -       $(OSALSRC) \
 -       $(HALSRC) \
 -       $(PLATFORMSRC) \
 -       $(BOARDSRC) \
 +CSRC = $(ALLCSRC) \
         $(TESTSRC) \
 -       $(LWSRC) \
 -       $(FATFSSRC) \
 -       $(STREAMSSRC) \
 -       $(SHELLSRC) \
         $(CHIBIOS)/os/various/evtimer.c \
         $(CONFDIR)/portab.c \
         src/usbcfg.c main.c
 @@ -155,14 +148,10 @@ TCSRC =  TCPPSRC =
  # List ASM source files here
 -ASMSRC =
 +ASMSRC = $(ALLASMSRC)
  ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
 -INCDIR = $(CHIBIOS)/os/license \
 -         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
 -         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
 -         $(STREAMSINC) $(SHELLINC) $(LWINC) $(FATFSINC) \
 -         $(CHIBIOS)/os/various $(CONFDIR) ./cfg ./src
 +INCDIR = $(ALLINC) $(TESTINC) $(CONFDIR) ./cfg ./src
  #
  # Project, sources and paths
 diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f407_olimex b/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f407_olimex index 112918a91..cbd3bc573 100644 --- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f407_olimex +++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f407_olimex @@ -90,6 +90,9 @@ DEPDIR   := ./.dep-stm32f407_olimex  # Imported source files and paths
  CHIBIOS = ../../..
 +
 +# Licensing files.
 +include $(CHIBIOS)/os/license/license.mk
  # Startup files.
  include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
  # HAL-OSAL files (optional).
 @@ -114,25 +117,15 @@ LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld  # C sources that can be compiled in ARM or THUMB mode depending on the global
  # setting.
 -CSRC = $(STARTUPSRC) \
 -       $(KERNSRC) \
 -       $(PORTSRC) \
 -       $(OSALSRC) \
 -       $(HALSRC) \
 -       $(PLATFORMSRC) \
 -       $(BOARDSRC) \
 +CSRC = $(ALLCSRC) \
         $(TESTSRC) \
 -       $(LWSRC) \
 -       $(FATFSSRC) \
 -       $(STREAMSSRC) \
 -       $(SHELLSRC) \
         $(CHIBIOS)/os/various/evtimer.c \
         $(CONFDIR)/portab.c \
         src/usbcfg.c main.c
  # C++ sources that can be compiled in ARM or THUMB mode depending on the global
  # setting.
 -CPPSRC =
 +CPPSRC = $(ALLCPPSRC)
  # C sources to be compiled in ARM mode regardless of the global setting.
  # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
 @@ -155,14 +148,10 @@ TCSRC =  TCPPSRC =
  # List ASM source files here
 -ASMSRC =
 -ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
 -
 -INCDIR = $(CHIBIOS)/os/license \
 -         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
 -         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
 -         $(STREAMSINC) $(SHELLINC) $(LWINC) $(FATFSINC) \
 -         $(CHIBIOS)/os/various $(CONFDIR) ./cfg ./src
 +ASMSRC = $(ALLASMSRC)
 +ASMXSRC = $(ALLXASMSRC)
 +
 +INCDIR = $(ALLINC) $(TESTINC) $(CONFDIR) ./cfg ./src
  #
  # Project, sources and paths
 diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f746_discovery b/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f746_discovery index e1ebb9d81..807a8e9bf 100644 --- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f746_discovery +++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/Makefile-stm32f746_discovery @@ -95,6 +95,9 @@ DEPDIR   := ./.dep-stm32f746_discovery  # Imported source files and paths
  CHIBIOS = ../../..
 +
 +# Licensing files.
 +include $(CHIBIOS)/os/license/license.mk
  # Startup files.
  include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f7xx.mk
  # HAL-OSAL files (optional).
 @@ -119,25 +122,15 @@ LDSCRIPT= $(STARTUPLD)/STM32F746xG.ld  # C sources that can be compiled in ARM or THUMB mode depending on the global
  # setting.
 -CSRC = $(STARTUPSRC) \
 -       $(KERNSRC) \
 -       $(PORTSRC) \
 -       $(OSALSRC) \
 -       $(HALSRC) \
 -       $(PLATFORMSRC) \
 -       $(BOARDSRC) \
 +CSRC = $(ALLCSRC) \
         $(TESTSRC) \
 -       $(LWSRC) \
 -       $(FATFSSRC) \
 -       $(STREAMSSRC) \
 -       $(SHELLSRC) \
         $(CHIBIOS)/os/various/evtimer.c \
         $(CONFDIR)/portab.c \
         src/usbcfg.c main.c
  # C++ sources that can be compiled in ARM or THUMB mode depending on the global
  # setting.
 -CPPSRC =
 +CPPSRC = $(ALLCPPSRC)
  # C sources to be compiled in ARM mode regardless of the global setting.
  # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
 @@ -160,14 +153,10 @@ TCSRC =  TCPPSRC =
  # List ASM source files here
 -ASMSRC =
 -ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
 -
 -INCDIR = $(CHIBIOS)/os/license \
 -         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
 -         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
 -         $(STREAMSINC) $(SHELLINC) $(LWINC) $(FATFSINC) \
 -         $(CHIBIOS)/os/various $(CONFDIR) ./cfg ./src
 +ASMSRC = $(ALLASMSRC)
 +ASMXSRC = $(ALLXASMSRC)
 +
 +INCDIR = $(ALLINC) $(TESTINC) $(CONFDIR) ./cfg ./src
  #
  # Project, sources and paths
  | 
