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

Revert "patches/openwrt: enable 64bit addressing on Turris 1.x"

This reverts commit 51b0ef62.
parent 17e981c9
Branches
Tags
1 merge request!135Hotfix/turris1x low ram
From 49f866e69ffe1bec487bf94e1f5ed33d34711415 Mon Sep 17 00:00:00 2001
From 4191adbf3751ee6212ab0d9faa25e4eea4a76285 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,13 +10,13 @@ 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 | 66 +++-
target/linux/mpc85xx/config-4.14 | 60 +++-
.../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, 863 insertions(+), 8 deletions(-)
7 files changed, 858 insertions(+), 7 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
......@@ -37,7 +37,7 @@ index aa33a4af96..b24bcb68ae 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 77fd10f302..3944b60f91 100644
index 77fd10f..da038dc 100644
--- a/target/linux/mpc85xx/config-4.14
+++ b/target/linux/mpc85xx/config-4.14
@@ -42,6 +42,15 @@ CONFIG_BOOKE_WDT=y
......@@ -149,23 +149,16 @@ index 77fd10f302..3944b60f91 100644
# CONFIG_P1022_DS is not set
# CONFIG_P1022_RDK is not set
# CONFIG_P1023_RDB is not set
@@ -255,8 +288,14 @@ CONFIG_PGTABLE_LEVELS=2
CONFIG_PHYLIB=y
CONFIG_PHYSICAL_ALIGN=0x04000000
@@ -257,6 +290,8 @@ CONFIG_PHYSICAL_ALIGN=0x04000000
CONFIG_PHYSICAL_START=0x00000000
-# CONFIG_PHYS_64BIT is not set
+CONFIG_PTE_64BIT=y
+CONFIG_PHYS_64BIT=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+# CONFIG_HUGETLBFS is not set
# CONFIG_PHYS_64BIT 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 +318,12 @@ CONFIG_PPC_DOORBELL=y
@@ -279,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
......@@ -179,7 +172,7 @@ index 77fd10f302..3944b60f91 100644
CONFIG_PPC_MMU_NOHASH=y
# CONFIG_PPC_MM_SLICES is not set
# CONFIG_PPC_MPC106 is not set
@@ -329,6 +369,7 @@ CONFIG_SPE=y
@@ -329,6 +365,7 @@ CONFIG_SPE=y
CONFIG_SPE_POSSIBLE=y
CONFIG_SPI=y
CONFIG_SPI_FSL_ESPI=y
......@@ -187,7 +180,7 @@ index 77fd10f302..3944b60f91 100644
CONFIG_SPI_MASTER=y
CONFIG_SRCU=y
# CONFIG_STRIP_ASM_SYMS is not set
@@ -352,6 +393,13 @@ CONFIG_UCC=y
@@ -352,6 +389,13 @@ CONFIG_UCC=y
CONFIG_UCC_FAST=y
CONFIG_UCC_GETH=y
# CONFIG_UGETH_TX_ON_DEMAND is not set
......@@ -201,7 +194,7 @@ index 77fd10f302..3944b60f91 100644
CONFIG_USB_SUPPORT=y
CONFIG_VDSO32=y
# CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
@@ -362,3 +410,5 @@ CONFIG_WATCHDOG_CORE=y
@@ -362,3 +406,5 @@ CONFIG_WATCHDOG_CORE=y
# CONFIG_XPS_USB_HCD_XILINX is not set
CONFIG_XZ_DEC_BCJ=y
CONFIG_XZ_DEC_POWERPC=y
......
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