diff options
| -rwxr-xr-x | build-release | 33 | ||||
| -rwxr-xr-x | builddeps-coreboot | 7 | ||||
| -rwxr-xr-x | cleandeps | 3 | ||||
| -rw-r--r-- | docs/git/index.html | 4 | ||||
| -rw-r--r-- | docs/release.html | 1 |
5 files changed, 43 insertions, 5 deletions
diff --git a/build-release b/build-release index b903b3f..27206fb 100755 --- a/build-release +++ b/build-release @@ -258,7 +258,7 @@ cd ../../ # build nvramtool, compiled (statically linked) and include the binary cd coreboot/util/ cp -r nvramtool nvramtool_ -cd nvramtool +cd nvramtool/ make clean make SHARED=0 CC='gcc -static' mkdir ../../../libreboot_bin/nvramtool @@ -283,6 +283,37 @@ rm -rf nvramtool mv nvramtool_ nvramtool cd ../../ +# ----------------- +# cbmem related +# ----------------- +# build cbmem, compiled (statically linked) and include the binary +cd coreboot/util/ +cp -r cbmem cbmem_ +cd cbmem/ +make clean +make SHARED=0 CC='gcc -static' +mkdir ../../../libreboot_bin/cbmem +if [ $(uname -i) = "i686" ] || [ $(uname -m) = "i686" ] + then + # User is building on 32-bit host. Build only 32-bit binaries + mkdir ../../../libreboot_bin/cbmem/i686 + mv cbmem ../../../libreboot_bin/cbmem/i686/ +elif [ $(uname -i) = "x86_64" ] || $(uname -m) = "x86_64" + then + # Build the 64-bit binaries + mkdir ../../../libreboot_bin/cbmem/x86_64 + mv cbmem ../../../libreboot_bin/cbmem/x86_64/ + # Now build 32-bit binaries + make clean + make SHARED=0 CC='gcc -static -m32' + mkdir ../../../libreboot_bin/cbmem/i686 + mv cbmem ../../../libreboot_bin/cbmem/i686/ +fi +cd ../ +rm -rf cbmem +mv cbmem_ cbmem +cd ../../ + # --------------------- # Include documentation # --------------------- diff --git a/builddeps-coreboot b/builddeps-coreboot index d70c798..1645feb 100755 --- a/builddeps-coreboot +++ b/builddeps-coreboot @@ -33,10 +33,13 @@ cd coreboot # ----------------------------------------- # cbfstool -cd util/cbfstool +cd util/cbfstool/ make # nvramtool -cd ../nvramtool +cd ../nvramtool/ +make +# cbmem +cd ../cbmem/ make # done. go back to coreboot dir @@ -41,6 +41,9 @@ make clean # clean nvramtool cd ../nvramtool/ make clean +# clean cbmem +cd ../cbmem/ +make clean # go back to coreboot dir cd ../../ diff --git a/docs/git/index.html b/docs/git/index.html index f306a2c..0edffa9 100644 --- a/docs/git/index.html +++ b/docs/git/index.html @@ -518,11 +518,11 @@ <p> If you are building on an i686 host, this will include statically linked 32-bit binaries in the binary release archive that you created, - for: <b>nvramtool, cbfstool, bucts, flashrom, ich9deblob</b>. + for: <b>nvramtool, cbfstool, bucts, flashrom, ich9deblob, cbmem</b>. </p> <p> - If you are building on an x86_64 host, this will include statically linked 32- and 64-bit binaries for <b>ich9deblob</b>, <b>cbfstool</b> and <b>nvramtool</b>, while <b>flashrom</b> + If you are building on an x86_64 host, this will include statically linked 32- and 64-bit binaries for <b>cbmem</b>, <b>ich9deblob</b>, <b>cbfstool</b> and <b>nvramtool</b>, while <b>flashrom</b> and <b>bucts</b> will be included only as 64-bit statically linked binaries. <b>To include a statically linked flashrom and bucts for i686, you will need to build them on a chroot, a virtual machine or a real 32-bit system. You can find the build dependencies for these packages listed in deps-*</b> </p> diff --git a/docs/release.html b/docs/release.html index b32787b..21d9e75 100644 --- a/docs/release.html +++ b/docs/release.html @@ -120,6 +120,7 @@ Changes for this release (latest changes first, earliest changes last) </h2> <ul> + <li>build-release: include cbmem (statically compiled) in libreboot_bin</li> <li>Documentation (X200): added software-based flashing instructions</li> <li>Documentation: remove all references to the bus pirate (replaced with BBB flashing tutorials)</li> <li><b>New board:</b> ThinkPad X200S and X200 Tablet support added to libreboot</li> |