diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-16 19:16:57 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-16 19:16:57 +0000 |
| commit | 4206c173f382c8e5a7aabcd491199df1bd44eadf (patch) | |
| tree | e1cafeb5a0f0a37ddba7920576ec5ff4404be0d4 | |
| parent | 9b26924fbfabc53ef5736aa2b94912571a19ba4d (diff) | |
| download | px4-nuttx-4206c173f382c8e5a7aabcd491199df1bd44eadf.tar.gz px4-nuttx-4206c173f382c8e5a7aabcd491199df1bd44eadf.tar.bz2 px4-nuttx-4206c173f382c8e5a7aabcd491199df1bd44eadf.zip | |
Fix an error in LPC43xx clock configuratin that can cause fail to boot
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4945 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/Documentation/NuttXLinks.html | 159 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/lpc43xx/lpc43_adc.c | 1 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/lpc43xx/lpc43_cgu.c | 8 | ||||
| -rw-r--r-- | nuttx/configs/lpc4330-xplorer/include/board.h | 6 | ||||
| -rw-r--r-- | nuttx/drivers/dev_null.c | 1 |
5 files changed, 88 insertions, 87 deletions
diff --git a/nuttx/Documentation/NuttXLinks.html b/nuttx/Documentation/NuttXLinks.html index 745e12b7e..a5e281cda 100644 --- a/nuttx/Documentation/NuttXLinks.html +++ b/nuttx/Documentation/NuttXLinks.html @@ -1,79 +1,80 @@ -<html>
-<head>
- <title>NuttX Links</title>
-</head>
-<body background="backgd.gif">
-<table width="100%>
- <tr>
- <td colspan="2"> </td>
- </tr>
- <tr>
- <td align="center" valign="top" width="22">
- <img height="20" width="20" src="favicon.ico">
- </td>
- <td bgcolor="#e4e4e4">
- <font color="#3c34ec"><i><b>Project Links</b></i></font>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <li><a href="http://www.nuttx.org/NuttX.html" target="main">Home</a></li>
- <li><a href="http://sourceforge.net/projects/nuttx/develop" target="_top">SourceForge</a></li>
- <li><a href="http://freshmeat.net/projects/nuttx/" target="_top">FreshMeat</a></li>
- <li><a href="http://tech.groups.yahoo.com/group/nuttx/" target="_top">Forum</a></li>
- <li><a href="http://sourceforge.net/projects/nuttx/files/" target="_top">Downloads</a></li>
- <li><a href="http://sourceforge.net/projects/nuttx/files/buildroot" target="_top">Toolchains</a></li>
- <li><a href="http://nuttx.svn.sourceforge.net/viewvc/nuttx/" target="_top">Browse SVN</a></li>
- <li><a href="freeports.html" target="header">Free Ports</a></li>
- <li><a href="http://rss.groups.yahoo.com/group/nuttx/rss" target="_top"><img src="rss.gif" border="0"></a></li>
- </td>
- </tr>
- <tr>
- <td align="center" valign="top" width="22">
- <a href="NuttXDocumentation.html">
- <img height="20" width="20" src="favicon.ico">
- </a>
- </td>
- <td bgcolor="#e4e4e4">
- <font color="#3c34ec"><i><b>Documentation</b></i></font>
- </td>
- </tr>
- <tr>
- <td align="center" valign="top" width="22">
- <a href="NuttXRelated.html">
- <img height="20" width="20" src="favicon.ico">
- </a>
- </td>
- <td bgcolor="#e4e4e4">
- <font color="#3c34ec"><i><b>Related Projects</b></i></font>
- </td>
- </tr>
- <tr>
- <td align="center" valign="top" width="22">
- <a href="NuttXCommercial.html">
- <img height="20" width="20" src="favicon.ico">
- </a>
- </td>
- <td bgcolor="#e4e4e4">
- <font color="#3c34ec"><i><b>Commercial Sites</b></i></font>
- </td>
- </tr>
- <tr>
- <td colspan="2" align="center" valign="top">
- <a href="http://download.famouswhy.com/nuttx/" target="_blank">
- <img src="http://download.famouswhy.com/awards/Famous_Software_Award_Logo.png" alt="NuttX" style="border:0">
- </a>
- </td>
- </tr>
- <tr>
- <td colspan="2" align="center" valign="top">
- <a href="http://www.fiberdownload.com/Download/26542/NuttX" target="_blank">
- <img src="editor_pick_2.png" alt="NuttX" style="border:0">
- <img src="award2_151_50.png" alt="NuttX" style="border:0">
- </a>
- </td>
- </tr>
-</table>
-</body>
-</html>
+<html> +<head> + <title>NuttX Links</title> +</head> +<body background="backgd.gif"> +<table width="100%> + <tr> + <td colspan="2"> </td> + </tr> + <tr> + <td align="center" valign="top" width="22"> + <img height="20" width="20" src="favicon.ico"> + </td> + <td bgcolor="#e4e4e4"> + <font color="#3c34ec"><i><b>Project Links</b></i></font> + </td> + </tr> + <tr> + <td> </td> + <td> + <li><a href="http://www.nuttx.org/NuttX.html" target="main">Home</a></li> + <li><a href="http://sourceforge.net/projects/nuttx/develop" target="_top">SourceForge</a></li> + <li><a href="http://freshmeat.net/projects/nuttx/" target="_top">FreshMeat</a></li> + <li><a href="http://tech.groups.yahoo.com/group/nuttx/" target="_top">Forum</a></li> + <li><a href="http://sourceforge.net/projects/nuttx/files/" target="_top">Downloads</a></li> + <li><a href="http://www.nx-engineering.com/nuttx-wiki/" target="_top">Wiki</a></li> + <li><a href="http://sourceforge.net/projects/nuttx/files/buildroot" target="_top">Toolchains</a></li> + <li><a href="http://nuttx.svn.sourceforge.net/viewvc/nuttx/" target="_top">Browse SVN</a></li> + <li><a href="freeports.html" target="header">Free Ports</a></li> + <li><a href="http://rss.groups.yahoo.com/group/nuttx/rss" target="_top"><img src="rss.gif" border="0"></a></li> + </td> + </tr> + <tr> + <td align="center" valign="top" width="22"> + <a href="NuttXDocumentation.html"> + <img height="20" width="20" src="favicon.ico"> + </a> + </td> + <td bgcolor="#e4e4e4"> + <font color="#3c34ec"><i><b>Documentation</b></i></font> + </td> + </tr> + <tr> + <td align="center" valign="top" width="22"> + <a href="NuttXRelated.html"> + <img height="20" width="20" src="favicon.ico"> + </a> + </td> + <td bgcolor="#e4e4e4"> + <font color="#3c34ec"><i><b>Related Projects</b></i></font> + </td> + </tr> + <tr> + <td align="center" valign="top" width="22"> + <a href="NuttXCommercial.html"> + <img height="20" width="20" src="favicon.ico"> + </a> + </td> + <td bgcolor="#e4e4e4"> + <font color="#3c34ec"><i><b>Commercial Sites</b></i></font> + </td> + </tr> + <tr> + <td colspan="2" align="center" valign="top"> + <a href="http://download.famouswhy.com/nuttx/" target="_blank"> + <img src="http://download.famouswhy.com/awards/Famous_Software_Award_Logo.png" alt="NuttX" style="border:0"> + </a> + </td> + </tr> + <tr> + <td colspan="2" align="center" valign="top"> + <a href="http://www.fiberdownload.com/Download/26542/NuttX" target="_blank"> + <img src="editor_pick_2.png" alt="NuttX" style="border:0"> + <img src="award2_151_50.png" alt="NuttX" style="border:0"> + </a> + </td> + </tr> +</table> +</body> +</html> diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_adc.c b/nuttx/arch/arm/src/lpc43xx/lpc43_adc.c index a6489a6d0..d9165ba75 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_adc.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_adc.c @@ -65,7 +65,6 @@ #include "up_arch.h" #include "chip.h" -#include "lpc43_internal.h" #include "lpc43_syscon.h" #include "lpc43_pinconn.h" #include "lpc43_adc.h" diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_cgu.c b/nuttx/arch/arm/src/lpc43xx/lpc43_cgu.c index 180d17bda..8e266e039 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_cgu.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_cgu.c @@ -163,13 +163,13 @@ static inline void lpc43_xtalconfig(void) /* Select the crystal oscillator as the input to PLL1 */ regval = getreg32(LPC43_PLL1_CTRL); - regval &= PLL1_CTRL_CLKSEL_MASK; + regval &= ~PLL1_CTRL_CLKSEL_MASK; regval |= PLL1_CLKSEL_XTAL | PLL1_CTRL_AUTOBLOCK; putreg32(regval, LPC43_PLL1_CTRL); } /**************************************************************************** - * Name: lpc43_clockconfig + * Name: lpc43_pll1config * * Description: * Configure PLL1 dividers and multipliers per the settings in the board.h @@ -197,11 +197,11 @@ static inline void lpc43_pll1config(void) PLL1_CTRL_MSEL_MASK); putreg32(regval, LPC43_PLL1_CTRL); - /* Clear PLL1 controls: + /* Set selected PLL1 controls: * * - PLL1_CTRL_FBSEL: Set in both integer and direct modes * - PLL1_CTRL_DIRECT: Set in direct mode - * - PLL1_CTRL_PSEL: Set to the value from board.h + * - PLL1_CTRL_PSEL: Set to the value from board.h (integer mode only) * - PLL1_CTRL_NSEL: Set to the value from board.h * - PLL1_CTRL_MSEL: Set to the value from board.h */ diff --git a/nuttx/configs/lpc4330-xplorer/include/board.h b/nuttx/configs/lpc4330-xplorer/include/board.h index c3b5bb759..94de34832 100644 --- a/nuttx/configs/lpc4330-xplorer/include/board.h +++ b/nuttx/configs/lpc4330-xplorer/include/board.h @@ -75,11 +75,11 @@ /* Integer and direct modes are supported: * - * In integer mode: + * In integer mode (Fclkout < 156000000): * Fclkin = BOARD_XTAL_FREQUENCY * Fclkout = Msel * FClkin / Nsel - * Fcco = 2 * Psel * Nclkout - * In direct mode: + * Fcco = 2 * Psel * Fclkout + * In direct mode (Fclkout > 156000000): * Fclkin = BOARD_XTAL_FREQUENCY * Fclkout = Msel * FClkin / Nsel * Fcco = Fclkout diff --git a/nuttx/drivers/dev_null.c b/nuttx/drivers/dev_null.c index e2c4c7ef7..c70370e1e 100644 --- a/nuttx/drivers/dev_null.c +++ b/nuttx/drivers/dev_null.c @@ -112,6 +112,7 @@ static int devnull_poll(FAR struct file *filp, FAR struct pollfd *fds, sem_post(fds->sem); } } + return OK; } #endif |