summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--changelog3
-rw-r--r--patches/02_rtc-cmos-ignore-bogus-century-byte.patch37
-rw-r--r--patches/02_use-non-posix-sed-r.patch (renamed from patches/03_use-non-posix-sed-r.patch)0
3 files changed, 0 insertions, 40 deletions
diff --git a/changelog b/changelog
index 7dadf83..8bfd56c 100644
--- a/changelog
+++ b/changelog
@@ -10,9 +10,6 @@ linux-libre-4.19 (4.19.161+gnu-1) trunk
and rebase patch onto new upstream Linux-libre.
* Drop patches/02_fix-mconf-linking.patch and instead add pkgconf to
build dependencies.
- * Apply patch from Eric Wong to fix regression in Linux(-libre) >= 4.3
- with older versions of libreboot and coreboot that didn't reserve
- the RTC century byte in NVRAM/CMOS.
* Add libncurses.6-dev and terminfo to Build-Depends for convenience
when building and running upstream mconf (menuconfig).
* Organize packages into sections.
diff --git a/patches/02_rtc-cmos-ignore-bogus-century-byte.patch b/patches/02_rtc-cmos-ignore-bogus-century-byte.patch
deleted file mode 100644
index 904d61f..0000000
--- a/patches/02_rtc-cmos-ignore-bogus-century-byte.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2a4daadd4d3e507138f8937926e6a4df49c6bfdc Mon Sep 17 00:00:00 2001
-From: Eric Wong <e@80x24.org>
-Date: Sun, 6 Jan 2019 08:21:03 +0000
-Subject: rtc: cmos: ignore bogus century byte
-
-Older versions of Libreboot and Coreboot had an invalid value
-(`3' in my case) in the century byte affecting the GM45 in
-the Thinkpad X200. Not everybody's updated their firmwares,
-and Linux <= 4.2 was able to read the RTC without problems,
-so workaround this by ignoring invalid values.
-
-Fixes: 3c217e51d8a272b9 ("rtc: cmos: century support")
-
-Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
-Cc: Alessandro Zummo <a.zummo@towertech.it>
-Cc: Sylvain Chouleur <sylvain.chouleur@intel.com>
-Cc: Patrick McDermott <patrick.mcdermott@libiquity.com>
-Cc: linux-rtc@vger.kernel.org
-Signed-off-by: Eric Wong <e@80x24.org>
-Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
----
- drivers/rtc/rtc-mc146818-lib.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/rtc/rtc-mc146818-lib.c b/drivers/rtc/rtc-mc146818-lib.c
-index 2f1772a358ca..18a6f15e313d 100644
---- a/drivers/rtc/rtc-mc146818-lib.c
-+++ b/drivers/rtc/rtc-mc146818-lib.c
-@@ -82,7 +82,7 @@ unsigned int mc146818_get_time(struct rtc_time *time)
- time->tm_year += real_year - 72;
- #endif
-
-- if (century)
-+ if (century > 20)
- time->tm_year += (century - 19) * 100;
-
- /*
diff --git a/patches/03_use-non-posix-sed-r.patch b/patches/02_use-non-posix-sed-r.patch
index 02c2e82..02c2e82 100644
--- a/patches/03_use-non-posix-sed-r.patch
+++ b/patches/02_use-non-posix-sed-r.patch