Merge branch 'release-2.2'

.gitignore

@@ -1,2 +1,4 @@
 /TODO
 /images/*
+/scripts/release.rar
+/scripts/wifi.sh

BUILDING.md

@@ -47,7 +47,7 @@ gigabytes of source code.
 
 ## Building the components
 
-Once the machine is up and running and has been succesfully provisioned, ssh
+Once the machine is up and running and has been successfully provisioned, ssh
 into it:
 
 ```
@@ -73,6 +73,6 @@ executing the following command:
 /vagrant/scripts/create-sd-card-image.sh
 ```
 
-If succesful, the resulting image can be found in the `images` folder
+If successful, the resulting image can be found in the `images` folder
 on the host machine (`/vagrant/images` on the guest machine). It is ready to be
 flashed to an SD card.

CHANGELOG.md

@@ -1,3 +1,10 @@
+# Version 2.2
+
+- Added support for custom WiFi and Samba configuration (thanks versechoruscurse
+  for the suggestion).
+- Improved splash screen visibility when using HDMI to VGA adapter dongles with
+  older (CRT) monitors.
+
 # Version 2.1
 
 - Updated packaged MiSTer release to release_20200908.

README.md

@@ -1,6 +1,9 @@
 # Mr. Fusion - Universal MiSTer installation image
 
-Mr. Fusion provides a compact image that you can download
+Mr. Fusion is a tiny, custom Linux distribution designed to run on the
+DE10-Nano and install MiSTer.
+
+It comes in the form of a compact image that you can download
 and flash onto an SD card of any size with a tool like [Apple Pi Baker](https://www.tweaking4all.com/software/macosx-software/applepi-baker-v2/), [balenaEtcher](https://www.balena.io/etcher/), [Win32 Disk Imager](https://sourceforge.net/projects/win32diskimager/) or even [dd](https://en.wikipedia.org/wiki/Dd_%28Unix%29).
 
 When you put this SD card into your DE10-nano and start it up, it will
@@ -12,6 +15,9 @@ From there, using the built-in scripts, you can configure WiFi
 [MiSTer Updater script](https://github.com/MiSTer-devel/Updater_script_MiSTer)
 to get an up to date MiSTer installation.
 
+You can provide custom WiFi and Samba configuration which Mr. Fusion will
+install alongside the basic MiSTer setup.
+
 ## Requirements
 
 - A Micro SD card of minimum 2 GB, for example the one that came with your
@@ -82,6 +88,22 @@ A new drive called `MRFUSION` will appear. In it is a `Scripts` folder. Put
 any script you want to have available in your MiSTer in this folder. It will
 be copied to your MiSTer's Scripts folder automatically during the installation.
 
+### Custom WiFi configuration
+
+You can copy a custom `wpa_supplicant.conf` file in the root of the SD card
+after flashing the Mr. Fusion image. It will automatically be copied to the
+correct place during the installation of MiSTer.
+This allows you to configure your WiFi credentials before you install MiSTer
+and thus removes the need to connect a keyboard after installation.
+
+### Custom Samba configuration
+
+You can copy a custom `samba.sh` file in the root of the SD card
+after flashing the Mr. Fusion image. It will automatically be copied to the
+correct place during the installation of MiSTer.
+This allows you to enable Samba before you install and thus removes
+the need to connect a keyboard to your MiSTer or having to ssh into it.
+
 ## How is this an improvement to the MiSTer setup process?
 
 Having a universal flash image means we can just use _any_ SD card image

Vagrantfile

@@ -1,5 +1,20 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
+# Copyright 2020 Michael Smith <root@retrospace.be>
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as published
+# by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA.
 
 VM_MEMORY=8192
 VM_CORES=8
@@ -126,7 +141,7 @@ Vagrant.configure("2") do |config|
   config.vm.provision "file", source: "config/kernel-defconfig",
                               destination: "/home/vagrant/linux-socfpga/arch/arm/configs/mrfusion_defconfig"
 
-  # Copy resize init script
+  # Copy MiSTer installation init script
   config.vm.provision "file", source: "scripts/S99install-mister.sh",
                               destination: "/home/vagrant/buildroot/board/mrfusion/rootfs-overlay/etc/init.d/"
 end

scripts/S99install-MiSTer.sh

@@ -1,4 +1,19 @@
 #!/bin/sh
+# Copyright 2020 Michael Smith <root@retrospace.be>
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as published
+# by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA.
 
 # This script is used as an init script and should only
 # run on startup, not on shutdown.
@@ -10,10 +25,18 @@ fi
 mkdir -p /mnt/release /tmp/release
 mount -r /dev/mmcblk0p1 /mnt/release
 ## Show splash screen
-fbv /mnt/release/splash.png &
+fbv -fr /mnt/release/splash.png &
 cd /tmp/release
 unrar x /mnt/release/release.rar
 cp /mnt/release/Scripts/* /tmp/release/files/Scripts
+## Custom wpa_supplicant.conf support
+if [[ -f /mnt/release/wpa_supplicant.conf ]]; then
+  cp /mnt/release/wpa_supplicant.conf /tmp/release/files/linux
+fi
+## Custom samba.sh support
+if [[ -f /mnt/release/samba.sh ]]; then
+  cp /mnt/release/samba.sh /tmp/release/files/linux
+fi
 umount /mnt/release
 
 # Re-partition the SD card:

scripts/build.sh

@@ -1,4 +1,19 @@
 #!/bin/bash
+# Copyright 2020 Michael Smith <root@retrospace.be>
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as published
+# by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA.
 
 # buildroot
 cd ~/buildroot

scripts/clean.sh

@@ -1,4 +1,19 @@
 #!/bin/bash
+# Copyright 2020 Michael Smith <root@retrospace.be>
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as published
+# by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA.
 
 # buildroot
 cd ~/buildroot

scripts/create-sd-card-image.sh

@@ -1,4 +1,19 @@
 #!/bin/bash
+# Copyright 2020 Michael Smith <root@retrospace.be>
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as published
+# by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA.
 
 # Create the sd card image container.
 dd if=/dev/zero of=/vagrant/images/mr-fusion.img bs=12M count=10