Skip to content
Snippets Groups Projects

patches/openwrt: turris1x: unset CONFIG_HUGETLBFS

Merged patches/openwrt: turris1x: unset CONFIG_HUGETLBFS
hotfix/turris1x-unset-HUGETLBFS into hbk
All threads resolved!
Merged Josef Schlehofer requested to merge hotfix/turris1x-unset-HUGETLBFS into hbk
All threads resolved!
Compare
and
1 file
+ 16
− 15
Preferences
Compare changes
patches/openwrt/wip/0002-Add-Turris-1.X-support-kernel-4.14.patch
+ 16
− 15
From 2b20d7e5075ac12dcb8b23fb6023a29adea61719 Mon Sep 17 00:00:00 2001
From 49f866e69ffe1bec487bf94e1f5ed33d34711415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Mon, 17 Feb 2020 11:56:15 +0100
Subject: [PATCH] Add Turris 1.X support (kernel 4.14)
@@ -10,19 +10,19 @@ Signed-off-by: Marek Behún <marek.behun@nic.cz>
Signed-off-by: Karel Kočí <karel.koci@nic.cz>
---
.../mpc85xx/base-files/etc/board.d/02_network | 4 +
target/linux/mpc85xx/config-4.14 | 65 +++-
target/linux/mpc85xx/config-4.14 | 66 +++-
.../files/arch/powerpc/boot/dts/turris1x.dts | 296 ++++++++++++++++++
target/linux/mpc85xx/image/Makefile | 8 +
target/linux/mpc85xx/p2020/config-default | 27 ++
...fsl_elbc_nand_add_ecc_mode_selection.patch | 227 ++++++++++++++
...a8k-extend-slave-bus-implementations.patch | 243 ++++++++++++++
7 files changed, 862 insertions(+), 8 deletions(-)
7 files changed, 863 insertions(+), 8 deletions(-)
create mode 100644 target/linux/mpc85xx/files/arch/powerpc/boot/dts/turris1x.dts
create mode 100644 target/linux/mpc85xx/patches-4.14/230-fsl_elbc_nand_add_ecc_mode_selection.patch
create mode 100644 target/linux/mpc85xx/patches-4.14/400-net-dsa-qca8k-extend-slave-bus-implementations.patch
diff --git a/target/linux/mpc85xx/base-files/etc/board.d/02_network b/target/linux/mpc85xx/base-files/etc/board.d/02_network
index aa33a4a..b24bcb6 100755
index aa33a4af96..b24bcb68ae 100755
--- a/target/linux/mpc85xx/base-files/etc/board.d/02_network
+++ b/target/linux/mpc85xx/base-files/etc/board.d/02_network
@@ -23,6 +23,10 @@ tplink,tl-wdr4900-v1)
@@ -37,7 +37,7 @@ index aa33a4a..b24bcb6 100755
ucidef_set_interfaces_lan_wan "eth0" "eth1"
;;
diff --git a/target/linux/mpc85xx/config-4.14 b/target/linux/mpc85xx/config-4.14
index 77fd10f..c8985bd 100644
index 77fd10f302..3944b60f91 100644
--- a/target/linux/mpc85xx/config-4.14
+++ b/target/linux/mpc85xx/config-4.14
@@ -42,6 +42,15 @@ CONFIG_BOOKE_WDT=y
@@ -149,7 +149,7 @@ index 77fd10f..c8985bd 100644
# CONFIG_P1022_DS is not set
# CONFIG_P1022_RDK is not set
# CONFIG_P1023_RDB is not set
@@ -255,8 +288,13 @@ CONFIG_PGTABLE_LEVELS=2
@@ -255,8 +288,14 @@ CONFIG_PGTABLE_LEVELS=2
CONFIG_PHYLIB=y
CONFIG_PHYSICAL_ALIGN=0x04000000
CONFIG_PHYSICAL_START=0x00000000
@@ -158,13 +158,14 @@ index 77fd10f..c8985bd 100644
+CONFIG_PHYS_64BIT=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+# CONFIG_HUGETLBFS is not set
# CONFIG_PPA8548 is not set
+CONFIG_NET_DSA=y
+CONFIG_NET_DSA_QCA8K=y
CONFIG_PPC=y
CONFIG_PPC32=y
# CONFIG_PPC64 is not set
@@ -279,11 +317,12 @@ CONFIG_PPC_DOORBELL=y
@@ -279,11 +318,12 @@ CONFIG_PPC_DOORBELL=y
# CONFIG_PPC_EARLY_DEBUG is not set
# CONFIG_PPC_EPAPR_HV_PIC is not set
CONFIG_PPC_FSL_BOOK3E=y
@@ -178,7 +179,7 @@ index 77fd10f..c8985bd 100644
CONFIG_PPC_MMU_NOHASH=y
# CONFIG_PPC_MM_SLICES is not set
# CONFIG_PPC_MPC106 is not set
@@ -329,6 +368,7 @@ CONFIG_SPE=y
@@ -329,6 +369,7 @@ CONFIG_SPE=y
CONFIG_SPE_POSSIBLE=y
CONFIG_SPI=y
CONFIG_SPI_FSL_ESPI=y
@@ -186,7 +187,7 @@ index 77fd10f..c8985bd 100644
CONFIG_SPI_MASTER=y
CONFIG_SRCU=y
# CONFIG_STRIP_ASM_SYMS is not set
@@ -352,6 +392,13 @@ CONFIG_UCC=y
@@ -352,6 +393,13 @@ CONFIG_UCC=y
CONFIG_UCC_FAST=y
CONFIG_UCC_GETH=y
# CONFIG_UGETH_TX_ON_DEMAND is not set
@@ -200,7 +201,7 @@ index 77fd10f..c8985bd 100644
CONFIG_USB_SUPPORT=y
CONFIG_VDSO32=y
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
@@ -362,3 +409,5 @@ CONFIG_WATCHDOG_CORE=y
@@ -362,3 +410,5 @@ CONFIG_WATCHDOG_CORE=y
# CONFIG_XPS_USB_HCD_XILINX is not set
CONFIG_XZ_DEC_BCJ=y
CONFIG_XZ_DEC_POWERPC=y
@@ -208,7 +209,7 @@ index 77fd10f..c8985bd 100644
+# CONFIG_VGA_CONSOLE is not set
diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/turris1x.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/turris1x.dts
new file mode 100644
index 0000000..b5128a3
index 0000000000..b5128a373d
--- /dev/null
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/turris1x.dts
@@ -0,0 +1,296 @@
@@ -509,7 +510,7 @@ index 0000000..b5128a3
+
+/include/ "fsl/p2020si-post.dtsi"
diff --git a/target/linux/mpc85xx/image/Makefile b/target/linux/mpc85xx/image/Makefile
index c0e3112..14a005f 100644
index c0e3112741..14a005f996 100644
--- a/target/linux/mpc85xx/image/Makefile
+++ b/target/linux/mpc85xx/image/Makefile
@@ -141,6 +141,14 @@ define Device/p2020rdb
@@ -528,7 +529,7 @@ index c0e3112..14a005f 100644
$(eval $(call BuildImage))
diff --git a/target/linux/mpc85xx/p2020/config-default b/target/linux/mpc85xx/p2020/config-default
index e652644..7913e00 100644
index e6526446b4..7913e003a4 100644
--- a/target/linux/mpc85xx/p2020/config-default
+++ b/target/linux/mpc85xx/p2020/config-default
@@ -4,6 +4,10 @@ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
@@ -582,7 +583,7 @@ index e652644..7913e00 100644
+CONFIG_NVMEM_SYSFS=y
diff --git a/target/linux/mpc85xx/patches-4.14/230-fsl_elbc_nand_add_ecc_mode_selection.patch b/target/linux/mpc85xx/patches-4.14/230-fsl_elbc_nand_add_ecc_mode_selection.patch
new file mode 100644
index 0000000..d661626
index 0000000000..d6616263f3
--- /dev/null
+++ b/target/linux/mpc85xx/patches-4.14/230-fsl_elbc_nand_add_ecc_mode_selection.patch
@@ -0,0 +1,227 @@
@@ -815,7 +816,7 @@ index 0000000..d661626
+ mtd_device_parse_register(mtd, part_probe_types, NULL,
diff --git a/target/linux/mpc85xx/patches-4.14/400-net-dsa-qca8k-extend-slave-bus-implementations.patch b/target/linux/mpc85xx/patches-4.14/400-net-dsa-qca8k-extend-slave-bus-implementations.patch
new file mode 100644
index 0000000..9a24bee
index 0000000000..9a24bee317
--- /dev/null
+++ b/target/linux/mpc85xx/patches-4.14/400-net-dsa-qca8k-extend-slave-bus-implementations.patch
@@ -0,0 +1,243 @@