summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSummerGift <[email protected]>2017-10-20 18:33:05 +0800
committerSummerGift <[email protected]>2017-10-20 18:33:41 +0800
commita98fc2909af32b0ba9470763e91c404c013bff33 (patch)
tree62af1a2613dd5f6df4fd7e30eb5f004826301340
parent23ee66c63c66006e8bee3c033902631ef2dfcaec (diff)
update apollo bsp
-rw-r--r--bsp/stm32f429-apollo/.config22
-rw-r--r--bsp/stm32f429-apollo/KConfig58
-rw-r--r--bsp/stm32f429-apollo/drivers/drv_eth.c2
-rw-r--r--bsp/stm32f429-apollo/rtconfig.h22
4 files changed, 9 insertions, 95 deletions
diff --git a/bsp/stm32f429-apollo/.config b/bsp/stm32f429-apollo/.config
index 2ef2e51258..5d12c9fcc0 100644
--- a/bsp/stm32f429-apollo/.config
+++ b/bsp/stm32f429-apollo/.config
@@ -129,8 +129,8 @@ CONFIG_RT_USING_LIBC=y
# light weight TCP/IP stack
#
CONFIG_RT_USING_LWIP=y
-CONFIG_RT_USING_LWIP141=y
-# CONFIG_RT_USING_LWIP202 is not set
+# CONFIG_RT_USING_LWIP141 is not set
+CONFIG_RT_USING_LWIP202=y
# CONFIG_RT_LWIP_IGMP is not set
CONFIG_RT_LWIP_ICMP=y
# CONFIG_RT_LWIP_SNMP is not set
@@ -189,11 +189,12 @@ CONFIG_LWIP_SO_RCVBUF=1
#
# IoT - internet of things
#
-# CONFIG_PKG_USING_CJSON is not set
# CONFIG_PKG_USING_PAHOMQTT is not set
# CONFIG_PKG_USING_WEBCLIENT is not set
# CONFIG_PKG_USING_MONGOOSE is not set
# CONFIG_PKG_USING_WEBTERMINAL is not set
+# CONFIG_PKG_USING_CJSON is not set
+# CONFIG_PKG_USING_EZXML is not set
#
# security packages
@@ -233,18 +234,3 @@ CONFIG_RT_USING_SPI5=y
#
# BSP_LWIP CONFIG
#
-CONFIG_RT_LWIP_IPADDR0=192
-CONFIG_RT_LWIP_IPADDR1=168
-CONFIG_RT_LWIP_IPADDR2=1
-CONFIG_RT_LWIP_IPADDR3=201
-CONFIG_RT_LWIP_GWADDR0=192
-CONFIG_RT_LWIP_GWADDR1=168
-CONFIG_RT_LWIP_GWADDR2=1
-CONFIG_RT_LWIP_GWADDR3=1
-CONFIG_RT_LWIP_MSKADDR0=255
-CONFIG_RT_LWIP_MSKADDR1=255
-CONFIG_RT_LWIP_MSKADDR2=255
-CONFIG_RT_LWIP_MSKADDR3=0
-CONFIG_CHECKSUM_CHECK_TCP=0
-CONFIG_CHECKSUM_CHECK_IP=0
-CONFIG_CHECKSUM_CHECK_UDP=0
diff --git a/bsp/stm32f429-apollo/KConfig b/bsp/stm32f429-apollo/KConfig
index e155d26cba..434acdc7eb 100644
--- a/bsp/stm32f429-apollo/KConfig
+++ b/bsp/stm32f429-apollo/KConfig
@@ -48,65 +48,7 @@ endmenu
menu "BSP_LWIP CONFIG"
-config RT_LWIP_IPADDR0
- int "RT_LWIP_IPADDR0"
- default 192
-
-config RT_LWIP_IPADDR1
- int "RT_LWIP_IPADDR1"
- default 168
-
-config RT_LWIP_IPADDR2
- int "RT_LWIP_IPADDR2"
- default 1
-
-config RT_LWIP_IPADDR3
- int "RT_LWIP_IPADDR3"
- default 201
-
-config RT_LWIP_GWADDR0
- int "RT_LWIP_GWADDR0"
- default 192
-
-config RT_LWIP_GWADDR1
- int "RT_LWIP_GWADDR1"
- default 168
-
-config RT_LWIP_GWADDR2
- int "RT_LWIP_GWADDR2"
- default 1
-
-config RT_LWIP_GWADDR3
- int "RT_LWIP_GWADDR3"
- default 1
-config RT_LWIP_MSKADDR0
- int "RT_LWIP_MSKADDR0"
- default 255
-
-config RT_LWIP_MSKADDR1
- int "RT_LWIP_MSKADDR1"
- default 255
-
-config RT_LWIP_MSKADDR2
- int "RT_LWIP_MSKADDR2"
- default 255
-
-config RT_LWIP_MSKADDR3
- int "RT_LWIP_MSKADDR3"
- default 0
-
-config CHECKSUM_CHECK_TCP
- int "CHECKSUM_CHECK_TCP"
- default 0
-
-config CHECKSUM_CHECK_IP
- int "The CHECKSUM_CHECK_IP"
- default 0
-
-config CHECKSUM_CHECK_UDP
- int "The CHECKSUM_CHECK_UDP"
- default 0
endmenu
diff --git a/bsp/stm32f429-apollo/drivers/drv_eth.c b/bsp/stm32f429-apollo/drivers/drv_eth.c
index e1c9f0365a..257e34f701 100644
--- a/bsp/stm32f429-apollo/drivers/drv_eth.c
+++ b/bsp/stm32f429-apollo/drivers/drv_eth.c
@@ -125,7 +125,7 @@ static void delay_ms(rt_uint32_t ms)
}
else
{
- rt_thread_delay(ms/(1000 / RT_TICK_PER_SECOND));
+ rt_thread_delay(rt_tick_from_millisecond(ms));
}
}
diff --git a/bsp/stm32f429-apollo/rtconfig.h b/bsp/stm32f429-apollo/rtconfig.h
index b825fd2acb..65a347ded1 100644
--- a/bsp/stm32f429-apollo/rtconfig.h
+++ b/bsp/stm32f429-apollo/rtconfig.h
@@ -117,8 +117,8 @@
/* light weight TCP/IP stack */
#define RT_USING_LWIP
-#define RT_USING_LWIP141
-/* RT_USING_LWIP202 is not set */
+/* RT_USING_LWIP141 is not set */
+#define RT_USING_LWIP202
/* RT_LWIP_IGMP is not set */
#define RT_LWIP_ICMP
/* RT_LWIP_SNMP is not set */
@@ -171,11 +171,12 @@
/* IoT - internet of things */
-/* PKG_USING_CJSON is not set */
/* PKG_USING_PAHOMQTT is not set */
/* PKG_USING_WEBCLIENT is not set */
/* PKG_USING_MONGOOSE is not set */
/* PKG_USING_WEBTERMINAL is not set */
+/* PKG_USING_CJSON is not set */
+/* PKG_USING_EZXML is not set */
/* security packages */
@@ -207,20 +208,5 @@
/* BSP_LWIP CONFIG */
-#define RT_LWIP_IPADDR0 192
-#define RT_LWIP_IPADDR1 168
-#define RT_LWIP_IPADDR2 1
-#define RT_LWIP_IPADDR3 201
-#define RT_LWIP_GWADDR0 192
-#define RT_LWIP_GWADDR1 168
-#define RT_LWIP_GWADDR2 1
-#define RT_LWIP_GWADDR3 1
-#define RT_LWIP_MSKADDR0 255
-#define RT_LWIP_MSKADDR1 255
-#define RT_LWIP_MSKADDR2 255
-#define RT_LWIP_MSKADDR3 0
-#define CHECKSUM_CHECK_TCP 0
-#define CHECKSUM_CHECK_IP 0
-#define CHECKSUM_CHECK_UDP 0
#endif