Skip to content

GitLab

Commit 9437460d authored by Robert Sprowson's avatar Robert Sprowson Committed by ROOL
Browse files

Add output mode for OMAP5 SD cards 

IGEPv5 and UEVM5432 radio icons added to templates, selection logic added
to Desc file.
Update the !Help accordingly, and refresh several dead web links.
Relax the maximum u-boot image size check a little, we have ~70kB for OMAP5.

Version 1.28. Tagged as 'SDCreate-1_28'
parent 1d078fcb
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 53 deletions
Makefile
View file @ 9437460d
......@@ -50,9 +50,13 @@ FILES =\
$(RDIR).scripts.BeagleBoard\
$(RDIR).scripts.DevKit8000\
$(RDIR).scripts.IGEPv2\
$(RDIR).scripts.IGEPv5\
$(RDIR).scripts.PandaBoard\
$(RDIR).scripts.Pandora\
$(RDIR).scripts.preenv5\
$(RDIR).scripts.uenv\
$(RDIR).scripts.UEVM5432\
$(RDIR).scripts.Wandboard\
$(RDIR).scripts.source.beagle\
$(RDIR).scripts.source.convert\
$(RDIR).scripts.source.devkit\
......@@ -85,9 +89,12 @@ install release_autobuild: $(FILES)
${CP} $(RDIR).scripts.BeagleBoard ${INSTDIR}.${APP}.scripts.BeagleBoard/scr ${CPFLAGS}
${CP} $(RDIR).scripts.DevKit8000 ${INSTDIR}.${APP}.scripts.DevKit8000/scr ${CPFLAGS}
${CP} $(RDIR).scripts.IGEPv2 ${INSTDIR}.${APP}.scripts.IGEPv2/scr ${CPFLAGS}
${CP} $(RDIR).scripts.IGEPv5 ${INSTDIR}.${APP}.scripts.IGEPv5/txt ${CPFLAGS}
${CP} $(RDIR).scripts.PandaBoard ${INSTDIR}.${APP}.scripts.PandaBoard/scr ${CPFLAGS}
${CP} $(RDIR).scripts.Pandora ${INSTDIR}.${APP}.scripts.Pandora/scr ${CPFLAGS}
${CP} $(RDIR).scripts.preenv5 ${INSTDIR}.${APP}.scripts.preenv5/txt ${CPFLAGS}
${CP} $(RDIR).scripts.uenv ${INSTDIR}.${APP}.scripts.uenv/txt ${CPFLAGS}
${CP} $(RDIR).scripts.UEVM5432 ${INSTDIR}.${APP}.scripts.UEVM5432/txt ${CPFLAGS}
${CP} $(RDIR).scripts.Wandboard ${INSTDIR}.${APP}.scripts.Wandboard/txt ${CPFLAGS}
|
${CP} $(RDIR).scripts.source.beagle ${INSTDIR}.${APP}.scripts.source.beagle ${CPFLAGS}
......
Resources/UK/!Help
View file @ 9437460d
......@@ -6,11 +6,11 @@ Introduction
------------
SDCreate is a utility designed to help people with the task of installing
RISC OS ROM images onto SD cards, for use with the OMAP3, OMAP4, and iMx6 ports
of RISC OS. If you attempt to create an SD card manually then there are many
places where things can go wrong, either due to user error or operating system
quirks. But if you use SDCreate to create the image for you then you can
(almost) guarantee that it will boot without any trouble.
RISC OS ROM images onto SD cards, for use with the OMAP3, OMAP4, OMAP5, and
iMX6 ports of RISC OS. If you attempt to create an SD card manually then there
are many places where things can go wrong, either due to user error or
operating system quirks. But if you use SDCreate to create the image for you
then you can (almost) guarantee that it will boot without any trouble.
Requirements
......@@ -22,7 +22,7 @@ space. You will need at least version 1.28 of the FrontEnd module and version
in the HardDisc4 image available in the downloads section of the RISC OS Open
website. Users of 26bit machines can find the modules in the "System resources"
download.
http://www.riscosopen.org/content/downloads/common
https://www.riscosopen.org/content/downloads/common
If you want to use SDCreate to write the image to an SD card, then you'll need
to be using a RISC OS 5 machine with a USB card reader and the USB mass storage
......@@ -31,7 +31,7 @@ drivers (SCSISoftUSB).
Alternatively, you can copy the SD card image to a Windows/Linux/Mac/etc. PC
and write the image to an SD card using any number of the free utilities that
are available for those platforms (see the 'Utilities for other platforms'
section, below)
section, below).
Before you use SDCreate to create an SD card image, you may need to track down
some extra files/software:
......@@ -39,9 +39,6 @@ some extra files/software:
* BeagleBoard-xM users will need suitable copies of x-loader and U-Boot. You
will find suitable versions on the Linux SD card that came with your board;
the 'mlo' file is x-loader, and the 'u-boot/bin' file is u-boot.
Alternatively, you can extract them from the demo images available to
download from the CircuitCo website:
http://circuitco.com/support/index.php?title=Circuitco_Support_Wiki
* TouchBook users will need suitable copies of x-loader and U-Boot as well. You
can either copy these off of the Linux SD card that came with the machine, or
......@@ -49,8 +46,15 @@ some extra files/software:
* TouchBook users will also need to install the RISC OS port of mkimage,
available from riscos.info:
http://www.riscos.info/packages/CommandDetails.html#Mkimage
https://www.riscos.info/packages/CommandDetails.html#Mkimage
* OMAP5432 UEVM users can find pre built binaries in the GLSDK from Texas
Instruments in the board-support/prebuilt-images/ directory:
https://software-dl.ti.com/dsps/dsps_public_sw/glsdk/6_03_00_01/index_FDS.html
* IGEPv5 users will need the second stage bootloader (MLO) and u-boot binaries
which the manufacturers ISEE provide:
https://labs.isee.biz/index.php?title=U-Boot_2014.01.y
Usage
-----
......@@ -111,9 +115,9 @@ RISC OS stores a number of non volatile settings in what is often referred to
as CMOS memory. Most notably, these are all the configuration settings such as
the keyboard repeat rate and the drive to boot from.
From RISC OS 5.18 onwards the OMAP3 and OMAP4 HALs will try to find CMOS
memory mounted on a carrier board plugged into the otherwise unused 14 pin
JTAG connector.
From RISC OS 5.18 onwards the OMAP3, OMAP4, and OMAP5 HALs will try to
find CMOS memory mounted on a carrier board plugged into the otherwise
unused 14 pin JTAG connector.
If that is not found to be present then an attempt will be made to find a valid
CMOS image loaded into volatile memory by the boot process, though any settings
will be forgotten when powered down - it is recommended to obtain a CMOS
......@@ -179,15 +183,12 @@ If you've created an image file using SDCreate, but can't use SDCreate itself
to write the image to a card, then you can use one of the following
Windows/Linux/Mac utilities to write the image for you:
* Windows - Win32DiskImager - https://wiki.ubuntu.com/Win32DiskImager
- Just make sure the file has a .img extension for Win32DiskImager to find it
* Linux - UNetbootin - http://unetbootin.sourceforge.net/
- Or if you're feeling adventurous, just use 'dd'
* Mac - http://meego.com/devices/netbook/installing-meego-your-netbook
- I'm not aware of any user-friendly utilities to do this on a Mac OS X
machine, but the above instructions for writing a MeeGo Linux disc image
onto a USB drive can easily be adapted for writing the SD card images
created by SDCreate.
Windows Linux Mac Download
Win32DiskImager Yes No No https://win32diskimager.org/
UNetbootin Yes Yes Yes https://unetbootin.github.io/
Etcher Yes Yes Yes https://etcher.balena.io
Or if you're feeling adventurous, just use 'dd'.
The techie bit
......@@ -234,6 +235,14 @@ SDCreate creates SD card images in the following manner:
RISCOS <- Your RISC OS ROM image
CMOS <- Your CMOS settings
IGEPv5:
MLO <- The x-loader binary
U-BOOT/BIN <- The U-Boot binary
UENV/TXT <- U-Boot environment file from !SDCreate.scripts
PREENV/TXT <- U-Boot pre environment file from !SDCreate.scripts
RISCOS <- Your RISC OS ROM image
CMOS <- Your CMOS settings
Touch Book:
MLO <- The x-loader binary
U-BOOT/BIN <- The U-Boot binary
......@@ -252,6 +261,14 @@ SDCreate creates SD card images in the following manner:
RISCOS <- Your RISC OS ROM image
CMOS <- Your CMOS settings
UEVM5432:
MLO <- The x-loader binary
U-BOOT/BIN <- The U-Boot binary
UENV/TXT <- U-Boot environment file from !SDCreate.scripts
PREENV/TXT <- U-Boot pre environment file from !SDCreate.scripts
RISCOS <- Your RISC OS ROM image
CMOS <- Your CMOS settings
Wandboard
README/TXT <- An introductory welcome note
RISCOS <- Your RISC OS ROM image
......@@ -288,6 +305,9 @@ Touch Book ROM start + &00000010
PandaBoard ROM start + &00000000
IGEPv5 ROM start + &00000000
UEVM5432 ROM start + &00000004
There is also an extra entry point at offset &00000064, which should be used
when the ROM image is packed as a uImage. This entry point allows RISC OS to
detect the machine type automatically, via the machine ID number that is passed
......@@ -307,6 +327,8 @@ only (easy) method to boot RISC OS.
History
-------
V1.28 - 2024/9/21
* Added IGEPv5 and UEVM5432 support, aka the OMAP5
V1.26 - 2018/2/1
* Added Wandboard (iMx6) support
V1.25 - 2012/5/21
......
Resources/UK/Desc
View file @ 9437460d
......@@ -36,6 +36,8 @@ dbox_start
icn 13 maps_to "BOOT/SCR <SDCreate$Dir>.scripts.pandora/scr RISCOS";
icn 22 maps_to "README/TXT <SDCreate$Dir>.scripts.wandboard/txt RISCOS";
icn 28 maps_to "BOOT/SCR <SDCreate$Dir>.scripts.pandaboard/scr RISCOS";
icn 30 maps_to "PREENV/TXT <SDCreate$Dir>.scripts.preenv5/txt UENV/TXT <SDCreate$Dir>.scripts.UEVM5432/txt RISCOS";
icn 31 maps_to "PREENV/TXT <SDCreate$Dir>.scripts.preenv5/txt UENV/TXT <SDCreate$Dir>.scripts.IGEPv5/txt RISCOS";
icn 0 maps_to "";
icn 14 maps_to "";
......@@ -73,9 +75,9 @@ dbox_end
rules_start
# Enable/disable top-level 'create image' icons
icn 21 off deselects icn 8, icn 9, icn 10, icn 11, icn 12, icn 13, icn 22, icn 28;
icn 21 off excludes icn 8, icn 9, icn 10, icn 11, icn 12, icn 13, icn 22, icn 28, icn 4, icn 29, icn 20;
icn 21 on includes icn 8, icn 9, icn 10, icn 11, icn 12, icn 13, icn 22, icn 28, icn 4, icn 29, icn 20;
icn 21 off deselects icn 8, icn 9, icn 10, icn 11, icn 12, icn 13, icn 22, icn 28, icn 30, icn 31;
icn 21 off excludes icn 8, icn 9, icn 10, icn 11, icn 12, icn 13, icn 22, icn 28, icn 4, icn 29, icn 20, icn 30, icn 31;
icn 21 on includes icn 8, icn 9, icn 10, icn 11, icn 12, icn 13, icn 22, icn 28, icn 4, icn 29, icn 20, icn 30, icn 31;
# Enable/disable 'SD image' icons
icn 16 on includes icn 23, icn 24;
......@@ -84,14 +86,16 @@ rules_start
icn 21 off includes icn 23, icn 24;
# Machine type ESG
icn 8 deselects icn 9, icn 10, icn 11, icn 12, icn 13, icn 22, icn 28;
icn 9 deselects icn 8, icn 10, icn 11, icn 12, icn 13, icn 22, icn 28;
icn 10 deselects icn 8, icn 9, icn 11, icn 12, icn 13, icn 22, icn 28;
icn 11 deselects icn 8, icn 9, icn 10, icn 12, icn 13, icn 22, icn 28;
icn 12 deselects icn 8, icn 9, icn 10, icn 11, icn 13, icn 22, icn 28;
icn 13 deselects icn 8, icn 9, icn 10, icn 11, icn 12, icn 22, icn 28;
icn 22 deselects icn 8, icn 9, icn 10, icn 11, icn 12, icn 13, icn 28;
icn 28 deselects icn 8, icn 9, icn 10, icn 11, icn 12, icn 13, icn 22;
icn 8 deselects icn 9, icn 10, icn 11, icn 12, icn 13, icn 22, icn 28, icn 30, icn 31;
icn 9 deselects icn 8, icn 10, icn 11, icn 12, icn 13, icn 22, icn 28, icn 30, icn 31;
icn 10 deselects icn 8, icn 9, icn 11, icn 12, icn 13, icn 22, icn 28, icn 30, icn 31;
icn 11 deselects icn 8, icn 9, icn 10, icn 12, icn 13, icn 22, icn 28, icn 30, icn 31;
icn 12 deselects icn 8, icn 9, icn 10, icn 11, icn 13, icn 22, icn 28, icn 30, icn 31;
icn 13 deselects icn 8, icn 9, icn 10, icn 11, icn 12, icn 22, icn 28, icn 30, icn 31;
icn 22 deselects icn 8, icn 9, icn 10, icn 11, icn 12, icn 13, icn 28, icn 30, icn 31;
icn 28 deselects icn 8, icn 9, icn 10, icn 11, icn 12, icn 13, icn 22, icn 30, icn 31;
icn 30 deselects icn 8, icn 9, icn 10, icn 11, icn 12, icn 13, icn 22, icn 28, icn 31;
icn 31 deselects icn 8, icn 9, icn 10, icn 11, icn 12, icn 13, icn 22, icn 28, icn 30;
# Machine type -> ROM/x-loader/U-Boot mapping (disable stuff)
icn 9 off excludes icn 5, icn 6, icn 14, icn 15;
......@@ -101,13 +105,15 @@ rules_start
icn 11 on excludes icn 5, icn 6, icn 14, icn 15;
icn 13 on excludes icn 5, icn 6, icn 14, icn 15;
icn 22 on excludes icn 5, icn 6, icn 14, icn 15;
icn 28 on excludes icn 5, icn 6, icn 14, icn 15;
icn 8 off excludes icn 5, icn 6, icn 14, icn 15;
icn 10 off excludes icn 5, icn 6, icn 14, icn 15;
icn 11 off excludes icn 5, icn 6, icn 14, icn 15;
icn 13 off excludes icn 5, icn 6, icn 14, icn 15;
icn 22 off excludes icn 5, icn 6, icn 14, icn 15;
icn 28 off excludes icn 5, icn 6, icn 14, icn 15;
icn 28 on excludes icn 5, icn 6, icn 14, icn 15;
icn 30 off excludes icn 5, icn 6, icn 14, icn 15;
icn 31 off excludes icn 5, icn 6, icn 14, icn 15;
# Machine type -> ROM/x-loader/U-Boot mapping (enable stuff)
icn 9 on includes icn 5, icn 6, icn 14, icn 15;
......@@ -134,6 +140,8 @@ rules_start
icn 13 off excludes icn 0, icn 0;
icn 22 off excludes icn 0, icn 0;
icn 28 off excludes icn 0, icn 0;
icn 30 off excludes icn 0, icn 0;
icn 31 off excludes icn 0, icn 0;
icn 8 on includes icn 0, icn 0;
icn 9 on includes icn 0, icn 0;
icn 10 on includes icn 0, icn 0;
......@@ -142,6 +150,8 @@ rules_start
icn 13 on includes icn 0, icn 0;
icn 22 on includes icn 0, icn 0;
icn 28 on includes icn 0, icn 0;
icn 30 on includes icn 0, icn 0;
icn 31 on includes icn 0, icn 0;
rules_end
......@@ -149,4 +159,4 @@ rules_end
# [CMOS <name>] (disc <id> | file <name>) [MLO <name>] [U-BOOT/BIN <name>] ([BOOT/SCR|BOOT/INI] <name> RISCOS <name> | UIMAGE <name>)
# [CMOS <name>] disc <id> image <name>
order_is
icn 27, icn 16, icn 24, output, icn 5, icn 6, icn 8, icn 9, icn 10, icn 11, icn 12, icn 13, icn 22, icn 28, icn 4;
icn 27, icn 16, icn 24, output, icn 5, icn 6, icn 8, icn 9, icn 10, icn 11, icn 12, icn 13, icn 22, icn 28, icn 30, icn 31, icn 4;
Resources/UK/Messages
View file @ 9437460d
......@@ -93,7 +93,9 @@ SETUPd:Select this option to create an SD card image for the Pandora.
SETUPg:Select this option to write an image to an SD card.
SETUPh:Enter the target SCSI drive number here.
SETUPl:Select this option to create an image.
SETUPm:Select this option to create an SD card image for the Wandboard
SETUPm:Select this option to create an SD card image for the Wandboard.
SETUPo:Enter the name of the SD image to load, or drag it to this icon.
SETUPr:Enter the name of the (optional) CMOS settings file, or drag it to this icon.
SETUPs:Select this option to create an SD card image for the PandaBoard
SETUPs:Select this option to create an SD card image for the PandaBoard.
SETUPu:Select this option to create an SD card image for the UEVM5432.
SETUPv:Select this option to create an SD card image for the IGEPv5.
Resources/UK/Templates,fec
View file @ 9437460d
No preview for this file type
Resources/scripts/IGEPv5 0 → 100644
View file @ 9437460d
uenvcmd=fatload mmc 0:1 0x4031E000 cmos;fatload mmc 0:1 0x81000000 riscos;bootm 0x81000000
Resources/scripts/UEVM5432 0 → 100644
View file @ 9437460d
uenvcmd=fatload mmc 0:1 0x4031E000 cmos;fatload mmc 0:1 0x81000000 riscos;bootm 0x81000004
Resources/scripts/preenv5 0 → 100644
View file @ 9437460d
preenvcmd=setenv bootdelay 0
VersionNum
View file @ 9437460d
/* (1.27)
/* (1.28)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.27
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 07 Oct 2018
#define Module_MajorVersion_CMHG 1.28
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 25 Jan 2025
#define Module_MajorVersion "1.27"
#define Module_Version 127
#define Module_MajorVersion "1.28"
#define Module_Version 128
#define Module_MinorVersion ""
#define Module_Date "07 Oct 2018"
#define Module_Date "25 Jan 2025"
#define Module_ApplicationDate "07-Oct-18"
#define Module_ApplicationDate "25-Jan-25"
#define Module_ComponentName "SDCreate"
#define Module_ComponentPath "bsd/RiscOS/Sources/Utilities/SDCreate"
#define Module_FullVersion "1.27"
#define Module_HelpVersion "1.27 (07 Oct 2018)"
#define Module_LibraryVersionInfo "1:27"
#define Module_FullVersion "1.28"
#define Module_HelpVersion "1.28 (25 Jan 2025)"
#define Module_LibraryVersionInfo "1:28"
bas/SDCreate
View file @ 9437460d
......@@ -184,9 +184,9 @@ DEF PROCCheckFile(outfile$,infile$)
REM Simplistic error checks
CASE outfile$ OF
WHEN "RISCOS","UIMAGE" : IF L%<1024*1024 OR (L% AND 3)<>0 THEN PRINT "File '"+infile$+"' doesn't look like a valid ROM image to me" : END
WHEN "BOOT/SCR","BOOT/INI","RESET/SCR","UENV/TXT" : IF L%>1024 THEN PRINT "File '"+infile$+"' doesn't look like a boot script to me" : END
WHEN "BOOT/SCR","BOOT/INI","RESET/SCR","UENV/TXT","PREENV/TXT" : IF L%>1024 THEN PRINT "File '"+infile$+"' doesn't look like a boot script to me" : END
WHEN "README/TXT" : IF L%>32768 THEN PRINT "File '"+infile$+"' doesn't look like a brief introduction to me" : END
WHEN "MLO" : IF L%>64*1024 OR L%<8*1024 THEN PRINT "File '"+infile$+"' doesn't look like a copy of x-loader to me" : END
WHEN "MLO" : IF L%>96*1024 OR L%<8*1024 THEN PRINT "File '"+infile$+"' doesn't look like a copy of x-loader to me" : END
WHEN "U-BOOT/BIN" : IF L%>512*1024 OR L%<64*1024 THEN PRINT "File '"+infile$+"' doesn't look like a copy of u-boot to me" : END
OTHERWISE PRINT "Don't know how to handle output file '"+outfile$+"'" : END
ENDCASE
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment