From bb5e0367ab1bfad9e054cdb803576c4fcab7f21a Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@110e8d01-0319-4d1e-a829-52ad28d1bb01>
Date: Sun, 21 Oct 2018 19:00:47 +0000
Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12386
 110e8d01-0319-4d1e-a829-52ad28d1bb01

---
 .../RT-STM32-LWIP-FATFS-USB-HTTPS/.cproject   |   2 +-
 .../RT-STM32-LWIP-FATFS-USB-HTTPS/Makefile    |   4 +-
 .../stm32f746_discovery}/chconf.h             |   0
 .../stm32f746_discovery}/halconf.h            |   0
 .../stm32f746_discovery}/mcuconf.h            |   0
 .../stm32f746_discovery}/portab.c             |   0
 .../stm32f746_discovery}/portab.h             |   0
 .../stm32f746_discovery.make}                 | 141 +++++++-----------
 8 files changed, 57 insertions(+), 90 deletions(-)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/{cfg-stm32f746_discovery => cfg/stm32f746_discovery}/chconf.h (100%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/{cfg-stm32f746_discovery => cfg/stm32f746_discovery}/halconf.h (100%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/{cfg-stm32f746_discovery => cfg/stm32f746_discovery}/mcuconf.h (100%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/{cfg-stm32f746_discovery => cfg/stm32f746_discovery}/portab.c (100%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/{cfg-stm32f746_discovery => cfg/stm32f746_discovery}/portab.h (100%)
 rename demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/{Makefile-stm32f746_discovery => make/stm32f746_discovery.make} (61%)

diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/.cproject b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/.cproject
index f7ae41732..576e346af 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/.cproject
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/.cproject
@@ -60,7 +60,7 @@
 					<folderInfo id="0.1570569554.1629784558." name="/" resourcePath="">
 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1578189045" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.eclipse.cdt.build.core.prefbase.toolchain.1578189045.328762513" name=""/>
-							<builder arguments="-f Makefile-stm32f746_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.339968776" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<builder arguments="-f make/stm32f746_discovery.make" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.339968776" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1142929379" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.1147455862" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1688616224" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths"/>
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/Makefile b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/Makefile
index 31c1b55f6..f2939eaba 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/Makefile
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/Makefile
@@ -5,13 +5,13 @@
 all:
 	@echo
 	@echo === Building for STM32F746-Discovery ===============================
-	+@make --no-print-directory -f Makefile-stm32f746_discovery all
+	+@make --no-print-directory -f make/stm32f746_discovery.make all
 	@echo ====================================================================
 	@echo
 
 clean:
 	@echo
-	+@make --no-print-directory -f Makefile-stm32f746_discovery clean
+	+@make --no-print-directory -f make/stm32f746_discovery.make clean
 	@echo
 
 #
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/chconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/chconf.h
similarity index 100%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/chconf.h
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/chconf.h
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/halconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/halconf.h
similarity index 100%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/halconf.h
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/halconf.h
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/mcuconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/mcuconf.h
similarity index 100%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/mcuconf.h
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/mcuconf.h
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/portab.c b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/portab.c
similarity index 100%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/portab.c
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/portab.c
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/portab.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/portab.h
similarity index 100%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/portab.h
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/portab.h
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/Makefile-stm32f746_discovery b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/make/stm32f746_discovery.make
similarity index 61%
rename from demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/Makefile-stm32f746_discovery
rename to demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/make/stm32f746_discovery.make
index 678e0a95b..50d6e2dad 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/Makefile-stm32f746_discovery
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/make/stm32f746_discovery.make
@@ -18,7 +18,7 @@ ifeq ($(USE_CPPOPT),)
   USE_CPPOPT = -fno-rtti
 endif
 
-# Enable this if you want the linker to remove unused code and data
+# Enable this if you want the linker to remove unused code and data.
 ifeq ($(USE_LINK_GC),)
   USE_LINK_GC = yes
 endif
@@ -28,16 +28,11 @@ ifeq ($(USE_LDOPT),)
   USE_LDOPT = 
 endif
 
-# Enable this if you want link time optimizations (LTO)
+# Enable this if you want link time optimizations (LTO).
 ifeq ($(USE_LTO),)
   USE_LTO = yes
 endif
 
-# If enabled, this option allows to compile the application in THUMB mode.
-ifeq ($(USE_THUMB),)
-  USE_THUMB = yes
-endif
-
 # Enable this if you want to see the full log while compiling.
 ifeq ($(USE_VERBOSE_COMPILE),)
   USE_VERBOSE_COMPILE = no
@@ -76,7 +71,7 @@ endif
 
 # FPU-related options.
 ifeq ($(USE_FPU_OPT),)
-  USE_FPU_OPT = -mfloat-abi=$(USE_FPU) -mfpu=fpv5-sp-d16 -fsingle-precision-constant
+  USE_FPU_OPT = -mfloat-abi=$(USE_FPU) -mfpu=fpv5-sp-d16
 endif
 
 #
@@ -84,17 +79,20 @@ endif
 ##############################################################################
 
 ##############################################################################
-# Project, sources and paths
+# Project, target, sources and paths
 #
 
 # Define project name here
 PROJECT = ch
-CONFDIR  := ./cfg-stm32f746_discovery
-BUILDDIR := ./build-stm32f746_discovery
-DEPDIR   := ./.dep-stm32f746_discovery
 
-# Imported source files and paths
-CHIBIOS = ../../..
+# Target settings.
+MCU  = cortex-m4
+
+# Imported source files and paths.
+CHIBIOS  := ../../..
+CONFDIR  := ./cfg/stm32f746_discovery
+BUILDDIR := ./build/stm32f746_discovery
+DEPDIR   := ./.dep/stm32f746_discovery
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -108,6 +106,8 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+# Auto-build files in ./source recursively.
+include $(CHIBIOS)/tools/mk/autobuild.mk
 # Other files (optional).
 include $(CHIBIOS)/test/lib/test.mk
 include $(CHIBIOS)/test/rt/rt_test.mk
@@ -121,85 +121,35 @@ include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk
 # Define linker script file here
 LDSCRIPT= $(STARTUPLD)/STM32F746xG_MAX.ld
 
-# C sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
-CSRC = $(ALLCSRC) \
-       $(TESTSRC) \
-       $(CHIBIOS)/os/various/evtimer.c \
-       $(CONFDIR)/portab.c \
-       usbcfg.c main.c web/web.c web/cert.c
-
-# C++ sources that can be compiled in ARM or THUMB mode depending on the global
-# setting.
+# C sources that can be compiled in ARM or THUMB mode depending on the global
+# setting.
+CSRC = $(ALLCSRC) \
+       $(TESTSRC) \
+       $(CHIBIOS)/os/various/evtimer.c \
+       $(CONFDIR)/portab.c \
+       main.c web/web.c web/cert.c
+
+# C++ sources that can be compiled in ARM or THUMB mode depending on the global
+# setting.
 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
-#       option that results in lower performance and larger code size.
-ACSRC =
-
-# C++ sources to be compiled in ARM mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-ACPPSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCSRC =
-
-# C sources to be compiled in THUMB mode regardless of the global setting.
-# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
-#       option that results in lower performance and larger code size.
-TCPPSRC =
-
-# List ASM source files here
+# List ASM source files here.
 ASMSRC = $(ALLASMSRC)
+
+# List ASM with preprocessor source files here.
 ASMXSRC = $(ALLXASMSRC)
 
-INCDIR = $(ALLINC) $(TESTINC) $(CONFDIR) ./cfg ./src
+# Inclusion directories.
+INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC) ./cfg
 
-#
-# Project, sources and paths
-##############################################################################
-
-##############################################################################
-# Compiler settings
-#
-
-MCU  = cortex-m7
-
-#TRGT = arm-elf-
-TRGT = arm-none-eabi-
-CC   = $(TRGT)gcc
-CPPC = $(TRGT)g++
-# Enable loading with g++ only if you need C++ runtime support.
-# NOTE: You can use C++ even without C++ support if you are careful. C++
-#       runtime support makes code size explode.
-LD   = $(TRGT)gcc
-#LD   = $(TRGT)g++
-CP   = $(TRGT)objcopy
-AS   = $(TRGT)gcc -x assembler-with-cpp
-AR   = $(TRGT)ar
-OD   = $(TRGT)objdump
-SZ   = $(TRGT)size
-HEX  = $(CP) -O ihex
-BIN  = $(CP) -O binary
-
-# ARM-specific options here
-AOPT =
-
-# THUMB-specific options here
-TOPT = -mthumb -DTHUMB
-
-# Define C warning options here
+# Define C warning options here.
 CWARN = -Wall -Wextra -Wundef -Wstrict-prototypes
 
-# Define C++ warning options here
-CPPWARN = -Wall -Wextra -Wundef -Wcpp
+# Define C++ warning options here.
+CPPWARN = -Wall -Wextra -Wundef
 
 #
-# Compiler settings
+# Project, target, sources and paths
 ##############################################################################
 
 ##############################################################################
@@ -207,7 +157,7 @@ CPPWARN = -Wall -Wextra -Wundef -Wcpp
 #
 
 # List all user C define here, like -D_DEBUG=1
-UDEFS = 
+UDEFS =
 
 # Define ASM defines here
 UADEFS =
@@ -219,11 +169,28 @@ UINCDIR =
 ULIBDIR =
 
 # List all user libraries here
-ULIBS = -lm
+ULIBS =
 
 #
-# End of user defines
+# End of user section
 ##############################################################################
 
-RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
+##############################################################################
+# Common rules
+#
+
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
+include $(RULESPATH)/arm-none-eabi.mk
 include $(RULESPATH)/rules.mk
+
+#
+# Common rules
+##############################################################################
+
+##############################################################################
+# Custom rules
+#
+
+#
+# Custom rules
+##############################################################################