From 78f63bd88dfe86e2d64c57c90387041e582fa285 Mon Sep 17 00:00:00 2001
From: Rocco Marco Guglielmi <roccomarco.guglielmi@live.com>
Date: Wed, 1 Jun 2016 10:59:55 +0000
Subject: [PATCH] Fixed Bug #749

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9549 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 readme.txt                               | 18 ++++++++++++------
 testhal/STM32/STM32F4xx/USB_CDC/.project |  5 +++++
 testhal/STM32/STM32F4xx/USB_CDC/Makefile |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/readme.txt b/readme.txt
index 03db8ff58..0cbd8181e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -114,15 +114,21 @@
 - RT:  Merged RT4.
 - NIL: Merged NIL2.
 - NIL: Added STM32F7 demo.
-- HAL: Fixed wrong comments in STM32F4xx GPT demo (bug #748).
+- HAL: Fixed LTO settings and added board folder in STM32F4xx-USB_CDC demo
+       (bug #749)(backported to 3.0.6 and 16.1.5).
+- HAL: Fixed wrong comments in STM32F4xx GPT demo (bug #748)
+       (backported to 2.6.10, 3.0.6 and 16.1.5).
 - HAL: Fixed wrong comments and indents in STM32F7xx-GPT-ADC and 
-       STM32L4-GPT-ADC demos (bug #747).
+       STM32L4-GPT-ADC demos (bug #747) (backported to 16.1.5).
 - HAL: Fixed wrong comments and indent in STM32F4xx and STM32F7xx 
-       hal_lld.h (bug #746).
-- HAL: Removed wrong SAI masks in STM32F4xx hal_lld.h (bug #745).
+       hal_lld.h (bug #746)(backported to 2.6.10, 3.0.6 and 16.1.5).
+- HAL: Removed wrong SAI masks in STM32F4xx hal_lld.h (bug #745)
+       (backported to 3.0.6 and 16.1.5).
 - HAL: Fixed wrong mask placement in STM32F4xx hal_lld.h (bug #744).
-- HAL: Fixed wrong indent in STM32F4xx hal_lld.h (bug #743).
-- HAL: Removed unused macros in STM32F7xx and STM32F4xx hal_lld.h (bug #742).
+- HAL: Fixed wrong indent in STM32F4xx hal_lld.h (bug #743)
+       (backported to 2.6.10, 3.0.6 and 16.1.5).
+- HAL: Removed unused macros in STM32F7xx and STM32F4xx hal_lld.h (bug #742)
+       (backported to 2.6.10, 3.0.6 and 16.1.5).
 - HAL: Fixed Doxygen related macros in STM32F7xx, STM32L0xx and STM32L4xx
        lld files (bug #741).
 - HAL: Fixed bug in VREF enable/disable functions in ADCv3 driver 
diff --git a/testhal/STM32/STM32F4xx/USB_CDC/.project b/testhal/STM32/STM32F4xx/USB_CDC/.project
index defd5f312..7ab20b929 100644
--- a/testhal/STM32/STM32F4xx/USB_CDC/.project
+++ b/testhal/STM32/STM32F4xx/USB_CDC/.project
@@ -24,6 +24,11 @@
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>board</name>
+			<type>2</type>
+			<locationURI>CHIBIOS/os/hal/boards/ST_STM32F4_DISCOVERY</locationURI>
+		</link>
 		<link>
 			<name>os</name>
 			<type>2</type>
diff --git a/testhal/STM32/STM32F4xx/USB_CDC/Makefile b/testhal/STM32/STM32F4xx/USB_CDC/Makefile
index 832f3c8a8..2b0d5c294 100644
--- a/testhal/STM32/STM32F4xx/USB_CDC/Makefile
+++ b/testhal/STM32/STM32F4xx/USB_CDC/Makefile
@@ -5,7 +5,7 @@
 
 # Compiler options here.
 ifeq ($(USE_OPT),)
-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16
+  USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16
 endif
 
 # C specific options here (added to USE_OPT).