Unify mbed library sources

Remove stdio retargeting reference form cmsis: keep it as a standalone
object
Avoid object files clash for sources with the same name
pull/6/head
Emilio Monti 2013-06-14 17:32:15 +01:00
parent 31ee5e5f29
commit 90b614baf8
112 changed files with 48 additions and 69 deletions

View File

@ -379,6 +379,3 @@ namespace __gnu_cxx {
} }
} }
#endif #endif
// Make sure we are pulling in the retargeting module at link time
volatile int stdio_retargeting_module;

View File

@ -186,9 +186,6 @@ void SystemInit (void) {
#endif /* (CLOCK_SETUP == 2) */ #endif /* (CLOCK_SETUP == 2) */
} }
// Make sure we are pulling in the retargeting module at link time
extern int stdio_retargeting_module;
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
-- SystemCoreClockUpdate() -- SystemCoreClockUpdate()
---------------------------------------------------------------------------- */ ---------------------------------------------------------------------------- */
@ -263,6 +260,4 @@ void SystemCoreClockUpdate (void) {
return; return;
} /* (!((MCG->C1 & MCG_C1_CLKS_MASK) == 0x80u)) */ } /* (!((MCG->C1 & MCG_C1_CLKS_MASK) == 0x80u)) */
SystemCoreClock = (MCGOUTClock / (1u + ((SIM->CLKDIV1 & SIM_CLKDIV1_OUTDIV1_MASK) >> SIM_CLKDIV1_OUTDIV1_SHIFT))); SystemCoreClock = (MCGOUTClock / (1u + ((SIM->CLKDIV1 & SIM_CLKDIV1_OUTDIV1_MASK) >> SIM_CLKDIV1_OUTDIV1_SHIFT)));
stdio_retargeting_module = 1;
} }

View File

@ -374,9 +374,6 @@ void SystemCoreClockUpdate (void) /* Get Core Clock Frequency */
} }
// Make sure we are pulling in the retargeting module at link time
extern int stdio_retargeting_module;
/** /**
* Initialize the system * Initialize the system
* *
@ -450,6 +447,4 @@ void SystemInit (void) {
/* System clock to the IOCON needs to be enabled or /* System clock to the IOCON needs to be enabled or
most of the I/O related peripherals won't work. */ most of the I/O related peripherals won't work. */
LPC_SYSCON->SYSAHBCLKCTRL |= (1<<16); LPC_SYSCON->SYSAHBCLKCTRL |= (1<<16);
stdio_retargeting_module = 1;
} }

View File

@ -505,9 +505,6 @@ uint32_t SystemCoreClock = __CORE_CLK;/*!< System Clock Frequency (Core Clock)*/
} }
// Make sure we are pulling in the retargeting module at link time
extern int stdio_retargeting_module;
/** /**
* Initialize the system * Initialize the system
* *
@ -576,8 +573,6 @@ void SystemInit (void)
#if (FLASH_SETUP == 1) /* Flash Accelerator Setup */ #if (FLASH_SETUP == 1) /* Flash Accelerator Setup */
LPC_SC->FLASHCFG = (LPC_SC->FLASHCFG & ~0x0000F000) | FLASHCFG_Val; LPC_SC->FLASHCFG = (LPC_SC->FLASHCFG & ~0x0000F000) | FLASHCFG_Val;
#endif #endif
stdio_retargeting_module = 1;
} }
/** /**

View File

@ -98,9 +98,6 @@ void SystemCoreClockUpdate (void) /* Get Core Clock Frequency */
} }
} }
// Make sure we are pulling in the retargeting module at link time
extern int stdio_retargeting_module;
/** /**
* Initialize the system * Initialize the system
* *
@ -144,6 +141,4 @@ void SystemInit (void)
// Setup MAM // Setup MAM
LPC_SC->MAMTIM = MAMTIM_Val; LPC_SC->MAMTIM = MAMTIM_Val;
LPC_SC->MAMCR = MAMCR_Val; LPC_SC->MAMCR = MAMCR_Val;
stdio_retargeting_module = 1;
} }

View File

@ -505,9 +505,6 @@ void fpu_init(void)
} }
#endif #endif
// Make sure we are pulling in the retargeting module at link time
extern int stdio_retargeting_module;
/** /**
* Initialize the system * Initialize the system
* *
@ -571,6 +568,4 @@ fpu_init();
#endif #endif
#endif #endif
SystemCoreClockUpdate(); SystemCoreClockUpdate();
stdio_retargeting_module = 1;
} }

View File

@ -311,9 +311,6 @@ void SystemCoreClockUpdate (void) /* Get Core Clock Frequency */
} }
// Make sure we are pulling in the retargeting module at link time
extern int stdio_retargeting_module;
/** /**
* Initialize the system * Initialize the system
* *
@ -367,6 +364,4 @@ void SystemInit (void) {
LPC_SYSCON->SYSAHBCLKDIV = SYSAHBCLKDIV_Val; LPC_SYSCON->SYSAHBCLKDIV = SYSAHBCLKDIV_Val;
#endif #endif
stdio_retargeting_module = 1;
} }

Some files were not shown because too many files have changed in this diff Show More