Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2024-12-24 16:05:41 +08:00
commit b939c8122c
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
15 changed files with 184 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-6.6
View File

@ -1,2 +1,2 @@
LINUX_VERSION-6.6 = .66 LINUX_VERSION-6.6 = .67
LINUX_KERNEL_HASH-6.6.66 = 9d757937c4661c2f512c62641b74ef74eff9bb13dc5dbcbaaa108c21152f1e52 LINUX_KERNEL_HASH-6.6.67 = e41da482ec42a3b0e2b8ed2574c1d327e3dcf95cdf025c55a356b04307113e1a

10
package/boot/uboot-d1/Makefile
View File

@ -30,7 +30,7 @@ define U-Boot/dongshan_nezha_stu
OPENSBI:=generic OPENSBI:=generic
DEPENDS:=+opensbi_generic DEPENDS:=+opensbi_generic
UBOOT_DTS:=sun20i-d1-dongshan-nezha-stu.dtb UBOOT_DTS:=sun20i-d1-dongshan-nezha-stu.dtb
BUILD_DEVICES:=dongshan_nezha_stu BUILD_DEVICES:=100ask_dongshan-nezha-stu
endef endef
define U-Boot/lichee_rv_dock define U-Boot/lichee_rv_dock
@ -38,7 +38,7 @@ define U-Boot/lichee_rv_dock
OPENSBI:=generic OPENSBI:=generic
DEPENDS:=+opensbi_generic DEPENDS:=+opensbi_generic
UBOOT_DTS:=sun20i-d1-lichee-rv-dock.dtb UBOOT_DTS:=sun20i-d1-lichee-rv-dock.dtb
BUILD_DEVICES:=lichee_rv_dock BUILD_DEVICES:=sipeed_lichee-rv-dock
endef endef
define U-Boot/mangopi_mq_pro define U-Boot/mangopi_mq_pro
@ -46,7 +46,7 @@ define U-Boot/mangopi_mq_pro
OPENSBI:=generic OPENSBI:=generic
DEPENDS:=+opensbi_generic DEPENDS:=+opensbi_generic
UBOOT_DTS:=sun20i-d1-mangopi-mq-pro.dtb UBOOT_DTS:=sun20i-d1-mangopi-mq-pro.dtb
BUILD_DEVICES:=mangopi_mq_pro BUILD_DEVICES:=widora_mangopi-mq-pro
endef endef
define U-Boot/nezha define U-Boot/nezha
@ -54,7 +54,7 @@ define U-Boot/nezha
OPENSBI:=generic OPENSBI:=generic
DEPENDS:=+opensbi_generic DEPENDS:=+opensbi_generic
UBOOT_DTS:=sun20i-d1-nezha.dtb UBOOT_DTS:=sun20i-d1-nezha.dtb
BUILD_DEVICES:=nezha BUILD_DEVICES:=allwinner_d1-nezha
endef endef
UBOOT_TARGETS := \ UBOOT_TARGETS := \
@ -74,7 +74,7 @@ endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(STAGING_DIR_IMAGE) $(INSTALL_DIR) $(STAGING_DIR_IMAGE)
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(DTS_DIR)/$(UBOOT_DTS) $(STAGING_DIR_IMAGE)/$(UBOOT_DTS) $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(DTS_DIR)/$(UBOOT_DTS) $(STAGING_DIR_IMAGE)/$(UBOOT_DTS)
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-$(UBOOT_IMAGE) $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_DEVICES)-$(UBOOT_IMAGE)
mkimage -C none -A riscv -T script -d uEnv-$(UENV).txt \ mkimage -C none -A riscv -T script -d uEnv-$(UENV).txt \
$(STAGING_DIR_IMAGE)/$(BUILD_DEVICES)-boot.scr $(STAGING_DIR_IMAGE)/$(BUILD_DEVICES)-boot.scr
endef endef

51
package/boot/uboot-rockchip/patches/110-rockchip-board-Increase-rng-seed-size-to-make-it-sufficie.patch → package/boot/uboot-rockchip/patches/001-rockchip-board-Increase-rng-seed-size-to-make-it-sufficie.patch
View File

@ -1,29 +1,8 @@
From ed4ae7386257aa66455e330234e513d098a36f84 Mon Sep 17 00:00:00 2001
From: Alex Shumsky <alexthreed@gmail.com> From: Alex Shumsky <alexthreed@gmail.com>
To: u-boot@lists.denx.de Date: Wed, 16 Oct 2024 13:02:03 +0300
Cc: Alex Shumsky <alexthreed@gmail.com>, Subject: [PATCH] rockchip: board: Increase rng-seed size to make it sufficient
Dragan Simic <dsimic@manjaro.org>, Marek Vasut <marex@denx.de>, for modern Linux
Ben Wolsieffer <benwolsieffer@gmail.com>,
Caleb Connolly <caleb.connolly@linaro.org>,
Chris Morgan <macromorgan@hotmail.com>,
Devarsh Thakkar <devarsht@ti.com>,
Jagan Teki <jagan@amarulasolutions.com>,
Janne Grunau <j@jannau.net>,
Jerome Forissier <jerome.forissier@linaro.org>,
Jiaxun Yang <jiaxun.yang@flygoat.com>,
Jonas Karlman <jonas@kwiboo.se>,
Joshua Watt <jpewhacker@gmail.com>,
Kever Yang <kever.yang@rock-chips.com>,
Mattijs Korpershoek <mkorpershoek@baylibre.com>,
Neal Gompa <neal@gompa.dev>,
Philipp Tomsich <philipp.tomsich@theobroma-systems.com>,
Philipp Tomsich <philipp.tomsich@vrull.eu>,
Quentin Schulz <quentin.schulz@cherry.de>,
Rasmus Villemoes <rasmus.villemoes@prevas.dk>,
Simon Glass <sjg@chromium.org>, Stefan Roese <sr@denx.de>,
Tim Harvey <tharvey@gateworks.com>, Tom Rini <trini@konsulko.com>
Subject: [PATCH v6] rockchip: board: Increase rng-seed size to make it sufficient for modern Linux
Date: Wed, 16 Oct 2024 13:02:03 +0300 [thread overview]
Message-ID: <20241016100203.629713-1-alexthreed@gmail.com> (raw)
Increase rng-seed size to make Linux happy and initialize rng pool instantly. Increase rng-seed size to make Linux happy and initialize rng pool instantly.
Linux 5.19+ requires 32 bytes of entropy to initialize random pool, but u-boot Linux 5.19+ requires 32 bytes of entropy to initialize random pool, but u-boot
@ -46,27 +25,9 @@ Signed-off-by: Alex Shumsky <alexthreed@gmail.com>
Fixes: d2048bafae40 ("rockchip: board: Add board_rng_seed() for all Rockchip devices") Fixes: d2048bafae40 ("rockchip: board: Add board_rng_seed() for all Rockchip devices")
Reviewed-by: Dragan Simic <dsimic@manjaro.org> Reviewed-by: Dragan Simic <dsimic@manjaro.org>
Reviewed-by: Marek Vasut <marex@denx.de> Reviewed-by: Marek Vasut <marex@denx.de>
Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
--- ---
Changes in v6:
- fix wording in docs and debug message
Changes in v5:
- add docs
Changes in v4:
- fix typos and code style
Changes in v3:
- reword warning
- increase default rng_seed_size to support older linux as well
- reword commit message
Changes in v2:
- add env config knob rng_seed_size
- add warning for small rng_seed_size
- 12-character commit SHA in Fixes
arch/arm/mach-rockchip/board.c | 11 ++++++++++- arch/arm/mach-rockchip/board.c | 11 ++++++++++-
common/Kconfig | 3 +++ common/Kconfig | 3 +++
doc/usage/environment.rst | 5 +++++ doc/usage/environment.rst | 5 +++++

55
package/boot/uboot-rockchip/patches/002-scripts-dtc-pylibfdt-libfdt-i_shipped-Use-SWIG_AppendOutp.patch Normal file
View File

@ -0,0 +1,55 @@
From a63456b9191fae2fe49f4b121e025792022e3950 Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Wed, 30 Oct 2024 06:07:16 +0100
Subject: [PATCH] scripts/dtc/pylibfdt/libfdt.i_shipped: Use SWIG_AppendOutput
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Swig has changed language specific AppendOutput functions. The helper
macro SWIG_AppendOutput remains unchanged. Use that instead
of SWIG_Python_AppendOutput, which would require an extra parameter
since swig 4.3.0.
/home/flk/poky/build-test/tmp/work/qemux86_64-poky-linux/u-boot/2024.10/git/arch/x86/cpu/u-boot-64.lds
| scripts/dtc/pylibfdt/libfdt_wrap.c: In function ‘_wrap_fdt_next_node’:
| scripts/dtc/pylibfdt/libfdt_wrap.c:5581:17: error: too few arguments to function ‘SWIG_Python_AppendOutput’
| 5581 | resultobj = SWIG_Python_AppendOutput(resultobj, val);
| | ^~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Reported-by: Rudi Heitbaum <rudi@heitbaum.com>
Link: https://github.com/dgibson/dtc/pull/154
---
scripts/dtc/pylibfdt/libfdt.i_shipped | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/scripts/dtc/pylibfdt/libfdt.i_shipped
+++ b/scripts/dtc/pylibfdt/libfdt.i_shipped
@@ -1037,7 +1037,7 @@ typedef uint32_t fdt32_t;
fdt_string(fdt1, fdt32_to_cpu($1->nameoff)));
buff = PyByteArray_FromStringAndSize(
(const char *)($1 + 1), fdt32_to_cpu($1->len));
- resultobj = SWIG_Python_AppendOutput(resultobj, buff);
+ resultobj = SWIG_AppendOutput(resultobj, buff);
}
}
@@ -1076,7 +1076,7 @@ typedef uint32_t fdt32_t;
%typemap(argout) int *depth {
PyObject *val = Py_BuildValue("i", *arg$argnum);
- resultobj = SWIG_Python_AppendOutput(resultobj, val);
+ resultobj = SWIG_AppendOutput(resultobj, val);
}
%apply int *depth { int *depth };
@@ -1092,7 +1092,7 @@ typedef uint32_t fdt32_t;
if (PyTuple_GET_SIZE(resultobj) == 0)
resultobj = val;
else
- resultobj = SWIG_Python_AppendOutput(resultobj, val);
+ resultobj = SWIG_AppendOutput(resultobj, val);
}
}

2
target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch
View File

@ -17583,7 +17583,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
* For devices with more than one control interface, we assume the * For devices with more than one control interface, we assume the
--- a/sound/usb/quirks.c --- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c +++ b/sound/usb/quirks.c
@@ -2233,6 +2233,8 @@ static const struct usb_audio_quirk_flag @@ -2247,6 +2247,8 @@ static const struct usb_audio_quirk_flag
QUIRK_FLAG_ALIGN_TRANSFER), QUIRK_FLAG_ALIGN_TRANSFER),
DEVICE_FLG(0x534d, 0x2109, /* MacroSilicon MS2109 */ DEVICE_FLG(0x534d, 0x2109, /* MacroSilicon MS2109 */
QUIRK_FLAG_ALIGN_TRANSFER), QUIRK_FLAG_ALIGN_TRANSFER),

20
target/linux/d1/image/Makefile
View File

@ -49,43 +49,47 @@ define Device/FitImage
KERNEL_NAME := Image KERNEL_NAME := Image
endef endef
define Device/dongshan_nezha_stu define Device/100ask_dongshan-nezha-stu
$(call Device/Default) $(call Device/Default)
DEVICE_VENDOR := Dongshan DEVICE_VENDOR := Dongshan
DEVICE_MODEL := Nezha STU devkit DEVICE_MODEL := Nezha STU devkit
DEVICE_DTS := allwinner/sun20i-d1-dongshan-nezha-stu DEVICE_DTS := allwinner/sun20i-d1-dongshan-nezha-stu
SUPPORTED_DEVICES += dongshan_nezha_stu
UBOOT := dongshan_nezha_stu UBOOT := dongshan_nezha_stu
endef endef
TARGET_DEVICES += dongshan_nezha_stu TARGET_DEVICES += 100ask_dongshan-nezha-stu
define Device/lichee_rv_dock define Device/sipeed_lichee-rv-dock
$(call Device/Default) $(call Device/Default)
DEVICE_VENDOR := Sipeed DEVICE_VENDOR := Sipeed
DEVICE_MODEL := LicheePi RV (dock) DEVICE_MODEL := LicheePi RV (dock)
DEVICE_DTS := allwinner/sun20i-d1-lichee-rv-dock DEVICE_DTS := allwinner/sun20i-d1-lichee-rv-dock
SUPPORTED_DEVICES += lichee_rv_dock
DEVICE_PACKAGES += kmod-rtl8723bs DEVICE_PACKAGES += kmod-rtl8723bs
UBOOT := lichee_rv_dock UBOOT := lichee_rv_dock
endef endef
TARGET_DEVICES += lichee_rv_dock TARGET_DEVICES += sipeed_lichee-rv-dock
define Device/mangopi_mq_pro define Device/widora_mangopi-mq-pro
$(call Device/Default) $(call Device/Default)
DEVICE_VENDOR := MangoPi DEVICE_VENDOR := MangoPi
DEVICE_MODEL := MQ Pro DEVICE_MODEL := MQ Pro
DEVICE_DTS := allwinner/sun20i-d1-mangopi-mq-pro DEVICE_DTS := allwinner/sun20i-d1-mangopi-mq-pro
SUPPORTED_DEVICES += mangopi_mq_pro
DEVICE_PACKAGES += kmod-rtl8723bs DEVICE_PACKAGES += kmod-rtl8723bs
UBOOT := mangopi_mq_pro UBOOT := mangopi_mq_pro
endef endef
TARGET_DEVICES += mangopi_mq_pro TARGET_DEVICES += widora_mangopi-mq-pro
define Device/nezha define Device/allwinner_d1-nezha
$(call Device/Default) $(call Device/Default)
DEVICE_VENDOR := Nezha DEVICE_VENDOR := Nezha
DEVICE_MODEL := D1 DEVICE_MODEL := D1
DEVICE_DTS := allwinner/sun20i-d1-nezha DEVICE_DTS := allwinner/sun20i-d1-nezha
SUPPORTED_DEVICES += nezha
UBOOT := nezha UBOOT := nezha
endef endef
TARGET_DEVICES += nezha TARGET_DEVICES += allwinner_d1-nezha
define Image/Build define Image/Build
$(call Image/Build/$(1),$(1)) $(call Image/Build/$(1),$(1))

4
target/linux/generic/pending-6.6/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch
View File

@ -19,8 +19,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ +
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
/* /**
@@ -243,6 +245,4 @@ static inline void *offset_to_ptr(const @@ -258,6 +260,4 @@ static inline void *offset_to_ptr(const
*/ */
#define prevent_tail_call_optimization() mb() #define prevent_tail_call_optimization() mb()

87
target/linux/generic/pending-6.6/605-netfilter-nft_set_hash-unaligned-atomic-read-on-stru.patch Normal file
View File

@ -0,0 +1,87 @@
From 113fb8a8d1f27156f58b27ce0fc02af9b3705bf7 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Sun, 22 Dec 2024 11:02:39 +0100
Subject: [PATCH] netfilter: nft_set_hash: unaligned atomic read on struct
nft_set_ext
Access to genmask field in struct nft_set_ext results in unaligned
atomic read:
[ 72.130109] Unable to handle kernel paging request at virtual address ffff0000c2bb708c
[ 72.131036] Mem abort info:
[ 72.131213] ESR = 0x0000000096000021
[ 72.131446] EC = 0x25: DABT (current EL), IL = 32 bits
[ 72.132209] SET = 0, FnV = 0
[ 72.133216] EA = 0, S1PTW = 0
[ 72.134080] FSC = 0x21: alignment fault
[ 72.135593] Data abort info:
[ 72.137194] ISV = 0, ISS = 0x00000021, ISS2 = 0x00000000
[ 72.142351] CM = 0, WnR = 0, TnD = 0, TagAccess = 0
[ 72.145989] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0
[ 72.150115] swapper pgtable: 4k pages, 48-bit VAs, pgdp=0000000237d27000
[ 72.154893] [ffff0000c2bb708c] pgd=0000000000000000, p4d=180000023ffff403, pud=180000023f84b403, pmd=180000023f835403,
+pte=0068000102bb7707
[ 72.163021] Internal error: Oops: 0000000096000021 [#1] SMP
[...]
[ 72.170041] CPU: 7 UID: 0 PID: 54 Comm: kworker/7:0 Tainted: G E 6.13.0-rc3+ #2
[ 72.170509] Tainted: [E]=UNSIGNED_MODULE
[ 72.170720] Hardware name: QEMU QEMU Virtual Machine, BIOS edk2-stable202302-for-qemu 03/01/2023
[ 72.171192] Workqueue: events_power_efficient nft_rhash_gc [nf_tables]
[ 72.171552] pstate: 21400005 (nzCv daif +PAN -UAO -TCO +DIT -SSBS BTYPE=--)
[ 72.171915] pc : nft_rhash_gc+0x200/0x2d8 [nf_tables]
[ 72.172166] lr : nft_rhash_gc+0x128/0x2d8 [nf_tables]
[ 72.172546] sp : ffff800081f2bce0
[ 72.172724] x29: ffff800081f2bd40 x28: ffff0000c2bb708c x27: 0000000000000038
[ 72.173078] x26: ffff0000c6780ef0 x25: ffff0000c643df00 x24: ffff0000c6778f78
[ 72.173431] x23: 000000000000001a x22: ffff0000c4b1f000 x21: ffff0000c6780f78
[ 72.173782] x20: ffff0000c2bb70dc x19: ffff0000c2bb7080 x18: 0000000000000000
[ 72.174135] x17: ffff0000c0a4e1c0 x16: 0000000000003000 x15: 0000ac26d173b978
[ 72.174485] x14: ffffffffffffffff x13: 0000000000000030 x12: ffff0000c6780ef0
[ 72.174841] x11: 0000000000000000 x10: ffff800081f2bcf8 x9 : ffff0000c3000000
[ 72.175193] x8 : 00000000000004be x7 : 0000000000000000 x6 : 0000000000000000
[ 72.175544] x5 : 0000000000000040 x4 : ffff0000c3000010 x3 : 0000000000000000
[ 72.175871] x2 : 0000000000003a98 x1 : ffff0000c2bb708c x0 : 0000000000000004
[ 72.176207] Call trace:
[ 72.176316] nft_rhash_gc+0x200/0x2d8 [nf_tables] (P)
[ 72.176653] process_one_work+0x178/0x3d0
[ 72.176831] worker_thread+0x200/0x3f0
[ 72.176995] kthread+0xe8/0xf8
[ 72.177130] ret_from_fork+0x10/0x20
[ 72.177289] Code: 54fff984 d503201f d2800080 91003261 (f820303f)
[ 72.177557] ---[ end trace 0000000000000000 ]---
Align struct nft_set_ext to word size to address this and
documentation it.
pahole reports that this increases the size of elements for rhash and
pipapo in 8 bytes on x86_64.
Fixes: 7ffc7481153b ("netfilter: nft_set_hash: skip duplicated elements pending gc run")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
include/net/netfilter/nf_tables.h | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -721,15 +721,18 @@ struct nft_set_ext_tmpl {
/**
* struct nft_set_ext - set extensions
*
- * @genmask: generation mask
+ * @genmask: generation mask, but also flags (see NFT_SET_ELEM_DEAD_BIT)
* @offset: offsets of individual extension types
* @data: beginning of extension data
+ *
+ * This structure must be aligned to word size, otherwise atomic bitops
+ * on genmask field can cause aligment failure on some archs.
*/
struct nft_set_ext {
u8 genmask;
u8 offset[NFT_SET_EXT_NUM];
char data[];
-};
+} __aligned(BITS_PER_LONG / 8);
static inline void nft_set_ext_prepare(struct nft_set_ext_tmpl *tmpl)
{

2
target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch
View File

@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/netfilter/nf_tables_api.c --- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c
@@ -8417,7 +8417,7 @@ static int nft_register_flowtable_net_ho @@ -8421,7 +8421,7 @@ static int nft_register_flowtable_net_ho
err = flowtable->data.type->setup(&flowtable->data, err = flowtable->data.type->setup(&flowtable->data,
hook->ops.dev, hook->ops.dev,
FLOW_BLOCK_BIND); FLOW_BLOCK_BIND);

3
target/linux/ipq40xx/base-files/etc/board.d/02_network
View File

@ -202,6 +202,9 @@ ipq40xx_setup_macs()
wan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr) wan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
lan_mac=$(macaddr_add "$wan_mac" 1) lan_mac=$(macaddr_add "$wan_mac" 1)
;; ;;
extreme-networks,ws-ap3915i)
label_mac="$(mtd_get_mac_ascii CFG1 ethaddr)"
;;
ezviz,cs-w3-wd1200g-eup) ezviz,cs-w3-wd1200g-eup)
label_mac=$(mtd_get_mac_binary "ART" 0x6) label_mac=$(mtd_get_mac_binary "ART" 0x6)
;; ;;

1
target/linux/ipq40xx/image/generic.mk
View File

@ -542,7 +542,6 @@ define Device/extreme-networks_ws-ap3915i
DEVICE_MODEL := WS-AP3915i DEVICE_MODEL := WS-AP3915i
IMAGE_SIZE := 30080k IMAGE_SIZE := 30080k
SOC := qcom-ipq4029 SOC := qcom-ipq4029
BLOCKSIZE := 128k
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size | append-metadata IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size | append-metadata
endef endef
TARGET_DEVICES += extreme-networks_ws-ap3915i TARGET_DEVICES += extreme-networks_ws-ap3915i

2
target/linux/octeon/config-6.6
View File

@ -9,6 +9,7 @@ CONFIG_ARCH_MMAP_RND_BITS_MIN=12
CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=15 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=15
CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_AT803X_PHY=y
CONFIG_ATA=y CONFIG_ATA=y
CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
@ -216,6 +217,7 @@ CONFIG_QUEUED_RWLOCKS=y
CONFIG_QUEUED_SPINLOCKS=y CONFIG_QUEUED_SPINLOCKS=y
CONFIG_RANDSTRUCT_NONE=y CONFIG_RANDSTRUCT_NONE=y
CONFIG_RAS=y CONFIG_RAS=y
CONFIG_REGULATOR=y
CONFIG_REGMAP=y CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=y CONFIG_REGMAP_I2C=y
CONFIG_RELAY=y CONFIG_RELAY=y

6
target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi
View File

@ -91,14 +91,10 @@
}; };
partition@b260000 { partition@b260000 {
label = "firmware"; label = "firmware";
reg = <0x260000 0x6d0000>; reg = <0x260000 0xda0000>;
compatible = "openwrt,uimage", "denx,uimage"; compatible = "openwrt,uimage", "denx,uimage";
openwrt,ih-magic = <0x83800000>; openwrt,ih-magic = <0x83800000>;
}; };
partition@930000 {
label = "runtime2";
reg = <0x930000 0x6d0000>;
};
}; };
}; };
}; };

11
target/linux/realtek/dts/rtl8393_zyxel_gs1900-48.dts
View File

@ -39,11 +39,6 @@
gpio-controller; gpio-controller;
}; };
gpio-restart {
compatible = "gpio-restart";
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
};
keys { keys {
compatible = "gpio-keys-polled"; compatible = "gpio-keys-polled";
poll-interval = <20>; poll-interval = <20>;
@ -131,14 +126,10 @@
}; };
partition@260000 { partition@260000 {
label = "firmware"; label = "firmware";
reg = <0x260000 0x6d0000>; reg = <0x260000 0xda0000>;
compatible = "openwrt,uimage", "denx,uimage"; compatible = "openwrt,uimage", "denx,uimage";
openwrt,ih-magic = <0x83800000>; openwrt,ih-magic = <0x83800000>;
}; };
partition@930000 {
label = "runtime2";
reg = <0x930000 0x6d0000>;
};
}; };
}; };
}; };

8
target/linux/realtek/image/common.mk
View File

@ -57,13 +57,17 @@ define Device/hpe_1920
endef endef
define Device/zyxel_gs1900 define Device/zyxel_gs1900
DEVICE_COMPAT_VERSION := 2.0
DEVICE_COMPAT_MESSAGE := Dual firmware paritition merged due to size constraints. \
Upgrade requires a new factory install. Regular sysupgrade is not possible.
DEVICE_VENDOR := Zyxel DEVICE_VENDOR := Zyxel
IMAGE_SIZE := 6976k IMAGE_SIZE := 13952k
UIMAGE_MAGIC := 0x83800000 UIMAGE_MAGIC := 0x83800000
KERNEL_INITRAMFS := \ KERNEL_INITRAMFS := \
kernel-bin | \ kernel-bin | \
append-dtb | \ append-dtb | \
libdeflate-gzip | \ libdeflate-gzip | \
zyxel-vers | \ zyxel-vers | \
uImage gzip uImage gzip | \
check-size 6976k
endef endef