Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-02 01:21:26 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix some memory sizing errors in refreshed defconfig files

Browse Source
This commit is contained in:
Gregory Nutt
2015-06-02 08:44:57 -06:00
parent 1b3d003d9e
commit 54d16d0933
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/lpc17xx/lpc17_emacram.h
+3 -2
View File
@@ -132,8 +132,9 @@
* *
* 16384 <= ntx * (pktsize + 8 + 4) + nrx * (pktsize + 8 + 8) * 16384 <= ntx * (pktsize + 8 + 4) + nrx * (pktsize + 8 + 8)
* *
* If ntx == nrx and pktsize == 590, then you could have ntx = nrx = 13. In this * If ntx == nrx and pktsize == 590+2, then you could have ntx = nrx = 13. In this
* case, you would need only 15,704 bytes of EMAC RAM (but be careful with alignment!). * case, you would need only 15,756 bytes of EMAC RAM (but be careful with alignment!
* 15,756 is not well aligned.).
*/ */
#define LPC17_TXDESCTAB_SIZE (CONFIG_NET_NTXDESC*LPC17_TXDESC_SIZE) #define LPC17_TXDESCTAB_SIZE (CONFIG_NET_NTXDESC*LPC17_TXDESC_SIZE)
arch/arm/src/lpc17xx/lpc17_ethernet.c
-1
View File
@@ -1983,7 +1983,6 @@ static inline void lpc17_txavail_process(FAR struct lpc17_driver_s *priv)
} }
net_unlock(state); net_unlock(state);
return OK;
} }
/**************************************************************************** /****************************************************************************
configs/olimex-lpc1766stk/ftpc/defconfig
+1 -1
View File
@@ -205,7 +205,7 @@ CONFIG_LPC17_SSP1=y
# Ethernet driver options # Ethernet driver options
# #
CONFIG_PHY_AUTONEG=y CONFIG_PHY_AUTONEG=y
CONFIG_NET_EMACRAM_SIZE=8480 CONFIG_NET_EMACRAM_SIZE=8512
CONFIG_NET_NTXDESC=7 CONFIG_NET_NTXDESC=7
CONFIG_NET_NRXDESC=7 CONFIG_NET_NRXDESC=7
# CONFIG_NET_WOL is not set # CONFIG_NET_WOL is not set
configs/olimex-lpc1766stk/nettest/defconfig
+1 -1
View File
@@ -206,7 +206,7 @@ CONFIG_LPC17_UART0=y
# Ethernet driver options # Ethernet driver options
# #
CONFIG_PHY_AUTONEG=y CONFIG_PHY_AUTONEG=y
CONFIG_NET_EMACRAM_SIZE=7264 CONFIG_NET_EMACRAM_SIZE=7296
CONFIG_NET_NTXDESC=6 CONFIG_NET_NTXDESC=6
CONFIG_NET_NRXDESC=6 CONFIG_NET_NRXDESC=6
# CONFIG_NET_WOL is not set # CONFIG_NET_WOL is not set
configs/olimex-lpc1766stk/nsh/defconfig
+1 -1
View File
@@ -206,7 +206,7 @@ CONFIG_LPC17_SSP1=y
# Ethernet driver options # Ethernet driver options
# #
CONFIG_PHY_AUTONEG=y CONFIG_PHY_AUTONEG=y
CONFIG_NET_EMACRAM_SIZE=7264 CONFIG_NET_EMACRAM_SIZE=7296
CONFIG_NET_NTXDESC=6 CONFIG_NET_NTXDESC=6
CONFIG_NET_NRXDESC=6 CONFIG_NET_NRXDESC=6
# CONFIG_NET_WOL is not set # CONFIG_NET_WOL is not set
configs/olimex-lpc1766stk/thttpd/defconfig
+1 -1
View File
@@ -206,7 +206,7 @@ CONFIG_LPC17_UART0=y
# Ethernet driver options # Ethernet driver options
# #
CONFIG_PHY_AUTONEG=y CONFIG_PHY_AUTONEG=y
CONFIG_NET_EMACRAM_SIZE=15712 CONFIG_NET_EMACRAM_SIZE=15776
CONFIG_NET_NTXDESC=13 CONFIG_NET_NTXDESC=13
CONFIG_NET_NRXDESC=13 CONFIG_NET_NRXDESC=13
# CONFIG_NET_WOL is not set # CONFIG_NET_WOL is not set
configs/olimex-lpc1766stk/zmodem/defconfig
+1 -1
View File
@@ -207,7 +207,7 @@ CONFIG_LPC17_SSP1=y
# Ethernet driver options # Ethernet driver options
# #
CONFIG_PHY_AUTONEG=y CONFIG_PHY_AUTONEG=y
CONFIG_NET_EMACRAM_SIZE=7264 CONFIG_NET_EMACRAM_SIZE=7296
CONFIG_NET_NTXDESC=6 CONFIG_NET_NTXDESC=6
CONFIG_NET_NRXDESC=6 CONFIG_NET_NRXDESC=6
# CONFIG_NET_WOL is not set # CONFIG_NET_WOL is not set