aboutsummaryrefslogtreecommitdiff
path: root/projects/cros-ec
diff options
context:
space:
mode:
authorSwift Geek <swiftgeek@gmail.com>2018-11-06 09:45:45 +0000
committerGogs <gogitservice@gmail.com>2018-11-06 09:45:45 +0000
commitec59c2f06621ea7d8dc7e27d3731fd549c097a8f (patch)
tree60e4b8ff67198f060a392940cd1c5d3cf707c1ce /projects/cros-ec
parent2e9f8f1daab26a605de356b2d0f246681d074766 (diff)
parentec780a88db977b99b090d916ed0354624af3c3d9 (diff)
downloadlibrebootfr-ec59c2f06621ea7d8dc7e27d3731fd549c097a8f.tar.gz
librebootfr-ec59c2f06621ea7d8dc7e27d3731fd549c097a8f.zip
Merge branch 'cros-ec' of and_who/libreboot into master
Diffstat (limited to 'projects/cros-ec')
-rw-r--r--projects/cros-ec/configs/nyan/revision2
-rw-r--r--projects/cros-ec/configs/veyron/revision2
-rw-r--r--projects/cros-ec/patches/veyron/0005-Don-t-include-missing-and-unnecessary-math-header.patch29
-rw-r--r--projects/cros-ec/patches/veyron/0005-cortex-m0-Use-assembly-exception-handlers-for-task-s.patch (renamed from projects/cros-ec/patches/veyron/0006-cortex-m0-Use-assembly-exception-handlers-for-task-s.patch)0
4 files changed, 2 insertions, 31 deletions
diff --git a/projects/cros-ec/configs/nyan/revision b/projects/cros-ec/configs/nyan/revision
index 6ce6b84b..c5b2d348 100644
--- a/projects/cros-ec/configs/nyan/revision
+++ b/projects/cros-ec/configs/nyan/revision
@@ -1 +1 @@
-origin/release-R65-10323.B
+origin/firmware-nyan-5771.B
diff --git a/projects/cros-ec/configs/veyron/revision b/projects/cros-ec/configs/veyron/revision
index 6ce6b84b..6c728396 100644
--- a/projects/cros-ec/configs/veyron/revision
+++ b/projects/cros-ec/configs/veyron/revision
@@ -1 +1 @@
-origin/release-R65-10323.B
+origin/firmware-veyron-6588.B
diff --git a/projects/cros-ec/patches/veyron/0005-Don-t-include-missing-and-unnecessary-math-header.patch b/projects/cros-ec/patches/veyron/0005-Don-t-include-missing-and-unnecessary-math-header.patch
deleted file mode 100644
index 0a099213..00000000
--- a/projects/cros-ec/patches/veyron/0005-Don-t-include-missing-and-unnecessary-math-header.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 913b2f1265bd7f3ebe6cf4cba92c20c5a423a6c3 Mon Sep 17 00:00:00 2001
-From: Paul Kocialkowski <contact@paulk.fr>
-Date: Tue, 2 Aug 2016 12:05:55 +0200
-Subject: [PATCH 5/6] Don't include missing and unnecessary math header
-
-This removes the inclusion of an unnecessary math header that is neither
-found nor necessary for non-cortex-m ECs.
-
-Change-Id: I56a04178dadedb76f841504fa645e2d43900d25f
-Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
----
- common/math_util.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/common/math_util.c b/common/math_util.c
-index 120d13d..34a267d 100644
---- a/common/math_util.c
-+++ b/common/math_util.c
-@@ -6,7 +6,6 @@
- /* Common math functions. */
-
- #include "common.h"
--#include "math.h"
- #include "math_util.h"
- #include "util.h"
-
---
-2.9.0
-
diff --git a/projects/cros-ec/patches/veyron/0006-cortex-m0-Use-assembly-exception-handlers-for-task-s.patch b/projects/cros-ec/patches/veyron/0005-cortex-m0-Use-assembly-exception-handlers-for-task-s.patch
index f0175825..f0175825 100644
--- a/projects/cros-ec/patches/veyron/0006-cortex-m0-Use-assembly-exception-handlers-for-task-s.patch
+++ b/projects/cros-ec/patches/veyron/0005-cortex-m0-Use-assembly-exception-handlers-for-task-s.patch