Merge pull request #849 from adamgreen/lpc4330-GCC-HardFaultFixes

Fixes to get LPC4330 GCC based builds to run
pull/852/head^2
Martin Kojtal 2015-01-17 10:18:31 +00:00
commit af8cf8447d
1 changed files with 1 additions and 3 deletions

View File

@ -150,11 +150,9 @@ void SystemInit(void)
SCB->VTOR = (unsigned int) &g_pfnVectors; SCB->VTOR = (unsigned int) &g_pfnVectors;
#endif #endif
#if !defined(TOOLCHAIN_GCC)
#if defined(__FPU_PRESENT) && __FPU_PRESENT == 1 #if defined(__FPU_PRESENT) && __FPU_PRESENT == 1
/* Initialize floating point */ /* Initialize floating point */
fpuInit(); fpuInit();
#endif
#endif #endif
SystemSetupPins(pre_clock_mux, COUNT_OF(pre_clock_mux)); /* Configure pins */ SystemSetupPins(pre_clock_mux, COUNT_OF(pre_clock_mux)); /* Configure pins */
@ -367,7 +365,7 @@ void fpuInit(void)
static void WaitUs(uint32_t us) static void WaitUs(uint32_t us)
{ {
uint32_t cyc = us * CPU_NANOSEC(1000) / 4; volatile uint32_t cyc = us * CPU_NANOSEC(1000) / 4;
while (cyc--) while (cyc--)
; ;
} }