ArmPlatformPkg: remove mention of ARMGCC and ARMLINUXGCC

Remove the ARMGCC and ARMLINUXGCC from comments in the respective
Makefiles of ArmPlatformPkg and ArmJunoPkg. Also drop the wildly
outdated Versatile Express instructions, since they refer to ARMGCC
as well.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18209 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/ArmJunoPkg/Makefile b/ArmPlatformPkg/ArmJunoPkg/Makefile
index 71828f3f2c0d5059a7548c28e08c83c66fbd6b42..d8d1f8465a018bda657ed26690ea1205155b1cca 100644 (file)
--- 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
deleted file mode 100644 (file)
index a3fe9d7..0000000
--- a/ArmPlatformPkg/Documentation/ArmVExpressInstructions.txt
+++ /dev/null
@@ -1,169 +0,0 @@
-=======================================\r
-= ARM Versatile Express Documentation =\r
-=======================================\r
-\r
-Status\r
-------\r
-Build and Run on EDK2 Subversion revision 11837\r
-Requirements \r
--      RVCTv3 (untested) or RVCTv4 or ARMGCC (Code Sourcery q201009)\r
--      Using Ubuntu: gcc, make, uuid-dev \r
--      Using Cygwin: gcc, make, e2fsprogs (needed for uuid.h) \r
-\r
-Serial Terminal settings \r
--      Baud Rates: 38400\r
-- Data: 8 bit\r
-- Parity: None\r
-- Flow Control: None \r
-\r
-\r
-Use ICE debugger with Versatile Express \r
----------------------------------------\r
-Prior to use ICE debugger with Versatile Express, you will need to update the version of the ICE's firmware.\r
-If you have not installed RealView 4.0 SP3, do it.\r
-Open "RealView ICE Update" and "Install Firmware Update ...". Install "[ARM_INSTALL_PATH]\RVI\Firmware\3.4\11\ARM-RVI-3.4.0-25-base.rvi" and "[ARM_INSTALL_PATH]\RVI\Firmware\3.4\22\ARM-RVI-3.4.59-59-patch.rvi". \r
-\r
-\r
-Howto build UEFI Versatile Express\r
-----------------------------------\r
-For Linux\r
----------\r
-\r
-For the first time \r
-******************\r
-1. Get EDK2 from Tianocore Subversion repository\r
-svn co https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2 edk2 --username guest\r
- \r
-2. Get FatPkg from EDK2 SVN repository: \r
-cd edk2\r
-svn co https://edk2-fatdriver2.svn.sourceforge.net/svnroot/edk2-fatdriver2/trunk/FatPkg FatPkg --username guest\r
-\r
-3. Set up the environment. And build the EDK2\92s tools\r
-export EDK_TOOLS_PATH=`pwd`/BaseTools\r
-. edksetup.sh\r
-make -C $EDK_TOOLS_PATH\r
-\r
-4. Ensure the ARMGCC toolchain is in your PATH environment variable or defined by the ARMGCC_TOOLS_PATH environment variable. Example:\r
-export ARMGCC_TOOLS_PATH=/opt/toolchains/arm-2010.09-arm-none-eabi-i686-pc-linux-gnu/bin/\r
-\r
-5. Build the ARM Versatile Express UEFI Firmware\r
-build -a ARM -p ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc -t ARMGCC\r
-\r
-6. Edit the ARM Versatile Express configuration file config.txt to declare the location of the UEFI firmware in NOR Flash\r
-TOTALIMAGES: 5                   ;Number of Images (Max : 32)\r
-NOR0UPDATE: AUTO                 ;Image Update:NONE/AUTO/FORCE\r
-NOR0ADDRESS: BOOT                ;Image Flash Address\r
-NOR0FILE: \SOFTWARE\bm_v209.axf  ;Image File Name\r
-NOR1UPDATE: AUTO                 ;IMAGE UPDATE:NONE/AUTO/FORCE\r
-NOR1ADDRESS: 44000000            ;Image Flash Address\r
-NOR1FILE: \SOFTWARE\sec_uefi.bin ;Image File Name\r
-NOR1LOAD: 0                      ;Image Load Address\r
-NOR1ENTRY: 0                     ;Image Entry Point\r
-NOR2UPDATE: AUTO                 ;IMAGE UPDATE:NONE/AUTO/FORCE\r
-NOR2ADDRESS: 45000000            ;Image Flash Address\r
-NOR2FILE: \SOFTWARE\uefi.bin     ;Image File Name\r
-NOR2LOAD: 45000000               ;Image Load Address\r
-NOR2ENTRY: 45000000              ;Image Entry Point\r
-NOR3UPDATE: AUTO                 ;IMAGE UPDATE:NONE/AUTO/FORCE\r
-NOR3ADDRESS: 46000000            ;Image Flash Address\r
-NOR3FILE: \SOFTWARE\kernel.bin   ;Image File Name\r
-NOR3LOAD: 46000000               ;Image Load Address\r
-NOR3ENTRY: 46000000              ;Image Entry Point\r
-NOR4UPDATE: AUTO                 ;IMAGE UPDATE:NONE/AUTO/FORCE\r
-NOR4ADDRESS: 40000000            ;Image Flash Address\r
-NOR4NAME: BOOTSCRIPT             ;Image Name\r
-NOR4FILE: \SOFTWARE\bootscr.txt  ;Image File Name\r
-\r
-7. To select second NOR Flash as a booting device, replace in the ARM Versatile Express file \SITE1\HBI0191B\board.txt:\r
-SCC: 0x004 0x00001F09\r
-By:\r
-SCC: 0x004 0x10001F09\r
-\r
-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:\r
-cp Build/ArmVExpress-CTA9x4/DEBUG_ARMGCC/FV/SEC_ARMVEXPRESS_EFI.fd /cygdrive/e/SOFTWARE/sec_uefi.bin\r
-\r
-9. Start the ARM Versatile Express board. You should read \93Waiting for firmware at 0x80000000 ...\94 on the serial port. \r
-\r
-10. Copy ARMVEXPRESS_EFI.fd at 0x80000000 with RealView Debugger\r
-readfile,raw,nowarn "[EDK2_PATH]\Build\ArmVExpress-CTA9x4\DEBUG_ARMGCC\FV\ARMVEXPRESS_EFI.fd"=0x80000000\r
-\r
-11. Resume the execution from RealView Debugger\r
-\r
-For all subsequent times\r
-************************\r
-1. Build ARM Versatile Express UEFI Firmware\r
-build -a ARM -p ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc -t ARMGCC\r
-\r
-2. Start the ARM Versatile Express board. You should read \93Waiting for firmware at 0x80000000 ...\94 on the serial port. \r
-\r
-3. Copy ARMVEXPRESS_EFI.fd at 0x80000000 with RealView Debugger\r
-readfile,raw,nowarn "[EDK2_PATH]\Build\ArmVExpress-CTA9x4\DEBUG_ARMGCC\FV\ARMVEXPRESS_EFI.fd"=0x80000000\r
-\r
-4. Resume the execution \r
-\r
-\r
-For RealView Compiler Toolchain on Windows\r
-------------------------------------------\r
-The command line window needs to be the one from Visual Studio to get the environment variables required to get some development tools (the windows compiler for BaseTools and `nmake`).\r
-The EDK2 toolchain name for ARM RealView Compiler Toolchain under a Windows environment is `RVCT`. The EDK2 build system will automatically pick up the RVCT toolchain defined in your PATH. If you want to use a specific version, set the environment variable 'RVCT_TOOLS_PATH': \r
-set RVCT_TOOLS_PATH=[YOUR_TOOLCHAIN_PATH]\r
-\r
-\r
-For RealView Compiler Toolchain on Linux\r
-----------------------------------------\r
-The EDK2 toolchain name for ARM RealView under a Linux environment is `RVCTLINUX`. The EDK2 build system will automatically pick up the RVCT toolchain defined in your PATH. If you want to use a specific version, set the environment variable 'RVCT_TOOLS_PATH': \r
-export RVCT_TOOLS_PATH=[YOUR_TOOLCHAIN_PATH]\r
-\r
-\r
-For RVCT on Cygwin\r
-------------------\r
-The EDK2 toolchain name for ARM RealView under a Cygwin environment is `RVCTCYGWIN`. The EDK2 build system will automatically pick up the RVCT toolchain defined in your PATH. If you want to use a specific version, set the environment variable 'RVCT_TOOLS_PATH': \r
-export RVCT_TOOLS_PATH=[YOUR_TOOLCHAIN_PATH]\r
-\r
-\r
-To support the standalone mode:\r
--------------------------------\r
-The full ArmVe UEFI firmware can be written into NOR Flash to allow the entire boot sequence to be done after a cold boot.\r
-\r
-build -a ARM -p ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc -t ARMGCC -D EDK2_ARMVE_STANDALONE=1\r
-ARMVEXPRESS_EFI.fd is required to be copied into the ARM Versatile Express board:\r
-cp Build/ArmVExpress-CTA9x4-Standalone/DEBUG_ARMGCC/FV/SEC_ARMVEXPRESS_EFI.fd /cygdrive/e/SOFTWARE/sec_uefi.bin\r
-cp Build/ArmVExpress-CTA9x4-Standalone/DEBUG_ARMGCC/FV/ARMVEXPRESS_EFI.fd /cygdrive/e/SOFTWARE/uefi.bin\r
-\r
-\r
-Trustzone Support\r
------------------\r
-ArmVE's UEFI supports booting Trustzone (two worlds: Secure and Normal Worlds) and No Trustzone (one world: the CPU remains in Secure World) supports. Trustzone support is enabled by Enabling SMC TZASC in the Test Chip SCC Register 1. This register can only be changed by editing the configuration file of your Versatile Express board: E:\SITE1\HBI0191B\board.txt Changing: \r
-SCC: 0x004 0x10001F09\r
-For: \r
-SCC: 0x004 0x10003F09\r
-\r
-\r
-Booting Linux\r
--------------\r
-The default entry in the ARM Boot Manager is defined by the PCDs:\r
-\r
-- gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"NorFlash"\r
-- gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)/MemoryMapped(0,0x46000000,0x462F0000)"\r
-- gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|"root=/dev/sda2 rootwait debug earlyprintk console=ttyAMA0,38400 mem=1G"\r
-- gArmPlatformTokenSpaceGuid.PcdDefaultBootType|1\r
-\r
-The PCD PcdDefaultBootDevicePath expects a Device Path conforms to the UEFI specification.\r
-PcdDefaultBootType defines the type of the image pointed by PcdDefaultBootDevicePath.\r
--      PcdDefaultBootDevicePath = 0 for an EFI Application\r
--      PcdDefaultBootDevicePath = 1 for a legacy kernel with ATAG support\r
--      PcdDefaultBootDevicePath = 2 for a kernel with Flat Device Tree (FDT) support\r
-\r
-Example of UEFI Device Path: \r
-\r
-// Load FDT binary from the Firmware Volume (mapped at 0x80000000)\r
-#define LINUX_KERNEL  L"MemoryMapped(11,0x80000000,0x6FEFFFFF)\\zImage.fdt"\r
-\r
-// Linux Kernel from a SD Card\r
-#define LINUX_KERNEL    L"VenHw(621B6FA5-4DC1-476F-B9D8-52C557D81070)/HD(1,MBR,0x00000000,0xF9,0x3C8907)\\boot\\zImage.fdt"\r
-\r
-// Kernel from SATA HD - Partition 2\r
-#define LINUX_KERNEL    L"Acpi(PNP0A03,0)/Pci(0|0)/Pci(0|0)/Pci(5|0)/Pci(0|0)/Sata(0,0,0)/HD(2,MBR,0x00076730,0x1F21BF,0x1F21BF)\\boot\\zImage.fdt"\r
-\r
-// Kernel from NOR Flash\r
-#define LINUX_KERNEL            L"VenHw(02118005-9DA7-443a-92D5-781F022AEDBB)/MemoryMapped(0,0x46000000,0x462F0000)"\r

diff --git a/ArmPlatformPkg/Scripts/Makefile b/ArmPlatformPkg/Scripts/Makefile
index 8f23f7bd36809523425b0f1089829a1db9076899..b6da154a866471d06ba39c9623285bcb86c58bce 100644 (file)
--- a/ArmPlatformPkg/Scripts/Makefile
+++ b/ArmPlatformPkg/Scripts/Makefile
@@ -11,10 +11,8 @@
 #\r
 #*/\r
 \r
-# Define the following variables to specify an alternative toolchain to the one located in your PATH:\r
+# Define the following variable to specify an alternative toolchain to the one located in your PATH:\r
 # - RVCT_TOOLS_PATH: for RVCT and RVCTLINUX toolchains\r
-# - ARMGCC_TOOLS_PATH: for ARMGCC toolchain\r
-# - ARMLINUXGCC_TOOLS_PATH: for ARMLINUXGCC\r
 \r
 EDK2_TOOLCHAIN ?= RVCTLINUX\r
 EDK2_ARCH ?= ARM\r