aboutsummaryrefslogtreecommitdiffstats
path: root/testhal
diff options
context:
space:
mode:
authorbarthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4>2014-08-26 08:23:57 +0000
committerbarthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4>2014-08-26 08:23:57 +0000
commit6220df1090c175979f37717a4f9040770f86a098 (patch)
tree8144b4e0749697002da2cc6db09320495cbd2602 /testhal
parente00a505b1c50375062a7ac789b2b95cf558b540c (diff)
downloadChibiOS-6220df1090c175979f37717a4f9040770f86a098.tar.gz
ChibiOS-6220df1090c175979f37717a4f9040770f86a098.tar.bz2
ChibiOS-6220df1090c175979f37717a4f9040770f86a098.zip
[FSMC NAND] Minor changes in testhal application.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7197 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal')
-rw-r--r--testhal/STM32/STM32F4xx/FSMC_NAND/.project5
-rw-r--r--testhal/STM32/STM32F4xx/FSMC_NAND/Makefile2
-rw-r--r--testhal/STM32/STM32F4xx/FSMC_NAND/mcuconf.h8
3 files changed, 8 insertions, 7 deletions
diff --git a/testhal/STM32/STM32F4xx/FSMC_NAND/.project b/testhal/STM32/STM32F4xx/FSMC_NAND/.project
index 8fb3b9c90..a6f603a3c 100644
--- a/testhal/STM32/STM32F4xx/FSMC_NAND/.project
+++ b/testhal/STM32/STM32F4xx/FSMC_NAND/.project
@@ -25,11 +25,6 @@
</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>
<locationURI>CHIBIOS/os</locationURI>
diff --git a/testhal/STM32/STM32F4xx/FSMC_NAND/Makefile b/testhal/STM32/STM32F4xx/FSMC_NAND/Makefile
index b31fff1dc..b01a387c4 100644
--- a/testhal/STM32/STM32F4xx/FSMC_NAND/Makefile
+++ b/testhal/STM32/STM32F4xx/FSMC_NAND/Makefile
@@ -102,10 +102,10 @@ CSRC = $(PORTSRC) \
$(PLATFORMSRC) \
$(BOARDSRC) \
$(CHIBIOS)/os/various/chprintf.c \
- main.c \
dma_storm_adc.c \
dma_storm_spi.c \
dma_storm_uart.c \
+ main.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
diff --git a/testhal/STM32/STM32F4xx/FSMC_NAND/mcuconf.h b/testhal/STM32/STM32F4xx/FSMC_NAND/mcuconf.h
index c31980738..99bafd9f6 100644
--- a/testhal/STM32/STM32F4xx/FSMC_NAND/mcuconf.h
+++ b/testhal/STM32/STM32F4xx/FSMC_NAND/mcuconf.h
@@ -41,7 +41,7 @@
#define STM32_CLOCK48_REQUIRED TRUE
#define STM32_SW STM32_SW_PLL
#define STM32_PLLSRC STM32_PLLSRC_HSE
-#define STM32_PLLM_VALUE 8
+#define STM32_PLLM_VALUE 12
#define STM32_PLLN_VALUE 336
#define STM32_PLLP_VALUE 2
#define STM32_PLLQ_VALUE 7
@@ -314,3 +314,9 @@
#define STM32_NAND_DMA_STREAM STM32_DMA_STREAM_ID(2, 7)
#define STM32_NAND_DMA_PRIORITY 0
#define STM32_NAND_DMA_ERROR_HOOK(nandp) osalSysHalt("DMA failure")
+
+/*
+ * FSMC SRAM driver system settings.
+ */
+#define STM32_USE_FSMC_SRAM FALSE
+#define STM32_SRAM_USE_FSMC_SRAM4 FALSE