diff options
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/coreboot/configs/revision | 2 | ||||
| -rw-r--r-- | projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch | 26 | ||||
| -rw-r--r-- | projects/coreboot/patches/0002-libpayload-Enable-USB-HID-in-veyron-configuration.patch (renamed from projects/coreboot/patches/0004-libpayload-Enable-USB-HID-in-veyron-configuration.patch) | 10 | ||||
| -rw-r--r-- | projects/coreboot/patches/0002-libpayload-Update-ARM-CrOS-devices-configuration.patch | 56 | ||||
| -rw-r--r-- | projects/coreboot/patches/0003-libpayload-Get-current-tick-from-high-register-in-ge.patch | 32 | ||||
| -rw-r--r-- | projects/depthcharge/configs/revision | 2 |
6 files changed, 20 insertions, 108 deletions
diff --git a/projects/coreboot/configs/revision b/projects/coreboot/configs/revision index 504b1b31..8f14f42e 100644 --- a/projects/coreboot/configs/revision +++ b/projects/coreboot/configs/revision @@ -1 +1 @@ -dcd2f17ff47cc1a4b26f253fb11a991cfe4ff6f5 +a19d44d2764be4dba55cad96abea12d92c8e1f0d 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 index 2e46141e..da906849 100644 --- 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,7 +1,7 @@ -From 95248477726f4a866b04a760f68930bc5ebd55ff Mon Sep 17 00:00:00 2001 +From 6c534728fde6a9582915995a2742808764fe4783 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/4] Avoid using git submodules for 3rdparty +Subject: [PATCH 1/2] Avoid using git submodules for 3rdparty This gets rid of git submodules entirely, to avoid the nuisance caused by automatically checking them out. @@ -26,7 +26,7 @@ Signed-off-by: Paul Kocialkowski <contact@paulk.fr> delete mode 160000 3rdparty/vboot diff --git a/.gitmodules b/.gitmodules -index c3270e6..3a617c7 100644 +index c3270e6ae2..3a617c7dc5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,23 +1,3 @@ @@ -55,48 +55,48 @@ index c3270e6..3a617c7 100644 - url = ../libgfxinit.git diff --git a/3rdparty/arm-trusted-firmware b/3rdparty/arm-trusted-firmware deleted file mode 160000 -index bfd9251..0000000 +index 236c27d21f..0000000000 --- a/3rdparty/arm-trusted-firmware +++ /dev/null @@ -1 +0,0 @@ --Subproject commit bfd925139fdbc2e87979849907b34843aa326994 +-Subproject commit 236c27d21f52ad8f0a998e54774e3d8a4b59129d diff --git a/3rdparty/blobs b/3rdparty/blobs deleted file mode 160000 -index 8090bdd..0000000 +index 8090bdd598..0000000000 --- a/3rdparty/blobs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8090bdd59853599e469b7503ea473ca12e8c681b diff --git a/3rdparty/chromeec b/3rdparty/chromeec deleted file mode 160000 -index ea1a869..0000000 +index bcffec7fdc..0000000000 --- a/3rdparty/chromeec +++ /dev/null @@ -1 +0,0 @@ --Subproject commit ea1a8699e96425806abdd532d04da254ae093f6e +-Subproject commit bcffec7fdc50e959cb298d094d8af472777dba75 diff --git a/3rdparty/libgfxinit b/3rdparty/libgfxinit deleted file mode 160000 -index 88a7f17..0000000 +index 88a7f17b7d..0000000000 --- a/3rdparty/libgfxinit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 88a7f17b7d7a4f8a4d25ef6b87c71236b0862f5d diff --git a/3rdparty/libhwbase b/3rdparty/libhwbase deleted file mode 160000 -index aab715f..0000000 +index aab715f166..0000000000 --- a/3rdparty/libhwbase +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aab715f166bf1b54cfbd6982e8df49248ea544d8 diff --git a/3rdparty/vboot b/3rdparty/vboot deleted file mode 160000 -index adfafba..0000000 +index adfafba793..0000000000 --- a/3rdparty/vboot +++ /dev/null @@ -1 +0,0 @@ -Subproject commit adfafba793684ed92965dfbd86b3fb3463975d8c diff --git a/Makefile.inc b/Makefile.inc -index c5ce30f..919a5d4 100644 +index c5ce30f2b1..919a5d4ac1 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -183,17 +183,6 @@ ifeq ($(CONFIG_COVERAGE),y) @@ -118,5 +118,5 @@ index c5ce30f..919a5d4 100644 romstage-c-deps:=$$(OPTION_TABLE_H) libverstage-c-deps:=$$(OPTION_TABLE_H) -- -2.10.2 +2.11.0 diff --git a/projects/coreboot/patches/0004-libpayload-Enable-USB-HID-in-veyron-configuration.patch b/projects/coreboot/patches/0002-libpayload-Enable-USB-HID-in-veyron-configuration.patch index af00a42d..aa76b57a 100644 --- a/projects/coreboot/patches/0004-libpayload-Enable-USB-HID-in-veyron-configuration.patch +++ b/projects/coreboot/patches/0002-libpayload-Enable-USB-HID-in-veyron-configuration.patch @@ -1,11 +1,11 @@ -From 552b999c7b32363cbc51722f33a0de189baf27fe Mon Sep 17 00:00:00 2001 +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 4/4] libpayload: Enable USB HID in veyron configuration +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_jerry). +without an embedded keyboard (such as veyron_mickey). Change-Id: Icae829e3a132005df17bcb6f7e6f8a190912576d Signed-off-by: Paul Kocialkowski <contact@paulk.fr> @@ -14,7 +14,7 @@ Signed-off-by: Paul Kocialkowski <contact@paulk.fr> 1 file changed, 1 deletion(-) diff --git a/payloads/libpayload/configs/config.veyron b/payloads/libpayload/configs/config.veyron -index e80535c..b643e92 100644 +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 @@ -23,5 +23,5 @@ index e80535c..b643e92 100644 CONFIG_LP_USB_DWC2=y -# CONFIG_LP_USB_HID is not set -- -2.10.2 +2.11.0 diff --git a/projects/coreboot/patches/0002-libpayload-Update-ARM-CrOS-devices-configuration.patch b/projects/coreboot/patches/0002-libpayload-Update-ARM-CrOS-devices-configuration.patch deleted file mode 100644 index 88f4013a..00000000 --- a/projects/coreboot/patches/0002-libpayload-Update-ARM-CrOS-devices-configuration.patch +++ /dev/null @@ -1,56 +0,0 @@ -From fc26e7861ec756614e27a82895b60724a8173757 Mon Sep 17 00:00:00 2001 -From: Paul Kocialkowski <contact@paulk.fr> -Date: Mon, 19 Dec 2016 18:03:23 +0100 -Subject: [PATCH 2/4] libpayload: Update ARM CrOS devices configuration - -This updates the configuration for ARM CrOS devices (nyans and veyrons) -by using the CHROMEOS Kconfig option, thus reducing the number of -options to select. It also brings proper serial console support. - -Change-Id: Iffc84c44a1d339c5bb575fbaffc40bc2d56bb6cf -Signed-off-by: Paul Kocialkowski <contact@paulk.fr> ---- - payloads/libpayload/configs/config.nyan | 10 +++------- - payloads/libpayload/configs/config.veyron | 10 +++------- - 2 files changed, 6 insertions(+), 14 deletions(-) - -diff --git a/payloads/libpayload/configs/config.nyan b/payloads/libpayload/configs/config.nyan -index 6e593e5..caad2b6 100644 ---- a/payloads/libpayload/configs/config.nyan -+++ b/payloads/libpayload/configs/config.nyan -@@ -1,10 +1,6 @@ --CONFIG_LP_GPL=y -+CONFIG_LP_CHROMEOS=y - CONFIG_LP_ARCH_ARM=y --# CONFIG_LP_CURSES is not set --CONFIG_LP_SKIP_CONSOLE_INIT=y --CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y --# CONFIG_LP_STORAGE is not set -+CONFIG_LP_8250_SERIAL_CONSOLE=y - CONFIG_LP_TIMER_TEGRA_1US=y --# CONFIG_LP_USB_OHCI is not set --# CONFIG_LP_USB_XHCI is not set -+CONFIG_LP_USB_EHCI=y - CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT=y -diff --git a/payloads/libpayload/configs/config.veyron b/payloads/libpayload/configs/config.veyron -index 793907f..e80535c 100644 ---- a/payloads/libpayload/configs/config.veyron -+++ b/payloads/libpayload/configs/config.veyron -@@ -1,11 +1,7 @@ --CONFIG_LP_GPL=y -+CONFIG_LP_CHROMEOS=y - CONFIG_LP_ARCH_ARM=y --# CONFIG_LP_CURSES is not set --CONFIG_LP_SKIP_CONSOLE_INIT=y --CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y --# CONFIG_LP_STORAGE is not set --CONFIG_LP_TIMER_RK=y --CONFIG_LP_USB=y -+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.10.2 - diff --git a/projects/coreboot/patches/0003-libpayload-Get-current-tick-from-high-register-in-ge.patch b/projects/coreboot/patches/0003-libpayload-Get-current-tick-from-high-register-in-ge.patch deleted file mode 100644 index 4fb09c79..00000000 --- a/projects/coreboot/patches/0003-libpayload-Get-current-tick-from-high-register-in-ge.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 03a830aad1cdf4325781aa60566bebcf5aa57238 Mon Sep 17 00:00:00 2001 -From: Paul Kocialkowski <contact@paulk.fr> -Date: Mon, 19 Dec 2016 19:22:39 +0100 -Subject: [PATCH 3/4] libpayload: Get current tick from high register in - generic timer - -This fixes the generic timer driver to get the current tick from the -high register, so that comparison with the high count value (obtained -previously from the same register) has a chance to succeed. - -Change-Id: I5ce02bfa15a91ad34641b8e24813a5b7ca790ec3 -Signed-off-by: Paul Kocialkowski <contact@paulk.fr> ---- - payloads/libpayload/drivers/timer/generic.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/payloads/libpayload/drivers/timer/generic.c b/payloads/libpayload/drivers/timer/generic.c -index 4c06618..ac26f40 100644 ---- a/payloads/libpayload/drivers/timer/generic.c -+++ b/payloads/libpayload/drivers/timer/generic.c -@@ -53,7 +53,7 @@ uint64_t timer_raw_value(void) - do { - count_h = readl(phys_to_virt(CONFIG_LP_TIMER_GENERIC_HIGH_REG)); - count_l = readl(phys_to_virt(CONFIG_LP_TIMER_GENERIC_REG)); -- cur_tick = readl(phys_to_virt(CONFIG_LP_TIMER_GENERIC_REG)); -+ cur_tick = readl(phys_to_virt(CONFIG_LP_TIMER_GENERIC_HIGH_REG)); - } while (cur_tick != count_h); - - return (cur_tick << 32) + count_l; --- -2.10.2 - diff --git a/projects/depthcharge/configs/revision b/projects/depthcharge/configs/revision index 4b3eeea8..bc799613 100644 --- a/projects/depthcharge/configs/revision +++ b/projects/depthcharge/configs/revision @@ -1 +1 @@ -91fab799a3e9f9da4e7569ca341f819319d091b0 +66b58a339a7fcc79248b9ef7853449542683c45d |