From bbdb615926e72c5aa82a9b0ef36342c7a4622228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <marek.behun@nic.cz>
Date: Thu, 4 Jul 2019 11:25:56 +0200
Subject: [PATCH] patches/openwrt: Reabse Turris 1.x patches for 4.14
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Marek BehĂşn <marek.behun@nic.cz>
---
...-full-Add-gettext_filter-and-gettext.patch | 8 +-
...-Add-Turris-1.X-support-kernel-4.14.patch} | 643 ++++++++++++------
...tomatically-bump-release-when-needed.patch | 20 +-
.../wip/0004-mvebu-Basic-MoX-support.patch | 19 +-
.../0005-Turris-Omnia-Improved-suppport.patch | 12 +-
...configuration-options-for-Turris-1.x.patch | 393 -----------
6 files changed, 448 insertions(+), 647 deletions(-)
rename patches/openwrt/wip/{0002-kernel-Add-Turris-1.X-support.patch => 0002-kernel-Add-Turris-1.X-support-kernel-4.14.patch} (59%)
delete mode 100644 patches/openwrt/wip/0006-Add-kernel-configuration-options-for-Turris-1.x.patch
diff --git a/patches/openwrt/wip/0001-gettext-full-Add-gettext_filter-and-gettext.patch b/patches/openwrt/wip/0001-gettext-full-Add-gettext_filter-and-gettext.patch
index 7dfcea4fc..6a3e37091 100644
--- a/patches/openwrt/wip/0001-gettext-full-Add-gettext_filter-and-gettext.patch
+++ b/patches/openwrt/wip/0001-gettext-full-Add-gettext_filter-and-gettext.patch
@@ -1,4 +1,4 @@
-From 48eba56519aae2c86a5ae7e6ee531108ea7ef22f Mon Sep 17 00:00:00 2001
+From 53d1f0994e94ca24d3593a9f34a98be215a2aff8 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <Michal@Hrusecky.net>
Date: Fri, 23 Feb 2018 21:10:56 +0100
Subject: [PATCH] gettext-full: Add gettext_filter and gettext
@@ -11,7 +11,7 @@ Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
create mode 100644 package/libs/gettext-full/src/gettext-tools/gettext_filter.c
diff --git a/package/libs/gettext-full/Makefile b/package/libs/gettext-full/Makefile
-index 2e65571701..282044cb19 100644
+index 2e65571..282044c 100644
--- a/package/libs/gettext-full/Makefile
+++ b/package/libs/gettext-full/Makefile
@@ -37,6 +37,14 @@ define Package/libintl-full
@@ -44,7 +44,7 @@ index 2e65571701..282044cb19 100644
+$(eval $(call BuildPackage,gettext-tools))
diff --git a/package/libs/gettext-full/src/gettext-tools/gettext_filter.c b/package/libs/gettext-full/src/gettext-tools/gettext_filter.c
new file mode 100644
-index 0000000000..ae71824572
+index 0000000..ae71824
--- /dev/null
+++ b/package/libs/gettext-full/src/gettext-tools/gettext_filter.c
@@ -0,0 +1,54 @@
@@ -103,5 +103,5 @@ index 0000000000..ae71824572
+ return 0;
+}
--
-2.20.1
+2.21.0
diff --git a/patches/openwrt/wip/0002-kernel-Add-Turris-1.X-support.patch b/patches/openwrt/wip/0002-kernel-Add-Turris-1.X-support-kernel-4.14.patch
similarity index 59%
rename from patches/openwrt/wip/0002-kernel-Add-Turris-1.X-support.patch
rename to patches/openwrt/wip/0002-kernel-Add-Turris-1.X-support-kernel-4.14.patch
index cff288808..b2df77998 100644
--- a/patches/openwrt/wip/0002-kernel-Add-Turris-1.X-support.patch
+++ b/patches/openwrt/wip/0002-kernel-Add-Turris-1.X-support-kernel-4.14.patch
@@ -1,96 +1,269 @@
-From c59526219dfbefd7c4accdd749921eb0f52413d0 Mon Sep 17 00:00:00 2001
-From: Michal Hrusecky <Michal@Hrusecky.net>
-Date: Wed, 27 Dec 2017 17:19:45 +0100
-Subject: [PATCH] kernel: Add Turris 1.X support
+From a1f640c7b14da6cc1dfd3c69e632ba61f6b45f8e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <marek.behun@nic.cz>
+Date: Thu, 4 Jul 2019 11:12:39 +0200
+Subject: [PATCH] kernel: Add Turris 1.X support (kernel 4.14)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
-Tested on Turris 1.1 and works, but might break other mpc boards, so might need
-some polishing.
-
-Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
-Signed-off-by: Karel KoÄŤĂ <karel.koci@nic.cz>
+Signed-off-by: Marek BehĂşn <marek.behun@nic.cz>
---
- .../mpc85xx/base-files/etc/board.d/02_network | 4 +
- target/linux/mpc85xx/config-4.14 | 3 +
- .../arch/powerpc/boot/dts/turris-nand-bch.dts | 27 ++
- .../arch/powerpc/boot/dts/turris.dtsi | 322 ++++++++++++++++++
+ .../mpc85xx/base-files/etc/board.d/02_network | 6 +
+ target/linux/mpc85xx/config-4.14 | 120 ++++++-
+ .../files/arch/powerpc/boot/dts/turris.dts | 296 ++++++++++++++++++
+ target/linux/mpc85xx/p2020/config-default | 15 +
target/linux/mpc85xx/p2020/profiles/turris.mk | 29 ++
- ...sl_elbc-add-support-for-software-ecc.patch | 223 ++++++++++++
- ...a8k-extend-slave-bus-implementations.patch | 235 +++++++++++++
- 7 files changed, 843 insertions(+)
- create mode 100644 target/linux/mpc85xx/files-4.19/arch/powerpc/boot/dts/turris-nand-bch.dts
- create mode 100644 target/linux/mpc85xx/files-4.19/arch/powerpc/boot/dts/turris.dtsi
+ ...fsl_elbc_nand_add_ecc_mode_selection.patch | 227 ++++++++++++++
+ ...a8k-extend-slave-bus-implementations.patch | 243 ++++++++++++++
+ 7 files changed, 929 insertions(+), 7 deletions(-)
+ create mode 100644 target/linux/mpc85xx/files/arch/powerpc/boot/dts/turris.dts
create mode 100644 target/linux/mpc85xx/p2020/profiles/turris.mk
- create mode 100644 target/linux/mpc85xx/patches-4.19/230-mtd-rawnand-fsl_elbc-add-support-for-software-ecc.patch
- create mode 100644 target/linux/mpc85xx/patches-4.19/233-net-dsa-qca8k-extend-slave-bus-implementations.patch
+ 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 d6b4eebf14..53a92bf341 100755
+index d6b4eeb..e6af770 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)
+@@ -23,6 +23,12 @@ tplink,tl-wdr4900-v1)
"0@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan"
ucidef_set_interface_macaddr "wan" "$(mtd_get_mac_binary config 332)"
;;
+fsl,P2020RDB)
-+ ucidef_set_interface_lan "lan1 lan2 lan3 lan4 lan5"
++ ucidef_set_interface_lan "eth0 eth1"
+ ucidef_set_interface_wan "eth2"
++ ucidef_add_switch "switch0" \
++ "0u@eth1" "1:lan1" "2:lan1" "3:lan1" "4:lan1" "5:lan2" "6u@eth0"
+ ;;
*)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
;;
diff --git a/target/linux/mpc85xx/config-4.14 b/target/linux/mpc85xx/config-4.14
-index f2337210d4..ce953e4532 100644
+index f233721..15c1686 100644
--- a/target/linux/mpc85xx/config-4.14
+++ b/target/linux/mpc85xx/config-4.14
-@@ -363,3 +363,6 @@ CONFIG_WATCHDOG_CORE=y
+@@ -42,6 +42,15 @@ CONFIG_BOOKE_WDT=y
+ CONFIG_BOUNCE=y
+ # CONFIG_BSC9131_RDB is not set
+ # CONFIG_BSC9132_QDS is not set
++CONFIG_BTRFS_FS=y
++CONFIG_VFAT_FS=y
++CONFIG_FAT_DEFAULT_CODEPAGE=437
++CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
++CONFIG_NLS_CODEPAGE_437=y
++CONFIG_NLS_ISO8859_1=y
++# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
++CONFIG_BTRFS_FS_POSIX_ACL=y
++CONFIG_BUILD_BIN2C=y
+ # CONFIG_C293_PCIE is not set
+ CONFIG_CLONE_BACKWARDS=y
+ CONFIG_CLZ_TAB=y
+@@ -60,6 +69,7 @@ CONFIG_CRYPTO_AUTHENC=y
+ CONFIG_CRYPTO_HASH=y
+ CONFIG_CRYPTO_HASH2=y
+ CONFIG_CRYPTO_HW=y
++CONFIG_CRYPTO_LZO=y
+ CONFIG_CRYPTO_MANAGER=y
+ CONFIG_CRYPTO_MANAGER2=y
+ # CONFIG_CRYPTO_MD5_PPC is not set
+@@ -72,6 +82,7 @@ CONFIG_CRYPTO_RSA=y
+ # CONFIG_CRYPTO_SHA1_PPC_SPE is not set
+ # CONFIG_CRYPTO_SHA256_PPC_SPE is not set
+ CONFIG_CRYPTO_WORKQUEUE=y
++CONFIG_CRYPTO_XZ=y
+ CONFIG_DEBUG_BUGVERBOSE=y
+ # CONFIG_DEFAULT_UIMAGE is not set
+ CONFIG_DNOTIFY=y
+@@ -183,7 +194,12 @@ CONFIG_IRQ_DOMAIN=y
+ CONFIG_IRQ_FORCED_THREADING=y
+ CONFIG_IRQ_WORK=y
+ CONFIG_ISA_DMA_API=y
++CONFIG_JFFS2_FS_POSIX_ACL=y
++CONFIG_JFFS2_LZO=y
++CONFIG_JFFS2_RUBIN=y
++CONFIG_JFFS2_ZLIB=y
+ CONFIG_KERNEL_GZIP=y
++# CONFIG_KERNEL_XZ is not set
+ CONFIG_KERNEL_START=0xc0000000
+ # CONFIG_KSI8560 is not set
+ CONFIG_LEGACY_PTYS=y
+@@ -192,7 +208,12 @@ CONFIG_LIBFDT=y
+ CONFIG_LOWMEM_CAM_NUM=3
+ CONFIG_LOWMEM_SIZE=0x30000000
+ CONFIG_LXT_PHY=y
+-# CONFIG_MATH_EMULATION is not set
++CONFIG_LZO_COMPRESS=y
++CONFIG_LZO_DECOMPRESS=y
++CONFIG_MATH_EMULATION=y
++# CONFIG_MATH_EMULATION_FULL is not set
++CONFIG_MATH_EMULATION_HW_UNIMPLEMENTED=y
++CONFIG_MDIO_BOARDINFO=y
+ CONFIG_MDIO_BUS=y
+ CONFIG_MDIO_DEVICE=y
+ CONFIG_MIGRATION=y
+@@ -201,19 +222,30 @@ CONFIG_MODULES_USE_ELF_RELA=y
+ # CONFIG_MPC8536_DS is not set
+ # CONFIG_MPC8540_ADS is not set
+ # CONFIG_MPC8560_ADS is not set
+-# CONFIG_MPC85xx_CDS is not set
++CONFIG_MPC85xx_CDS=y
+ # CONFIG_MPC85xx_DS is not set
+-# CONFIG_MPC85xx_MDS is not set
+-# CONFIG_MPC85xx_RDB is not set
++CONFIG_MPC85xx_MDS=y
++CONFIG_MPC85xx_RDB=y
+ CONFIG_MPIC=y
+ # CONFIG_MPIC_MSGR is not set
+ CONFIG_MPIC_TIMER=y
+ # CONFIG_MPIC_U3_HT_IRQS is not set
+ # CONFIG_MPIC_WEIRD is not set
+ CONFIG_MPILIB=y
+-# CONFIG_MTD_CFI is not set
++# CONFIG_MTD_CFI_NOSWAP is not set
++CONFIG_MTD_CFI_STAA=y
++CONFIG_MTD_JEDECPROBE=y
+ CONFIG_MTD_M25P80=y
+ CONFIG_MTD_SPI_NOR=y
++CONFIG_MTD_RAM=y
++CONFIG_MTD_ROM=y
++CONFIG_MTD_UBI=y
++CONFIG_MTD_UBI_BEB_LIMIT=20
++# CONFIG_MTD_UBI_BLOCK is not set
++# CONFIG_MTD_UBI_FASTMAP is not set
++# CONFIG_MTD_UBI_GLUEBI is not set
++CONFIG_MTD_UBI_WL_THRESHOLD=4096
++CONFIG_MUTEX_SPIN_ON_OWNER=y
+ # CONFIG_MVME2500 is not set
+ # CONFIG_NEED_DMA_MAP_STATE is not set
+ # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
+@@ -231,13 +263,14 @@ CONFIG_OF_FLATTREE=y
+ CONFIG_OF_GPIO=y
+ CONFIG_OF_IRQ=y
+ CONFIG_OF_MDIO=y
++CONFIG_OF_MTD=y
+ CONFIG_OF_NET=y
+ CONFIG_OF_PCI=y
+ CONFIG_OF_PCI_IRQ=y
+ CONFIG_OF_RESERVED_MEM=y
+ CONFIG_OLD_SIGACTION=y
+ CONFIG_OLD_SIGSUSPEND=y
+-# CONFIG_P1010_RDB is not set
++CONFIG_P1010_RDB=y
+ # CONFIG_P1022_DS is not set
+ # CONFIG_P1022_RDK is not set
+ # CONFIG_P1023_RDB is not set
+@@ -281,11 +314,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
+-# CONFIG_PPC_I8259 is not set
++CONFIG_PPC_I8259=y
+ # CONFIG_PPC_ICP_HV is not set
+ # CONFIG_PPC_ICP_NATIVE is not set
+ # CONFIG_PPC_ICS_RTAS is not set
+ CONFIG_PPC_INDIRECT_PCI=y
++CONFIG_PPC_LIB_RHEAP=y
+ CONFIG_PPC_MMU_NOHASH=y
+ # CONFIG_PPC_MM_SLICES is not set
+ # CONFIG_PPC_MPC106 is not set
+@@ -331,6 +365,7 @@ CONFIG_SPE=y
+ CONFIG_SPE_POSSIBLE=y
+ CONFIG_SPI=y
+ CONFIG_SPI_FSL_ESPI=y
++CONFIG_SPI_FSL_LIB=y
+ CONFIG_SPI_MASTER=y
+ CONFIG_SRCU=y
+ # CONFIG_STRIP_ASM_SYMS is not set
+@@ -354,6 +389,13 @@ CONFIG_UCC=y
+ CONFIG_UCC_FAST=y
+ CONFIG_UCC_GETH=y
+ # CONFIG_UGETH_TX_ON_DEMAND is not set
++CONFIG_USB=y
++CONFIG_USB_COMMON=y
++CONFIG_USB_EHCI_FSL=y
++CONFIG_USB_EHCI_HCD=y
++# CONFIG_USB_EHCI_HCD_PLATFORM is not set
++CONFIG_USB_EHCI_HCD_PPC_OF=y
++CONFIG_USB_FHCI_HCD=y
+ CONFIG_USB_SUPPORT=y
+ CONFIG_VDSO32=y
+ # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
+@@ -361,5 +403,69 @@ CONFIG_VM_EVENT_COUNTERS=y
+ CONFIG_WATCHDOG_CORE=y
+ # CONFIG_XES_MPC85xx is not set
# CONFIG_XPS_USB_HCD_XILINX is not set
++CONFIG_XOR_BLOCKS=y
++CONFIG_XPS=y
CONFIG_XZ_DEC_BCJ=y
CONFIG_XZ_DEC_POWERPC=y
-+CONFIG_FB_FSL_DIU=n
-+CONFIG_VGA_CONSOLE=y
-+CONFIG_VGACON_SOFT_SCROLLBACK=n
-diff --git a/target/linux/mpc85xx/files-4.19/arch/powerpc/boot/dts/turris-nand-bch.dts b/target/linux/mpc85xx/files-4.19/arch/powerpc/boot/dts/turris-nand-bch.dts
-new file mode 100644
-index 0000000000..59ef5fdf2e
---- /dev/null
-+++ b/target/linux/mpc85xx/files-4.19/arch/powerpc/boot/dts/turris-nand-bch.dts
-@@ -0,0 +1,27 @@
-+/*
-+ * Turris RDB Device Tree Source
-+ *
-+ * Copyright 2013 CZ.NIC z.s.p.o. (http://www.nic.cz/)
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License as published by the
-+ * Free Software Foundation; either version 2 of the License, or (at your
-+ * option) any later version.
-+ */
-+
-+/include/ "turris.dtsi"
-+
-+&lbc {
-+ nand@1,0 {
-+ nand-ecc-mode = "soft";
-+ nand-ecc-algo = "bch";
-+ };
-+};
-+
-+/*
-+&soc {
-+ sdhc@2e000 {
-+ status = "disabled";
-+ };
-+};
-+*/
-diff --git a/target/linux/mpc85xx/files-4.19/arch/powerpc/boot/dts/turris.dtsi b/target/linux/mpc85xx/files-4.19/arch/powerpc/boot/dts/turris.dtsi
++CONFIG_ZLIB_DEFLATE=y
++CONFIG_ZLIB_INFLATE=y
++# CONFIG_FB_FSL_DIU is not set
++# CONFIG_VGA_CONSOLE is not set
++CONFIG_AIO=y
++CONFIG_FHANDLE=y
++CONFIG_FANOTIFY=y
++CONFIG_MAGIC_SYSRQ=y
++CONFIG_PRINTK_TIME=y
++CONFIG_KEXEC=y
++CONFIG_DEVTMPFS=y
++CONFIG_DEVTMPFS_MOUNT=y
++CONFIG_CGROUPS=y
++CONFIG_CGROUP_DEBUG=y
++CONFIG_FREEZER=y
++CONFIG_CGROUP_FREEZER=y
++CONFIG_CGROUP_DEVICE=y
++CONFIG_CGROUP_PIDS=y
++CONFIG_CPUSETS=y
++CONFIG_CGROUP_CPUACCT=y
++CONFIG_RESOURCE_COUNTERS=y
++CONFIG_MM_OWNER=y
++CONFIG_MEMCG=y
++CONFIG_MEMCG_SWAP=y
++CONFIG_MEMCG_KMEM=y
++CONFIG_CGROUP_SCHED=y
++CONFIG_BLK_CGROUP=y
++CONFIG_NET_CLS_CGROUP=y
++CONFIG_NETPRIO_CGROUP=y
++CONFIG_NAMESPACES=y
++CONFIG_UTS_NS=y
++CONFIG_IPC_NS=y
++CONFIG_USER_NS=y
++CONFIG_PID_NS=y
++CONFIG_NET_NS=y
++CONFIG_LXC_MISC=y
++CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
++CONFIG_POSIX_MQUEUE=y
++CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT=4092
++CONFIG_BTRFS_FS=y
++CONFIG_BTRFS_FS_POSIX_ACL=y
++CONFIG_NFS_FS=y
++CONFIG_NFS_V2=y
++CONFIG_NFS_V3=y
++CONFIG_ROOT_NFS=y
++CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
++CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP=n
++CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP=n
++CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC=y
++CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=y
++CONFIG_WATCHDOG_SYSFS=y
++CONFIG_WATCHDOG_NOWAYOUT=y
++CONFIG_FAIR_GROUP_SCHED=y
++CONFIG_CFS_BANDWIDTH=y
++CONFIG_TASKSTATS=y
++CONFIG_TASK_DELAY_ACCT=y
++CONFIG_TASK_IO_ACCOUNTING=y
++CONFIG_TASK_XACCT=y
++CONFIG_VM_EVENT_COUNTERS=y
++CONFIG_NET_DSA=y
++CONFIG_NET_DSA_QCA8K=y
++CONFIG_DEVMEM=y
+diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/turris.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/turris.dts
new file mode 100644
-index 0000000000..03c8fc5ade
+index 0000000..b5128a3
--- /dev/null
-+++ b/target/linux/mpc85xx/files-4.19/arch/powerpc/boot/dts/turris.dtsi
-@@ -0,0 +1,322 @@
++++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/turris.dts
+@@ -0,0 +1,296 @@
+/*
+ * Turris RDB Device Tree Source
+ *
@@ -130,8 +303,7 @@ index 0000000000..03c8fc5ade
+ /* NOR and NAND Flashes */
+ ranges = <0x0 0x0 0x0 0xef000000 0x01000000
+ 0x1 0x0 0x0 0xff800000 0x00040000
-+ 0x3 0x0 0x0 0xffa00000 0x00100000>;
-+ /* 0x2 0x0 0x0 0xffb00000 0x00020000>; */
++ 0x2 0x0 0x0 0xffb00000 0x00020000>;
+
+ nor@0,0 {
+ #address-cells = <1>;
@@ -192,6 +364,8 @@ index 0000000000..03c8fc5ade
+ compatible = "fsl,p2020-fcm-nand",
+ "fsl,elbc-fcm-nand";
+ reg = <0x1 0x0 0x00040000>;
++ nand-ecc-mode = "soft";
++ nand-ecc-algo = "bch";
+
+ partitions {
+ compatible = "fixed-partitions";
@@ -222,11 +396,6 @@ index 0000000000..03c8fc5ade
+ };
+ };
+ };
-+
-+/* led-controller@3,0 {
-+ compatible = "cznic,turris-leds";
-+ reg = <0x3 0x0 0x30>;
-+ };*/
+ };
+
+ soc: soc@ffe00000 {
@@ -243,29 +412,6 @@ index 0000000000..03c8fc5ade
+ };
+ };
+
-+ spi0: spi@7000 {
-+/* spidev@0 {
-+ compatible = "spidev";
-+ spi-max-frequency = <40000000>;
-+ reg = <0>;
-+ };
-+ spidev@1 {
-+ compatible = "spidev";
-+ spi-max-frequency = <40000000>;
-+ reg = <1>;
-+ };
-+ spidev@2 {
-+ compatible = "spidev";
-+ spi-max-frequency = <40000000>;
-+ reg = <2>;
-+ };
-+ spidev@3 {
-+ compatible = "spidev";
-+ spi-max-frequency = <40000000>;
-+ reg = <3>;
-+ };*/
-+ };
-+
+ usb@22000 {
+ phy_type = "ulpi";
+ dr_mode = "host";
@@ -276,6 +422,7 @@ index 0000000000..03c8fc5ade
+ compatible = "qca,qca8337";
+ #size-cells = <0>;
+ #address-cells = <1>;
++ interrupts = <2 1 0 0>;
+ reg = <0x10>;
+
+ ports {
@@ -413,9 +560,49 @@ index 0000000000..03c8fc5ade
+};
+
+/include/ "fsl/p2020si-post.dtsi"
+diff --git a/target/linux/mpc85xx/p2020/config-default b/target/linux/mpc85xx/p2020/config-default
+index e652644..f9e7555 100644
+--- a/target/linux/mpc85xx/p2020/config-default
++++ b/target/linux/mpc85xx/p2020/config-default
+@@ -4,6 +4,10 @@ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+ CONFIG_GENERIC_IRQ_MIGRATION=y
+ CONFIG_GENERIC_TBSYNC=y
+ CONFIG_HAVE_RCU_TABLE_FREE=y
++CONFIG_I2C=y
++CONFIG_I2C_BOARDINFO=y
++CONFIG_I2C_CHARDEV=y
++CONFIG_I2C_MPC=y
+ CONFIG_LOCK_SPIN_ON_OWNER=y
+ CONFIG_MPC85xx_RDB=y
+ CONFIG_MTD_CFI=y
+@@ -14,6 +18,12 @@ CONFIG_MTD_NAND_ECC_BCH=y
+ CONFIG_MTD_NAND_FSL_ELBC=y
+ CONFIG_MTD_SPLIT_FIRMWARE=y
+ CONFIG_MTD_SPLIT_FIT_FW=y
++CONFIG_MTD_UBI=y
++CONFIG_MTD_UBI_BEB_LIMIT=20
++# CONFIG_MTD_UBI_BLOCK is not set
++# CONFIG_MTD_UBI_FASTMAP is not set
++# CONFIG_MTD_UBI_GLUEBI is not set
++CONFIG_MTD_UBI_WL_THRESHOLD=4096
+ CONFIG_MUTEX_SPIN_ON_OWNER=y
+ CONFIG_NET_FLOW_LIMIT=y
+ CONFIG_NR_CPUS=2
+@@ -26,6 +36,11 @@ CONFIG_RFS_ACCEL=y
+ CONFIG_RPS=y
+ CONFIG_RWSEM_SPIN_ON_OWNER=y
+ CONFIG_SMP=y
++CONFIG_UBIFS_FS=y
++CONFIG_UBIFS_FS_ADVANCED_COMPR=y
++CONFIG_UBIFS_FS_LZO=y
++CONFIG_UBIFS_FS_XZ=y
++CONFIG_UBIFS_FS_ZLIB=y
+ CONFIG_TREE_RCU=y
+ CONFIG_TREE_SRCU=y
+ CONFIG_XPS=y
diff --git a/target/linux/mpc85xx/p2020/profiles/turris.mk b/target/linux/mpc85xx/p2020/profiles/turris.mk
new file mode 100644
-index 0000000000..e7c4048e08
+index 0000000..6c1d542
--- /dev/null
+++ b/target/linux/mpc85xx/p2020/profiles/turris.mk
@@ -0,0 +1,29 @@
@@ -425,8 +612,8 @@ index 0000000000..e7c4048e08
+TURRISNAND_DTS:="turris-bch"
+TURRISNAND_UBIFS_OPTS:="-m 2048 -e 124KiB -c 2000 -F"
+TURRISNAND_UBI_OPTS:="-m 2048 -p 128KiB -s 2048"
-+KERNEL_PATCHVER:=4.19
-+KERNELNAME:=zImage turris-nand-bch.dtb
++KERNEL_PATCHVER:=4.14
++KERNELNAME:=zImage turris.dtb
+
+define Profile/TURRIS
+ NAME:=Turris 1.X
@@ -448,17 +635,17 @@ index 0000000000..e7c4048e08
+ Package set optimized for the Turris 1.X.
+endef
+$(eval $(call Profile,TURRIS))
-diff --git a/target/linux/mpc85xx/patches-4.19/230-mtd-rawnand-fsl_elbc-add-support-for-software-ecc.patch b/target/linux/mpc85xx/patches-4.19/230-mtd-rawnand-fsl_elbc-add-support-for-software-ecc.patch
+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 0000000000..0400c09ebc
+index 0000000..d661626
--- /dev/null
-+++ b/target/linux/mpc85xx/patches-4.19/230-mtd-rawnand-fsl_elbc-add-support-for-software-ecc.patch
-@@ -0,0 +1,223 @@
-+diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c
-+index 55f449b711fd..941dbe898bc2 100644
-+--- a/drivers/mtd/nand/raw/fsl_elbc_nand.c
-++++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c
-+@@ -355,6 +355,14 @@ static void fsl_elbc_cmdfunc(struct mtd_info *mtd, unsigned int command,
++++ b/target/linux/mpc85xx/patches-4.14/230-fsl_elbc_nand_add_ecc_mode_selection.patch
+@@ -0,0 +1,227 @@
++Index: a/drivers/mtd/nand/fsl_elbc_nand.c
++===================================================================
++--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++++ b/drivers/mtd/nand/fsl_elbc_nand.c
++@@ -355,6 +355,14 @@ static void fsl_elbc_cmdfunc(struct mtd_
+ fsl_elbc_run_command(mtd);
+ return;
+
@@ -473,13 +660,13 @@ index 0000000000..0400c09ebc
+ /* READOOB reads only the OOB because no ECC is performed. */
+ case NAND_CMD_READOOB:
+ dev_vdbg(priv->dev,
-+@@ -637,79 +645,6 @@ static int fsl_elbc_wait(struct mtd_info *mtd, struct nand_chip *chip)
++@@ -637,75 +645,6 @@ static int fsl_elbc_wait(struct mtd_info
+ return (elbc_fcm_ctrl->mdr & 0xff) | NAND_STATUS_WP;
+ }
+
-+-static int fsl_elbc_attach_chip(struct nand_chip *chip)
++-static int fsl_elbc_chip_init_tail(struct mtd_info *mtd)
+-{
-+- struct mtd_info *mtd = nand_to_mtd(chip);
++- struct nand_chip *chip = mtd_to_nand(mtd);
+- struct fsl_elbc_mtd *priv = nand_get_controller_data(chip);
+- struct fsl_lbc_ctrl *ctrl = priv->ctrl;
+- struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
@@ -540,20 +727,58 @@ index 0000000000..0400c09ebc
+- dev_err(priv->dev,
+- "fsl_elbc_init: page size %d is not supported\n",
+- mtd->writesize);
-+- return -ENOTSUPP;
++- return -1;
+- }
+-
+- return 0;
+-}
+-
-+-static const struct nand_controller_ops fsl_elbc_controller_ops = {
-+- .attach_chip = fsl_elbc_attach_chip,
-+-};
-+-
+ static int fsl_elbc_read_page(struct mtd_info *mtd, struct nand_chip *chip,
+ uint8_t *buf, int oob_required, int page)
+ {
-+@@ -791,27 +726,108 @@ static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv)
++@@ -748,6 +687,32 @@ static int fsl_elbc_write_subpage(struct
++ return 0;
++ }
++
+++static int fsl_elbc_ecc_init(struct fsl_elbc_mtd *priv)
+++{
+++ struct nand_chip *chip = &priv->chip;
+++
+++ switch (chip->ecc.mode) {
+++ case NAND_ECC_SOFT:
+++ break;
+++ case NAND_ECC_HW:
+++ chip->ecc.read_page = fsl_elbc_read_page;
+++ chip->ecc.write_page = fsl_elbc_write_page;
+++ chip->ecc.write_subpage = fsl_elbc_write_subpage;
+++ /* put in small page settings and adjust later if needed */
+++ /* chip->ecc.layout = (priv->fmr & FMR_ECCM) ?
+++ &fsl_elbc_oob_sp_eccm1 : &fsl_elbc_oob_sp_eccm0; */
+++ chip->ecc.size = 512;
+++ chip->ecc.bytes = 3;
+++ chip->ecc.strength = 1;
+++ break;
+++ default:
+++ return -EINVAL;
+++ }
+++
+++ return 0;
+++}
+++
+++
++ static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv)
++ {
++ struct fsl_lbc_ctrl *ctrl = priv->ctrl;
++@@ -755,6 +721,8 @@ static int fsl_elbc_chip_init(struct fsl
++ struct fsl_elbc_fcm_ctrl *elbc_fcm_ctrl = ctrl->nand;
++ struct nand_chip *chip = &priv->chip;
++ struct mtd_info *mtd = nand_to_mtd(chip);
+++ int ret;
+++ unsigned int al;
++
++ dev_dbg(priv->dev, "eLBC Set Information for bank %d\n", priv->bank);
++
++@@ -787,24 +755,62 @@ static int fsl_elbc_chip_init(struct fsl
+ chip->controller = &elbc_fcm_ctrl->controller;
+ nand_set_controller_data(chip, priv);
+
@@ -561,49 +786,28 @@ index 0000000000..0400c09ebc
+- chip->ecc.write_page = fsl_elbc_write_page;
+- chip->ecc.write_subpage = fsl_elbc_write_subpage;
+-
-+- /* If CS Base Register selects full hardware ECC then use it */
-+- if ((in_be32(&lbc->bank[priv->bank].br) & BR_DECC) ==
-+- BR_DECC_CHK_GEN) {
-+- chip->ecc.mode = NAND_ECC_HW;
++ /* If CS Base Register selects full hardware ECC then use it */
++ if ((in_be32(&lbc->bank[priv->bank].br) & BR_DECC) ==
++ BR_DECC_CHK_GEN) {
++ chip->ecc.mode = NAND_ECC_HW;
+- mtd_set_ooblayout(mtd, &fsl_elbc_ooblayout_ops);
+- chip->ecc.size = 512;
+- chip->ecc.bytes = 3;
+- chip->ecc.strength = 1;
-++ return 0;
-++}
-++
-++static int fsl_elbc_attach_chip(struct nand_chip *chip)
-++{
-++ struct mtd_info *mtd = nand_to_mtd(chip);
-++ struct fsl_elbc_mtd *priv = nand_get_controller_data(chip);
-++ struct fsl_lbc_ctrl *ctrl = priv->ctrl;
-++ struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
-++ unsigned int al;
++ } else {
++ /* otherwise fall back to default software ECC */
++ chip->ecc.mode = NAND_ECC_SOFT;
++ chip->ecc.algo = NAND_ECC_HAMMING;
++ }
++
+++ ret = nand_scan_ident(mtd, 1, NULL);
+++ if (ret)
+++ return ret;
++
-++ switch (chip->ecc.mode) {
-++ case NAND_ECC_NONE:
-++ /* If CS Base Register selects full hardware ECC then use it */
-++ if ((in_be32(&lbc->bank[priv->bank].br) & BR_DECC) ==
-++ BR_DECC_CHK_GEN) {
-++ chip->ecc.read_page = fsl_elbc_read_page;
-++ chip->ecc.write_page = fsl_elbc_write_page;
-++ chip->ecc.write_subpage = fsl_elbc_write_subpage;
-++
-++ chip->ecc.mode = NAND_ECC_HW;
-++ mtd_set_ooblayout(mtd, &fsl_elbc_ooblayout_ops);
-++ chip->ecc.size = 512;
-++ chip->ecc.bytes = 3;
-++ chip->ecc.strength = 1;
-++ } else {
-++ /* otherwise fall back to default software ECC */
-++ chip->ecc.mode = NAND_ECC_SOFT;
-++ chip->ecc.algo = NAND_ECC_HAMMING;
-++ }
-++ break;
-++ case NAND_ECC_SOFT:
-++ break;
-++ default:
-++ return -EINVAL;
+++ ret = fsl_elbc_ecc_init(priv);
+++ if (ret) {
+++ dev_err(priv->dev, "ECC init failed: %d\n", ret);
+++ return ret;
++ }
++
++ /* calculate FMR Address Length field */
@@ -615,41 +819,6 @@ index 0000000000..0400c09ebc
++
++ priv->fmr |= al << FMR_AL_SHIFT;
++
-++ dev_dbg(priv->dev, "fsl_elbc_init: nand->numchips = %d\n",
-++ chip->numchips);
-++ dev_dbg(priv->dev, "fsl_elbc_init: nand->chipsize = %lld\n",
-++ chip->chipsize);
-++ dev_dbg(priv->dev, "fsl_elbc_init: nand->pagemask = %8x\n",
-++ chip->pagemask);
-++ dev_dbg(priv->dev, "fsl_elbc_init: nand->chip_delay = %d\n",
-++ chip->chip_delay);
-++ dev_dbg(priv->dev, "fsl_elbc_init: nand->badblockpos = %d\n",
-++ chip->badblockpos);
-++ dev_dbg(priv->dev, "fsl_elbc_init: nand->chip_shift = %d\n",
-++ chip->chip_shift);
-++ dev_dbg(priv->dev, "fsl_elbc_init: nand->page_shift = %d\n",
-++ chip->page_shift);
-++ dev_dbg(priv->dev, "fsl_elbc_init: nand->phys_erase_shift = %d\n",
-++ chip->phys_erase_shift);
-++ dev_dbg(priv->dev, "fsl_elbc_init: nand->ecc.mode = %d\n",
-++ chip->ecc.mode);
-++ dev_dbg(priv->dev, "fsl_elbc_init: nand->ecc.steps = %d\n",
-++ chip->ecc.steps);
-++ dev_dbg(priv->dev, "fsl_elbc_init: nand->ecc.bytes = %d\n",
-++ chip->ecc.bytes);
-++ dev_dbg(priv->dev, "fsl_elbc_init: nand->ecc.total = %d\n",
-++ chip->ecc.total);
-++ dev_dbg(priv->dev, "fsl_elbc_init: mtd->ooblayout = %p\n",
-++ mtd->ooblayout);
-++ dev_dbg(priv->dev, "fsl_elbc_init: mtd->flags = %08x\n", mtd->flags);
-++ dev_dbg(priv->dev, "fsl_elbc_init: mtd->size = %lld\n", mtd->size);
-++ dev_dbg(priv->dev, "fsl_elbc_init: mtd->erasesize = %d\n",
-++ mtd->erasesize);
-++ dev_dbg(priv->dev, "fsl_elbc_init: mtd->writesize = %d\n",
-++ mtd->writesize);
-++ dev_dbg(priv->dev, "fsl_elbc_init: mtd->oobsize = %d\n",
-++ mtd->oobsize);
-++
++ /* adjust Option Register and ECC to match Flash page size */
++ if (mtd->writesize == 512) {
++ priv->page_size = 0;
@@ -657,36 +826,63 @@ index 0000000000..0400c09ebc
++ } else if (mtd->writesize == 2048) {
++ priv->page_size = 1;
++ setbits32(&lbc->bank[priv->bank].or, OR_FCM_PGS);
-+ } else {
-+- /* otherwise fall back to default software ECC */
-+- chip->ecc.mode = NAND_ECC_SOFT;
-+- chip->ecc.algo = NAND_ECC_HAMMING;
-++ dev_err(priv->dev,
-++ "fsl_elbc_init: page size %d is not supported\n",
+++ /* adjust ecc setup if needed */
+++ if (((in_be32(&lbc->bank[priv->bank].br) & BR_DECC) ==
+++ BR_DECC_CHK_GEN) && (chip->ecc.mode == NAND_ECC_HW)) {
+++ chip->ecc.size = 512;
+++ /* chip->ecc.layout = (priv->fmr & FMR_ECCM) ?
+++ &fsl_elbc_oob_lp_eccm1 :
+++ &fsl_elbc_oob_lp_eccm0; */
+++ }
+++ } else {
+++ dev_err(priv->dev, "page size %d is not supported\n",
++ mtd->writesize);
-++ return -ENOTSUPP;
-+ }
-+
+++ return -1;
+++ }
+++
+++ ret = nand_scan_tail(mtd);
+++ if (ret) {
+++ dev_err(priv->dev, "nand_scan_tail failed: %d\n", ret);
+++ return ret;
+++ }
+++
+ return 0;
+ }
+
-++static const struct nand_controller_ops fsl_elbc_controller_ops = {
-++ .attach_chip = fsl_elbc_attach_chip,
-++};
-++
-+ static int fsl_elbc_chip_remove(struct fsl_elbc_mtd *priv)
-+ {
-+ struct fsl_elbc_fcm_ctrl *elbc_fcm_ctrl = priv->ctrl->nand;
-diff --git a/target/linux/mpc85xx/patches-4.19/233-net-dsa-qca8k-extend-slave-bus-implementations.patch b/target/linux/mpc85xx/patches-4.19/233-net-dsa-qca8k-extend-slave-bus-implementations.patch
++@@ -912,18 +940,6 @@ static int fsl_elbc_nand_probe(struct pl
++ if (ret)
++ goto err;
++
++- ret = nand_scan_ident(mtd, 1, NULL);
++- if (ret)
++- goto err;
++-
++- ret = fsl_elbc_chip_init_tail(mtd);
++- if (ret)
++- goto err;
++-
++- ret = nand_scan_tail(mtd);
++- if (ret)
++- goto err;
++-
++ /* First look for RedBoot table or partitions on the command
++ * line, these take precedence over device tree information */
++ 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 0000000000..d5aca2e691
+index 0000000..9a24bee
--- /dev/null
-+++ b/target/linux/mpc85xx/patches-4.19/233-net-dsa-qca8k-extend-slave-bus-implementations.patch
-@@ -0,0 +1,235 @@
-+From ee910c90b118cbfe376d59997210363687181798 Mon Sep 17 00:00:00 2001
-+From: Christian Lamparter <chunkeey@gmail.com>
-+Date: Fri, 22 Mar 2019 01:05:03 +0100
-+Subject: [PATCH 4/4] net: dsa: qca8k: extend slave-bus implementations
++++ b/target/linux/mpc85xx/patches-4.14/400-net-dsa-qca8k-extend-slave-bus-implementations.patch
+@@ -0,0 +1,243 @@
++From c13c700885cf9cdfe52a67124168671cbb843f2c Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <marek.behun@nic.cz>
++Date: Wed, 3 Jul 2019 10:57:02 +0200
++Subject: [PATCH] net: dsa: qca8k: extend slave-bus implementations
++MIME-Version: 1.0
++Content-Type: text/plain; charset=UTF-8
++Content-Transfer-Encoding: 8bit
++
++commit db460c54b67fc2cbe6dcef88b7bf3cba8e07f80e upstream
+
+This patch implements accessors for the QCA8337 MDIO access
+through the MDIO_MASTER register, which makes it possible to
@@ -698,16 +894,18 @@ index 0000000000..d5aca2e691
+configurations, as this is not supported by the hardware.
+
+Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
++Signed-off-by: David S. Miller <davem@davemloft.net>
++Signed-off-by: Marek BehĂşn <marek.behun@nic.cz>
+---
-+ drivers/net/dsa/qca8k.c | 156 +++++++++++++++++++++++++++++++++++++++-
++ drivers/net/dsa/qca8k.c | 157 +++++++++++++++++++++++++++++++++++++++-
+ drivers/net/dsa/qca8k.h | 13 ++++
-+ 2 files changed, 168 insertions(+), 1 deletion(-)
++ 2 files changed, 169 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
-+index bdd8f2df6630..d8d30470feab 100644
++index c3c9d7e33bd6..d5f40d3c75e3 100644
+--- a/drivers/net/dsa/qca8k.c
++++ b/drivers/net/dsa/qca8k.c
-+@@ -477,6 +477,155 @@ qca8k_port_set_status(struct qca8k_priv *priv, int port, int enable)
++@@ -485,6 +485,156 @@ qca8k_port_set_status(struct qca8k_priv *priv, int port, int enable)
+ qca8k_reg_clear(priv, QCA8K_REG_PORT_STATUS(port), mask);
+ }
+
@@ -815,7 +1013,8 @@ index 0000000000..d5aca2e691
++ if (err)
++ return err;
++
-++ if (!dsa_is_user_port(priv->ds, reg))
+++ if (dsa_is_cpu_port(priv->ds, reg) ||
+++ dsa_is_dsa_port(priv->ds, reg))
++ continue;
++
++ if (of_property_read_bool(port, "phy-handle"))
@@ -863,7 +1062,7 @@ index 0000000000..d5aca2e691
+ static int
+ qca8k_setup(struct dsa_switch *ds)
+ {
-+@@ -498,6 +647,10 @@ qca8k_setup(struct dsa_switch *ds)
++@@ -506,6 +656,10 @@ qca8k_setup(struct dsa_switch *ds)
+ if (IS_ERR(priv->regmap))
+ pr_warn("regmap initialization failed");
+
@@ -872,9 +1071,9 @@ index 0000000000..d5aca2e691
++ return ret;
++
+ /* Initialize CPU port pad mode (xMII type, delays...) */
-+ phy_mode = of_get_phy_mode(ds->ports[QCA8K_CPU_PORT].dn);
++ phy_mode = of_get_phy_mode(ds->dst->cpu_dp->dn);
+ if (phy_mode < 0) {
-+@@ -902,7 +1055,8 @@ qca8k_sw_probe(struct mdio_device *mdiodev)
++@@ -905,7 +1059,8 @@ qca8k_sw_probe(struct mdio_device *mdiodev)
+ return -ENOMEM;
+
+ priv->ds->priv = priv;
@@ -916,7 +1115,7 @@ index 0000000000..d5aca2e691
+
+ struct qca8k_mib_desc {
+--
-+2.19.2
++2.21.0
+
--
2.21.0
diff --git a/patches/openwrt/wip/0003-build-Automatically-bump-release-when-needed.patch b/patches/openwrt/wip/0003-build-Automatically-bump-release-when-needed.patch
index 812d1e4ad..cff885081 100644
--- a/patches/openwrt/wip/0003-build-Automatically-bump-release-when-needed.patch
+++ b/patches/openwrt/wip/0003-build-Automatically-bump-release-when-needed.patch
@@ -1,4 +1,4 @@
-From f43fa864e0047e6d4b1ab555ba5c5b74e7c4a6d8 Mon Sep 17 00:00:00 2001
+From a41edb5a9967c4f423809b6a29c065938c376c1c Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <michal.hrusecky@nic.cz>
Date: Wed, 31 Oct 2018 13:14:23 +0100
Subject: [PATCH] build: Automatically bump release when needed
@@ -15,10 +15,10 @@ Signed-off-by: Michal Hrusecky <michal.hrusecky@nic.cz>
4 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/config/Config-build.in b/config/Config-build.in
-index 4076c293d4..cee3443602 100644
+index 5132497..c48fcd9 100644
--- a/config/Config-build.in
+++ b/config/Config-build.in
-@@ -181,6 +181,22 @@ menu "Global build settings"
+@@ -190,6 +190,22 @@ menu "Global build settings"
bool "libstdc++"
endchoice
@@ -42,7 +42,7 @@ index 4076c293d4..cee3443602 100644
config PKG_CHECK_FORMAT_SECURITY
diff --git a/include/package-defaults.mk b/include/package-defaults.mk
-index 31e331b2d5..19b5e6fa51 100644
+index 31e331b..19b5e6f 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -28,7 +28,11 @@ define Package/Default
@@ -58,10 +58,10 @@ index 31e331b2d5..19b5e6fa51 100644
else
VERSION:=$(PKG_RELEASE)
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
-index 457f2e7652..cb5518b89a 100644
+index 88571a8..312c8d0 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
-@@ -190,6 +190,11 @@ $(_endef)
+@@ -194,6 +194,11 @@ $(_endef)
fi; \
done; $(Package/$(1)/extra_provides) \
) | sort -u > $(PKG_INFO_DIR)/$(1).provides
@@ -73,7 +73,7 @@ index 457f2e7652..cb5518b89a 100644
$(if $(PROVIDES),@for pkg in $(filter-out $(1),$(PROVIDES)); do cp $(PKG_INFO_DIR)/$(1).provides $(PKG_INFO_DIR)/$$$$pkg.provides; done)
$(CheckDependencies)
-@@ -204,8 +209,24 @@ $(_endef)
+@@ -208,8 +213,24 @@ $(_endef)
)
endif
(cd $$(IDIR_$(1))/CONTROL; \
@@ -99,7 +99,7 @@ index 457f2e7652..cb5518b89a 100644
printf "Description: "; echo "$$$$DESCRIPTION" | sed -e 's,^[[:space:]]*, ,g'; \
) > control; \
chmod 644 control; \
-@@ -241,6 +262,9 @@ $(_endef)
+@@ -245,6 +266,9 @@ $(_endef)
$(INSTALL_DIR) $$(PDIR_$(1))
$(IPKG_BUILD) $$(IDIR_$(1)) $$(PDIR_$(1))
@@ -110,7 +110,7 @@ index 457f2e7652..cb5518b89a 100644
$(1)-clean:
diff --git a/rules.mk b/rules.mk
-index e97b3f6491..c786d1b75a 100644
+index 80cb3d6..b0a653f 100644
--- a/rules.mk
+++ b/rules.mk
@@ -161,6 +161,7 @@ STAGING_DIR_ROOT:=$(STAGING_DIR)/root-$(BOARD)
@@ -122,5 +122,5 @@ index e97b3f6491..c786d1b75a 100644
BUILD_DIR_HOST:=$(if $(IS_PACKAGE_BUILD),$(BUILD_DIR_BASE)/hostpkg,$(BUILD_DIR_BASE)/host)
STAGING_DIR_HOST:=$(TOPDIR)/staging_dir/host
--
-2.19.2
+2.21.0
diff --git a/patches/openwrt/wip/0004-mvebu-Basic-MoX-support.patch b/patches/openwrt/wip/0004-mvebu-Basic-MoX-support.patch
index 860c8368c..9d3a4b805 100644
--- a/patches/openwrt/wip/0004-mvebu-Basic-MoX-support.patch
+++ b/patches/openwrt/wip/0004-mvebu-Basic-MoX-support.patch
@@ -1,4 +1,4 @@
-From 94e43988cd50595b556433a10924dc155326b461 Mon Sep 17 00:00:00 2001
+From 86a2033bfead504954310d05027fdb64ec876e61 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <Michal@Hrusecky.net>
Date: Wed, 7 Mar 2018 17:10:32 +0100
Subject: [PATCH] mvebu: Basic MoX support
@@ -141,7 +141,10 @@ Signed-off-by: Karel KoÄŤĂ <karel.koci@nic.cz>
...-marvell-Add-DTS-file-for-Turris-Mox.patch | 931 ++++++++++++++++++
...64-restart-Armada-3700-restart-code.patch} | 6 +-
...-cpufreq-armada-37xx-Fix-clock-leak.patch} | 0
- 130 files changed, 14299 insertions(+), 307 deletions(-)
+ ...37xx-periph-Fix-switching-CPU-rate-.patch} | 0
+ ...37xx-periph-Fix-wrong-return-value-.patch} | 0
+ ...37xx-periph-Remove-unused-var-num_p.patch} | 0
+ 133 files changed, 14299 insertions(+), 307 deletions(-)
delete mode 100644 target/linux/mvebu/patches-4.14/527-PCI-aardvark-allow-to-specify-link-capability.patch
create mode 100644 target/linux/mvebu/patches-4.14/90001-crypto-inside-secure-remove-null-check-before-kfree.patch
create mode 100644 target/linux/mvebu/patches-4.14/90002-crypto-inside-secure-do-not-use-areq-result-for-part.patch
@@ -4235,11 +4238,7 @@ diff --git a/target/linux/mvebu/patches-4.14/403-net-mvneta-convert-to-phylink.p
similarity index 92%
rename from target/linux/mvebu/patches-4.14/403-net-mvneta-convert-to-phylink.patch
rename to target/linux/mvebu/patches-4.14/90039-net-mvneta-convert-to-phylink.patch
-<<<<<<< HEAD
-index 577317a..850d3be 100644
-=======
-index 34a2d34..3827dc0 100644
->>>>>>> 9ca6a63... patches/openwrt: rebase Mox support patch (fixes Omnia bug)
+index 34a2d34..5d525d8 100644
--- a/target/linux/mvebu/patches-4.14/403-net-mvneta-convert-to-phylink.patch
+++ b/target/linux/mvebu/patches-4.14/90039-net-mvneta-convert-to-phylink.patch
@@ -1,7 +1,7 @@
@@ -11274,11 +11273,7 @@ index 0000000..ef80f7f
+
diff --git a/target/linux/mvebu/patches-4.14/90098-net-dsa-mv88e6xxx-Poll-when-no-interrupt-defined.patch b/target/linux/mvebu/patches-4.14/90098-net-dsa-mv88e6xxx-Poll-when-no-interrupt-defined.patch
new file mode 100644
-<<<<<<< HEAD
-index 0000000..1fa9e00
-=======
-index 0000000..80aa5c0
->>>>>>> 9ca6a63... patches/openwrt: rebase Mox support patch (fixes Omnia bug)
+index 0000000..a89f1fe
--- /dev/null
+++ b/target/linux/mvebu/patches-4.14/90098-net-dsa-mv88e6xxx-Poll-when-no-interrupt-defined.patch
@@ -0,0 +1,253 @@
diff --git a/patches/openwrt/wip/0005-Turris-Omnia-Improved-suppport.patch b/patches/openwrt/wip/0005-Turris-Omnia-Improved-suppport.patch
index 1c9ecbea3..70ce9c81d 100644
--- a/patches/openwrt/wip/0005-Turris-Omnia-Improved-suppport.patch
+++ b/patches/openwrt/wip/0005-Turris-Omnia-Improved-suppport.patch
@@ -1,4 +1,4 @@
-From c9e1eb2c22ab4d47c2d27e31ef5b0d214e347e26 Mon Sep 17 00:00:00 2001
+From 4f60ddfbfad11c24bdcd1ff690b48c60809c4b85 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <Michal@Hrusecky.net>
Date: Fri, 22 Feb 2019 08:30:39 +0100
Subject: [PATCH] Turris Omnia: Improved suppport
@@ -18,7 +18,7 @@ Subject: [PATCH] Turris Omnia: Improved suppport
diff --git a/target/linux/mvebu/patches-4.14/8888-Turris-Omnia-Add-separate-DTS-for-SFP-support.patch b/target/linux/mvebu/patches-4.14/8888-Turris-Omnia-Add-separate-DTS-for-SFP-support.patch
new file mode 100644
-index 0000000000..5b55b55c8f
+index 0000000..5b55b55
--- /dev/null
+++ b/target/linux/mvebu/patches-4.14/8888-Turris-Omnia-Add-separate-DTS-for-SFP-support.patch
@@ -0,0 +1,903 @@
@@ -927,7 +927,7 @@ index 0000000000..5b55b55c8f
++};
diff --git a/target/linux/mvebu/patches-4.14/8889-Reenable-Turris-Omnia-second-ethernet-connection-to-.patch b/target/linux/mvebu/patches-4.14/8889-Reenable-Turris-Omnia-second-ethernet-connection-to-.patch
new file mode 100644
-index 0000000000..fc7f13eafc
+index 0000000..fc7f13e
--- /dev/null
+++ b/target/linux/mvebu/patches-4.14/8889-Reenable-Turris-Omnia-second-ethernet-connection-to-.patch
@@ -0,0 +1,39 @@
@@ -972,7 +972,7 @@ index 0000000000..fc7f13eafc
+
diff --git a/target/linux/mvebu/patches-4.14/8890-turris-omnia-led-driver.patch b/target/linux/mvebu/patches-4.14/8890-turris-omnia-led-driver.patch
new file mode 100644
-index 0000000000..477370d4b1
+index 0000000..477370d
--- /dev/null
+++ b/target/linux/mvebu/patches-4.14/8890-turris-omnia-led-driver.patch
@@ -0,0 +1,323 @@
@@ -1301,7 +1301,7 @@ index 0000000000..477370d4b1
++
diff --git a/target/linux/mvebu/patches-4.14/8891-turris-omnia-custom-led-functions.patch b/target/linux/mvebu/patches-4.14/8891-turris-omnia-custom-led-functions.patch
new file mode 100644
-index 0000000000..739d30c027
+index 0000000..739d30c
--- /dev/null
+++ b/target/linux/mvebu/patches-4.14/8891-turris-omnia-custom-led-functions.patch
@@ -0,0 +1,269 @@
@@ -1576,7 +1576,7 @@ index 0000000000..739d30c027
+ /* Set AUTO for the LED */
diff --git a/target/linux/mvebu/patches-4.14/8892-turris-omnia-enable-leds-in-dts.patch b/target/linux/mvebu/patches-4.14/8892-turris-omnia-enable-leds-in-dts.patch
new file mode 100644
-index 0000000000..c162f2270b
+index 0000000..c162f22
--- /dev/null
+++ b/target/linux/mvebu/patches-4.14/8892-turris-omnia-enable-leds-in-dts.patch
@@ -0,0 +1,102 @@
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
deleted file mode 100644
index c49977179..000000000
--- a/patches/openwrt/wip/0006-Add-kernel-configuration-options-for-Turris-1.x.patch
+++ /dev/null
@@ -1,393 +0,0 @@
-From d400354808aed7fb3e954f04b66afb527866bcdf 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
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is hacky approach and we should instead add these options to board
-specific configuration.
-
-Signed-off-by: Karel KoÄŤĂ <karel.koci@nic.cz>
----
- target/linux/mpc85xx/config-4.14 | 69 +++++++++++++++++++++++++++---
- target/linux/mpc85xx/config-4.19 | 73 ++++++++++++++++++++++++++++----
- 2 files changed, 127 insertions(+), 15 deletions(-)
-
-diff --git a/target/linux/mpc85xx/config-4.14 b/target/linux/mpc85xx/config-4.14
-index 79480d72da..41d4f00b66 100644
---- a/target/linux/mpc85xx/config-4.14
-+++ b/target/linux/mpc85xx/config-4.14
-@@ -42,6 +42,15 @@ CONFIG_BOOKE_WDT=y
- CONFIG_BOUNCE=y
- # CONFIG_BSC9131_RDB is not set
- # CONFIG_BSC9132_QDS is not set
-+CONFIG_BTRFS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+CONFIG_NLS_ISO8859_1=y
-+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-+CONFIG_BTRFS_FS_POSIX_ACL=y
-+CONFIG_BUILD_BIN2C=y
- # CONFIG_C293_PCIE is not set
- CONFIG_CLONE_BACKWARDS=y
- CONFIG_CLZ_TAB=y
-@@ -59,6 +68,7 @@ CONFIG_CRYPTO_AKCIPHER2=y
- CONFIG_CRYPTO_AUTHENC=y
- CONFIG_CRYPTO_HASH=y
- CONFIG_CRYPTO_HASH2=y
-+CONFIG_CRYPTO_LZO=y
- CONFIG_CRYPTO_HW=y
- CONFIG_CRYPTO_MANAGER=y
- CONFIG_CRYPTO_MANAGER2=y
-@@ -72,6 +82,7 @@ CONFIG_CRYPTO_RSA=y
- # CONFIG_CRYPTO_SHA1_PPC_SPE is not set
- # CONFIG_CRYPTO_SHA256_PPC_SPE is not set
- CONFIG_CRYPTO_WORKQUEUE=y
-+CONFIG_CRYPTO_XZ=y
- CONFIG_DEBUG_BUGVERBOSE=y
- # CONFIG_DEFAULT_UIMAGE is not set
- CONFIG_DNOTIFY=y
-@@ -184,6 +195,10 @@ CONFIG_IRQ_FORCED_THREADING=y
- CONFIG_IRQ_WORK=y
- CONFIG_ISA_DMA_API=y
- CONFIG_KERNEL_GZIP=y
-+CONFIG_JFFS2_FS_POSIX_ACL=y
-+CONFIG_JFFS2_LZO=y
-+CONFIG_JFFS2_RUBIN=y
-+CONFIG_JFFS2_ZLIB=y
- CONFIG_KERNEL_START=0xc0000000
- # CONFIG_KSI8560 is not set
- CONFIG_LEGACY_PTYS=y
-@@ -192,28 +207,53 @@ CONFIG_LIBFDT=y
- CONFIG_LOWMEM_CAM_NUM=3
- CONFIG_LOWMEM_SIZE=0x30000000
- CONFIG_LXT_PHY=y
--# CONFIG_MATH_EMULATION is not set
-+CONFIG_LZO_COMPRESS=y
-+CONFIG_LZO_DECOMPRESS=y
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_MATH_EMULATION_FULL is not set
-+CONFIG_MATH_EMULATION_HW_UNIMPLEMENTED=y
-+CONFIG_MDIO_BOARDINFO=y
- CONFIG_MDIO_BUS=y
- CONFIG_MDIO_DEVICE=y
- CONFIG_MIGRATION=y
-+CONFIG_MMC=y
-+CONFIG_MMC_BLOCK=y
-+CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
-+CONFIG_MMC_SDHCI_OF_ESDHC=y
-+# CONFIG_MMC_SDHCI_PCI is not set
-+CONFIG_MMC_SDHCI_PLTFM=y
-+# CONFIG_MMC_TIFM_SD is not set
-+# CONFIG_MMC_WBSD is not set
- # CONFIG_MMIO_NVRAM is not set
- CONFIG_MODULES_USE_ELF_RELA=y
- # CONFIG_MPC8536_DS is not set
- # CONFIG_MPC8540_ADS is not set
- # CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
-+CONFIG_MPC85xx_CDS=y
- # CONFIG_MPC85xx_DS is not set
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_RDB is not set
-+CONFIG_MPC85xx_MDS=y
-+CONFIG_MPC85xx_RDB=y
- CONFIG_MPIC=y
- # CONFIG_MPIC_MSGR is not set
- CONFIG_MPIC_TIMER=y
- # CONFIG_MPIC_U3_HT_IRQS is not set
- # CONFIG_MPIC_WEIRD is not set
- CONFIG_MPILIB=y
--# CONFIG_MTD_CFI is not set
-+# CONFIG_MTD_CFI_NOSWAP is not set
-+CONFIG_MTD_CFI_STAA=y
-+CONFIG_MTD_JEDECPROBE=y
- CONFIG_MTD_M25P80=y
-+CONFIG_MTD_RAM=y
-+CONFIG_MTD_ROM=y
- CONFIG_MTD_SPI_NOR=y
-+CONFIG_MTD_UBI=y
-+CONFIG_MTD_UBI_BEB_LIMIT=20
-+# CONFIG_MTD_UBI_BLOCK is not set
-+# CONFIG_MTD_UBI_FASTMAP is not set
-+# CONFIG_MTD_UBI_GLUEBI is not set
-+CONFIG_MTD_UBI_WL_THRESHOLD=4096
-+CONFIG_MUTEX_SPIN_ON_OWNER=y
- # CONFIG_MVME2500 is not set
- # CONFIG_NEED_DMA_MAP_STATE is not set
- # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
-@@ -222,6 +262,7 @@ CONFIG_NEED_SG_DMA_LENGTH=y
- CONFIG_NLS=y
- # CONFIG_NONSTATIC_KERNEL is not set
- CONFIG_NO_BOOTMEM=y
-+CONFIG_NR_CPUS=4
- CONFIG_NR_IRQS=512
- CONFIG_OF=y
- CONFIG_OF_ADDRESS=y
-@@ -231,13 +272,14 @@ CONFIG_OF_FLATTREE=y
- CONFIG_OF_GPIO=y
- CONFIG_OF_IRQ=y
- CONFIG_OF_MDIO=y
-+CONFIG_OF_MTD=y
- CONFIG_OF_NET=y
- CONFIG_OF_PCI=y
- CONFIG_OF_PCI_IRQ=y
- CONFIG_OF_RESERVED_MEM=y
- CONFIG_OLD_SIGACTION=y
- CONFIG_OLD_SIGSUSPEND=y
--# CONFIG_P1010_RDB is not set
-+CONFIG_P1010_RDB=y
- # CONFIG_P1022_DS is not set
- # CONFIG_P1022_RDK is not set
- # CONFIG_P1023_RDB is not set
-@@ -281,11 +323,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
--# CONFIG_PPC_I8259 is not set
-+CONFIG_PPC_I8259=y
- # CONFIG_PPC_ICP_HV is not set
- # CONFIG_PPC_ICP_NATIVE is not set
- # CONFIG_PPC_ICS_RTAS is not set
- CONFIG_PPC_INDIRECT_PCI=y
-+CONFIG_PPC_LIB_RHEAP=y
- 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
- CONFIG_SPE_POSSIBLE=y
- CONFIG_SPI=y
- CONFIG_SPI_FSL_ESPI=y
-+CONFIG_SPI_FSL_LIB=y
- CONFIG_SPI_MASTER=y
- CONFIG_SRCU=y
- # CONFIG_STRIP_ASM_SYMS is not set
-@@ -349,7 +393,13 @@ CONFIG_TINY_SRCU=y
- # CONFIG_TQM8548 is not set
- # CONFIG_TQM8555 is not set
- # CONFIG_TQM8560 is not set
-+CONFIG_TREE_RCU=y
- # CONFIG_TWR_P102x is not set
-+CONFIG_UBIFS_FS=y
-+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-+CONFIG_UBIFS_FS_LZO=y
-+CONFIG_UBIFS_FS_XZ=y
-+CONFIG_UBIFS_FS_ZLIB=y
- CONFIG_UCC=y
- CONFIG_UCC_FAST=y
- CONFIG_UCC_GETH=y
-@@ -368,8 +418,13 @@ CONFIG_VM_EVENT_COUNTERS=y
- CONFIG_WATCHDOG_CORE=y
- # CONFIG_XES_MPC85xx is not set
- # CONFIG_XPS_USB_HCD_XILINX is not set
-+CONFIG_XOR_BLOCKS=y
-+CONFIG_XPS=y
- CONFIG_XZ_DEC_BCJ=y
- CONFIG_XZ_DEC_POWERPC=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_ZLIB_INFLATE=y
- CONFIG_FB_FSL_DIU=n
- CONFIG_VGA_CONSOLE=y
- CONFIG_VGACON_SOFT_SCROLLBACK=n
-+CONFIG_SPI_SPIDEV=y
-diff --git a/target/linux/mpc85xx/config-4.19 b/target/linux/mpc85xx/config-4.19
-index c92edcfa37..345846c9a7 100644
---- a/target/linux/mpc85xx/config-4.19
-+++ b/target/linux/mpc85xx/config-4.19
-@@ -41,6 +41,15 @@ CONFIG_BOOKE_WDT=y
- CONFIG_BOUNCE=y
- # CONFIG_BSC9131_RDB is not set
- # CONFIG_BSC9132_QDS is not set
-+CONFIG_BTRFS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+CONFIG_NLS_ISO8859_1=y
-+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-+CONFIG_BTRFS_FS_POSIX_ACL=y
-+CONFIG_BUILD_BIN2C=y
- # CONFIG_C293_PCIE is not set
- CONFIG_CLONE_BACKWARDS=y
- CONFIG_CLZ_TAB=y
-@@ -58,6 +67,7 @@ CONFIG_CRYPTO_AKCIPHER2=y
- CONFIG_CRYPTO_AUTHENC=y
- CONFIG_CRYPTO_HASH=y
- CONFIG_CRYPTO_HASH2=y
-+CONFIG_CRYPTO_LZO=y
- CONFIG_CRYPTO_HW=y
- CONFIG_CRYPTO_MANAGER=y
- CONFIG_CRYPTO_MANAGER2=y
-@@ -71,6 +81,7 @@ CONFIG_CRYPTO_RSA=y
- # CONFIG_CRYPTO_SHA1_PPC_SPE is not set
- # CONFIG_CRYPTO_SHA256_PPC_SPE is not set
- CONFIG_CRYPTO_WORKQUEUE=y
-+CONFIG_CRYPTO_XZ=y
- CONFIG_DEBUG_BUGVERBOSE=y
- CONFIG_DNOTIFY=y
- CONFIG_DTC=y
-@@ -102,7 +113,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
- CONFIG_GENERIC_CMOS_UPDATE=y
- CONFIG_GENERIC_CPU=y
- CONFIG_GENERIC_CPU_AUTOPROBE=y
--CONFIG_GENERIC_CPU_VULNERABILITIES=y
-+CONFIG_GENERIC_IO=y
- CONFIG_GENERIC_IRQ_SHOW=y
- CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
- CONFIG_GENERIC_ISA_DMA=y
-@@ -165,12 +176,17 @@ CONFIG_I2C_BOARDINFO=y
- CONFIG_I2C_MPC=y
- CONFIG_ILLEGAL_POINTER_VALUE=0
- CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_IOMMU_HELPER=y
- CONFIG_IRQCHIP=y
- CONFIG_IRQ_DOMAIN=y
- CONFIG_IRQ_FORCED_THREADING=y
- CONFIG_IRQ_WORK=y
- CONFIG_ISA_DMA_API=y
- CONFIG_KERNEL_GZIP=y
-+CONFIG_JFFS2_FS_POSIX_ACL=y
-+CONFIG_JFFS2_LZO=y
-+CONFIG_JFFS2_RUBIN=y
-+CONFIG_JFFS2_ZLIB=y
- CONFIG_KERNEL_START=0xc0000000
- # CONFIG_KSI8560 is not set
- CONFIG_LEGACY_PTYS=y
-@@ -180,46 +196,77 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
- CONFIG_LOWMEM_CAM_NUM=3
- CONFIG_LOWMEM_SIZE=0x30000000
- CONFIG_LXT_PHY=y
--# CONFIG_MATH_EMULATION is not set
-+CONFIG_LZO_COMPRESS=y
-+CONFIG_LZO_DECOMPRESS=y
-+CONFIG_MATH_EMULATION=y
-+# CONFIG_MATH_EMULATION_FULL is not set
-+CONFIG_MATH_EMULATION_HW_UNIMPLEMENTED=y
-+CONFIG_MDIO_BOARDINFO=y
- CONFIG_MDIO_BUS=y
- CONFIG_MDIO_DEVICE=y
- CONFIG_MEMFD_CREATE=y
- CONFIG_MIGRATION=y
-+CONFIG_MMC=y
-+CONFIG_MMC_BLOCK=y
-+CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
-+CONFIG_MMC_SDHCI_OF_ESDHC=y
-+# CONFIG_MMC_SDHCI_PCI is not set
-+CONFIG_MMC_SDHCI_PLTFM=y
-+# CONFIG_MMC_TIFM_SD is not set
-+# CONFIG_MMC_WBSD is not set
-+# CONFIG_MMIO_NVRAM is not set
- CONFIG_MODULES_USE_ELF_RELA=y
- # CONFIG_MPC8536_DS is not set
- # CONFIG_MPC8540_ADS is not set
- # CONFIG_MPC8560_ADS is not set
--# CONFIG_MPC85xx_CDS is not set
-+CONFIG_MPC85xx_CDS=y
- # CONFIG_MPC85xx_DS is not set
--# CONFIG_MPC85xx_MDS is not set
--# CONFIG_MPC85xx_RDB is not set
-+CONFIG_MPC85xx_MDS=y
-+CONFIG_MPC85xx_RDB=y
- CONFIG_MPIC=y
- # CONFIG_MPIC_MSGR is not set
- CONFIG_MPIC_TIMER=y
- CONFIG_MPILIB=y
--# CONFIG_MTD_CFI is not set
-+# CONFIG_MTD_CFI_NOSWAP is not set
-+CONFIG_MTD_CFI_STAA=y
-+CONFIG_MTD_JEDECPROBE=y
- CONFIG_MTD_M25P80=y
-+CONFIG_MTD_RAM=y
-+CONFIG_MTD_ROM=y
- CONFIG_MTD_SPI_NOR=y
-+CONFIG_MTD_UBI=y
-+CONFIG_MTD_UBI_BEB_LIMIT=20
-+# CONFIG_MTD_UBI_BLOCK is not set
-+# CONFIG_MTD_UBI_FASTMAP is not set
-+# CONFIG_MTD_UBI_GLUEBI is not set
-+CONFIG_MTD_UBI_WL_THRESHOLD=4096
-+CONFIG_MUTEX_SPIN_ON_OWNER=y
- # CONFIG_MVME2500 is not set
- CONFIG_NEED_PER_CPU_KM=y
- CONFIG_NEED_SG_DMA_LENGTH=y
- CONFIG_NLS=y
- CONFIG_NO_BOOTMEM=y
-+CONFIG_NR_CPUS=4
- CONFIG_NR_IRQS=512
- CONFIG_NVMEM=y
- CONFIG_OF=y
- CONFIG_OF_ADDRESS=y
-+CONFIG_OF_ADDRESS_PCI=y
- CONFIG_OF_EARLY_FLATTREE=y
- CONFIG_OF_FLATTREE=y
- CONFIG_OF_GPIO=y
- CONFIG_OF_IRQ=y
- CONFIG_OF_KOBJ=y
- CONFIG_OF_MDIO=y
-+CONFIG_OF_MTD=y
- CONFIG_OF_NET=y
-+CONFIG_OF_PCI=y
-+CONFIG_OF_PCI_IRQ=y
- CONFIG_OF_RESERVED_MEM=y
- CONFIG_OLD_SIGACTION=y
- CONFIG_OLD_SIGSUSPEND=y
--# CONFIG_P1010_RDB is not set
-+CONFIG_P1010_RDB=y
- # CONFIG_P1022_DS is not set
- # CONFIG_P1022_RDK is not set
- # CONFIG_P1023_RDB is not set
-@@ -258,7 +305,7 @@ CONFIG_PPC_DOORBELL=y
- # CONFIG_PPC_EARLY_DEBUG is not set
- CONFIG_PPC_FSL_BOOK3E=y
- CONFIG_PPC_INDIRECT_PCI=y
--# CONFIG_PPC_IRQ_SOFT_MASK_DEBUG is not set
-+CONFIG_PPC_LIB_RHEAP=y
- CONFIG_PPC_MMU_NOHASH=y
- CONFIG_PPC_PCI_CHOICE=y
- # CONFIG_PPC_PTDUMP is not set
-@@ -292,12 +339,14 @@ CONFIG_SPE=y
- CONFIG_SPE_POSSIBLE=y
- CONFIG_SPI=y
- CONFIG_SPI_FSL_ESPI=y
-+CONFIG_SPI_FSL_LIB=y
- CONFIG_SPI_MASTER=y
- CONFIG_SPI_MEM=y
- CONFIG_SRCU=y
- # CONFIG_STRIP_ASM_SYMS is not set
- # CONFIG_STX_GP3 is not set
- CONFIG_SWCONFIG=y
-+CONFIG_SWIOTLB=y
- CONFIG_SWPHY=y
- CONFIG_SYSCTL_EXCEPTION_TRACE=y
- CONFIG_TASK_SIZE=0xc0000000
-@@ -310,7 +359,13 @@ CONFIG_TINY_SRCU=y
- # CONFIG_TQM8548 is not set
- # CONFIG_TQM8555 is not set
- # CONFIG_TQM8560 is not set
-+CONFIG_TREE_RCU=y
- # CONFIG_TWR_P102x is not set
-+CONFIG_UBIFS_FS=y
-+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-+CONFIG_UBIFS_FS_LZO=y
-+CONFIG_UBIFS_FS_XZ=y
-+CONFIG_UBIFS_FS_ZLIB=y
- CONFIG_UCC=y
- CONFIG_UCC_FAST=y
- CONFIG_UCC_GETH=y
-@@ -329,5 +384,7 @@ CONFIG_VM_EVENT_COUNTERS=y
- CONFIG_WATCHDOG_CORE=y
- # CONFIG_XES_MPC85xx is not set
- # CONFIG_XPS_USB_HCD_XILINX is not set
-+CONFIG_XOR_BLOCKS=y
-+CONFIG_XPS=y
- CONFIG_XZ_DEC_BCJ=y
- CONFIG_XZ_DEC_POWERPC=y
---
-2.21.0
-
--
GitLab