From 3344963e4b343950d46217b36bdc6760f06d805f Mon Sep 17 00:00:00 2001 From: "bernard.xiong" Date: Sun, 15 Nov 2009 14:45:03 +0000 Subject: [PATCH] add more STM32F107 support git-svn-id: https://rt-thread.googlecode.com/svn/trunk@165 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- bsp/stm3210/project.Uv2 | 2 +- bsp/stm3210/startup.c | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/bsp/stm3210/project.Uv2 b/bsp/stm3210/project.Uv2 index 617db90ed0..aca0befb7b 100644 --- a/bsp/stm3210/project.Uv2 +++ b/bsp/stm3210/project.Uv2 @@ -216,7 +216,7 @@ Options 1,0,0 // Target 'RT-Thread STM32' ADSLDMC (--keep __fsym_* --keep __vsym_*) ADSLDIF () ADSLDDW () - OPTDL (SARMCM3.DLL)()(DARMSTM.DLL)(-pSTM32F103ZE)(SARMCM3.DLL)()(TARMSTM.DLL)(-pSTM32F103ZE) + OPTDL (SARMCM3.DLL)()(DARMSTM.DLL)(-pSTM32F107xCSchedule)(SARMCM3.DLL)()(TARMSTM.DLL)(-pSTM32F107xC) OPTDBG 49150,7,()()()()()()()()()() (Segger\JL2CM3.dll)()()() FLASH1 { 9,0,0,0,1,0,0,0,5,16,0,0,0,0,0,0,0,0,0,0 } FLASH2 (Segger\JL2CM3.dll) diff --git a/bsp/stm3210/startup.c b/bsp/stm3210/startup.c index 0ee8ddbde4..e880f85804 100644 --- a/bsp/stm3210/startup.c +++ b/bsp/stm3210/startup.c @@ -26,11 +26,7 @@ /*@{*/ #ifdef RT_USING_LWIP -#ifdef STM32F10X_CL - extern void rt_hw_stm32_eth_init(void); -#else - #include "enc28j60.h" -#endif +#include "enc28j60.h" #include #endif @@ -40,7 +36,6 @@ extern void finsh_system_init(void); extern void finsh_set_device(const char* device); #endif -/* bss end definitions for heap init */ #ifdef __CC_ARM extern int Image$$RW_IRAM1$$ZI$$Limit; #elif __ICCARM__ @@ -109,25 +104,18 @@ void rtthread_startup(void) /* init hardware serial device */ rt_hw_usart_init(); - -#ifdef RT_USING_DFS /* init sdcard driver */ #if STM32_USE_SDIO rt_hw_sdcard_init(); #else rt_hw_msd_init(); #endif -#endif #ifdef RT_USING_LWIP eth_system_device_init(); /* register ethernetif device */ -#ifdef STM32F10X_CL - rt_hw_stm32_eth_init(); -#else rt_hw_enc28j60_init(); -#endif #endif rt_hw_rtc_init(); @@ -141,7 +129,7 @@ void rtthread_startup(void) #ifdef RT_USING_FINSH /* init finsh */ finsh_system_init(); - finsh_set_device(FINSH_DEVICE_NAME); + finsh_set_device("uart1"); #endif /* init idle thread */