diff --git a/configs/16z/README.txt b/configs/16z/README.txt index fe3df18898c..4f9d2d397e5 100644 --- a/configs/16z/README.txt +++ b/configs/16z/README.txt @@ -398,29 +398,4 @@ ostest trailing bad characters are manually eliminated, then the build will succeed on the next try. -pashello --------- - - Configures to use examples/pashello for execution from FLASH - See examples/README.txt for information about pashello. - - NOTES: - - 1. This configuration uses the mconf-based configuration tool. To - change this configuration using that tool, you should: - - a. Build and install the kconfig-mconf tool. See nuttx/README.txt - and misc/tools/ - - b. Execute 'make menuconfig' in nuttx/ in order to start the - reconfiguration process. - - 2. The last time I tried building this configuration, there were - a few undefined symbols from the PCODE logic. It might require - a little TLC to get this all working again. - - 3. The native windows build has not been tried with this configuration - but should, in principle, work (see notes for the ostest configuration - above). - Check out any README.txt files in these s. diff --git a/configs/16z/include/board.h b/configs/16z/include/board.h index 595a768b90e..b76c528946f 100644 --- a/configs/16z/include/board.h +++ b/configs/16z/include/board.h @@ -44,6 +44,14 @@ * Definitions ****************************************************************************/ +/* The 16Z board has a 19.6608MHz crystal. The ZNEO clocking will be + * configured to use this crystal frequency directly as the clock source + */ + +#define BOARD_XTAL_FREQUENCY 19660800 /* 19.6608MHz */ +#define BOARD_CLKSRC 1 /* Clock source = external crystal */ +#define BOARD_SYSTEM_FREQUENCY BOARD_XTAL_FREQUENCY + /* LEDs * * The 16z board has 7 LEDs, five of which are controllable via software: diff --git a/configs/16z/nsh/nsh.linkcmd b/configs/16z/nsh/nsh.linkcmd index 03ca01583cd..1c60431f077 100755 --- a/configs/16z/nsh/nsh.linkcmd +++ b/configs/16z/nsh/nsh.linkcmd @@ -1,5 +1,5 @@ /****************************************************************************/ -/* configs/16z/nsh/nsh.linkcmd */ +/* configs/16z/nsh/nsh.linkcmd */ /* */ /* Copyright (C) 2014 Gregory Nutt. All rights reserved. */ /* Author: Gregory Nutt */ @@ -69,8 +69,8 @@ define _near_stack = highaddr of RAM define _near_heapbot = top of RAM define _far_heapbot = top of ERAM -define _SYS_CLK_SRC = 2 -define _SYS_CLK_FREQ = 20000000 +define _SYS_CLK_SRC = 1 +define _SYS_CLK_FREQ = 19660800 define __EXTCT_INIT_PARAM = $40 define __EXTCS0_INIT_PARAM = $9001 diff --git a/configs/16z/ostest/ostest.linkcmd b/configs/16z/ostest/ostest.linkcmd index fa62efede6e..a80efe2cca7 100755 --- a/configs/16z/ostest/ostest.linkcmd +++ b/configs/16z/ostest/ostest.linkcmd @@ -69,8 +69,8 @@ define _near_stack = highaddr of RAM define _near_heapbot = top of RAM define _far_heapbot = top of ERAM -define _SYS_CLK_SRC = 2 -define _SYS_CLK_FREQ = 20000000 +define _SYS_CLK_SRC = 1 +define _SYS_CLK_FREQ = 19660800 define __EXTCT_INIT_PARAM = $40 define __EXTCS0_INIT_PARAM = $9001 diff --git a/configs/z16f2800100zcog/include/board.h b/configs/z16f2800100zcog/include/board.h index e9b37d85d99..61cfa46d8aa 100644 --- a/configs/z16f2800100zcog/include/board.h +++ b/configs/z16f2800100zcog/include/board.h @@ -1,7 +1,7 @@ /**************************************************************************** * board/board.h * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -43,6 +43,14 @@ /**************************************************************************** * Definitions ****************************************************************************/ +/* The 16Z board has a 20MHz crystal. The ZNEO clocking will be configured + * to use this crystal frequency directly as the clock source + */ + +#define BOARD_XTAL_FREQUENCY 20000000 /* 20MHz */ +#define BOARD_CLKSRC 1 /* Clock source = external crystal */ +#define BOARD_SYSTEM_FREQUENCY BOARD_XTAL_FREQUENCY + /* LED pattern definitions * diff --git a/configs/z16f2800100zcog/nsh/nsh.linkcmd b/configs/z16f2800100zcog/nsh/nsh.linkcmd index 8113bfd35ff..db03f480cfe 100755 --- a/configs/z16f2800100zcog/nsh/nsh.linkcmd +++ b/configs/z16f2800100zcog/nsh/nsh.linkcmd @@ -69,7 +69,7 @@ define _near_stack = highaddr of RAM define _near_heapbot = top of RAM define _far_heapbot = top of ERAM -define _SYS_CLK_SRC = 2 +define _SYS_CLK_SRC = 1 define _SYS_CLK_FREQ = 20000000 define __EXTCT_INIT_PARAM = $80 diff --git a/configs/z16f2800100zcog/ostest/ostest.linkcmd b/configs/z16f2800100zcog/ostest/ostest.linkcmd index 85e9dc1570d..f3e83f31f14 100755 --- a/configs/z16f2800100zcog/ostest/ostest.linkcmd +++ b/configs/z16f2800100zcog/ostest/ostest.linkcmd @@ -1,7 +1,7 @@ /****************************************************************************/ /* configs/z16f2800100zcog/ostest/ostest.linkcmd */ /* */ -/* Copyright (C) 2008 Gregory Nutt. All rights reserved. */ +/* Copyright (C) 2008, 2014 Gregory Nutt. All rights reserved. */ /* Author: Gregory Nutt */ /* */ /* Redistribution and use in source and binary forms, with or without */ @@ -69,7 +69,7 @@ define _near_stack = highaddr of RAM define _near_heapbot = top of RAM define _far_heapbot = top of ERAM -define _SYS_CLK_SRC = 2 +define _SYS_CLK_SRC = 1 define _SYS_CLK_FREQ = 20000000 define __EXTCT_INIT_PARAM = $80 diff --git a/configs/z16f2800100zcog/pashello/pashello.linkcmd b/configs/z16f2800100zcog/pashello/pashello.linkcmd index 84cf3e0e043..a5b893a3b88 100755 --- a/configs/z16f2800100zcog/pashello/pashello.linkcmd +++ b/configs/z16f2800100zcog/pashello/pashello.linkcmd @@ -1,7 +1,7 @@ /****************************************************************************/ /* configs/z16f2800100zcog/pashello/pashello.linkcmd */ /* */ -/* Copyright (C) 2008 Gregory Nutt. All rights reserved. */ +/* Copyright (C) 2008, 2014 Gregory Nutt. All rights reserved. */ /* Author: Gregory Nutt */ /* */ /* Redistribution and use in source and binary forms, with or without */ @@ -69,7 +69,7 @@ define _near_stack = highaddr of RAM define _near_heapbot = top of RAM define _far_heapbot = top of ERAM -define _SYS_CLK_SRC = 2 +define _SYS_CLK_SRC = 1 define _SYS_CLK_FREQ = 20000000 define __EXTCT_INIT_PARAM = $80