From 7ab94288e052ad17cbbed5c78a5e7194b0cfa116 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 9 Oct 2021 16:44:01 +0100 Subject: oxnas: switch to Linux 5.10 Linux 5.10 has been there as testing kernel for a while now. Do the switch and drop config and patches for Linux 5.4. Signed-off-by: Daniel Golle --- .../oxnas/patches-5.4/150-oxnas-restart.patch | 25 ---------------------- 1 file changed, 25 deletions(-) delete mode 100644 target/linux/oxnas/patches-5.4/150-oxnas-restart.patch (limited to 'target/linux/oxnas/patches-5.4/150-oxnas-restart.patch') diff --git a/target/linux/oxnas/patches-5.4/150-oxnas-restart.patch b/target/linux/oxnas/patches-5.4/150-oxnas-restart.patch deleted file mode 100644 index 79fbd9cdbe..0000000000 --- a/target/linux/oxnas/patches-5.4/150-oxnas-restart.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/drivers/power/reset/Kconfig -+++ b/drivers/power/reset/Kconfig -@@ -123,6 +123,12 @@ config POWER_RESET_OCELOT_RESET - help - This driver supports restart for Microsemi Ocelot SoC. - -+config POWER_RESET_OXNAS -+ bool "OXNAS SoC restart driver" -+ depends on ARCH_OXNAS -+ help -+ Restart support for OXNAS boards. -+ - config POWER_RESET_PIIX4_POWEROFF - tristate "Intel PIIX4 power-off driver" - depends on PCI ---- a/drivers/power/reset/Makefile -+++ b/drivers/power/reset/Makefile -@@ -11,6 +11,7 @@ obj-$(CONFIG_POWER_RESET_GPIO) += gpio-p - obj-$(CONFIG_POWER_RESET_GPIO_RESTART) += gpio-restart.o - obj-$(CONFIG_POWER_RESET_HISI) += hisi-reboot.o - obj-$(CONFIG_POWER_RESET_MSM) += msm-poweroff.o -+obj-$(CONFIG_POWER_RESET_OXNAS) += oxnas-restart.o - obj-$(CONFIG_POWER_RESET_QCOM_PON) += qcom-pon.o - obj-$(CONFIG_POWER_RESET_OCELOT_RESET) += ocelot-reset.o - obj-$(CONFIG_POWER_RESET_PIIX4_POWEROFF) += piix4-poweroff.o -- cgit v1.2.3