Commit f7bbb82e authored by Ben Avison's avatar Ben Avison
Browse files

Resync cross-compile version of !Common with RISC OS native version.

Also add a couple more cross-compile Env files.

Version 1.30. Tagged as 'Env-1_30'
parent af08299b
......@@ -35,7 +35,7 @@ elif [ "$APCS" == "APCS-32" ]; then
NCC_TOOLOPTIONS="-APCS 3/32bit/fpe3 -memaccess -L22-S22+L41"
OBJASM_TOOLOPTIONS="-APCS 3/32bit"
;;
'Any32')
'All32')
GCC_TOOLOPTIONS="-march=armv3 -mfpu=fpe3"
NCC_TOOLOPTIONS="-APCS 3/32bit/fpe3 -cpu 3 -memaccess -L22-S22-L41"
OBJASM_TOOLOPTIONS="-APCS 3/32bit -cpu 3"
......@@ -47,18 +47,23 @@ elif [ "$APCS" == "APCS-32" ]; then
;;
'Tungsten')
GCC_TOOLOPTIONS="-march=armv5te -mfpu=fpe3"
NCC_TOOLOPTIONS="-cpu 5TE -memaccess +L22+S22+L41"
NCC_TOOLOPTIONS="-APCS 3/32bit/fpe3 -cpu 5TE -memaccess +L22+S22+L41"
OBJASM_TOOLOPTIONS="-APCS 3/32bit -cpu 5TE"
;;
'ARM11ZF')
GCC_TOOLOPTIONS="-march=armv6 -mfpu=fpe3"
NCC_TOOLOPTIONS="-APCS 3/32bit/fpe3 -cpu 6 -memaccess +L22+S22-L41"
OBJASM_TOOLOPTIONS="-APCS 3/32bit/fpe3 -cpu 6Z --fpu VFPv2"
;;
'CortexA8')
GCC_TOOLOPTIONS="-march=armv6 -mfpu=fpe3"
NCC_TOOLOPTIONS="-APCS 3/32bit/fpe3 -cpu 6 -memaccess +L22+S22-L41"
OBJASM_TOOLOPTIONS="-APCS 3/32bit -cpu 5TEJ"
OBJASM_TOOLOPTIONS="-APCS 3/32bit/fpe3 -cpu Cortex-A8"
;;
'CortexA9')
GCC_TOOLOPTIONS="-march=armv6 -mfpu=fpe3"
NCC_TOOLOPTIONS="-APCS 3/32bit/fpe3 -cpu 6 -memaccess +L22+S22-L41"
OBJASM_TOOLOPTIONS="-APCS 3/32bit -cpu 5TEJ"
OBJASM_TOOLOPTIONS="-APCS 3/32bit/fpe3 -cpu Cortex-A9"
;;
*)
GCC_TOOLOPTIONS="-march=armv2 -mfpu=fpe3"
......
#!/bin/bash
# Environment to build ROM for Raspberry Pi (BCM2835-based board)
#
# This can either be applied to the current shell using the "source" command,
# or executed directly. In the latter case, you will want to describe a
# a command to be executed by a subshell using the parameters to this script.
# In either case, the working directory must be set to the root of your sandbox on entry.
export LOCALE=UK
export KEYBOARD=All
export MACHINE=ARM11ZF
export SYSTEM=Ursula
export USERIF=Raspberry
export DISPLAYTYPE=PAL
export IMAGESIZE=5120K
export HALSIZE=64K
export BUILD=ROOL/BCM2835
export APCS=APCS-32
. Env/!Common.sh
[ -z "$@" ] || bash -c "$@"
#!/bin/bash
# Environment to build user disc image (also useful for any other soft-loadable binaries)
#
# This can either be applied to the current shell using the "source" command,
# or executed directly. In the latter case, you will want to describe a
# a command to be executed by a subshell using the parameters to this script.
# In either case, the working directory must be set to the root of your sandbox on entry.
export LOCALE=UK
export KEYBOARD=All
export MACHINE=All
export SYSTEM=Ursula
export USERIF=Iyonix
export DISPLAYTYPE=PAL
export IMAGESIZE=4096K
export HALSIZE=64K
export BUILD=ROOL/Disc
export APCS=APCS-32
. Env/!Common.sh
[ -z "$@" ] || bash -c "$@"
/* (1.29)
/* (1.30)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.29
#define Module_MajorVersion_CMHG 1.30
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 15 Sep 2014
#define Module_Date_CMHG 24 Sep 2014
#define Module_MajorVersion "1.29"
#define Module_Version 129
#define Module_MajorVersion "1.30"
#define Module_Version 130
#define Module_MinorVersion ""
#define Module_Date "15 Sep 2014"
#define Module_Date "24 Sep 2014"
#define Module_ApplicationDate "15-Sep-14"
#define Module_ApplicationDate "24-Sep-14"
#define Module_ComponentName "Env"
#define Module_ComponentPath "castle/RiscOS/Env"
#define Module_FullVersion "1.29"
#define Module_HelpVersion "1.29 (15 Sep 2014)"
#define Module_LibraryVersionInfo "1:29"
#define Module_FullVersion "1.30"
#define Module_HelpVersion "1.30 (24 Sep 2014)"
#define Module_LibraryVersionInfo "1:30"
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