From 2a7d2bd72a548aad44e02daae94e05f3c61a6578 Mon Sep 17 00:00:00 2001 From: beeanyew Date: Tue, 13 Jul 2021 17:04:00 +0200 Subject: [PATCH] Get rid of default.cfg, add instructions to readme about config files --- README.md | 6 +++++- default.cfg => amiga.cfg | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) rename default.cfg => amiga.cfg (95%) diff --git a/README.md b/README.md index 08483ed..85272cc 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,11 @@ Now the final steps to get things up and running, all of this is done from a com * `make` Next up, follow the steps for installing the FPGA bitstream update below. (Scroll down.) -You can now start the PiStorm emulator with a basic config by typing `sudo ./emulator` and hitting enter. + +If you are running the PiStorm in an Amiga computer, you can start the emulator with a basic default Amiga config by typing `sudo ./emulator --config amiga.cfg`. +In addition, the emulator will attempt to load a file called `default.cfg` if no config file is specified on the command line, so if you wish for the emulator to start up with for instance the basic default Amiga config, you can copy `amiga.cfg` to `default.cfg`. +**Important note:** Try not to edit the sample config files such as `amiga.cfg`, always save them under a different name, for instance one directory level below the `pistorm` directory. +One way to do this would be to copy for instance `amiga.cfg` like this: `cp ./amiga.cfg ../amiga.cfg` and then running the emulator using `sudo ./emulator --config ../amiga.cfg`. This way, you will never have any problems using `git pull` to update your PiStorm repo to the latest commit. To exit the emulator you can press `Ctrl+C` (on the keyboard or over SSH) or press `Q` on the keyboard connected to the Raspberry Pi. diff --git a/default.cfg b/amiga.cfg similarity index 95% rename from default.cfg rename to amiga.cfg index 2590c2d..fcf5c9c 100644 --- a/default.cfg +++ b/amiga.cfg @@ -17,6 +17,8 @@ map type=rom address=0xF80000 size=0x80000 file=kick.rom ovl=0 id=kickstart # like 256M, 512M, 1024M, or add additional map lines. map type=ram address=0x10000000 size=128M id=z3_autoconf_fast # Max 8MB of Z2 Fast can be mapped due to addressing space limitations, but for instance 2+4MB can be chained to leave 2MB for something else. +# Do not map Zorro II Fast RAM unless you absolutely need it, as Z2 address space is very limited. +# Cases where you may need Zorro II Fast may include emulating a 68000, 68010 or 68EC020, and/or if you are using Kickstart 1.3. #map type=ram address=0x200000 size=8M id=z2_autoconf_fast #map type=ram address=0x200000 size=2M id=z2_autoconf_fast #map type=ram address=0x400000 size=4M id=z2_autoconf_fast