summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessio Igor Bogani <alessio.bogani@elettra.eu>2020-12-09 16:58:08 +0100
committerKhem Raj <raj.khem@gmail.com>2020-12-18 20:59:33 -0800
commitb3700b83d1e1d368fa42dffb4cd208603a6a6b69 (patch)
tree5c9cf04e1d72fcefccdd056a11be63ed9f65c275
parentd2b76ad9ff51e4c4db60d4d40f29cb846c3b2f16 (diff)
downloadmeta-altera-master.tar.gz
Rename devicetree de0_sockit to de0_nano_soc in kernel 4.xHEADmaster
This makes kernel 4.x compatible with subsequent kernels which use a different name of the devicetree file for the same board.
-rw-r--r--recipes-kernel/linux/linux-altera-ltsi/0001-Rename-de0_sockit-devicetree-to-de0_nano_soc.patch31
-rw-r--r--recipes-kernel/linux/linux-altera-ltsi_4.14.130.bb3
2 files changed, 33 insertions, 1 deletions
diff --git a/recipes-kernel/linux/linux-altera-ltsi/0001-Rename-de0_sockit-devicetree-to-de0_nano_soc.patch b/recipes-kernel/linux/linux-altera-ltsi/0001-Rename-de0_sockit-devicetree-to-de0_nano_soc.patch
new file mode 100644
index 0000000..bab4202
--- /dev/null
+++ b/recipes-kernel/linux/linux-altera-ltsi/0001-Rename-de0_sockit-devicetree-to-de0_nano_soc.patch
@@ -0,0 +1,31 @@
1From 1ec97470546748c7b26326962c5d3d0e71fde5d5 Mon Sep 17 00:00:00 2001
2From: Alessio Igor Bogani <alessio.bogani@elettra.eu>
3Date: Wed, 9 Dec 2020 13:47:04 +0100
4Subject: [PATCH] Rename de0_sockit devicetree to de0_nano_soc
5
6---
7 arch/arm/boot/dts/Makefile | 2 +-
8 ...yclone5_de0_sockit.dts => socfpga_cyclone5_de0_nano_soc.dts} | 0
9 2 files changed, 1 insertion(+), 1 deletion(-)
10 rename arch/arm/boot/dts/{socfpga_cyclone5_de0_sockit.dts => socfpga_cyclone5_de0_nano_soc.dts} (100%)
11
12diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
13index 0f84ce144456..36091af14337 100644
14--- a/arch/arm/boot/dts/Makefile
15+++ b/arch/arm/boot/dts/Makefile
16@@ -793,7 +793,7 @@ dtb-$(CONFIG_ARCH_SOCFPGA) += \
17 socfpga_arria10_swvp.dtb \
18 socfpga_cyclone5_mcvevk.dtb \
19 socfpga_cyclone5_socdk.dtb \
20- socfpga_cyclone5_de0_sockit.dtb \
21+ socfpga_cyclone5_de0_nano_soc.dtb \
22 socfpga_cyclone5_sockit.dtb \
23 socfpga_cyclone5_socrates.dtb \
24 socfpga_cyclone5_sodia.dtb \
25diff --git a/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts
26similarity index 100%
27rename from arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts
28rename to arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts
29--
302.17.1
31
diff --git a/recipes-kernel/linux/linux-altera-ltsi_4.14.130.bb b/recipes-kernel/linux/linux-altera-ltsi_4.14.130.bb
index 22efe0a..36cb647 100644
--- a/recipes-kernel/linux/linux-altera-ltsi_4.14.130.bb
+++ b/recipes-kernel/linux/linux-altera-ltsi_4.14.130.bb
@@ -7,7 +7,8 @@ include linux-altera.inc
7 7
8FILESEXTRAPATHS_prepend := "${THISDIR}/config:" 8FILESEXTRAPATHS_prepend := "${THISDIR}/config:"
9 9
10SRC_URI_append_cyclone5 = " file://lbdaf.scc " 10SRC_URI_append_cyclone5 = " file://lbdaf.scc \
11 file://0001-Rename-de0_sockit-devicetree-to-de0_nano_soc.patch"
11SRC_URI_append_arria5 = " file://lbdaf.scc " 12SRC_URI_append_arria5 = " file://lbdaf.scc "
12SRC_URI_append_arria10 = " file://lbdaf.scc " 13SRC_URI_append_arria10 = " file://lbdaf.scc "
13 14