From 8cbe258eb47a214f699adc6fe5ed33f0c24c5cfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz> Date: Thu, 18 Jul 2019 15:13:56 +0200 Subject: [PATCH] patches/openwrt: enable DSA for Turris 1.x Driver for DSA switch chip was enabled but DSA it self was not. This commit enables it as well. --- configs/turris1x/kernel | 2 -- ...configuration-options-for-Turris-1.x.patch | 25 +++++++++++++------ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/configs/turris1x/kernel b/configs/turris1x/kernel index 99b16afc0..b5836ebf5 100644 --- a/configs/turris1x/kernel +++ b/configs/turris1x/kernel @@ -5,5 +5,3 @@ CONFIG_PACKAGE_kmod-swconfig=y CONFIG_PACKAGE_kmod-mmc=y CONFIG_PACKAGE_kmod-mtd-rw=y CONFIG_PACKAGE_kmod-sdhci=y - -CONFIG_KERNEL_NET_DSA_QCA8K=y diff --git a/patches/openwrt/wip/0006-Add-kernel-configuration-options-for-Turris-1.x.patch b/patches/openwrt/wip/0006-Add-kernel-configuration-options-for-Turris-1.x.patch index c8af2709f..01795f073 100644 --- a/patches/openwrt/wip/0006-Add-kernel-configuration-options-for-Turris-1.x.patch +++ b/patches/openwrt/wip/0006-Add-kernel-configuration-options-for-Turris-1.x.patch @@ -1,4 +1,4 @@ -From a9d05664bd7858a509edafb4f9e1b26237c56003 Mon Sep 17 00:00:00 2001 +From bd4642a693f8739dc9a9724b6386b7045cbb583d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz> Date: Mon, 11 Mar 2019 16:25:30 +0100 Subject: [PATCH] Add kernel configuration options for Turris 1.x @@ -11,11 +11,11 @@ specific configuration. Signed-off-by: Karel KoÄŤĂ <karel.koci@nic.cz> --- - target/linux/mpc85xx/config-4.14 | 69 ++++++++++++++++++++++++++++---- - 1 file changed, 62 insertions(+), 7 deletions(-) + target/linux/mpc85xx/config-4.14 | 74 +++++++++++++++++++++++++++----- + 1 file changed, 64 insertions(+), 10 deletions(-) diff --git a/target/linux/mpc85xx/config-4.14 b/target/linux/mpc85xx/config-4.14 -index 79480d72da..41d4f00b66 100644 +index 79480d7..2823a64 100644 --- a/target/linux/mpc85xx/config-4.14 +++ b/target/linux/mpc85xx/config-4.14 @@ -42,6 +42,15 @@ CONFIG_BOOKE_WDT=y @@ -158,7 +158,7 @@ index 79480d72da..41d4f00b66 100644 CONFIG_PPC_MMU_NOHASH=y # CONFIG_PPC_MM_SLICES is not set # CONFIG_PPC_MPC106 is not set -@@ -331,6 +374,7 @@ CONFIG_SPE=y +@@ -331,13 +374,13 @@ CONFIG_SPE=y CONFIG_SPE_POSSIBLE=y CONFIG_SPI=y CONFIG_SPI_FSL_ESPI=y @@ -166,7 +166,16 @@ index 79480d72da..41d4f00b66 100644 CONFIG_SPI_MASTER=y CONFIG_SRCU=y # CONFIG_STRIP_ASM_SYMS is not set -@@ -349,7 +393,13 @@ CONFIG_TINY_SRCU=y + # CONFIG_STX_GP3 is not set +-CONFIG_SWCONFIG=y +-CONFIG_SWIOTLB=y +-CONFIG_SWPHY=y ++CONFIG_NET_DSA=y ++CONFIG_NET_DSA_QCA8K=y + CONFIG_SYSCTL_EXCEPTION_TRACE=y + CONFIG_TASK_SIZE=0xc0000000 + CONFIG_THREAD_SHIFT=13 +@@ -349,7 +392,13 @@ CONFIG_TINY_SRCU=y # CONFIG_TQM8548 is not set # CONFIG_TQM8555 is not set # CONFIG_TQM8560 is not set @@ -180,7 +189,7 @@ index 79480d72da..41d4f00b66 100644 CONFIG_UCC=y CONFIG_UCC_FAST=y CONFIG_UCC_GETH=y -@@ -368,8 +418,13 @@ CONFIG_VM_EVENT_COUNTERS=y +@@ -368,8 +417,13 @@ CONFIG_VM_EVENT_COUNTERS=y CONFIG_WATCHDOG_CORE=y # CONFIG_XES_MPC85xx is not set # CONFIG_XPS_USB_HCD_XILINX is not set @@ -195,5 +204,5 @@ index 79480d72da..41d4f00b66 100644 CONFIG_VGACON_SOFT_SCROLLBACK=n +CONFIG_SPI_SPIDEV=y -- -2.21.0 +2.22.0 -- GitLab