Skip to content
Snippets Groups Projects
Verified Commit 5cb98bf2 authored by Karel Koci's avatar Karel Koci :metal:
Browse files

patches/turrispackages: refresh Turris 1.x support patch

The device tree changed name.
parent fc311ee5
2 merge requests!123Turris OS 5.0 (HBK),!89WIP: Refactor/configs
From c710ec3307aa069330489a4b005a662fbef77846 Mon Sep 17 00:00:00 2001
From 6f5ab93ff31c077fdf8584f535e6698a093732dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Tue, 13 Aug 2019 14:49:22 +0200
Subject: [PATCH] Revert "turris1x-support: fix for kernel 4.19"
......@@ -11,24 +11,24 @@ This patch is not compatible with kernel 4.14 so we revert it.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hardware/turris1x/turris1x-support/Makefile b/hardware/turris1x/turris1x-support/Makefile
index b5b78ab2e..3c8e8f42e 100644
index c68a5bf..4fbd8b4 100644
--- a/hardware/turris1x/turris1x-support/Makefile
+++ b/hardware/turris1x/turris1x-support/Makefile
@@ -25,12 +25,12 @@ endef
@@ -28,12 +28,12 @@ endef
Build/Configure:=:
define Build/Compile
- $(KERNEL_MAKE) zImage turris-nand-bch.dtb
+ $(KERNEL_MAKE) zImage turris.dtb
+ $(KERNEL_MAKE) zImage turris1x.dtb
endef
define Package/$(PKG_NAME)/install
define Package/turris1x-support/install
$(INSTALL_DIR) $(1)/boot
- $(INSTALL_DATA) $(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/turris-nand-bch.dtb "$(1)"/boot/fdt
+ $(INSTALL_DATA) $(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/turris.dtb "$(1)"/boot/fdt
+ $(INSTALL_DATA) $(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/turris1x.dtb "$(1)"/boot/fdt
mkimage -T script -C none -n boot -d files/boot.txt "$(1)"/boot.scr
endef
--
2.22.0
2.24.1
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment