dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Drop SPIFI frequency.. spifi_init no longer reports errors 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4950 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2012-07-17 22:03:50 +00:00
parent 2224c2734a
commit 36009cb960
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nuttx/configs/lpc4330-xplorer/include/board.h
View File

@ -157,28 +157,30 @@
* for the selected divider
*/
#if BOARD_FCLKOUT_FREQUENCY < 120000000
#undef BOARD_SPIFI_PLL1 /* No division */
#undef BOARD_SPIFI_DIVA /* Supports division by 1-4 */
#undef BOARD_SPIFI_DIVB /* Supports division by 1-16 */
#undef BOARD_SPIFI_DIVC /* Supports division by 1-16 */
#undef BOARD_SPIFI_DIVD /* Supports division by 1-16 */
#undef BOARD_SPIFI_DIVE /* Supports division by 1-256 */
#if BOARD_FCLKOUT_FREQUENCY < 20000000
# define BOARD_SPIFI_PLL1 1 /* Use PLL1 directly */
# undef BOARD_SPIFI_DIVA
#else
# undef BOARD_SPIFI_PLL1
# define BOARD_SPIFI_DIVA 1 /* Use IDIVA */
# define BOARD_SPIFI_DIVB 1 /* Use IDIVB */
#endif
#undef BOARD_SPIFI_DIVB
#undef BOARD_SPIFI_DIVC
#undef BOARD_SPIFI_DIVD
#undef BOARD_SPIFI_DIVE
/* We need to configure the divider so that its output is as close to 120MHz
* without exceeding that value.
/* We need to configure the divider so that its output is as close to the
* desired SCLK value. The peak data transfer rate will be about half of
* this frequency in bytes per second.
*/
#if BOARD_FCLKOUT_FREQUENCY < 120000000
#if BOARD_FCLKOUT_FREQUENCY < 20000000
# define BOARD_SPIFI_FREQUENCY BOARD_FCLKOUT_FREQUENCY /* 72Mhz? */
#else
# define BOARD_SPIFI_DIVIDER (2) /* 204MHz / 2 = 102MHz */
# define BOARD_SPIFI_FREQUENCY (102000000) /* 204MHz / 2 = 102MHz */
# define BOARD_SPIFI_DIVIDER (14) /* 204MHz / 14 = 14.57MHz */
# define BOARD_SPIFI_FREQUENCY (102000000) /* 204MHz / 14 = 14.57MHz */
#endif
/* UART clocking ***********************************************************/

2
nuttx/configs/lpc4330-xplorer/src/up_nsh.c
View File

@ -88,7 +88,7 @@
#ifdef CONFIG_SPIFI_BLKDRVR
# ifndef CONFIG_LPC43_SPIFI=n
# ifndef CONFIG_LPC43_SPIFI
# error "SPIFI support is not enabled (CONFIG_LPC43_SPIFI)"
# endif