On Mon, Aug 10, 2015 at 03:07:41PM +0200, Ard Biesheuvel wrote:
> Remove the ARMGCC and ARMLINUXGCC from comments in the respective
> Makefiles of ArmPlatformPkg and ArmJunoPkg and from the [ancient]
> Versatile Express instructions.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
> ---
> ArmPlatformPkg/ArmJunoPkg/Makefile | 4 +---
> ArmPlatformPkg/Documentation/ArmVExpressInstructions.txt | 25
> ++++++++++----------
> ArmPlatformPkg/Scripts/Makefile | 4 +---
> 3 files changed, 15 insertions(+), 18 deletions(-)
>
> diff --git a/ArmPlatformPkg/ArmJunoPkg/Makefile
> b/ArmPlatformPkg/ArmJunoPkg/Makefile
> index 71828f3f2c0d..d8d1f8465a01 100644
> --- a/ArmPlatformPkg/ArmJunoPkg/Makefile
> +++ b/ArmPlatformPkg/ArmJunoPkg/Makefile
> @@ -10,10 +10,8 @@
> # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> #
>
> -# Define the following variables to specify an alternative toolchain to the
> one located in your PATH:
> +# Define the following variable to specify an alternative toolchain to the
> one located in your PATH:
> # - RVCT_TOOLS_PATH: for RVCT and RVCTLINUX toolchains
> -# - ARMGCC_TOOLS_PATH: for ARMGCC toolchain
> -# - ARMLINUXGCC_TOOLS_PATH: for ARMLINUXGCC
>
> EDK2_TOOLCHAIN ?= GCC49
> GCC49_AARCH64_PREFIX ?= aarch64-none-elf-
> diff --git a/ArmPlatformPkg/Documentation/ArmVExpressInstructions.txt
> b/ArmPlatformPkg/Documentation/ArmVExpressInstructions.txt
> index a3fe9d77a123..90be05051273 100644
> --- a/ArmPlatformPkg/Documentation/ArmVExpressInstructions.txt
> +++ b/ArmPlatformPkg/Documentation/ArmVExpressInstructions.txt
> @@ -6,7 +6,7 @@ Status
> ------
> Build and Run on EDK2 Subversion revision 11837
> Requirements
> -- RVCTv3 (untested) or RVCTv4 or ARMGCC (Code Sourcery q201009)
> +- RVCTv3 (untested) or RVCTv4 or GCC (Code Sourcery q201009)
You'll want to drop the Code Sourcery reference as well.
That said, this entire file is really quite dated.
And subversion 11837 (16 June 2011) isn't even on trunk.
Maybe just delete the entire file?
This kind of thing would fit better in a wiki anyway.
/
Leif
> - Using Ubuntu: gcc, make, uuid-dev
> - Using Cygwin: gcc, make, e2fsprogs (needed for uuid.h)
>
> @@ -43,11 +43,12 @@ export EDK_TOOLS_PATH=`pwd`/BaseTools
> . edksetup.sh
> make -C $EDK_TOOLS_PATH
>
> -4. Ensure the ARMGCC toolchain is in your PATH environment variable or
> defined by the ARMGCC_TOOLS_PATH environment variable. Example:
> -export
> ARMGCC_TOOLS_PATH=/opt/toolchains/arm-2010.09-arm-none-eabi-i686-pc-linux-gnu/bin/
> +4. Ensure the GCC toolchain is in your PATH environment variable and define
> the GCC48_ARM_PREFIX environment variable. Example:
> +export
> PATH=$PATH:/opt/toolchains/arm-2010.09-arm-none-eabi-i686-pc-linux-gnu/bin/
> +export GCC48_ARM_PREFIX=arm-none-eabi-
>
> 5. Build the ARM Versatile Express UEFI Firmware
> -build -a ARM -p ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc -t
> ARMGCC
> +build -a ARM -p ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc -t GCC48
>
> 6. Edit the ARM Versatile Express configuration file config.txt to declare
> the location of the UEFI firmware in NOR Flash
> TOTALIMAGES: 5 ;Number of Images (Max : 32)
> @@ -79,25 +80,25 @@ SCC: 0x004 0x00001F09
> By:
> SCC: 0x004 0x10001F09
>
> -8. Copy Build/ArmVExpress-CTA9x4/DEBUG_ARMGCC/FV/SEC_ARMVEXPRESS_EFI.fd to
> the ARM Versatile Express mass storage (available when the board is connected
> through USB to your host machine) under the folder SOTWARE and name
> sec_uefi.bin. Example for cygwin:
> -cp Build/ArmVExpress-CTA9x4/DEBUG_ARMGCC/FV/SEC_ARMVEXPRESS_EFI.fd
> /cygdrive/e/SOFTWARE/sec_uefi.bin
> +8. Copy Build/ArmVExpress-CTA9x4/DEBUG_GCC48/FV/SEC_ARMVEXPRESS_EFI.fd to
> the ARM Versatile Express mass storage (available when the board is connected
> through USB to your host machine) under the folder SOTWARE and name
> sec_uefi.bin. Example for cygwin:
> +cp Build/ArmVExpress-CTA9x4/DEBUG_GCC48/FV/SEC_ARMVEXPRESS_EFI.fd
> /cygdrive/e/SOFTWARE/sec_uefi.bin
>
> 9. Start the ARM Versatile Express board. You should read ?Waiting for
> firmware at 0x80000000 ...? on the serial port.
>
> 10. Copy ARMVEXPRESS_EFI.fd at 0x80000000 with RealView Debugger
> -readfile,raw,nowarn
> "[EDK2_PATH]\Build\ArmVExpress-CTA9x4\DEBUG_ARMGCC\FV\ARMVEXPRESS_EFI.fd"=0x80000000
> +readfile,raw,nowarn
> "[EDK2_PATH]\Build\ArmVExpress-CTA9x4\DEBUG_GCC48\FV\ARMVEXPRESS_EFI.fd"=0x80000000
>
> 11. Resume the execution from RealView Debugger
>
> For all subsequent times
> ************************
> 1. Build ARM Versatile Express UEFI Firmware
> -build -a ARM -p ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc -t
> ARMGCC
> +build -a ARM -p ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc -t GCC48
>
> 2. Start the ARM Versatile Express board. You should read ?Waiting for
> firmware at 0x80000000 ...? on the serial port.
>
> 3. Copy ARMVEXPRESS_EFI.fd at 0x80000000 with RealView Debugger
> -readfile,raw,nowarn
> "[EDK2_PATH]\Build\ArmVExpress-CTA9x4\DEBUG_ARMGCC\FV\ARMVEXPRESS_EFI.fd"=0x80000000
> +readfile,raw,nowarn
> "[EDK2_PATH]\Build\ArmVExpress-CTA9x4\DEBUG_GCC48\FV\ARMVEXPRESS_EFI.fd"=0x80000000
>
> 4. Resume the execution
>
> @@ -125,10 +126,10 @@ To support the standalone mode:
> -------------------------------
> The full ArmVe UEFI firmware can be written into NOR Flash to allow the
> entire boot sequence to be done after a cold boot.
>
> -build -a ARM -p ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc -t
> ARMGCC -D EDK2_ARMVE_STANDALONE=1
> +build -a ARM -p ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc -t
> GCC48 -D EDK2_ARMVE_STANDALONE=1
> ARMVEXPRESS_EFI.fd is required to be copied into the ARM Versatile Express
> board:
> -cp
> Build/ArmVExpress-CTA9x4-Standalone/DEBUG_ARMGCC/FV/SEC_ARMVEXPRESS_EFI.fd
> /cygdrive/e/SOFTWARE/sec_uefi.bin
> -cp Build/ArmVExpress-CTA9x4-Standalone/DEBUG_ARMGCC/FV/ARMVEXPRESS_EFI.fd
> /cygdrive/e/SOFTWARE/uefi.bin
> +cp Build/ArmVExpress-CTA9x4-Standalone/DEBUG_GCC48/FV/SEC_ARMVEXPRESS_EFI.fd
> /cygdrive/e/SOFTWARE/sec_uefi.bin
> +cp Build/ArmVExpress-CTA9x4-Standalone/DEBUG_GCC48/FV/ARMVEXPRESS_EFI.fd
> /cygdrive/e/SOFTWARE/uefi.bin
>
>
> Trustzone Support
> diff --git a/ArmPlatformPkg/Scripts/Makefile b/ArmPlatformPkg/Scripts/Makefile
> index 8f23f7bd3680..b6da154a8664 100644
> --- a/ArmPlatformPkg/Scripts/Makefile
> +++ b/ArmPlatformPkg/Scripts/Makefile
> @@ -11,10 +11,8 @@
> #
> #*/
>
> -# Define the following variables to specify an alternative toolchain to the
> one located in your PATH:
> +# Define the following variable to specify an alternative toolchain to the
> one located in your PATH:
> # - RVCT_TOOLS_PATH: for RVCT and RVCTLINUX toolchains
> -# - ARMGCC_TOOLS_PATH: for ARMGCC toolchain
> -# - ARMLINUXGCC_TOOLS_PATH: for ARMLINUXGCC
>
> EDK2_TOOLCHAIN ?= RVCTLINUX
> EDK2_ARCH ?= ARM
> --
> 1.9.1
>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
