zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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
sbg
patacongo 13 years ago
parent
5eee9a3a37
commit
6cffd422b8
5 changed files with 88 additions and 87 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 159
      nuttx/Documentation/NuttXLinks.html
  2. 1
      nuttx/arch/arm/src/lpc43xx/lpc43_adc.c
  3. 8
      nuttx/arch/arm/src/lpc43xx/lpc43_cgu.c
  4. 6
      nuttx/configs/lpc4330-xplorer/include/board.h
  5. 1
      nuttx/drivers/dev_null.c

159
nuttx/Documentation/NuttXLinks.html
Unescape View File

@ -1,79 +1,80 @@ @@ -1,79 +1,80 @@
<html>
<head>
<title>NuttX Links</title>
</head>
<body background="backgd.gif">
<table width="100%>
<tr>
<td colspan="2">&nbsp</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>&nbsp</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">&nbsp</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>&nbsp</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>

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

@ -65,7 +65,6 @@ @@ -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"

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

@ -163,13 +163,13 @@ static inline void lpc43_xtalconfig(void) @@ -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) @@ -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
*/

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

@ -75,11 +75,11 @@ @@ -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

1
nuttx/drivers/dev_null.c
Unescape View File

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

Write Preview
Loading…
Cancel
Save