phone-side
/
nuttx-bb
9
0
Fork 0
Code Releases Activity

Fix an error in LPC43xx clock configuratin that can cause fail to boot 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4945 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2012-07-16 19:16:57 +00:00
parent 32c88f81c0
commit fa4c614079
5 changed files with 88 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
nuttx/Documentation/NuttXLinks.html
View File

@ -1,79 +1,80 @@
<html> <html>
<head> <head>
<title>NuttX Links</title> <title>NuttX Links</title>
</head> </head>
<body background="backgd.gif"> <body background="backgd.gif">
<table width="100%> <table width="100%>
<tr> <tr>
<td colspan="2">&nbsp</td> <td colspan="2">&nbsp</td>
</tr> </tr>
<tr> <tr>
<td align="center" valign="top" width="22"> <td align="center" valign="top" width="22">
<img height="20" width="20" src="favicon.ico"> <img height="20" width="20" src="favicon.ico">
</td> </td>
<td bgcolor="#e4e4e4"> <td bgcolor="#e4e4e4">
<font color="#3c34ec"><i><b>Project Links</b></i></font> <font color="#3c34ec"><i><b>Project Links</b></i></font>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>&nbsp</td> <td>&nbsp</td>
<td> <td>
<li><a href="http://www.nuttx.org/NuttX.html" target="main">Home</a></li> <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://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://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://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/" target="_top">Downloads</a></li>
<li><a href="http://sourceforge.net/projects/nuttx/files/buildroot" target="_top">Toolchains</a></li> <li><a href="http://www.nx-engineering.com/nuttx-wiki/" target="_top">Wiki</a></li>
<li><a href="http://nuttx.svn.sourceforge.net/viewvc/nuttx/" target="_top">Browse SVN</a></li> <li><a href="http://sourceforge.net/projects/nuttx/files/buildroot" target="_top">Toolchains</a></li>
<li><a href="freeports.html" target="header">Free Ports</a></li> <li><a href="http://nuttx.svn.sourceforge.net/viewvc/nuttx/" target="_top">Browse SVN</a></li>
<li><a href="http://rss.groups.yahoo.com/group/nuttx/rss" target="_top"><img src="rss.gif" border="0"></a></li> <li><a href="freeports.html" target="header">Free Ports</a></li>
</td> <li><a href="http://rss.groups.yahoo.com/group/nuttx/rss" target="_top"><img src="rss.gif" border="0"></a></li>
</tr> </td>
<tr> </tr>
<td align="center" valign="top" width="22"> <tr>
<a href="NuttXDocumentation.html"> <td align="center" valign="top" width="22">
<img height="20" width="20" src="favicon.ico"> <a href="NuttXDocumentation.html">
</a> <img height="20" width="20" src="favicon.ico">
</td> </a>
<td bgcolor="#e4e4e4"> </td>
<font color="#3c34ec"><i><b>Documentation</b></i></font> <td bgcolor="#e4e4e4">
</td> <font color="#3c34ec"><i><b>Documentation</b></i></font>
</tr> </td>
<tr> </tr>
<td align="center" valign="top" width="22"> <tr>
<a href="NuttXRelated.html"> <td align="center" valign="top" width="22">
<img height="20" width="20" src="favicon.ico"> <a href="NuttXRelated.html">
</a> <img height="20" width="20" src="favicon.ico">
</td> </a>
<td bgcolor="#e4e4e4"> </td>
<font color="#3c34ec"><i><b>Related Projects</b></i></font> <td bgcolor="#e4e4e4">
</td> <font color="#3c34ec"><i><b>Related Projects</b></i></font>
</tr> </td>
<tr> </tr>
<td align="center" valign="top" width="22"> <tr>
<a href="NuttXCommercial.html"> <td align="center" valign="top" width="22">
<img height="20" width="20" src="favicon.ico"> <a href="NuttXCommercial.html">
</a> <img height="20" width="20" src="favicon.ico">
</td> </a>
<td bgcolor="#e4e4e4"> </td>
<font color="#3c34ec"><i><b>Commercial Sites</b></i></font> <td bgcolor="#e4e4e4">
</td> <font color="#3c34ec"><i><b>Commercial Sites</b></i></font>
</tr> </td>
<tr> </tr>
<td colspan="2" align="center" valign="top"> <tr>
<a href="http://download.famouswhy.com/nuttx/" target="_blank"> <td colspan="2" align="center" valign="top">
<img src="http://download.famouswhy.com/awards/Famous_Software_Award_Logo.png" alt="NuttX" style="border:0"> <a href="http://download.famouswhy.com/nuttx/" target="_blank">
</a> <img src="http://download.famouswhy.com/awards/Famous_Software_Award_Logo.png" alt="NuttX" style="border:0">
</td> </a>
</tr> </td>
<tr> </tr>
<td colspan="2" align="center" valign="top"> <tr>
<a href="http://www.fiberdownload.com/Download/26542/NuttX" target="_blank"> <td colspan="2" align="center" valign="top">
<img src="editor_pick_2.png" alt="NuttX" style="border:0"> <a href="http://www.fiberdownload.com/Download/26542/NuttX" target="_blank">
<img src="award2_151_50.png" alt="NuttX" style="border:0"> <img src="editor_pick_2.png" alt="NuttX" style="border:0">
</a> <img src="award2_151_50.png" alt="NuttX" style="border:0">
</td> </a>
</tr> </td>
</table> </tr>
</body> </table>
</html> </body>
</html>

1
nuttx/arch/arm/src/lpc43xx/lpc43_adc.c
View File

@ -65,7 +65,6 @@
#include "up_arch.h" #include "up_arch.h"
#include "chip.h" #include "chip.h"
#include "lpc43_internal.h"
#include "lpc43_syscon.h" #include "lpc43_syscon.h"
#include "lpc43_pinconn.h" #include "lpc43_pinconn.h"
#include "lpc43_adc.h" #include "lpc43_adc.h"

8
nuttx/arch/arm/src/lpc43xx/lpc43_cgu.c
View File

@ -163,13 +163,13 @@ static inline void lpc43_xtalconfig(void)
/* Select the crystal oscillator as the input to PLL1 */ /* Select the crystal oscillator as the input to PLL1 */
regval = getreg32(LPC43_PLL1_CTRL); regval = getreg32(LPC43_PLL1_CTRL);
regval &= PLL1_CTRL_CLKSEL_MASK; regval &= ~PLL1_CTRL_CLKSEL_MASK;
regval |= PLL1_CLKSEL_XTAL | PLL1_CTRL_AUTOBLOCK; regval |= PLL1_CLKSEL_XTAL | PLL1_CTRL_AUTOBLOCK;
putreg32(regval, LPC43_PLL1_CTRL); putreg32(regval, LPC43_PLL1_CTRL);
} }
/**************************************************************************** /****************************************************************************
* Name: lpc43_clockconfig * Name: lpc43_pll1config
* *
* Description: * Description:
* Configure PLL1 dividers and multipliers per the settings in the board.h * 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); PLL1_CTRL_MSEL_MASK);
putreg32(regval, LPC43_PLL1_CTRL); putreg32(regval, LPC43_PLL1_CTRL);
/* Clear PLL1 controls: /* Set selected PLL1 controls:
* *
* - PLL1_CTRL_FBSEL: Set in both integer and direct modes * - PLL1_CTRL_FBSEL: Set in both integer and direct modes
* - PLL1_CTRL_DIRECT: Set in direct mode * - 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_NSEL: Set to the value from board.h
* - PLL1_CTRL_MSEL: Set to the value from board.h * - PLL1_CTRL_MSEL: Set to the value from board.h
*/ */

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

@ -75,11 +75,11 @@
/* Integer and direct modes are supported: /* Integer and direct modes are supported:
* *
* In integer mode: * In integer mode (Fclkout < 156000000):
* Fclkin = BOARD_XTAL_FREQUENCY * Fclkin = BOARD_XTAL_FREQUENCY
* Fclkout = Msel * FClkin / Nsel * Fclkout = Msel * FClkin / Nsel
* Fcco = 2 * Psel * Nclkout * Fcco = 2 * Psel * Fclkout
* In direct mode: * In direct mode (Fclkout > 156000000):
* Fclkin = BOARD_XTAL_FREQUENCY * Fclkin = BOARD_XTAL_FREQUENCY
* Fclkout = Msel * FClkin / Nsel * Fclkout = Msel * FClkin / Nsel
* Fcco = Fclkout * Fcco = Fclkout

1
nuttx/drivers/dev_null.c
View File

@ -112,6 +112,7 @@ static int devnull_poll(FAR struct file *filp, FAR struct pollfd *fds,
sem_post(fds->sem); sem_post(fds->sem);
} }
} }
return OK; return OK;
} }
#endif #endif