diff options
Diffstat (limited to 'resources')
-rw-r--r-- | resources/libreboot/config/macbook21/config | 4 | ||||
-rw-r--r-- | resources/libreboot/config/qemu_i440fx_piix4/config | 4 | ||||
-rw-r--r-- | resources/libreboot/config/qemu_q35_ich9/config | 4 | ||||
-rw-r--r-- | resources/libreboot/config/r400_4mb/config | 4 | ||||
-rw-r--r-- | resources/libreboot/config/r400_8mb/config | 4 | ||||
-rw-r--r-- | resources/libreboot/config/t400_4mb/config | 4 | ||||
-rw-r--r-- | resources/libreboot/config/t400_8mb/config | 4 | ||||
-rw-r--r-- | resources/libreboot/config/t500_4mb/config | 4 | ||||
-rw-r--r-- | resources/libreboot/config/t500_8mb/config | 4 | ||||
-rw-r--r-- | resources/libreboot/config/t60/config | 4 | ||||
-rw-r--r-- | resources/libreboot/config/x200_4mb/config | 4 | ||||
-rw-r--r-- | resources/libreboot/config/x200_8mb/config | 4 | ||||
-rw-r--r-- | resources/libreboot/config/x60/config | 4 | ||||
-rw-r--r-- | resources/libreboot/patch/0016-buildgcc-Define-CMAKE-only-if-clang-package-is-built.patch | 41 | ||||
-rwxr-xr-x | resources/scripts/helpers/download/coreboot | 8 |
15 files changed, 53 insertions, 48 deletions
diff --git a/resources/libreboot/config/macbook21/config b/resources/libreboot/config/macbook21/config index c9a290f8..caf5e7a4 100644 --- a/resources/libreboot/config/macbook21/config +++ b/resources/libreboot/config/macbook21/config @@ -198,6 +198,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y CONFIG_ARCH_VERSTAGE_X86_32=y CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y +# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set +# CONFIG_ARCH_VERSTAGE_X86_64 is not set +# CONFIG_ARCH_ROMSTAGE_X86_64 is not set +# CONFIG_ARCH_RAMSTAGE_X86_64 is not set CONFIG_AP_IN_SIPI_WAIT=y # CONFIG_SIPI_VECTOR_IN_ROM is not set CONFIG_NUM_IPI_STARTS=2 diff --git a/resources/libreboot/config/qemu_i440fx_piix4/config b/resources/libreboot/config/qemu_i440fx_piix4/config index d027b3f6..a456d19f 100644 --- a/resources/libreboot/config/qemu_i440fx_piix4/config +++ b/resources/libreboot/config/qemu_i440fx_piix4/config @@ -196,6 +196,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y CONFIG_ARCH_VERSTAGE_X86_32=y CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y +# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set +# CONFIG_ARCH_VERSTAGE_X86_64 is not set +# CONFIG_ARCH_ROMSTAGE_X86_64 is not set +# CONFIG_ARCH_RAMSTAGE_X86_64 is not set # CONFIG_SIPI_VECTOR_IN_ROM is not set CONFIG_NUM_IPI_STARTS=2 # CONFIG_ROMCC is not set diff --git a/resources/libreboot/config/qemu_q35_ich9/config b/resources/libreboot/config/qemu_q35_ich9/config index 27702932..dcdc0670 100644 --- a/resources/libreboot/config/qemu_q35_ich9/config +++ b/resources/libreboot/config/qemu_q35_ich9/config @@ -197,6 +197,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y CONFIG_ARCH_VERSTAGE_X86_32=y CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y +# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set +# CONFIG_ARCH_VERSTAGE_X86_64 is not set +# CONFIG_ARCH_ROMSTAGE_X86_64 is not set +# CONFIG_ARCH_RAMSTAGE_X86_64 is not set # CONFIG_SIPI_VECTOR_IN_ROM is not set CONFIG_NUM_IPI_STARTS=2 # CONFIG_ROMCC is not set diff --git a/resources/libreboot/config/r400_4mb/config b/resources/libreboot/config/r400_4mb/config index c6708bae..91dafe9b 100644 --- a/resources/libreboot/config/r400_4mb/config +++ b/resources/libreboot/config/r400_4mb/config @@ -207,6 +207,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y CONFIG_ARCH_VERSTAGE_X86_32=y CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y +# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set +# CONFIG_ARCH_VERSTAGE_X86_64 is not set +# CONFIG_ARCH_ROMSTAGE_X86_64 is not set +# CONFIG_ARCH_RAMSTAGE_X86_64 is not set # CONFIG_AP_IN_SIPI_WAIT is not set # CONFIG_SIPI_VECTOR_IN_ROM is not set CONFIG_NUM_IPI_STARTS=2 diff --git a/resources/libreboot/config/r400_8mb/config b/resources/libreboot/config/r400_8mb/config index 7f0a3b95..905a9971 100644 --- a/resources/libreboot/config/r400_8mb/config +++ b/resources/libreboot/config/r400_8mb/config @@ -207,6 +207,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y CONFIG_ARCH_VERSTAGE_X86_32=y CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y +# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set +# CONFIG_ARCH_VERSTAGE_X86_64 is not set +# CONFIG_ARCH_ROMSTAGE_X86_64 is not set +# CONFIG_ARCH_RAMSTAGE_X86_64 is not set # CONFIG_AP_IN_SIPI_WAIT is not set # CONFIG_SIPI_VECTOR_IN_ROM is not set CONFIG_NUM_IPI_STARTS=2 diff --git a/resources/libreboot/config/t400_4mb/config b/resources/libreboot/config/t400_4mb/config index 7b812073..5ae564a8 100644 --- a/resources/libreboot/config/t400_4mb/config +++ b/resources/libreboot/config/t400_4mb/config @@ -207,6 +207,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y CONFIG_ARCH_VERSTAGE_X86_32=y CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y +# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set +# CONFIG_ARCH_VERSTAGE_X86_64 is not set +# CONFIG_ARCH_ROMSTAGE_X86_64 is not set +# CONFIG_ARCH_RAMSTAGE_X86_64 is not set # CONFIG_AP_IN_SIPI_WAIT is not set # CONFIG_SIPI_VECTOR_IN_ROM is not set CONFIG_NUM_IPI_STARTS=2 diff --git a/resources/libreboot/config/t400_8mb/config b/resources/libreboot/config/t400_8mb/config index d5800b45..8fbf5835 100644 --- a/resources/libreboot/config/t400_8mb/config +++ b/resources/libreboot/config/t400_8mb/config @@ -207,6 +207,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y CONFIG_ARCH_VERSTAGE_X86_32=y CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y +# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set +# CONFIG_ARCH_VERSTAGE_X86_64 is not set +# CONFIG_ARCH_ROMSTAGE_X86_64 is not set +# CONFIG_ARCH_RAMSTAGE_X86_64 is not set # CONFIG_AP_IN_SIPI_WAIT is not set # CONFIG_SIPI_VECTOR_IN_ROM is not set CONFIG_NUM_IPI_STARTS=2 diff --git a/resources/libreboot/config/t500_4mb/config b/resources/libreboot/config/t500_4mb/config index 2f283fb2..e864cac4 100644 --- a/resources/libreboot/config/t500_4mb/config +++ b/resources/libreboot/config/t500_4mb/config @@ -207,6 +207,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y CONFIG_ARCH_VERSTAGE_X86_32=y CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y +# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set +# CONFIG_ARCH_VERSTAGE_X86_64 is not set +# CONFIG_ARCH_ROMSTAGE_X86_64 is not set +# CONFIG_ARCH_RAMSTAGE_X86_64 is not set # CONFIG_AP_IN_SIPI_WAIT is not set # CONFIG_SIPI_VECTOR_IN_ROM is not set CONFIG_NUM_IPI_STARTS=2 diff --git a/resources/libreboot/config/t500_8mb/config b/resources/libreboot/config/t500_8mb/config index 2b625cad..a21072e4 100644 --- a/resources/libreboot/config/t500_8mb/config +++ b/resources/libreboot/config/t500_8mb/config @@ -207,6 +207,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y CONFIG_ARCH_VERSTAGE_X86_32=y CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y +# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set +# CONFIG_ARCH_VERSTAGE_X86_64 is not set +# CONFIG_ARCH_ROMSTAGE_X86_64 is not set +# CONFIG_ARCH_RAMSTAGE_X86_64 is not set # CONFIG_AP_IN_SIPI_WAIT is not set # CONFIG_SIPI_VECTOR_IN_ROM is not set CONFIG_NUM_IPI_STARTS=2 diff --git a/resources/libreboot/config/t60/config b/resources/libreboot/config/t60/config index d216c367..8d23cd5f 100644 --- a/resources/libreboot/config/t60/config +++ b/resources/libreboot/config/t60/config @@ -207,6 +207,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y CONFIG_ARCH_VERSTAGE_X86_32=y CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y +# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set +# CONFIG_ARCH_VERSTAGE_X86_64 is not set +# CONFIG_ARCH_ROMSTAGE_X86_64 is not set +# CONFIG_ARCH_RAMSTAGE_X86_64 is not set CONFIG_AP_IN_SIPI_WAIT=y # CONFIG_SIPI_VECTOR_IN_ROM is not set CONFIG_NUM_IPI_STARTS=2 diff --git a/resources/libreboot/config/x200_4mb/config b/resources/libreboot/config/x200_4mb/config index bf263436..95056e55 100644 --- a/resources/libreboot/config/x200_4mb/config +++ b/resources/libreboot/config/x200_4mb/config @@ -205,6 +205,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y CONFIG_ARCH_VERSTAGE_X86_32=y CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y +# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set +# CONFIG_ARCH_VERSTAGE_X86_64 is not set +# CONFIG_ARCH_ROMSTAGE_X86_64 is not set +# CONFIG_ARCH_RAMSTAGE_X86_64 is not set # CONFIG_AP_IN_SIPI_WAIT is not set # CONFIG_SIPI_VECTOR_IN_ROM is not set CONFIG_NUM_IPI_STARTS=2 diff --git a/resources/libreboot/config/x200_8mb/config b/resources/libreboot/config/x200_8mb/config index 5da0cfbf..de42e491 100644 --- a/resources/libreboot/config/x200_8mb/config +++ b/resources/libreboot/config/x200_8mb/config @@ -205,6 +205,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y CONFIG_ARCH_VERSTAGE_X86_32=y CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y +# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set +# CONFIG_ARCH_VERSTAGE_X86_64 is not set +# CONFIG_ARCH_ROMSTAGE_X86_64 is not set +# CONFIG_ARCH_RAMSTAGE_X86_64 is not set # CONFIG_AP_IN_SIPI_WAIT is not set # CONFIG_SIPI_VECTOR_IN_ROM is not set CONFIG_NUM_IPI_STARTS=2 diff --git a/resources/libreboot/config/x60/config b/resources/libreboot/config/x60/config index 3efb0d22..8cfe35bf 100644 --- a/resources/libreboot/config/x60/config +++ b/resources/libreboot/config/x60/config @@ -208,6 +208,10 @@ CONFIG_ARCH_BOOTBLOCK_X86_32=y CONFIG_ARCH_VERSTAGE_X86_32=y CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y +# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set +# CONFIG_ARCH_VERSTAGE_X86_64 is not set +# CONFIG_ARCH_ROMSTAGE_X86_64 is not set +# CONFIG_ARCH_RAMSTAGE_X86_64 is not set CONFIG_AP_IN_SIPI_WAIT=y # CONFIG_SIPI_VECTOR_IN_ROM is not set CONFIG_NUM_IPI_STARTS=2 diff --git a/resources/libreboot/patch/0016-buildgcc-Define-CMAKE-only-if-clang-package-is-built.patch b/resources/libreboot/patch/0016-buildgcc-Define-CMAKE-only-if-clang-package-is-built.patch deleted file mode 100644 index b303292d..00000000 --- a/resources/libreboot/patch/0016-buildgcc-Define-CMAKE-only-if-clang-package-is-built.patch +++ /dev/null @@ -1,41 +0,0 @@ -From beb6138691594cd227a1b50079d14e6adc4e8ef5 Mon Sep 17 00:00:00 2001 -From: David Hendricks <dhendrix@chromium.org> -Date: Mon, 15 Jun 2015 17:03:22 -0700 -Subject: [PATCH] buildgcc: Define $CMAKE only if clang package is built - -This moves the CMAKE definition down into the case statement -for $PACKAGE so that it is only required when the user wants to -build clang. - -With this approach, "./buildgcc -P clang" will error out with the -"ERROR: Missing tool:" message if cmake is not installed. - -Change-Id: I1e5c1bd67ade8f93ba0390df7f234deb47b9b18a -Signed-off-by: David Hendricks <dhendrix@chromium.org> ---- - util/crossgcc/buildgcc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc -index 7f440f7..552a6a2 100755 ---- a/util/crossgcc/buildgcc -+++ b/util/crossgcc/buildgcc -@@ -165,7 +165,6 @@ searchtool() - TAR=$(searchtool tar) || exit $? - PATCH=$(searchtool patch) || exit $? - MAKE=$(searchtool make) || exit $? --CMAKE=$(searchtool cmake "cmake") || exit $? - SHA1SUM=$(searchtool sha1sum) - SHA512SUM=$(searchtool sha512sum) - CHECKSUM=$SHA1SUM -@@ -554,6 +553,7 @@ case "$PACKAGE" in - CLANG|clang) - NAME=clang - PACKAGES="LLVM CFE CRT CTE" -+ CMAKE=$(searchtool cmake "cmake") || exit $? - ;; - IASL|iasl) - NAME="IASL ACPI compiler" --- -1.9.1 - diff --git a/resources/scripts/helpers/download/coreboot b/resources/scripts/helpers/download/coreboot index b8329218..98a50475 100755 --- a/resources/scripts/helpers/download/coreboot +++ b/resources/scripts/helpers/download/coreboot @@ -44,7 +44,7 @@ git clone http://review.coreboot.org/coreboot cd "coreboot/" # reset to previously tested revision -git reset --hard 5f6c392924306eb514610487963d3686293e380d +git reset --hard cd5cdd3ba42371cc97b1464fd7b98de5bef05a6a # Get patches from review.coreboot.org # ------------------------------------------------------------------------------ @@ -138,12 +138,6 @@ printf "ec/lenovo/h8: re-factor handling of power_management_beeps\n" # git fetch http://review.coreboot.org/coreboot refs/changes/31/10531/8 && git cherry-pick FETCH_HEAD git am "../resources/libreboot/patch/0015-ec-lenovo-h8-re-factor-handling-of-power_management_.patch" -printf "buildgcc: Define CMAKE only if clang package is built\n" -# Needed, otherwise the build system complains that cmake isn't present (unless it's installed) -# Libreboot doesn't use clang, which is the only part of coreboot that requires cmake -# git fetch http://review.coreboot.org/coreboot refs/changes/56/10556/1 && git cherry-pick FETCH_HEAD -git am "../resources/libreboot/patch/0016-buildgcc-Define-CMAKE-only-if-clang-package-is-built.patch" - # Run coreboot-libre deblob scripts # ------------------------------------------------------------------------------ |