libreboot

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README

commit 9af3d3c6e3dec05b877f02c9cfbe9a0f385acfb5
parent a576346d3e3605b75f42f317fa1182e7060acea5
Author: Swift Geek <swiftgeek@gmail.com>
Date:   Sun, 31 Dec 2017 18:13:51 +0000

Merge branch 'coreboot-rebase' of and_who/libreboot into master

Diffstat:
projects/coreboot/configs/revision | 2+-
projects/coreboot/configs/seabios/d510mo/revision | 1-
projects/coreboot/configs/seabios/d945gclf/revision | 1-
projects/coreboot/configs/seabios/ga-g41m-es2l/revision | 1-
projects/coreboot/configs/seabios/kcma-d8/revision | 1-
projects/coreboot/configs/seabios/kfsn4-dre/revision | 1-
projects/coreboot/configs/seabios/kgpe-d16/revision | 1-
projects/coreboot/configs/seabios/macbook21/revision | 1-
projects/coreboot/configs/seabios/qemu_i440fx_piix4/revision | 1-
projects/coreboot/configs/seabios/qemu_q35_ich9/revision | 1-
projects/coreboot/configs/seabios/r400_16mb/revision | 1-
projects/coreboot/configs/seabios/r400_4mb/revision | 1-
projects/coreboot/configs/seabios/r400_8mb/revision | 1-
projects/coreboot/configs/seabios/t400_16mb/revision | 1-
projects/coreboot/configs/seabios/t400_4mb/revision | 1-
projects/coreboot/configs/seabios/t400_8mb/revision | 1-
projects/coreboot/configs/seabios/t500_16mb/revision | 1-
projects/coreboot/configs/seabios/t500_4mb/revision | 1-
projects/coreboot/configs/seabios/t500_8mb/revision | 1-
projects/coreboot/configs/seabios/t60/revision | 1-
projects/coreboot/configs/seabios/w500_16mb/revision | 1-
projects/coreboot/configs/seabios/w500_4mb/revision | 1-
projects/coreboot/configs/seabios/w500_8mb/revision | 1-
projects/coreboot/configs/seabios/x200_16mb/revision | 1-
projects/coreboot/configs/seabios/x200_4mb/revision | 1-
projects/coreboot/configs/seabios/x200_8mb/revision | 1-
projects/coreboot/configs/seabios/x60/revision | 1-
projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch | 50++++++++++++++++++++++++--------------------------
projects/coreboot/patches/0002-libpayload-Enable-USB-HID-in-veyron-configuration.patch | 27---------------------------
29 files changed, 25 insertions(+), 80 deletions(-)

diff --git a/projects/coreboot/configs/revision b/projects/coreboot/configs/revision @@ -1 +1 @@ -a19d44d2764be4dba55cad96abea12d92c8e1f0d +ceeafa45cae26ab857687082e02eae40d9621291 diff --git a/projects/coreboot/configs/seabios/d510mo/revision b/projects/coreboot/configs/seabios/d510mo/revision @@ -1 +0,0 @@ -2a3434757ef425dbdfedf1fc69e1a033a6e7310d diff --git a/projects/coreboot/configs/seabios/d945gclf/revision b/projects/coreboot/configs/seabios/d945gclf/revision @@ -1 +0,0 @@ -36d405268f040208cd26902f3c0b5346f7d4d25b diff --git a/projects/coreboot/configs/seabios/ga-g41m-es2l/revision b/projects/coreboot/configs/seabios/ga-g41m-es2l/revision @@ -1 +0,0 @@ -7c2e5396a3d47c64eb5a553fe412aad4c0f8dc1b diff --git a/projects/coreboot/configs/seabios/kcma-d8/revision b/projects/coreboot/configs/seabios/kcma-d8/revision @@ -1 +0,0 @@ -eee0e229764e965996479d7eb07e6086176b8bf0 diff --git a/projects/coreboot/configs/seabios/kfsn4-dre/revision b/projects/coreboot/configs/seabios/kfsn4-dre/revision @@ -1 +0,0 @@ -15fca66bf08db45937ce88b950491963654805b9 diff --git a/projects/coreboot/configs/seabios/kgpe-d16/revision b/projects/coreboot/configs/seabios/kgpe-d16/revision @@ -1 +0,0 @@ -eee0e229764e965996479d7eb07e6086176b8bf0 diff --git a/projects/coreboot/configs/seabios/macbook21/revision b/projects/coreboot/configs/seabios/macbook21/revision @@ -1 +0,0 @@ -2a3434757ef425dbdfedf1fc69e1a033a6e7310d diff --git a/projects/coreboot/configs/seabios/qemu_i440fx_piix4/revision b/projects/coreboot/configs/seabios/qemu_i440fx_piix4/revision @@ -1 +0,0 @@ -2a3434757ef425dbdfedf1fc69e1a033a6e7310d diff --git a/projects/coreboot/configs/seabios/qemu_q35_ich9/revision b/projects/coreboot/configs/seabios/qemu_q35_ich9/revision @@ -1 +0,0 @@ -2a3434757ef425dbdfedf1fc69e1a033a6e7310d diff --git a/projects/coreboot/configs/seabios/r400_16mb/revision b/projects/coreboot/configs/seabios/r400_16mb/revision @@ -1 +0,0 @@ -d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4 diff --git a/projects/coreboot/configs/seabios/r400_4mb/revision b/projects/coreboot/configs/seabios/r400_4mb/revision @@ -1 +0,0 @@ -d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4 diff --git a/projects/coreboot/configs/seabios/r400_8mb/revision b/projects/coreboot/configs/seabios/r400_8mb/revision @@ -1 +0,0 @@ -d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4 diff --git a/projects/coreboot/configs/seabios/t400_16mb/revision b/projects/coreboot/configs/seabios/t400_16mb/revision @@ -1 +0,0 @@ -d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4 diff --git a/projects/coreboot/configs/seabios/t400_4mb/revision b/projects/coreboot/configs/seabios/t400_4mb/revision @@ -1 +0,0 @@ -d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4 diff --git a/projects/coreboot/configs/seabios/t400_8mb/revision b/projects/coreboot/configs/seabios/t400_8mb/revision @@ -1 +0,0 @@ -d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4 diff --git a/projects/coreboot/configs/seabios/t500_16mb/revision b/projects/coreboot/configs/seabios/t500_16mb/revision @@ -1 +0,0 @@ -d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4 diff --git a/projects/coreboot/configs/seabios/t500_4mb/revision b/projects/coreboot/configs/seabios/t500_4mb/revision @@ -1 +0,0 @@ -d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4 diff --git a/projects/coreboot/configs/seabios/t500_8mb/revision b/projects/coreboot/configs/seabios/t500_8mb/revision @@ -1 +0,0 @@ -d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4 diff --git a/projects/coreboot/configs/seabios/t60/revision b/projects/coreboot/configs/seabios/t60/revision @@ -1 +0,0 @@ -2a3434757ef425dbdfedf1fc69e1a033a6e7310d diff --git a/projects/coreboot/configs/seabios/w500_16mb/revision b/projects/coreboot/configs/seabios/w500_16mb/revision @@ -1 +0,0 @@ -d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4 diff --git a/projects/coreboot/configs/seabios/w500_4mb/revision b/projects/coreboot/configs/seabios/w500_4mb/revision @@ -1 +0,0 @@ -d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4 diff --git a/projects/coreboot/configs/seabios/w500_8mb/revision b/projects/coreboot/configs/seabios/w500_8mb/revision @@ -1 +0,0 @@ -d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4 diff --git a/projects/coreboot/configs/seabios/x200_16mb/revision b/projects/coreboot/configs/seabios/x200_16mb/revision @@ -1 +0,0 @@ -d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4 diff --git a/projects/coreboot/configs/seabios/x200_4mb/revision b/projects/coreboot/configs/seabios/x200_4mb/revision @@ -1 +0,0 @@ -d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4 diff --git a/projects/coreboot/configs/seabios/x200_8mb/revision b/projects/coreboot/configs/seabios/x200_8mb/revision @@ -1 +0,0 @@ -d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4 diff --git a/projects/coreboot/configs/seabios/x60/revision b/projects/coreboot/configs/seabios/x60/revision @@ -1 +0,0 @@ -2a3434757ef425dbdfedf1fc69e1a033a6e7310d diff --git a/projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch b/projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch @@ -1,13 +1,10 @@ -From 6c534728fde6a9582915995a2742808764fe4783 Mon Sep 17 00:00:00 2001 +From c47f1f9e3b5d1a77b5261ad7cb7538c384828487 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski <contact@paulk.fr> -Date: Wed, 20 Jul 2016 16:03:30 +0200 -Subject: [PATCH 1/2] Avoid using git submodules for 3rdparty +Date: Thu, 21 Dec 2017 18:05:33 -0500 +Subject: [PATCH] Avoid using git submodules for 3rdparty This gets rid of git submodules entirely, to avoid the nuisance caused by automatically checking them out. - -Change-Id: I54de09656bd2dd9c308bd6c8dce554945aa8e535 -Signed-off-by: Paul Kocialkowski <contact@paulk.fr> --- .gitmodules | 20 -------------------- 3rdparty/arm-trusted-firmware | 1 - @@ -16,8 +13,8 @@ Signed-off-by: Paul Kocialkowski <contact@paulk.fr> 3rdparty/libgfxinit | 1 - 3rdparty/libhwbase | 1 - 3rdparty/vboot | 1 - - Makefile.inc | 11 ----------- - 8 files changed, 37 deletions(-) + Makefile.inc | 12 ------------ + 8 files changed, 38 deletions(-) delete mode 160000 3rdparty/arm-trusted-firmware delete mode 160000 3rdparty/blobs delete mode 160000 3rdparty/chromeec @@ -26,7 +23,7 @@ Signed-off-by: Paul Kocialkowski <contact@paulk.fr> delete mode 160000 3rdparty/vboot diff --git a/.gitmodules b/.gitmodules -index c3270e6ae2..3a617c7dc5 100644 +index c3270e6..3a617c7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,23 +1,3 @@ @@ -55,51 +52,51 @@ index c3270e6ae2..3a617c7dc5 100644 - url = ../libgfxinit.git diff --git a/3rdparty/arm-trusted-firmware b/3rdparty/arm-trusted-firmware deleted file mode 160000 -index 236c27d21f..0000000000 +index b118723..0000000 --- a/3rdparty/arm-trusted-firmware +++ /dev/null @@ -1 +0,0 @@ --Subproject commit 236c27d21f52ad8f0a998e54774e3d8a4b59129d +-Subproject commit b1187232fdf819586ba8c8ece4a27a7515cbdc6d diff --git a/3rdparty/blobs b/3rdparty/blobs deleted file mode 160000 -index 8090bdd598..0000000000 +index d2e558a..0000000 --- a/3rdparty/blobs +++ /dev/null @@ -1 +0,0 @@ --Subproject commit 8090bdd59853599e469b7503ea473ca12e8c681b +-Subproject commit d2e558a81f95f7b9149bea6b8362bb43ade82584 diff --git a/3rdparty/chromeec b/3rdparty/chromeec deleted file mode 160000 -index bcffec7fdc..0000000000 +index 9fb1038..0000000 --- a/3rdparty/chromeec +++ /dev/null @@ -1 +0,0 @@ --Subproject commit bcffec7fdc50e959cb298d094d8af472777dba75 +-Subproject commit 9fb10386a720d270e37ce61da3ff3a6d5a69951e diff --git a/3rdparty/libgfxinit b/3rdparty/libgfxinit deleted file mode 160000 -index 88a7f17b7d..0000000000 +index 42fb2d0..0000000 --- a/3rdparty/libgfxinit +++ /dev/null @@ -1 +0,0 @@ --Subproject commit 88a7f17b7d7a4f8a4d25ef6b87c71236b0862f5d +-Subproject commit 42fb2d065d604eb08c723ac6b96aeebb4c84cbd3 diff --git a/3rdparty/libhwbase b/3rdparty/libhwbase deleted file mode 160000 -index aab715f166..0000000000 +index 6685971..0000000 --- a/3rdparty/libhwbase +++ /dev/null @@ -1 +0,0 @@ --Subproject commit aab715f166bf1b54cfbd6982e8df49248ea544d8 +-Subproject commit 66859712e4817288591908d737dbf41ddea31c3a diff --git a/3rdparty/vboot b/3rdparty/vboot deleted file mode 160000 -index adfafba793..0000000000 +index f6780a3..0000000 --- a/3rdparty/vboot +++ /dev/null @@ -1 +0,0 @@ --Subproject commit adfafba793684ed92965dfbd86b3fb3463975d8c +-Subproject commit f6780a36ff19b36abcdb5ace903c4ae2272fb574 diff --git a/Makefile.inc b/Makefile.inc -index c5ce30f2b1..919a5d4ac1 100644 +index 413f7ad..ed2d839 100644 --- a/Makefile.inc +++ b/Makefile.inc -@@ -183,17 +183,6 @@ ifeq ($(CONFIG_COVERAGE),y) +@@ -191,18 +191,6 @@ ifeq ($(CONFIG_COVERAGE),y) ramstage-c-ccopts += -fprofile-arcs -ftest-coverage endif @@ -111,12 +108,13 @@ index c5ce30f2b1..919a5d4ac1 100644 -# unless explicitly requested and enabled through --checkout -forgetthis:=$(if $(GIT),$(shell git submodule update --init --checkout 3rdparty/blobs)) -endif --export UPDATED_SUBMODULES:=1 +-UPDATED_SUBMODULES:=1 +-COREBOOT_EXPORTS += UPDATED_SUBMODULES -endif - + postcar-c-deps:=$$(OPTION_TABLE_H) ramstage-c-deps:=$$(OPTION_TABLE_H) romstage-c-deps:=$$(OPTION_TABLE_H) - libverstage-c-deps:=$$(OPTION_TABLE_H) -- -2.11.0 +1.9.1 diff --git a/projects/coreboot/patches/0002-libpayload-Enable-USB-HID-in-veyron-configuration.patch b/projects/coreboot/patches/0002-libpayload-Enable-USB-HID-in-veyron-configuration.patch @@ -1,27 +0,0 @@ -From 417866c23c193a44a84d686ce1c2ee3d43284e05 Mon Sep 17 00:00:00 2001 -From: Paul Kocialkowski <contact@paulk.fr> -Date: Mon, 19 Dec 2016 20:23:44 +0100 -Subject: [PATCH 2/2] libpayload: Enable USB HID in veyron configuration - -This enables USB HID support in the veyron config, since it seems to -work correctly and is needed for interaction with depthcharge on devices -without an embedded keyboard (such as veyron_mickey). - -Change-Id: Icae829e3a132005df17bcb6f7e6f8a190912576d -Signed-off-by: Paul Kocialkowski <contact@paulk.fr> ---- - payloads/libpayload/configs/config.veyron | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/payloads/libpayload/configs/config.veyron b/payloads/libpayload/configs/config.veyron -index e80535c63e..b643e92a48 100644 ---- a/payloads/libpayload/configs/config.veyron -+++ b/payloads/libpayload/configs/config.veyron -@@ -4,4 +4,3 @@ CONFIG_LP_8250_SERIAL_CONSOLE=y - CONFIG_LP_TIMER_RK3288=y - CONFIG_LP_USB_EHCI=y - CONFIG_LP_USB_DWC2=y --# CONFIG_LP_USB_HID is not set --- -2.11.0 -