about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorJohn Ericson <git@JohnEricson.me>2021-03-21 13:22:53 -0400
committerGitHub <noreply@github.com>2021-03-21 13:22:53 -0400
commitc82066e585bb59ea72a0ff842d66936711f57e4f (patch)
treebef44869cbe67187b92a89fe5b410db8bad34f3b /lib
parent31410a082875c75d92aceb25107d4524c49c33a2 (diff)
parent7b573e80516d77cb7ece1dcc969e5f35f6e79e74 (diff)
Merge pull request #113212 from lopsided98/kernel-arm-fix
lib/systems/platforms: remove TI_CPTS override
Diffstat (limited to 'lib')
-rw-r--r--lib/systems/platforms.nix6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index 3bf90cd0cafb5..f46e9c826a5cc 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -303,14 +303,12 @@ rec {
       preferBuiltin = true;
       target = "zImage";
       extraConfig = ''
-        # Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig.
+        # Serial port for Raspberry Pi 3. Wasn't included in ARMv7 defconfig
+        # until 4.17.
         SERIAL_8250_BCM2835AUX y
         SERIAL_8250_EXTENDED y
         SERIAL_8250_SHARE_IRQ y
 
-        # Fix broken sunxi-sid nvmem driver.
-        TI_CPTS y
-
         # Hangs ODROID-XU4
         ARM_BIG_LITTLE_CPUIDLE n