summaryrefslogtreecommitdiffstats
path: root/resources/scripts/helpers/build
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-07-18 19:31:16 (EDT)
committer Francis Rowe <info@gluglug.org.uk>2015-09-20 04:06:27 (EDT)
commitd1bb5d6fcc75f07ca6a58b5536906980aff9d253 (patch)
tree7821900fe16ece180a021957371a7c0b798922dd /resources/scripts/helpers/build
parent919af0e6b7cbff2171d370a0b830f2b9d740410b (diff)
downloadlibreboot-d1bb5d6fcc75f07ca6a58b5536906980aff9d253.zip
libreboot-d1bb5d6fcc75f07ca6a58b5536906980aff9d253.tar.gz
libreboot-d1bb5d6fcc75f07ca6a58b5536906980aff9d253.tar.bz2
New board: ThinkPad R500 (experimental)
The ich9deblob and ich9gen utilities were modified, so that they support reading and/or writing descriptor images where the GbE region is not defined. These utilities were also re-factored and tidied up a bit. A quick was noticed during the course of this work, in that Compenent 1 Density was being set to 8MiB constantly, even on systems with 4MiB flash chips. Component 2 Density was set statically to 2MiB. ich9gen now sets both to 4MiB or 8MiB, depending on whether building the descriptor for a 4MiB or 8MiB ROM image. There are still some ACPI bugs (see docs/hcl/r500.html), which will have to be fixed upstream. TODO: get hw reg dumps from a factory R500, and compare with the X200 or T400 dumps.
Diffstat (limited to 'resources/scripts/helpers/build')
-rwxr-xr-xresources/scripts/helpers/build/roms/withgrub24
-rwxr-xr-xresources/scripts/helpers/build/roms/withgrub_helper4
2 files changed, 24 insertions, 4 deletions
diff --git a/resources/scripts/helpers/build/roms/withgrub b/resources/scripts/helpers/build/roms/withgrub
index 1463e69..84c009d 100755
--- a/resources/scripts/helpers/build/roms/withgrub
+++ b/resources/scripts/helpers/build/roms/withgrub
@@ -92,11 +92,27 @@ 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" "t400" "t500"
+ for board in "x200" "r400" "r500" "t400" "t500"
do
for romsize in "4m" "8m"
do
@@ -105,7 +121,11 @@ if [ -d "bin/grub/" ]; then
../../../resources/utilities/ich9deblob/ich9gen
for rom in *
do
- dd if="ich9fdgbe_${romsize}.bin" of="${rom}" bs=1 count=12k conv=notrunc
+ 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
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 4869ae7..87aa214 100755
--- a/resources/scripts/helpers/build/roms/withgrub_helper
+++ b/resources/scripts/helpers/build/roms/withgrub_helper
@@ -64,7 +64,7 @@ fi
for romtype in txtmode vesafb
do
- 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" ]
+ 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" ]
then
if [ "${romtype}" = "txtmode" ]
then
@@ -90,7 +90,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" = "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" = "r500_4mb" ] || [ "$1" = "r500_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