diff --git a/readme.txt b/readme.txt
index 27680e2a0..b0ddd2c50 100644
--- a/readme.txt
+++ b/readme.txt
@@ -21,6 +21,8 @@
in order to support the STM32 AFIO remapping feature.
- CHANGE: Removed the mmcsd.c driver, it is replaced by the generic MMC_SPI
driver present into the HAL.
+- CHANGE: Updated the GPL exception text in the documentation, this should be
+ the final text for the stable version 1.4.x.
*** 1.3.5 ***
- FIX: Fixed problem with memory core allocator (bug 2912528).
diff --git a/testhal/STM32/Makefile b/testhal/STM32/Makefile
index 446655339..c522668bf 100644
--- a/testhal/STM32/Makefile
+++ b/testhal/STM32/Makefile
@@ -57,22 +57,24 @@ LDSCRIPT= ch.ld
# Imported source files
CHIBIOS = ../..
-include ${CHIBIOS}/os/hal/hal.mk
-include ${CHIBIOS}/os/hal/platforms/STM32/platform.mk
-include ${CHIBIOS}/os/ports/GCC/ARMCM3/port.mk
-include ${CHIBIOS}/os/kernel/kernel.mk
-include ${CHIBIOS}/test/test.mk
+include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk
+include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk
+include $(CHIBIOS)/os/hal/hal.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCM3/port.mk
+include $(CHIBIOS)/os/kernel/kernel.mk
+include $(CHIBIOS)/test/test.mk
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
-CSRC = ${PORTSRC} \
- ${KERNSRC} \
- ${TESTSRC} \
- ${HALSRC} \
- ${PLATFORMSRC} \
- ${CHIBIOS}/os/various/evtimer.c \
- ${CHIBIOS}/os/various/syscalls.c \
- board.c settings.c main.c
+CSRC = $(PORTSRC) \
+ $(KERNSRC) \
+ $(TESTSRC) \
+ $(HALSRC) \
+ $(PLATFORMSRC) \
+ $(BOARDSRC) \
+ $(CHIBIOS)/os/various/evtimer.c \
+ $(CHIBIOS)/os/various/syscalls.c \
+ settings.c main.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -100,10 +102,11 @@ TCPPSRC =
# List ASM source files here
ASMSRC = $(PORTASM) \
- ${CHIBIOS}/os/ports/GCC/ARMCM3/STM32F103/vectors.s
+ $(CHIBIOS)/os/ports/GCC/ARMCM3/STM32F103/vectors.s
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) $(HALINC) $(PLATFORMINC) \
- ${CHIBIOS}/os/various
+INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
+ $(HALINC) $(PLATFORMINC) $(BOARDINC) \
+ $(CHIBIOS)/os/various
#
# Project, sources and paths
@@ -192,10 +195,10 @@ ULIBS =
##############################################################################
ifeq ($(USE_FWLIB),yes)
- include ${CHIBIOS}/ext/stm32lib/stm32lib.mk
- CSRC += ${STM32SRC}
- INCDIR += ${STM32INC}
+ include $(CHIBIOS)/ext/stm32lib/stm32lib.mk
+ CSRC += $(STM32SRC)
+ INCDIR += $(STM32INC)
USE_OPT += -DUSE_STDPERIPH_DRIVER
endif
-include ${CHIBIOS}/os/ports/GCC/ARM/rules.mk
+include $(CHIBIOS)/os/ports/GCC/ARM/rules.mk
diff --git a/testhal/STM32/board.c b/testhal/STM32/board.c
deleted file mode 100644
index 8c33354ae..000000000
--- a/testhal/STM32/board.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.
-
- This file is part of ChibiOS/RT.
-
- ChibiOS/RT is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- ChibiOS/RT is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-*/
-
-#include "ch.h"
-#include "hal.h"
-
-/*
- * Early initialization code.
- * This initialization is performed just after reset before BSS and DATA
- * segments initialization.
- */
-void hwinit0(void) {
-
- stm32_clock_init();
-}
-
-/*
- * Late initialization code.
- * This initialization is performed after BSS and DATA segments initialization
- * and before invoking the main() function.
- */
-void hwinit1(void) {
-
- /*
- * HAL initialization.
- */
- halInit();
-
- /*
- * ChibiOS/RT initialization.
- */
- chSysInit();
-}
diff --git a/testhal/STM32/board.h b/testhal/STM32/board.h
deleted file mode 100644
index 588ea3c5d..000000000
--- a/testhal/STM32/board.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.
-
- This file is part of ChibiOS/RT.
-
- ChibiOS/RT is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- ChibiOS/RT is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-*/
-
-#ifndef _BOARD_H_
-#define _BOARD_H_
-
-/*
- * Board frequencies.
- */
-#define LSECLK 32768
-#define HSECLK 8000000
-#define HSICLK 8000000
-
-/*
- * IO pins assignments.
- */
-#define GPIOA_BUTTON 0
-#define GPIOA_SPI1NSS 4
-
-#define GPIOB_SPI2NSS 12
-
-#define GPIOC_MMCWP 6
-#define GPIOC_MMCCP 7
-#define GPIOC_CANCNTL 10
-#define GPIOC_DISC 11
-#define GPIOC_LED 12
-
-/*
- * All inputs with pullups unless otherwise specified.
- */
-#define VAL_GPIOACRL 0x88888884 // PA0:FI
-#define VAL_GPIOACRH 0x88888888
-#define VAL_GPIOAODR 0xFFFFFFFF
-
-#define VAL_GPIOBCRL 0x88883888 // PB3:PP
-#define VAL_GPIOBCRH 0x88888888
-#define VAL_GPIOBODR 0xFFFFFFFF
-
-#define VAL_GPIOCCRL 0x44888888 // PC6,PC7:FI
-#define VAL_GPIOCCRH 0x88833888 // PC11,PC12:PP
-#define VAL_GPIOCODR 0xFFFFFFFF
-
-#define VAL_GPIODCRL 0x88888844 // PD0,PD1:FI
-#define VAL_GPIODCRH 0x88888888
-#define VAL_GPIODODR 0xFFFFFFFF
-
-#define VAL_GPIOECRL 0x88888888
-#define VAL_GPIOECRH 0x88888888
-#define VAL_GPIOEODR 0xFFFFFFFF
-
-#endif /* _BOARD_H_ */