From eacdfa0f739c57f5ba30a9763fac029c521b7cb6 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 16 Jun 2019 15:29:38 -0600 Subject: [PATCH] configs/makerlisp: Update README, comments. Removed unused definitions. Enable task names and the NSH date command. --- configs/makerlisp/README.txt | 34 +++++++++++++++++++++++---- configs/makerlisp/nsh/defconfig | 2 -- configs/makerlisp/src/makerlisp.h | 39 +++++-------------------------- 3 files changed, 35 insertions(+), 40 deletions(-) diff --git a/configs/makerlisp/README.txt b/configs/makerlisp/README.txt index 160acd140d..3e530dc159 100644 --- a/configs/makerlisp/README.txt +++ b/configs/makerlisp/README.txt @@ -278,22 +278,46 @@ Configuration Subdirectories connectivity is via host serical console connected through the USB serial console. - Withe the I/O expansion board, the serial console can also be sued with + With the I/O expansion board, the serial console can also be used with either a TTL-to-RS232 or a TTL-to-USB Serial adapter connected by CN1 pins 59 and 61. The default baud setting is 115200N1. - To use the VGA display controller with stdout and stderr, you also - need to selection CONFIG_MAKERLISP_VGA=y in your configuration. This - enables a required VGA initialization sequence. + To use the VGA display controller with stdin, stdout and stderr, you + also need to selection CONFIG_MAKERLISP_VGA=y in your configuration. + This enables a required VGA initialization sequence. The PC terminal software should be configured as described in the MakerLisp Putty HOWTO document: 115200N1 BAUD. + 2. The eZ80 RTC, the procFS file system, and SD card support in included. + The procFS file system will be auto-mounted at /proc when the board + boots. + + The RTC can be read and set from the NSH date command. + + nsh> date + Thu, Dec 19 20:53:29 2086 + nsh> help date + date usage: date [-s "MMM DD HH:MM:SS YYYY"] + nsh> date -s "Jun 16 15:09:00 2019" + nsh> date + Sun, Jun 16 15:09:01 2019 + + The SD card can be be mounted with the following NSH mount command: + + nsh> mount -t vfat /dev/mmcsd0 /mnt/sdcard + + NOTE: The is no card detect signal so the microSD card must be + placed in the card slot before the system is started. + STATUS: 2109-06-16: The basic NSH configuration appears to be fully functional using only the CPU and I/O expansion card. Console is provided over USB. - Added support for SPI-based SD cards, the RTC and procFS. \ No newline at end of file + Added support for SPI-based SD cards, the RTC and procFS. There are + still a few issues at the end-of-the-day: (1) the SD card block driver + is not being registered, and (2) RTC does not preserve time across a + power cycle. diff --git a/configs/makerlisp/nsh/defconfig b/configs/makerlisp/nsh/defconfig index b4aba9abc5..257631ec93 100644 --- a/configs/makerlisp/nsh/defconfig +++ b/configs/makerlisp/nsh/defconfig @@ -32,7 +32,6 @@ CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y -CONFIG_NSH_DISABLE_DATE=y CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 @@ -50,7 +49,6 @@ CONFIG_START_DAY=16 CONFIG_START_MONTH=6 CONFIG_START_YEAR=2019 CONFIG_SYSTEM_NSH=y -CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_BITS=0 CONFIG_UART0_RXBUFSIZE=192 CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/configs/makerlisp/src/makerlisp.h b/configs/makerlisp/src/makerlisp.h index d666a71d87..168ab4ea43 100644 --- a/configs/makerlisp/src/makerlisp.h +++ b/configs/makerlisp/src/makerlisp.h @@ -62,14 +62,13 @@ /* Memory map. Board-specific extensions to the basic ez80f91 memory map * (see arch/z80/src/ez80/ez80f91.h) + * + * - Chip select 0 is for RAM 0 to (512k - 1), starting at address 0x40000 + * (after the flash). + * - Chip select 1 is for 512k to (1M - 1), at address 0xc0000. + * + * All RAM has zero wait states. */ - /* CS0: 0x000000 256Kb of on-chip flash */ -#define EZ80_OFFCHIPFLASH 0x400000 /* CS0: Off chip flash (Up to 4Mb-256Kb) */ -#define EZ80_LEDGPIOCNTRL 0x800000 /* CS2: (See below) */ -#define EZ80_PLTFMSRAM 0xb80000 /* CS2: Platform SRAM (512Kb) */ -#define EZ80_MODULESRAM 0xc00000 /* CS1: Module SRAM (up to 2Mb) */ - /* 0xffc000 On-chip EMAC SRAM (8Kb) */ - /* 0xffe000 On-chip SRAM (8Kb) */ /* LED and port emulation memory register addresses */ @@ -84,32 +83,6 @@ #define EZ80_GPIOD6 (1 << 6) #define EZ80_GPIOD7 (1 << 7) -/* Modem Signals: - * - * DCD: - * The Data Carrier Detect (DCD) signal at D1 indicates that a good carrier - * signal is being received from the remove mode. - * RX: - * The RX signal at D2 indicates that data is received from the modem. - * DTR: - * The Data Terminal Ready (DTR) signal at D3 informs the modem that the PC - * is ready. - * TX: - * The TX signal at D4 indicates that data is transmitted to the modem. - */ - - /* Push buttons: - * - * PB0 SW1 Bit 0 of GPIO Port B - * PB1 SW2 Bit 1 of GPIO Port B - * PB2 SW3 Bit 2 of GPIO Port B - * RESET SW4 - */ - -#define EZ80_PB0_IRQ EZ80_PORTB0_IRQ /* Vector Oxa0 */ -#define EZ80_PB1_IRQ EZ80_PORTB1_IRQ /* Vector Oxa4 */ -#define EZ80_PB2_IRQ EZ80_PORTB2_IRQ /* Vector Oxa8 */ - /**************************************************************************** * Public Data ****************************************************************************/