diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-27 15:03:49 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-27 15:03:49 +0000 |
| commit | 331b7968c8606a58e5458d98559ac6366a767dd2 (patch) | |
| tree | dad89d8ac9b2ac797623e2869cf729612fa2ae3a /nuttx/arch/arm/src/stm32/stm32_start.c | |
| parent | 23a7ea577bec1494adf24fe09cf9835bd717da3a (diff) | |
| download | px4-nuttx-331b7968c8606a58e5458d98559ac6366a767dd2.tar.gz px4-nuttx-331b7968c8606a58e5458d98559ac6366a767dd2.tar.bz2 px4-nuttx-331b7968c8606a58e5458d98559ac6366a767dd2.zip | |
Updates from Uros
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3424 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/stm32/stm32_start.c')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_start.c | 47 |
1 files changed, 1 insertions, 46 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_start.c b/nuttx/arch/arm/src/stm32/stm32_start.c index 9deb19dd2..ca47f540a 100644 --- a/nuttx/arch/arm/src/stm32/stm32_start.c +++ b/nuttx/arch/arm/src/stm32/stm32_start.c @@ -34,10 +34,6 @@ * ****************************************************************************/ -/**************************************************************************** - * Included Files - ****************************************************************************/ - #include <nuttx/config.h> #include <stdint.h> @@ -55,47 +51,6 @@ /**************************************************************************** - * Private Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Public Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - -void stm32_jtag_enable(void) -{ -#ifdef CONFIG_STM32_JTAG_FULL_ENABLE - -#elif CONFIG_STM32_JTAG_NOJNTRST_ENABLE - uint32_t val = getreg32(STM32_AFIO_MAPR); - val &= 0x00FFFFFF; // clear undefined readings ... - val |= AFIO_MAPR_SWJ; // enabled but without JNTRST - putreg32(val, STM32_AFIO_MAPR); - -#elif CONFIG_STM32_JTAG_SW_ENABLE - uint32_t val = getreg32(STM32_AFIO_MAPR); - val &= 0x00FFFFFF; // clear undefined readings ... - val |= AFIO_MAPR_SWDP; // set JTAG-DP disabled and SW-DP enabled - putreg32(val, STM32_AFIO_MAPR); - -#else - uint32_t val = getreg32(STM32_AFIO_MAPR); - val &= 0x00FFFFFF; // clear undefined readings ... - val |= AFIO_MAPR_DISAB; // set JTAG-DP and SW-DP Disabled - putreg32(val, STM32_AFIO_MAPR); - -#endif -} - -/**************************************************************************** * Name: showprogress * * Description: @@ -130,7 +85,7 @@ void __start(void) stm32_clockconfig(); stm32_lowsetup(); - stm32_jtag_enable(); + stm32_gpio_remap(); showprogress('A'); /* Clear .bss. We'll do this inline (vs. calling memset) just to be |