diff --git a/BeagleBoardPkg/b.bat b/BeagleBoardPkg/b.bat
deleted file mode 100755
index 76ddea68bd..0000000000
--- a/BeagleBoardPkg/b.bat
+++ /dev/null
@@ -1,68 +0,0 @@
-@REM Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-@REM
-
-@REM Example usage of this script. default is a DEBUG build
-@REM b
-@REM b clean
-@REM b release
-@REM b release clean
-@REM b -v -y build.log
-
-ECHO OFF
-@REM Setup Build environment. Sets WORKSPACE and puts build in path
-CALL ..\edksetup.bat
-
-@REM Set for tools chain. Currently RVCT
-SET TARGET_TOOLS=RVCT
-SET TARGET=DEBUG
-
-@if /I "%1"=="RELEASE" (
- @REM If 1st argument is release set TARGET to RELEASE and shift arguments to remove it
- SET TARGET=RELEASE
- shift /1
-)
-
-SET BUILD_ROOT=%WORKSPACE%\Build\BeagleBoard\%TARGET%_%TARGET_TOOLS%
-
-@REM Build the Beagle Board firmware and creat an FD (FLASH Device) Image.
-CALL build -p BeagleBoardPkg\BeagleBoardPkg.dsc -a ARM -t %TARGET_TOOLS% -b %TARGET% %1 %2 %3 %4 %5 %6 %7 %8
-@if ERRORLEVEL 1 goto Exit
-
-@if /I "%1"=="CLEAN" goto Clean
-
-@REM
-@REM Ram starts at 0x80000000
-@REM OMAP 3530 TRM defines 0x80008208 as the entry point
-@REM The reset vector is caught by the mask ROM in the OMAP 3530 so that is why this entry
-@REM point looks so strange.
-@REM OMAP 3430 TRM section 26.4.8 has Image header information. (missing in OMAP 3530 TRM)
-@REM
-@cd Tools
-
-ECHO Building tools...
-CALL nmake
-
-ECHO Patching image with ConfigurationHeader.dat
-CALL GenerateImage -D ..\ConfigurationHeader.dat -E 0x80008208 -I %BUILD_ROOT%\FV\BEAGLEBOARD_EFI.fd -O %BUILD_ROOT%\FV\BeagleBoard_EFI_flashboot.fd
-
-ECHO Patching ..\Debugger_scripts ...
-SET DEBUGGER_SCRIPT=..\Debugger_scripts
-@for /f %%a IN ('dir /b %DEBUGGER_SCRIPT%\*.inc %DEBUGGER_SCRIPT%\*.cmm') do (
- @CALL replace %DEBUGGER_SCRIPT%\%%a %BUILD_ROOT%\%%a ZZZZZZ %BUILD_ROOT% WWWWWW %WORKSPACE%
-)
-
-cd ..
-:Exit
-EXIT /B
-
-:Clean
-cd Tools
-CALL nmake clean
-cd ..
diff --git a/BeagleBoardPkg/ba.bat b/BeagleBoardPkg/ba.bat
deleted file mode 100755
index 24a60e46d8..0000000000
--- a/BeagleBoardPkg/ba.bat
+++ /dev/null
@@ -1,68 +0,0 @@
-@REM Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the BSD License
-@REM which accompanies this distribution. The full text of the license may be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-@REM
-
-@REM Example usage of this script. default is a DEBUG build
-@REM b
-@REM b clean
-@REM b release
-@REM b release clean
-@REM b -v -y build.log
-
-ECHO OFF
-@REM Setup Build environment. Sets WORKSPACE and puts build in path
-CALL ..\edksetup.bat
-
-@REM Set for tools chain. Currently ARMGCC
-SET TARGET_TOOLS=ARMGCC
-SET TARGET=DEBUG
-
-@if /I "%1"=="RELEASE" (
- @REM If 1st argument is release set TARGET to RELEASE and shift arguments to remove it
- SET TARGET=RELEASE
- shift /1
-)
-
-SET BUILD_ROOT=%WORKSPACE%\Build\BeagleBoard\%TARGET%_%TARGET_TOOLS%
-
-@REM Build the Beagle Board firmware and creat an FD (FLASH Device) Image.
-CALL build -p BeagleBoardPkg\BeagleBoardPkg.dsc -a ARM -t %TARGET_TOOLS% -b %TARGET% %1 %2 %3 %4 %5 %6 %7 %8
-@if ERRORLEVEL 1 goto Exit
-
-@if /I "%1"=="CLEAN" goto Clean
-
-@REM
-@REM Ram starts at 0x80000000
-@REM OMAP 3530 TRM defines 0x80008208 as the entry point
-@REM The reset vector is caught by the mask ROM in the OMAP 3530 so that is why this entry
-@REM point looks so strange.
-@REM OMAP 3430 TRM section 26.4.8 has Image header information. (missing in OMAP 3530 TRM)
-@REM
-@cd Tools
-
-ECHO Building tools...
-CALL nmake
-
-ECHO Patching image with ConfigurationHeader.dat
-CALL GenerateImage -D ..\ConfigurationHeader.dat -E 0x80008208 -I %BUILD_ROOT%\FV\BEAGLEBOARD_EFI.fd -O %BUILD_ROOT%\FV\BeagleBoard_EFI_flashboot.fd
-
-ECHO Patching ..\Debugger_scripts ...
-SET DEBUGGER_SCRIPT=..\Debugger_scripts
-@for /f %%a IN ('dir /b %DEBUGGER_SCRIPT%\*.inc %DEBUGGER_SCRIPT%\*.cmm') do (
- @CALL replace %DEBUGGER_SCRIPT%\%%a %BUILD_ROOT%\%%a ZZZZZZ %BUILD_ROOT% WWWWWW %WORKSPACE%
-)
-
-cd ..
-:Exit
-EXIT /B
-
-:Clean
-cd Tools
-CALL nmake clean
-cd ..
diff --git a/BeagleBoardPkg/build.sh b/BeagleBoardPkg/build.sh
deleted file mode 100755
index ad8e69fc24..0000000000
--- a/BeagleBoardPkg/build.sh
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-
-set -e
-shopt -s nocasematch
-
-function process_debug_scripts {
- if [[ -d $1 ]]; then
- for filename in `ls $1`
- do
- sed -e "s@ZZZZZZ@$BUILD_ROOT@g" -e "s@WWWWWW@$WORKSPACE@g" \
- "$1/$filename" \
- > "$BUILD_ROOT/$filename"
-
- #For ARMCYGWIN, we have to change /cygdrive/c to c:
- if [[ $TARGET_TOOLS == RVCT31CYGWIN ]]
- then
- mv "$BUILD_ROOT/$filename" "$BUILD_ROOT/$filename"_temp
- sed -e "s@/cygdrive/\(.\)@\1:@g" \
- "$BUILD_ROOT/$filename"_temp \
- > "$BUILD_ROOT/$filename"
- rm -f "$BUILD_ROOT/$filename"_temp
- fi
- done
- fi
-}
-
-
-#
-# Setup workspace if it is not set
-#
-if [ -z "${WORKSPACE:-}" ]
-then
- echo Initializing workspace
- cd ..
-# Uses an external BaseTools project
-# export EDK_TOOLS_PATH=`pwd`/../BaseTools
-# Uses the BaseTools in edk2
- export EDK_TOOLS_PATH=`pwd`/BaseTools
- source edksetup.sh BaseTools
-else
- echo Building from: $WORKSPACE
-fi
-
-#
-# Pick a default tool type for a given OS if no toolchain already defined
-#
-if [ -z "${TARGET_TOOLS:-}" ]
-then
- case `uname` in
- CYGWIN*)
- TARGET_TOOLS=RVCT31CYGWIN
- ;;
- Linux*)
- if [[ ! -z `locate arm-linux-gnueabi-gcc` ]]; then
- TARGET_TOOLS=ARMLINUXGCC
- else
- TARGET_TOOLS=ARMGCC
- fi
- ;;
- Darwin*)
- Major=$(uname -r | cut -f 1 -d '.')
- if [[ $Major == 9 ]]
- then
- # Not supported by this open source project
- TARGET_TOOLS=XCODE31
- else
- TARGET_TOOLS=XCODE32
- fi
- ;;
- esac
-fi
-
-TARGET=DEBUG
-for arg in "$@"
-do
- if [[ $arg == RELEASE ]];
- then
- TARGET=RELEASE
- fi
-done
-
-BUILD_ROOT=$WORKSPACE/Build/BeagleBoard/"$TARGET"_"$TARGET_TOOLS"
-GENERATE_IMAGE=$WORKSPACE/BeagleBoardPkg/Tools/generate_image
-FLASH_BOOT=$BUILD_ROOT/FV/BeagleBoard_EFI_flashboot.fd
-
-if [[ ! -e $EDK_TOOLS_PATH/Source/C/bin ]];
-then
- # build the tools if they don't yet exist
- echo Building tools: $EDK_TOOLS_PATH
- make -C $EDK_TOOLS_PATH
-else
- echo using prebuilt tools
-fi
-
-#
-# Build the edk2 BeagleBoard code
-#
-if [[ $TARGET == RELEASE ]]; then
- build -p $WORKSPACE/BeagleBoardPkg/BeagleBoardPkg.dsc -a ARM -t $TARGET_TOOLS -b $TARGET -D DEBUG_TARGET=RELEASE ${2:-} ${3:-} ${4:-} ${5:-} ${6:-} ${7:-} ${8:-}
-else
- build -p ${WORKSPACE:-}/BeagleBoardPkg/BeagleBoardPkg.dsc -a ARM -t $TARGET_TOOLS -b $TARGET ${1:-} ${2:-} ${3:-} ${4:-} ${5:-} ${6:-} ${7:-} ${8:-}
-fi
-
-
-for arg in "$@"
-do
- if [[ $arg == clean ]]; then
- # no need to post process if we are doing a clean
- exit
- elif [[ $arg == cleanall ]]; then
- make -C $EDK_TOOLS_PATH clean
- make -C $WORKSPACE/BeagleBoardPkg/Tools clean
- exit
-
- fi
-done
-
-
-#
-# Build the tool used to patch the FLASH image to work with the Beagle board ROM
-#
-if [[ ! -e $GENERATE_IMAGE ]];
-then
- make -C $WORKSPACE/BeagleBoardPkg/Tools
-fi
-
-echo Patching FD to work with BeagleBoard ROM
-rm -f $FLASH_BOOT
-
-#
-# Ram starts at 0x80000000
-# OMAP 3530 TRM defines 0x80008000 as the entry point
-# The reset vector is caught by the mask ROM in the OMAP 3530 so that is why this entry
-# point looks so strange.
-# OMAP 3430 TRM section 26.4.8 has Image header information. (missing in OMAP 3530 TRM)
-#
-$GENERATE_IMAGE -D $WORKSPACE/BeagleBoardPkg/ConfigurationHeader.dat -E 0x80008000 -I $BUILD_ROOT/FV/BEAGLEBOARD_EFI.fd -O $FLASH_BOOT
-
-echo Creating debugger scripts
-process_debug_scripts $WORKSPACE/BeagleBoardPkg/Debugger_scripts
-
diff --git a/BeagleBoardPkg/readme.txt b/BeagleBoardPkg/readme.txt
deleted file mode 100644
index 702b77b174..0000000000
--- a/BeagleBoardPkg/readme.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-On Ubuntu 10.04, in your $(WORKROOT) directory (eg: ~/dev/)
-
-Build UEFI for the BeagleBoard :
-================================
-# Requirements
-sudo apt-get install uuid-dev
-
-# Get the arm-none-eabi Toolchain:
-cd $(WORKROOT)
-wget http://www.codesourcery.com/sgpp/lite/arm/portal/package7813/public/arm-none-eabi/arm-2010.09-51-arm-none-eabi-i686-pc-linux-gnu.tar.bz2
-tar xjf arm-2010.09-51-arm-none-eabi-i686-pc-linux-gnu.tar.bz2
-Add the arm-none-eabi toolchain to your path
-
-# Build UEFI
-svn co https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2 edk2 --username guest
-cd $(WORKROOT)/edk2
-svn co https://edk2-fatdriver2.svn.sourceforge.net/svnroot/edk2-fatdriver2/trunk/FatPkg FatPkg --username guest
-patch -p1 < ArmPlatformPkg/Documentation/patches/BaseTools-Pending-Patches.patch
-cd BeagleBoardPkg/
-./build.sh
-
-# To Build a Release verion of UEFI
-./build.sh RELEASE
-
-
-Test UEFI on qEmu :
-===================
-
-Installing Linaro qEmu:
------------------------
-cd $(WORKROOT)
-git clone git://git.linaro.org/qemu/qemu-linaro.git
-cd $(WORKROOT)/qemu-linaro
-./configure --target-list=arm-softmmu,arm-linux-user,armeb-linux-user
-make
-
-Installing Linaro image Creator:
---------------------------------
-wget http://launchpad.net/linaro-image-tools/trunk/0.4.8/+download/linaro-image-tools-0.4.8.tar.gz
-tar xzf linaro-image-tools-0.4.8.tar.gz
-cd $(WORKROOT)/linaro-image-tools-0.4.8/
-sudo apt-get install parted dosfstools uboot-mkimage python-argparse python-dbus python-debian python-parted qemu-arm-static btrfs-tools command-not-found
-
-Creating u-boot + Linux Linaro image:
--------------------------------------
-mkdir $(WORKROOT)/beagle_image && cd $(WORKROOT)/beagle_image
-wget http://releases.linaro.org/platform/linaro-m/hwpacks/final/hwpack_linaro-omap3_20101109-1_armel_supported.tar.gz
-wget http://releases.linaro.org/platform/linaro-m/headless/release-candidate/linaro-m-headless-tar-20101101-0.tar.gz
-sudo $(WORKROOT)/linaro-image-tools-0.4.8/linaro-media-create --image_file beagle_sd.img --dev beagle --binary linaro-m-headless-tar-20101101-0.tar.gz --hwpack hwpack_linaro-omap3_20101109-1_armel_supported.tar.gz
-sudo chmod a+rw beagle_sd.img
-
-Test u-boot + Linux Linaro image on qEmu:
------------------------------------------
-$(WORKROOT)/qemu-linaro/arm-softmmu/qemu-system-arm -M beagle -sd $(WORKROOT)/beagle_image/beagle_sd.img -serial stdio -clock unix
-# in u-boot:
-boot
-
-Start UEFI from NOR Flash :
----------------------------
-# Adding zImage to beagle_sd.img
-mkdir /tmp/beagle_img1
-sudo mount -o loop,offset=$[63*512] $(WORKROOT)/beagle_image/beagle_sd.img /tmp/beagle_img1
-cp zImage /tmp/beagle_img1
-sudo umount /tmp/beagle_img1
-
-./qemu-system-arm -M beagle -mtdblock /work/tianocore/Build/BeagleBoard/DEBUG_ARMGCC/FV/BeagleBoard_EFI_flashboot.fd -serial stdio -sd /work/linaro-image-tools-0.4.8/beagle_sd.img
-
-Start UEFI from SD card :
--------------------------
-# To replace u-boot by uefi in the SD card
-1) Build the BeagleBoard UEFI firmware without the OMAP353x header
-cd $(WORKROOT)/edk2/BeagleBoardPkg/
-./build.sh -D EDK2_SECOND_STAGE_BOOTOLADER=1
-
-2) Replace u-boot by UEFI
-sudo mount -o loop,offset=$[63*512] $(WORKROOT)/beagle_image/beagle_sd.img /tmp/beagle_img1
-sudo cp ../Build/BeagleBoard/DEBUG_ARMGCC/FV/BEAGLEBOARD_EFI.fd /tmp/beagle_img1/u-boot.bin
-sudo umount /tmp/beagle_img1