summaryrefslogtreecommitdiffstats
path: root/resources/scripts
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2016-03-10 23:20:52 (EST)
committer Francis Rowe <info@gluglug.org.uk>2016-03-10 23:25:57 (EST)
commit464076335d6ca5e6f801f863e95dc3847616a595 (patch)
tree0cb308ea155de7d0a65bba2de23cfbee92ebed60 /resources/scripts
parent2d68bc1581647ca27ce8350a295de03cb7ff23d8 (diff)
downloadlibreboot-464076335d6ca5e6f801f863e95dc3847616a595.zip
libreboot-464076335d6ca5e6f801f863e95dc3847616a595.tar.gz
libreboot-464076335d6ca5e6f801f863e95dc3847616a595.tar.bz2
Remove ThinkPad R500 support (wasn't ready for production use yet anyway)
R500 support in its current state should not be merged in the master branch. This will likely not make it into the immediate upcoming release. This patch will be reverted in a separate experimental branch, for the time being.
Diffstat (limited to 'resources/scripts')
-rwxr-xr-xresources/scripts/helpers/build/roms/withgrub24
-rwxr-xr-xresources/scripts/helpers/build/roms/withgrub_helper4
2 files changed, 4 insertions, 24 deletions
diff --git a/resources/scripts/helpers/build/roms/withgrub b/resources/scripts/helpers/build/roms/withgrub
index 3ef295a..f3d2946 100755
--- a/resources/scripts/helpers/build/roms/withgrub
+++ b/resources/scripts/helpers/build/roms/withgrub
@@ -91,27 +91,11 @@ do
fi
done
-# TEMPORARY HACK: copy t400* to r500*
-# (until proper R500 support is added)
-if [ -d "bin/grub/" ]; then
- cd "bin/grub/"
- for board in "t400"
- do
- for romsize in "4m" "8m"
- do
- if [ -d "${board}_${romsize}b/" ]; then
- cp -R "${board}_${romsize}b/" "r500_${romsize}b/"
- fi
- done
- done
- cd ../../
-fi
-
# Build the deblobbed descriptor+gbe regions for GM45/ICH9M targets.
# Then put them in the ROM images.
if [ -d "bin/grub/" ]; then
cd "bin/grub/"
- for board in "x200" "r400" "r500" "t400" "t500"
+ for board in "x200" "r400" "t400" "t500"
do
for romsize in "4m" "8m"
do
@@ -124,11 +108,7 @@ if [ -d "bin/grub/" ]; then
fi
for rom in *.rom
do
- if [ "${board}" = "r500" ]; then
- dd if="ich9fdnogbe_${romsize}.bin" of="${rom}" bs=1 count=4k conv=notrunc
- else
- dd if="ich9fdgbe_${romsize}.bin" of="${rom}" bs=1 count=12k conv=notrunc
- fi
+ dd if="ich9fdgbe_${romsize}.bin" of="${rom}" bs=1 count=12k conv=notrunc
done
rm -f "ich9fd"*.bin "mk"*.[ch]
cd "../"
diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper
index 16e861e..efed9bd 100755
--- a/resources/scripts/helpers/build/roms/withgrub_helper
+++ b/resources/scripts/helpers/build/roms/withgrub_helper
@@ -88,7 +88,7 @@ fi
for romtype in txtmode vesafb
do
- if [ "${boardtarget}" = "x200_8mb" ] || [ "${boardtarget}" = "x200_4mb" ] || [ "${boardtarget}" = "r400_8mb" ] || [ "${boardtarget}" = "r400_4mb" ] || [ "${boardtarget}" = "r500_8mb" ] || [ "${boardtarget}" = "r500_4mb" ] || [ "${boardtarget}" = "t400_8mb" ] || [ "${boardtarget}" = "t400_4mb" ] || [ "${boardtarget}" = "t500_8mb" ] || [ "${boardtarget}" = "t500_4mb" ]
+ if [ "${boardtarget}" = "x200_8mb" ] || [ "${boardtarget}" = "x200_4mb" ] || [ "${boardtarget}" = "r400_8mb" ] || [ "${boardtarget}" = "r400_4mb" ] || [ "${boardtarget}" = "t400_8mb" ] || [ "${boardtarget}" = "t400_4mb" ] || [ "${boardtarget}" = "t500_8mb" ] || [ "${boardtarget}" = "t500_4mb" ]
then
if [ "${romtype}" = "txtmode" ]
then
@@ -118,7 +118,7 @@ do
# Add the background image
if [ "$romtype" = "vesafb" ]
then
- if [ "$1" = "macbook21" ] || [ "$1" = "x200_4mb" ] || [ "$1" = "x200_8mb" ] || [ "$1" = "r400_4mb" ] || [ "$1" = "r400_8mb" ] || [ "$1" = "r500_4mb" ] || [ "$1" = "r500_8mb" ] || [ "$1" = "t400_4mb" ] || [ "$1" = "t400_8mb" ] || [ "$1" = "t500_4mb" ] || [ "$1" = "t500_8mb" ]
+ if [ "$1" = "macbook21" ] || [ "$1" = "x200_4mb" ] || [ "$1" = "x200_8mb" ] || [ "$1" = "r400_4mb" ] || [ "$1" = "r400_8mb" ] || [ "$1" = "t400_4mb" ] || [ "$1" = "t400_8mb" ] || [ "$1" = "t500_4mb" ] || [ "$1" = "t500_8mb" ]
then
./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add -f ../../../resources/grub/background/background1280x800.png -n background.png -t raw
else