diff --git a/configs/makerlisp/README.txt b/configs/makerlisp/README.txt index b0103d33da..977ef6caab 100644 --- a/configs/makerlisp/README.txt +++ b/configs/makerlisp/README.txt @@ -235,7 +235,25 @@ Common Configuration Notes The available board-specific configurations are summarized in the following paragraphs. - 3. This configuration uses the mconf-based configuration tool. To + When the build completes successfully, you will find this files in + the top level nuttx directory: + + a. nuttx.hex - A loadable file in Intel HEX format + b. nuttx.lod - A loadable file in ZDS-II binary format + c. nuttx.map - A linker map file + + 3. ZDS-II make be used to write the nuttx.lod file to FLASH. General + instructions: + + a. Start ZDS-II + b. Open the project, for example, nsh/nsh.zdsproj + c. Select Debug->Connect To Target + d. Select Debug->Download code + + There are projects for the ZiLOG Smart Flash Programmer as well but + these are not functional as of this writing. + + 4. This configuration uses the mconf-based configuration tool. To change this configurations using that tool, you should: a. Build and install the kconfig-mconf tool. See nuttx/README.txt diff --git a/configs/makerlisp/include/board.h b/configs/makerlisp/include/board.h index a294d7505f..f4250af0a3 100644 --- a/configs/makerlisp/include/board.h +++ b/configs/makerlisp/include/board.h @@ -46,7 +46,12 @@ * Pre-processor Definitions ****************************************************************************/ -/* Clocking */ +/* Clocking + * + * The MakerLisp CPU board has a 5Mhz crystal. This is multiplied by 10 by + * the PLL to obtain a system clock frequency of 50MHz. See the PLL setup + * in scripts/makerlisp.linkcmd. + */ #define EZ80_SYS_CLK_FREQ 50000000 diff --git a/configs/makerlisp/nsh/README.txt b/configs/makerlisp/nsh/README.txt index 17fffc3b84..5b47610afc 100644 --- a/configs/makerlisp/nsh/README.txt +++ b/configs/makerlisp/nsh/README.txt @@ -3,7 +3,11 @@ README.txt nsh.zdsproj is a simple ZDS-II project that will allow you to use the ZDS-II debugger. -nsh.ztft is the target file that accompanies the ZDS-II project file. It - is identical to configs/scripts/makerlisp_flash.ztgt. nsh.zfpproj is a simple project that will allow you to use the Smart Flash - Programming. + Programming. NOTE: As of this writing this project does not work, probably + due to RAM configuration in the project. Use ZDS-II instead as is described + in the upper README.txt file +nsh_flash.ztgt is the target file that accompanies the project files. This + one is identical to configs/scripts/makerlisp_ram.ztgt. +nsh_ram.ztgt is the target file that accompanies the project files. This + one is identical to configs/scripts/makerlisp_flash.ztgt. diff --git a/configs/makerlisp/nsh/nsh.zdsproj b/configs/makerlisp/nsh/nsh.zdsproj index 66853c982e..680cd7d8d6 100644 --- a/configs/makerlisp/nsh/nsh.zdsproj +++ b/configs/makerlisp/nsh/nsh.zdsproj @@ -1,4 +1,4 @@ - + eZ80F91 @@ -17,7 +17,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -44,133 +44,13 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -193,15 +73,15 @@ - - + + - + - + @@ -213,23 +93,143 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + diff --git a/configs/makerlisp/nsh/nsh.zfpproj b/configs/makerlisp/nsh/nsh.zfpproj index 0c09b49635..182f3b77fe 100644 --- a/configs/makerlisp/nsh/nsh.zfpproj +++ b/configs/makerlisp/nsh/nsh.zfpproj @@ -74,7 +74,7 @@ - + @@ -225,11 +225,11 @@ - - + + - + diff --git a/configs/makerlisp/nsh/nsh.ztgt b/configs/makerlisp/nsh/nsh_flash.ztgt similarity index 100% rename from configs/makerlisp/nsh/nsh.ztgt rename to configs/makerlisp/nsh/nsh_flash.ztgt diff --git a/configs/makerlisp/nsh/nsh_ram.ztgt b/configs/makerlisp/nsh/nsh_ram.ztgt new file mode 100644 index 0000000000..478b8a26d4 --- /dev/null +++ b/configs/makerlisp/nsh/nsh_ram.ztgt @@ -0,0 +1,69 @@ + + + + + true + 1f4 + 8 + 5000000 + + PLL + 50000000 + + + 0 + 100000 + ffff + true + + + + 200000 + false + 000000 + FFFFF + + 1 + false + true + + + + + 0 + 8 + 0 + 7 + + + 0 + 8 + 8 + F + + + 0 + 28 + 20 + 9F + + + 0 + 0 + 0 + 0 + + + + 0 + AF + false + true + false + + 4 + + EZ80F91 + 1.0.1 + 1.00 + diff --git a/configs/makerlisp/scripts/makerlisp.linkcmd b/configs/makerlisp/scripts/makerlisp.linkcmd index 3be276acbc..965e934463 100644 --- a/configs/makerlisp/scripts/makerlisp.linkcmd +++ b/configs/makerlisp/scripts/makerlisp.linkcmd @@ -83,9 +83,9 @@ DEFINE __FLASH_ADDR_U_INIT_PARAM = $00 define _SYS_CLK_FREQ = 50000000 -define _OSC_FREQ = 50000000 -define _SYS_CLK_SRC = 0 -define _OSC_FREQ_MULT = 1 +define _OSC_FREQ = 5000000 +define _SYS_CLK_SRC = 1 +define _OSC_FREQ_MULT = 10 define __PLL_CTL0_INIT_PARAM = $40 define _zsl_g_clock_xdefine = 50000000