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

patches/openwrt: fix target compilation without config hack

This fixes target compilation for mvebu target as some patches are
adding additional options.

This is required because we no longer copy all CONFIG_KERNEL_ options to
platform kernel config file.
parent afea4a8a
Branches
Tags
2 merge requests!123Turris OS 5.0 (HBK),!89WIP: Refactor/configs
From 881faafd30ec80efc3467af32b7d96a9fcf14835 Mon Sep 17 00:00:00 2001 From 61d3c76c6e893ad455a9a2fa338a3a0541fab57a Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <Michal@Hrusecky.net> From: Michal Hrusecky <Michal@Hrusecky.net>
Date: Wed, 7 Mar 2018 17:10:32 +0100 Date: Wed, 7 Mar 2018 17:10:32 +0100
Subject: [PATCH] mvebu: Basic MoX support Subject: [PATCH 01/10] mvebu: Basic MoX support
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
...@@ -11,7 +11,8 @@ Adding basic support for CZ.NICs MoX board. ...@@ -11,7 +11,8 @@ Adding basic support for CZ.NICs MoX board.
Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net> Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
Signed-off-by: Karel Kočí <karel.koci@nic.cz> Signed-off-by: Karel Kočí <karel.koci@nic.cz>
--- ---
target/linux/mvebu/config-4.14 | 1 + target/linux/mvebu/config-4.14 | 4 +
target/linux/mvebu/cortexa53/config-default | 3 +
target/linux/mvebu/image/cortex-a53.mk | 11 + target/linux/mvebu/image/cortex-a53.mk | 11 +
...ark-allow-to-specify-link-capability.patch | 43 - ...ark-allow-to-specify-link-capability.patch | 43 -
...ecure-remove-null-check-before-kfree.patch | 34 + ...ecure-remove-null-check-before-kfree.patch | 34 +
...@@ -122,7 +123,6 @@ Signed-off-by: Karel Kočí <karel.koci@nic.cz> ...@@ -122,7 +123,6 @@ Signed-off-by: Karel Kočí <karel.koci@nic.cz>
...v88e6xxx-Fix-IRQ-when-loading-module.patch | 43 + ...v88e6xxx-Fix-IRQ-when-loading-module.patch | 43 +
...x-fix-races-between-lock-and-irq-fre.patch | 102 ++ ...x-fix-races-between-lock-and-irq-fre.patch | 102 ++
...-dsa-mv88e6xxx-Share-main-switch-IRQ.patch | 29 + ...-dsa-mv88e6xxx-Share-main-switch-IRQ.patch | 29 +
...x-Fix-88E6141-6341-2500mbps-SERDES-s.patch | 103 ++
...eta-Fix-napi-structure-mixup-on-arma.patch | 107 ++ ...eta-Fix-napi-structure-mixup-on-arma.patch | 107 ++
...fix-mvneta_config_rss-on-armada-3700.patch | 77 ++ ...fix-mvneta_config_rss-on-armada-3700.patch | 77 ++
...-armada-37xx-Correct-mpp-definitions.patch | 108 ++ ...-armada-37xx-Correct-mpp-definitions.patch | 108 ++
...@@ -143,7 +143,7 @@ Signed-off-by: Karel Kočí <karel.koci@nic.cz> ...@@ -143,7 +143,7 @@ Signed-off-by: Karel Kočí <karel.koci@nic.cz>
...37xx-periph-Fix-switching-CPU-rate-.patch} | 0 ...37xx-periph-Fix-switching-CPU-rate-.patch} | 0
...37xx-periph-Fix-wrong-return-value-.patch} | 0 ...37xx-periph-Fix-wrong-return-value-.patch} | 0
...37xx-periph-Remove-unused-var-num_p.patch} | 0 ...37xx-periph-Remove-unused-var-num_p.patch} | 0
132 files changed, 14283 insertions(+), 302 deletions(-) 132 files changed, 14186 insertions(+), 302 deletions(-)
delete mode 100644 target/linux/mvebu/patches-4.14/527-PCI-aardvark-allow-to-specify-link-capability.patch 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/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 create mode 100644 target/linux/mvebu/patches-4.14/90002-crypto-inside-secure-do-not-use-areq-result-for-part.patch
...@@ -275,7 +275,7 @@ Signed-off-by: Karel Kočí <karel.koci@nic.cz> ...@@ -275,7 +275,7 @@ Signed-off-by: Karel Kočí <karel.koci@nic.cz>
rename target/linux/mvebu/patches-4.14/{512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch => 99512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch} (100%) rename target/linux/mvebu/patches-4.14/{512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch => 99512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch} (100%)
   
diff --git a/target/linux/mvebu/config-4.14 b/target/linux/mvebu/config-4.14 diff --git a/target/linux/mvebu/config-4.14 b/target/linux/mvebu/config-4.14
index 7b26c9b..1cfce96 100644 index 120396a..c29d80f 100644
--- a/target/linux/mvebu/config-4.14 --- a/target/linux/mvebu/config-4.14
+++ b/target/linux/mvebu/config-4.14 +++ b/target/linux/mvebu/config-4.14
@@ -379,6 +379,7 @@ CONFIG_NEED_DMA_MAP_STATE=y @@ -379,6 +379,7 @@ CONFIG_NEED_DMA_MAP_STATE=y
...@@ -286,6 +286,27 @@ index 7b26c9b..1cfce96 100644 ...@@ -286,6 +286,27 @@ index 7b26c9b..1cfce96 100644
CONFIG_NET_DSA_MV88E6XXX=y CONFIG_NET_DSA_MV88E6XXX=y
CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
CONFIG_NET_DSA_TAG_DSA=y CONFIG_NET_DSA_TAG_DSA=y
@@ -536,3 +537,6 @@ CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZSTD_COMPRESS=y
CONFIG_ZSTD_DECOMPRESS=y
+# CONFIG_ARMADA_37XX_WATCHDOG is not set
+# CONFIG_ARMADA_37XX_RWTM_MBOX is not set
+# CONFIG_MFD_MOXTET is not set
diff --git a/target/linux/mvebu/cortexa53/config-default b/target/linux/mvebu/cortexa53/config-default
index 0041686..40278cd 100644
--- a/target/linux/mvebu/cortexa53/config-default
+++ b/target/linux/mvebu/cortexa53/config-default
@@ -41,6 +41,9 @@ CONFIG_ARM64_VA_BITS=39
CONFIG_ARM64_VA_BITS_39=y
# CONFIG_ARM64_VA_BITS_48 is not set
# CONFIG_ARM64_VHE is not set
+CONFIG_ARMADA_37XX_WATCHDOG=y
+CONFIG_ARMADA_37XX_RWTM_MBOX=y
+CONFIG_ARM_ARMADA_37XX_CPUFREQ=y
CONFIG_ARMADA_37XX_CLK=y
CONFIG_ARMADA_AP806_SYSCON=y
CONFIG_ARMADA_CP110_SYSCON=y
diff --git a/target/linux/mvebu/image/cortex-a53.mk b/target/linux/mvebu/image/cortex-a53.mk diff --git a/target/linux/mvebu/image/cortex-a53.mk b/target/linux/mvebu/image/cortex-a53.mk
index d7014d6..4c5baf5 100644 index d7014d6..4c5baf5 100644
--- a/target/linux/mvebu/image/cortex-a53.mk --- a/target/linux/mvebu/image/cortex-a53.mk
...@@ -5029,7 +5050,7 @@ diff --git a/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool- ...@@ -5029,7 +5050,7 @@ diff --git a/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-
similarity index 81% similarity index 81%
rename from target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch rename from target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
rename to target/linux/mvebu/patches-4.14/90044-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch rename to target/linux/mvebu/patches-4.14/90044-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
index a5efa25..9a138b9 100644 index 2e4be1b..efd10f6 100644
--- a/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch --- a/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
+++ b/target/linux/mvebu/patches-4.14/90044-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch +++ b/target/linux/mvebu/patches-4.14/90044-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
@@ -1,21 +1,24 @@ @@ -1,21 +1,24 @@
...@@ -16520,5 +16541,5 @@ similarity index 100% ...@@ -16520,5 +16541,5 @@ similarity index 100%
rename from target/linux/mvebu/patches-4.14/512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch rename from target/linux/mvebu/patches-4.14/512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch
rename to target/linux/mvebu/patches-4.14/99512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch rename to target/linux/mvebu/patches-4.14/99512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch
-- --
2.22.1 2.24.1
   
From 4f60ddfbfad11c24bdcd1ff690b48c60809c4b85 Mon Sep 17 00:00:00 2001 From f4d2931843caffec015cbad3f94f0538ff8b4fe2 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <Michal@Hrusecky.net> From: Michal Hrusecky <Michal@Hrusecky.net>
Date: Fri, 22 Feb 2019 08:30:39 +0100 Date: Fri, 22 Feb 2019 08:30:39 +0100
Subject: [PATCH] Turris Omnia: Improved suppport Subject: [PATCH 02/10] Turris Omnia: Improved suppport
--- ---
target/linux/mvebu/config-4.14 | 2 +
...nia-Add-separate-DTS-for-SFP-support.patch | 903 ++++++++++++++++++ ...nia-Add-separate-DTS-for-SFP-support.patch | 903 ++++++++++++++++++
...Omnia-second-ethernet-connection-to-.patch | 39 + ...Omnia-second-ethernet-connection-to-.patch | 39 +
.../8890-turris-omnia-led-driver.patch | 323 +++++++ .../8890-turris-omnia-led-driver.patch | 323 +++++++
...91-turris-omnia-custom-led-functions.patch | 269 ++++++ ...91-turris-omnia-custom-led-functions.patch | 269 ++++++
...8892-turris-omnia-enable-leds-in-dts.patch | 102 ++ ...8892-turris-omnia-enable-leds-in-dts.patch | 102 ++
5 files changed, 1636 insertions(+) 6 files changed, 1638 insertions(+)
create mode 100644 target/linux/mvebu/patches-4.14/8888-Turris-Omnia-Add-separate-DTS-for-SFP-support.patch create mode 100644 target/linux/mvebu/patches-4.14/8888-Turris-Omnia-Add-separate-DTS-for-SFP-support.patch
create mode 100644 target/linux/mvebu/patches-4.14/8889-Reenable-Turris-Omnia-second-ethernet-connection-to-.patch create mode 100644 target/linux/mvebu/patches-4.14/8889-Reenable-Turris-Omnia-second-ethernet-connection-to-.patch
create mode 100644 target/linux/mvebu/patches-4.14/8890-turris-omnia-led-driver.patch create mode 100644 target/linux/mvebu/patches-4.14/8890-turris-omnia-led-driver.patch
create mode 100644 target/linux/mvebu/patches-4.14/8891-turris-omnia-custom-led-functions.patch create mode 100644 target/linux/mvebu/patches-4.14/8891-turris-omnia-custom-led-functions.patch
create mode 100644 target/linux/mvebu/patches-4.14/8892-turris-omnia-enable-leds-in-dts.patch create mode 100644 target/linux/mvebu/patches-4.14/8892-turris-omnia-enable-leds-in-dts.patch
diff --git a/target/linux/mvebu/config-4.14 b/target/linux/mvebu/config-4.14
index c29d80f..dc7f61e 100644
--- a/target/linux/mvebu/config-4.14
+++ b/target/linux/mvebu/config-4.14
@@ -540,3 +540,5 @@ CONFIG_ZSTD_DECOMPRESS=y
# CONFIG_ARMADA_37XX_WATCHDOG is not set
# CONFIG_ARMADA_37XX_RWTM_MBOX is not set
# CONFIG_MFD_MOXTET is not set
+# CONFIG_CRYPTO_DEV_TURRIS_MOX_RWTM is not set
+# CONFIG_LEDS_OMNIA is not set
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 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 new file mode 100644
index 0000000..5b55b55 index 0000000..5b55b55
...@@ -1683,5 +1694,5 @@ index 0000000..c162f22 ...@@ -1683,5 +1694,5 @@ index 0000000..c162f22
+ +
+ i2c@1 { + i2c@1 {
-- --
2.21.0 2.24.1
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