Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
commit
8f910160ea
|
|
@ -131,6 +131,7 @@ define Host/Exports/Default
|
|||
$(1) : export STAGING_PREFIX=$$(HOST_BUILD_PREFIX)
|
||||
$(1) : export PKG_CONFIG_PATH=$$(STAGING_DIR_HOST)/lib/pkgconfig:$$(HOST_BUILD_PREFIX)/lib/pkgconfig
|
||||
$(1) : export PKG_CONFIG_LIBDIR=$$(HOST_BUILD_PREFIX)/lib/pkgconfig
|
||||
$(1) : export GIT_CEILING_DIRECTORIES=$$(BUILD_DIR_HOST)
|
||||
$(if $(HOST_CONFIG_SITE),$(1) : export CONFIG_SITE:=$(HOST_CONFIG_SITE))
|
||||
$(if $(IS_PACKAGE_BUILD),$(1) : export PATH=$$(TARGET_PATH_PKG))
|
||||
endef
|
||||
|
|
|
|||
|
|
@ -13,6 +13,15 @@ endif
|
|||
|
||||
include $(KERNEL_DETAILS_FILE)
|
||||
|
||||
ifdef KERNEL_TESTING_PATCHVER
|
||||
KERNEL_TESTING_DETAILS_FILE=$(INCLUDE_DIR)/kernel-$(KERNEL_TESTING_PATCHVER)
|
||||
ifeq ($(wildcard $(KERNEL_TESTING_DETAILS_FILE)),)
|
||||
$(error Missing kernel version/hash file for $(KERNEL_TESTING_PATCHVER). Please create $(KERNEL_TESTING_DETAILS_FILE))
|
||||
endif
|
||||
|
||||
include $(KERNEL_TESTING_DETAILS_FILE)
|
||||
endif
|
||||
|
||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
||||
|
||||
|
|
|
|||
|
|
@ -194,6 +194,7 @@ define Build/Exports/Default
|
|||
$(1) : export CONFIG_SITE:=$$(CONFIG_SITE)
|
||||
$(1) : export PKG_CONFIG_PATH:=$$(PKG_CONFIG_PATH)
|
||||
$(1) : export PKG_CONFIG_LIBDIR:=$$(PKG_CONFIG_PATH)
|
||||
$(1) : export GIT_CEILING_DIRECTORIES:=$$(BUILD_DIR)
|
||||
endef
|
||||
Build/Exports=$(Build/Exports/Default)
|
||||
|
||||
|
|
|
|||
|
|
@ -111,6 +111,7 @@ $(eval $(call KernelPackage,libphy))
|
|||
define KernelPackage/phylink
|
||||
SUBMENU:=$(NETWORK_DEVICES_MENU)
|
||||
TITLE:=Model for MAC to optional PHY connection
|
||||
DEPENDS:=+kmod-libphy
|
||||
KCONFIG:=CONFIG_PHYLINK
|
||||
FILES:=$(LINUX_DIR)/drivers/net/phy/phylink.ko
|
||||
AUTOLOAD:=$(call AutoLoad,15,phylink,1)
|
||||
|
|
|
|||
|
|
@ -1286,7 +1286,7 @@ $(eval $(call KernelPackage,usb-net-smsc75xx))
|
|||
|
||||
define KernelPackage/usb-net-smsc95xx
|
||||
TITLE:=SMSC LAN95XX based USB 2.0 10/100 ethernet devices
|
||||
DEPENDS:=+kmod-libphy +kmod-phy-smsc
|
||||
DEPENDS:=+kmod-libphy +kmod-phy-smsc +LINUX_6_1:kmod-net-selftests
|
||||
KCONFIG:=CONFIG_USB_NET_SMSC95XX
|
||||
FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/smsc95xx.ko
|
||||
AUTOLOAD:=$(call AutoProbe,smsc95xx)
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ endef
|
|||
$(foreach a,$(LIBSELINUX_UTILS),$(eval $(call GenUtilPkg,libselinux-$(a),$(a))))
|
||||
|
||||
# Needed to link libselinux utilities, which link against
|
||||
# libselinux.so, which indirectly depends on libpcre.so, installed in
|
||||
# libselinux.so, which indirectly depends on libpcre2.so, installed in
|
||||
# $(STAGING_DIR_HOSTPKG).
|
||||
HOST_LDFLAGS += -Wl,-rpath="$(STAGING_DIR_HOSTPKG)/lib"
|
||||
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@ PKG_RELEASE:=1
|
|||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
|
||||
PKG_SOURCE_DATE:=2023-04-17
|
||||
PKG_SOURCE_VERSION:=7de5440a520f9c6687358c7ef88ac4aad0ff98a5
|
||||
PKG_MIRROR_HASH:=aaf6aef1c991c67b6ef43b4c7f102ba94319bf522f620e93293d031b8333bd8f
|
||||
PKG_SOURCE_DATE:=2023-05-31
|
||||
PKG_SOURCE_VERSION:=38cbdc1c8cbbe2e30d62227d74565bd3fa21a36b
|
||||
PKG_MIRROR_HASH:=c275ef1f550726b045b3dd7bcee1d660bba9d56c4d53bf32f1eeb6f68bc4116c
|
||||
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
PKG_LICENSE:=GPL-2.0
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk
|
|||
PKG_NAME:=selinux-policy
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://git.defensec.nl/selinux-policy.git
|
||||
PKG_VERSION:=1.2.3
|
||||
PKG_MIRROR_HASH:=ff1ddca168a6631aeac34352657f424bc4acf5d50b8aa7ff8dfa8c9663ba8538
|
||||
PKG_VERSION:=1.2.5
|
||||
PKG_MIRROR_HASH:=81ac6e31d2f1febddbe594f3578a9c40444fc0e349075ab6abd3d3ee014a988e
|
||||
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
|
||||
PKG_BUILD_DEPENDS:=secilc/host policycoreutils/host
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
obj-$(CONFIG_SPI_FSL_CPM) += spi-fsl-cpm.o
|
||||
--- /dev/null
|
||||
+++ b/drivers/spi/spi-en7523.c
|
||||
@@ -0,0 +1,311 @@
|
||||
@@ -0,0 +1,313 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+
|
||||
+#include <linux/module.h>
|
||||
|
|
@ -166,6 +166,7 @@
|
|||
+ }
|
||||
+}
|
||||
+
|
||||
+#if 0
|
||||
+static void set_spi_clock_speed(int freq_mhz)
|
||||
+{
|
||||
+ u32 tmp, val;
|
||||
|
|
@ -178,6 +179,7 @@
|
|||
+ tmp |= (val << 8) | 1;
|
||||
+ writel(tmp, ENSPI_CLOCK_DIVIDER);
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+static void init_hw(void)
|
||||
+{
|
||||
|
|
|
|||
|
|
@ -1604,6 +1604,7 @@ CONFIG_DQL=y
|
|||
# CONFIG_DRM_I2C_NXP_TDA998X is not set
|
||||
# CONFIG_DRM_I2C_SIL164 is not set
|
||||
# CONFIG_DRM_I915 is not set
|
||||
# CONFIG_DRM_ITE_IT6505 is not set
|
||||
# CONFIG_DRM_IMX_LCDIF is not set
|
||||
# CONFIG_DRM_ITE_IT6505 is not set
|
||||
# CONFIG_DRM_ITE_IT66121 is not set
|
||||
|
|
@ -6704,6 +6705,7 @@ CONFIG_TCP_CONG_CUBIC=y
|
|||
# CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set
|
||||
# CONFIG_TEST_DEBUG_VIRTUAL is not set
|
||||
# CONFIG_TEST_DIV64 is not set
|
||||
# CONFIG_TEST_DYNAMIC_DEBUG is not set
|
||||
# CONFIG_TEST_FIRMWARE is not set
|
||||
# CONFIG_TEST_FREE_PAGES is not set
|
||||
# CONFIG_TEST_HASH is not set
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
From 2c82524000cca691c89c9fda251b55ef04eabcb6 Mon Sep 17 00:00:00 2001
|
||||
From: Mathias Kresin <openwrt@kresin.me>
|
||||
Date: Mon, 2 May 2016 18:50:00 +0000
|
||||
Subject: [PATCH] find active root
|
||||
|
||||
Signed-off-by: Mathias Kresin <openwrt@kresin.me>
|
||||
---
|
||||
drivers/mtd/parsers/ofpart_core.c | 49 ++++++++++++++++++++++++++++++-
|
||||
1 file changed, 48 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/mtd/parsers/ofpart_core.c
|
||||
+++ b/drivers/mtd/parsers/ofpart_core.c
|
||||
@@ -38,6 +38,38 @@ static bool node_has_compatible(struct d
|
||||
|
|
|
|||
|
|
@ -1,3 +1,26 @@
|
|||
From 1d1885f4a7abd7272f47b835b03d8662fb981d19 Mon Sep 17 00:00:00 2001
|
||||
From: Eddi De Pieri <eddi@depieri.net>
|
||||
Date: Tue, 14 Oct 2014 11:04:00 +0000
|
||||
Subject: [PATCH] MIPS: lantiq: ifxmips_pcie: use of
|
||||
|
||||
Signed-off-by: Eddi De Pieri <eddi@depieri.net>
|
||||
---
|
||||
arch/mips/pci/Makefile | 2 +-
|
||||
arch/mips/pci/ifxmips_pcie.c | 151 +++++++++++++++++++++++++++----
|
||||
arch/mips/pci/ifxmips_pcie_vr9.h | 105 ---------------------
|
||||
3 files changed, 133 insertions(+), 125 deletions(-)
|
||||
|
||||
--- a/arch/mips/pci/Makefile
|
||||
+++ b/arch/mips/pci/Makefile
|
||||
@@ -43,7 +43,7 @@ obj-$(CONFIG_PCI_LANTIQ) += pci-lantiq.o
|
||||
obj-$(CONFIG_SOC_MT7620) += pci-mt7620.o
|
||||
obj-$(CONFIG_SOC_RT288X) += pci-rt2880.o
|
||||
obj-$(CONFIG_SOC_RT3883) += pci-rt3883.o
|
||||
-obj-$(CONFIG_PCIE_LANTIQ) += ifxmips_pcie_phy.o ifxmips_pcie.o fixup-lantiq-pcie.o
|
||||
+obj-$(CONFIG_PCIE_LANTIQ) += ifxmips_pcie.o fixup-lantiq-pcie.o
|
||||
obj-$(CONFIG_PCIE_LANTIQ_MSI) += pcie-lantiq-msi.o
|
||||
obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o
|
||||
obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o
|
||||
--- a/arch/mips/pci/ifxmips_pcie.c
|
||||
+++ b/arch/mips/pci/ifxmips_pcie.c
|
||||
@@ -16,8 +16,15 @@
|
||||
|
|
@ -374,14 +397,3 @@
|
|||
static inline void pcie_core_pmu_setup(int pcie_port)
|
||||
{
|
||||
struct clk *clk;
|
||||
--- a/arch/mips/pci/Makefile
|
||||
+++ b/arch/mips/pci/Makefile
|
||||
@@ -43,7 +43,7 @@ obj-$(CONFIG_PCI_LANTIQ) += pci-lantiq.o
|
||||
obj-$(CONFIG_SOC_MT7620) += pci-mt7620.o
|
||||
obj-$(CONFIG_SOC_RT288X) += pci-rt2880.o
|
||||
obj-$(CONFIG_SOC_RT3883) += pci-rt3883.o
|
||||
-obj-$(CONFIG_PCIE_LANTIQ) += ifxmips_pcie_phy.o ifxmips_pcie.o fixup-lantiq-pcie.o
|
||||
+obj-$(CONFIG_PCIE_LANTIQ) += ifxmips_pcie.o fixup-lantiq-pcie.o
|
||||
obj-$(CONFIG_PCIE_LANTIQ_MSI) += pcie-lantiq-msi.o
|
||||
obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o
|
||||
obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o
|
||||
|
|
|
|||
|
|
@ -1,3 +1,18 @@
|
|||
From 4d48a3d1ef6f8d036bd926e3c1f70b56fcc679b2 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Koch <stefan.koch10@gmail.com>
|
||||
Date: Thu, 20 Oct 2016 21:32:00 +0200
|
||||
Subject: [PATCH] lantiq: vpe
|
||||
|
||||
Signed-off-by: Stefan Koch <stefan.koch10@gmail.com>
|
||||
---
|
||||
arch/mips/Kconfig | 6 ++++
|
||||
arch/mips/include/asm/mipsmtregs.h | 5 ++++
|
||||
arch/mips/include/asm/vpe.h | 9 ++++++
|
||||
arch/mips/kernel/vpe-mt.c | 47 ++++++++++++++++++++++++++++++
|
||||
arch/mips/kernel/vpe.c | 35 ++++++++++++++++++++++
|
||||
arch/mips/lantiq/prom.c | 4 +++
|
||||
6 files changed, 106 insertions(+)
|
||||
|
||||
--- a/arch/mips/Kconfig
|
||||
+++ b/arch/mips/Kconfig
|
||||
@@ -2429,6 +2429,12 @@ config MIPS_VPE_LOADER
|
||||
|
|
@ -13,6 +28,27 @@
|
|||
config MIPS_VPE_LOADER_CMP
|
||||
bool
|
||||
default "y"
|
||||
--- a/arch/mips/include/asm/mipsmtregs.h
|
||||
+++ b/arch/mips/include/asm/mipsmtregs.h
|
||||
@@ -32,6 +32,9 @@
|
||||
#define read_c0_vpeconf1() __read_32bit_c0_register($1, 3)
|
||||
#define write_c0_vpeconf1(val) __write_32bit_c0_register($1, 3, val)
|
||||
|
||||
+#define read_c0_vpeopt() __read_32bit_c0_register($1, 7)
|
||||
+#define write_c0_vpeopt(val) __write_32bit_c0_register($1, 7, val)
|
||||
+
|
||||
#define read_c0_tcstatus() __read_32bit_c0_register($2, 1)
|
||||
#define write_c0_tcstatus(val) __write_32bit_c0_register($2, 1, val)
|
||||
|
||||
@@ -378,6 +381,8 @@ do { \
|
||||
#define write_vpe_c0_vpeconf0(val) mttc0(1, 2, val)
|
||||
#define read_vpe_c0_vpeconf1() mftc0(1, 3)
|
||||
#define write_vpe_c0_vpeconf1(val) mttc0(1, 3, val)
|
||||
+#define read_vpe_c0_vpeopt() mftc0(1, 7)
|
||||
+#define write_vpe_c0_vpeopt(val) mttc0(1, 7, val)
|
||||
#define read_vpe_c0_count() mftc0(9, 0)
|
||||
#define write_vpe_c0_count(val) mttc0(9, 0, val)
|
||||
#define read_vpe_c0_status() mftc0(12, 0)
|
||||
--- a/arch/mips/include/asm/vpe.h
|
||||
+++ b/arch/mips/include/asm/vpe.h
|
||||
@@ -124,4 +124,13 @@ void cleanup_tc(struct tc *tc);
|
||||
|
|
@ -157,24 +193,3 @@
|
|||
|
||||
int ltq_soc_type(void)
|
||||
{
|
||||
--- a/arch/mips/include/asm/mipsmtregs.h
|
||||
+++ b/arch/mips/include/asm/mipsmtregs.h
|
||||
@@ -32,6 +32,9 @@
|
||||
#define read_c0_vpeconf1() __read_32bit_c0_register($1, 3)
|
||||
#define write_c0_vpeconf1(val) __write_32bit_c0_register($1, 3, val)
|
||||
|
||||
+#define read_c0_vpeopt() __read_32bit_c0_register($1, 7)
|
||||
+#define write_c0_vpeopt(val) __write_32bit_c0_register($1, 7, val)
|
||||
+
|
||||
#define read_c0_tcstatus() __read_32bit_c0_register($2, 1)
|
||||
#define write_c0_tcstatus(val) __write_32bit_c0_register($2, 1, val)
|
||||
|
||||
@@ -378,6 +381,8 @@ do { \
|
||||
#define write_vpe_c0_vpeconf0(val) mttc0(1, 2, val)
|
||||
#define read_vpe_c0_vpeconf1() mftc0(1, 3)
|
||||
#define write_vpe_c0_vpeconf1(val) mttc0(1, 3, val)
|
||||
+#define read_vpe_c0_vpeopt() mftc0(1, 7)
|
||||
+#define write_vpe_c0_vpeopt(val) mttc0(1, 7, val)
|
||||
#define read_vpe_c0_count() mftc0(9, 0)
|
||||
#define write_vpe_c0_count(val) mttc0(9, 0, val)
|
||||
#define read_vpe_c0_status() mftc0(12, 0)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
From 3c92a781de062064e36b867c0ab22f9aba48f3d3 Mon Sep 17 00:00:00 2001
|
||||
From: Eddi De Pieri <eddi@depieri.net>
|
||||
Date: Tue, 8 Nov 2016 17:38:00 +0100
|
||||
Subject: [PATCH] lantiq: pci: bar11mask fix
|
||||
|
||||
Signed-off-by: Eddi De Pieri <eddi@depieri.net>
|
||||
---
|
||||
arch/mips/pci/pci-lantiq.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/arch/mips/pci/pci-lantiq.c
|
||||
+++ b/arch/mips/pci/pci-lantiq.c
|
||||
@@ -59,6 +59,8 @@
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
From 07ce9e9bc4dcd5ac4728e587901112eef95bbe7b Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Koch <stefan.koch10@gmail.com>
|
||||
Date: Mon, 13 Mar 2017 23:42:00 +0100
|
||||
Subject: [PATCH] lantiq: vpe nosmp
|
||||
|
||||
Signed-off-by: Stefan Koch <stefan.koch10@gmail.com>
|
||||
---
|
||||
arch/mips/kernel/vpe-mt.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/arch/mips/kernel/vpe-mt.c
|
||||
+++ b/arch/mips/kernel/vpe-mt.c
|
||||
@@ -132,7 +132,10 @@ int vpe_run(struct vpe *v)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
From ebaae1cd68cd79c7eee67c9c5c0fa45809e84525 Mon Sep 17 00:00:00 2001
|
||||
From: Maikel Bloemendal <openwrt@maikelenyvonne.nl>
|
||||
Date: Fri, 14 Nov 2014 17:06:00 +0000
|
||||
Subject: [PATCH] owrt: lantiq: multiple flash
|
||||
|
||||
Signed-off-by: Maikel Bloemendal <openwrt@maikelenyvonne.nl>
|
||||
---
|
||||
drivers/mtd/maps/lantiq-flash.c | 168 +++++++++++++++++++++-----------
|
||||
1 file changed, 109 insertions(+), 59 deletions(-)
|
||||
|
||||
--- a/drivers/mtd/maps/lantiq-flash.c
|
||||
+++ b/drivers/mtd/maps/lantiq-flash.c
|
||||
@@ -17,6 +17,7 @@
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
From 5e93c85ac3e5626d1aa7e7f9c0a008b2a4224f04 Mon Sep 17 00:00:00 2001
|
||||
From: Matti Laakso <malaakso@elisanet.fi>
|
||||
Date: Sat, 14 Feb 2015 20:48:00 +0000
|
||||
Subject: [PATCH] MTD: cfi_cmdset_0001: disable buffered writes
|
||||
|
||||
Signed-off-by: Matti Laakso <malaakso@elisanet.fi>
|
||||
---
|
||||
drivers/mtd/chips/cfi_cmdset_0001.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
|
||||
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
|
||||
@@ -39,7 +39,7 @@
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
From 5502ef9d40ab20b2ac683660d1565a7c4968bcc8 Mon Sep 17 00:00:00 2001
|
||||
From: Mathias Kresin <openwrt@kresin.me>
|
||||
Date: Mon, 2 May 2016 18:50:00 +0000
|
||||
Subject: [PATCH] xrx200: add gphy clk src device tree binding
|
||||
|
||||
Signed-off-by: Mathias Kresin <openwrt@kresin.me>
|
||||
---
|
||||
arch/mips/lantiq/xway/sysctrl.c | 16 ++++++++++++++++
|
||||
1 file changed, 16 insertions(+)
|
||||
|
||||
--- a/arch/mips/lantiq/xway/sysctrl.c
|
||||
+++ b/arch/mips/lantiq/xway/sysctrl.c
|
||||
@@ -440,6 +440,20 @@ static void clkdev_add_clkout(void)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
From 870ed9cae083ff8a60a739ef7e74c5a1800533be Mon Sep 17 00:00:00 2001
|
||||
From: Johann Neuhauser <johann@it-neuhauser.de>
|
||||
Date: Thu, 17 May 2018 19:12:35 +0200
|
||||
Subject: [PATCH] net: lantiq_etop: of mdio
|
||||
|
||||
Signed-off-by: Johann Neuhauser <johann@it-neuhauser.de>
|
||||
---
|
||||
drivers/net/ethernet/lantiq_etop.c | 555 +++++++++++++++++++++++++-----------
|
||||
1 file changed, 389 insertions(+), 166 deletions(-)
|
||||
|
||||
--- a/drivers/net/ethernet/lantiq_etop.c
|
||||
+++ b/drivers/net/ethernet/lantiq_etop.c
|
||||
@@ -30,6 +30,7 @@
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user