Skip to content

Commit 03d5683

Browse files
small-white-rabbitsmall-white-rabbit
authored
Merge branch 'openwrt:main' into wax206
2 parents 68f6b8a + 5e3a602 commit 03d5683

227 files changed

Lines changed: 4995 additions & 1738 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎package/boot/uboot-ath79/Makefile‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,27 @@ define U-Boot/Default
1919
endef
2020

2121
define U-Boot/ar9344_nec_aterm
22-
NAME:=NEC Aterm series (AR9344)
22+
NAME:=NEC Aterm series (AR9344, GbE)
2323
BUILD_SUBTARGET:= tiny
2424
BUILD_DEVICES:=nec_wg600hp nec_wr8750n nec_wr9500n
2525
UBOOT_CONFIG:=nec_ar9344_aterm
2626
endef
2727

28+
define U-Boot/ar9344_nec_aterm_fe
29+
NAME:=NEC Aterm series (AR9344, FE)
30+
BUILD_SUBTARGET:= tiny
31+
BUILD_DEVICES:=nec_wf1200hp nec_wf1200hp2
32+
UBOOT_CONFIG:=nec_ar9344_aterm_fe
33+
endef
34+
2835
define U-Boot/qca9558_nec_aterm
2936
NAME:=NEC Aterm series (QCA9558)
3037
BUILD_SUBTARGET:= generic
3138
BUILD_DEVICES:=nec_wg1400hp nec_wg1800hp nec_wg1800hp2 nec_wg2200hp
3239
UBOOT_CONFIG:=nec_qca9558_aterm
3340
endef
3441

35-
UBOOT_TARGETS := ar9344_nec_aterm qca9558_nec_aterm
42+
UBOOT_TARGETS := ar9344_nec_aterm ar9344_nec_aterm_fe qca9558_nec_aterm
3643

3744
# don't stage files to bindir, let target/linux/ath79/image/*.mk do that
3845
define Package/u-boot/install

‎package/boot/uboot-ath79/patches/400-ath79-add-support-for-NEC-AR9344-Aterm-series.patch‎

Lines changed: 91 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,21 @@ Subject: [PATCH] ath79: add support for NEC AR9344 Aterm series
55

66
---
77
arch/mips/dts/Makefile | 1 +
8-
arch/mips/dts/nec,ar9344-aterm.dts | 35 +++++++++++++++
9-
arch/mips/mach-ath79/Kconfig | 5 +++
10-
board/nec/ar9344_aterm/Kconfig | 30 +++++++++++++
8+
arch/mips/dts/nec,ar9344-aterm.dts | 35 ++++++++++++++
9+
arch/mips/mach-ath79/Kconfig | 5 ++
10+
board/nec/ar9344_aterm/Kconfig | 33 +++++++++++++
1111
board/nec/ar9344_aterm/Makefile | 3 ++
12-
board/nec/ar9344_aterm/ar9344_aterm.c | 59 ++++++++++++++++++++++++++
13-
configs/nec_ar9344_aterm_defconfig | 61 +++++++++++++++++++++++++++
14-
include/configs/nec_ar9344_aterm.h | 28 ++++++++++++
15-
8 files changed, 222 insertions(+)
12+
board/nec/ar9344_aterm/ar9344_aterm.c | 70 +++++++++++++++++++++++++++
13+
configs/nec_ar9344_aterm_defconfig | 61 +++++++++++++++++++++++
14+
configs/nec_ar9344_aterm_fe_defconfig | 62 ++++++++++++++++++++++++
15+
include/configs/nec_ar9344_aterm.h | 28 +++++++++++
16+
9 files changed, 298 insertions(+)
1617
create mode 100644 arch/mips/dts/nec,ar9344-aterm.dts
1718
create mode 100644 board/nec/ar9344_aterm/Kconfig
1819
create mode 100644 board/nec/ar9344_aterm/Makefile
1920
create mode 100644 board/nec/ar9344_aterm/ar9344_aterm.c
2021
create mode 100644 configs/nec_ar9344_aterm_defconfig
22+
create mode 100644 configs/nec_ar9344_aterm_fe_defconfig
2123
create mode 100644 include/configs/nec_ar9344_aterm.h
2224

2325
--- a/arch/mips/dts/Makefile
@@ -91,7 +93,7 @@ Subject: [PATCH] ath79: add support for NEC AR9344 Aterm series
9193
endmenu
9294
--- /dev/null
9395
+++ b/board/nec/ar9344_aterm/Kconfig
94-
@@ -0,0 +1,30 @@
96+
@@ -0,0 +1,33 @@
9597
+if BOARD_NEC_AR9344_ATERM
9698
+
9799
+config SYS_VENDOR
@@ -121,6 +123,9 @@ Subject: [PATCH] ath79: add support for NEC AR9344 Aterm series
121123
+config SYS_ICACHE_LINE_SIZE
122124
+ default 32
123125
+
126+
+config BOARD_NEC_AR9344_ATERM_FE
127+
+ bool "Aterm devices based on AR9344 with FE ports"
128+
+
124129
+endif
125130
--- /dev/null
126131
+++ b/board/nec/ar9344_aterm/Makefile
@@ -130,7 +135,7 @@ Subject: [PATCH] ath79: add support for NEC AR9344 Aterm series
130135
+obj-y = ar9344_aterm.o
131136
--- /dev/null
132137
+++ b/board/nec/ar9344_aterm/ar9344_aterm.c
133-
@@ -0,0 +1,59 @@
138+
@@ -0,0 +1,70 @@
134139
+// SPDX-License-Identifier: GPL-2.0+
135140
+/*
136141
+ * Copyright (C) 2024 INAGAKI Hiroshi <musashino.open@gmail.com>
@@ -156,16 +161,27 @@ Subject: [PATCH] ath79: add support for NEC AR9344 Aterm series
156161
+ writel(0x2, regs + AR934X_GPIO_REG_FUNC);
157162
+
158163
+ /* Configure default GPIO OE/SET regs */
164+
+#if defined(CONFIG_BOARD_NEC_AR9344_ATERM_FE)
165+
+ writel(0x39b1f, regs + AR71XX_GPIO_REG_OE);
166+
+ writel(0x040000, regs + AR71XX_GPIO_REG_SET);
167+
+#else
159168
+ writel(0x3db1f, regs + AR71XX_GPIO_REG_OE);
160169
+ writel(0x142000, regs + AR71XX_GPIO_REG_SET);
170+
+#endif
161171
+
162172
+ /* Configure pin multiplexing */
163173
+ writel(0x00000000, regs + AR934X_GPIO_REG_OUT_FUNC0);
164174
+ writel(0x0b0a0900, regs + AR934X_GPIO_REG_OUT_FUNC1);
165175
+ writel(0x00180000, regs + AR934X_GPIO_REG_OUT_FUNC2);
166-
+ writel(0x00000000, regs + AR934X_GPIO_REG_OUT_FUNC3);
167176
+ writel(0x2f2e0000, regs + AR934X_GPIO_REG_OUT_FUNC4);
177+
+
178+
+#if defined(CONFIG_BOARD_NEC_AR9344_ATERM_FE)
179+
+ writel(0x002b2a00, regs + AR934X_GPIO_REG_OUT_FUNC3);
180+
+ writel(0x002c2d00, regs + AR934X_GPIO_REG_OUT_FUNC5);
181+
+#else
182+
+ writel(0x00000000, regs + AR934X_GPIO_REG_OUT_FUNC3);
168183
+ writel(0x00000000, regs + AR934X_GPIO_REG_OUT_FUNC5);
184+
+#endif
169185
+}
170186
+
171187
+#ifdef CONFIG_DEBUG_UART_BOARD_INIT
@@ -255,6 +271,71 @@ Subject: [PATCH] ath79: add support for NEC AR9344 Aterm series
255271
+CONFIG_SYS_NS16550=y
256272
+# CONFIG_GZIP is not set
257273
--- /dev/null
274+
+++ b/configs/nec_ar9344_aterm_fe_defconfig
275+
@@ -0,0 +1,62 @@
276+
+CONFIG_MIPS=y
277+
+CONFIG_SYS_MALLOC_LEN=0x40000
278+
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
279+
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xbd007fff
280+
+CONFIG_ENV_SIZE=0x1000
281+
+CONFIG_DEFAULT_DEVICE_TREE="nec,ar9344-aterm"
282+
+CONFIG_SYS_LOAD_ADDR=0x83000000
283+
+CONFIG_ARCH_ATH79=y
284+
+CONFIG_BOARD_NEC_AR9344_ATERM=y
285+
+CONFIG_BOARD_NEC_AR9344_ATERM_FE=y
286+
+CONFIG_SYS_MIPS_TIMER_FREQ=280000000
287+
+CONFIG_MIPS_RELOCATION_TABLE_SIZE=0x4000
288+
+# CONFIG_LOCALVERSION_AUTO is not set
289+
+CONFIG_TIMESTAMP=y
290+
+CONFIG_BOOTDELAY=3
291+
+# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
292+
+CONFIG_USE_BOOTARGS=y
293+
+CONFIG_BOOTARGS="console=ttyS0,115200"
294+
+CONFIG_USE_BOOTCOMMAND=y
295+
+CONFIG_BOOTCOMMAND="bootm 0x9f040000"
296+
+# CONFIG_DISPLAY_BOARDINFO is not set
297+
+CONFIG_BOARD_EARLY_INIT_F=y
298+
+CONFIG_SYS_MALLOC_BOOTPARAMS=y
299+
+# CONFIG_CMDLINE_EDITING is not set
300+
+# CONFIG_AUTO_COMPLETE is not set
301+
+# CONFIG_SYS_LONGHELP is not set
302+
+CONFIG_SYS_MAXARGS=32
303+
+# CONFIG_SYS_XTRACE is not set
304+
+# CONFIG_CMD_BDI is not set
305+
+# CONFIG_CMD_CONSOLE is not set
306+
+# CONFIG_BOOTM_PLAN9 is not set
307+
+# CONFIG_BOOTM_RTEMS is not set
308+
+# CONFIG_BOOTM_VXWORKS is not set
309+
+# CONFIG_CMD_ELF is not set
310+
+# CONFIG_CMD_FDT is not set
311+
+# CONFIG_CMD_RUN is not set
312+
+# CONFIG_CMD_XIMG is not set
313+
+# CONFIG_CMD_EXPORTENV is not set
314+
+# CONFIG_CMD_IMPORTENV is not set
315+
+# CONFIG_CMD_EDITENV is not set
316+
+# CONFIG_CMD_SAVEENV is not set
317+
+# CONFIG_CMD_ENV_EXISTS is not set
318+
+# CONFIG_CMD_CRC32 is not set
319+
+# CONFIG_CMD_DM is not set
320+
+# CONFIG_CMD_LOADS is not set
321+
+# CONFIG_CMD_ECHO is not set
322+
+# CONFIG_CMD_ITEST is not set
323+
+# CONFIG_CMD_SOURCE is not set
324+
+# CONFIG_CMD_SETEXPR is not set
325+
+# CONFIG_CMD_SLEEP is not set
326+
+# CONFIG_ISO_PARTITION is not set
327+
+# CONFIG_OF_TAG_MIGRATE is not set
328+
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
329+
+CONFIG_NO_NET=y
330+
+CONFIG_CLK=y
331+
+# CONFIG_GPIO is not set
332+
+# CONFIG_I2C is not set
333+
+# CONFIG_INPUT is not set
334+
+# CONFIG_POWER is not set
335+
+CONFIG_DM_SERIAL=y
336+
+CONFIG_SYS_NS16550=y
337+
+# CONFIG_GZIP is not set
338+
--- /dev/null
258339
+++ b/include/configs/nec_ar9344_aterm.h
259340
@@ -0,0 +1,28 @@
260341
+/* SPDX-License-Identifier: GPL-2.0+ */

‎package/boot/uboot-mvebu/Makefile‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ define U-Boot/Default
2222
HIDDEN:=1
2323
endef
2424

25+
define U-Boot/mox
26+
NAME:=CZ.NIC Turris Mox
27+
BUILD_DEVICES:=cznic_turris-mox
28+
BUILD_SUBTARGET:=cortexa53
29+
UBOOT_CONFIG:=turris_mox
30+
endef
31+
2532
define U-Boot/clearfog
2633
NAME:=SolidRun ClearFog A1
2734
BUILD_DEVICES:=solidrun_clearfog-base-a1 solidrun_clearfog-pro-a1
@@ -69,6 +76,7 @@ define U-Boot/rb5009
6976
endef
7077

7178
UBOOT_TARGETS:= \
79+
mox \
7280
clearfog \
7381
helios4 \
7482
omnia \

‎package/boot/uboot-tools/uboot-envtools/files/mediatek_filogic‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ jdcloud,re-cp-03)
8888
;;
8989
buffalo,wsr-6000ax8|\
9090
mercusys,mr80x-v3|\
91+
mercusys,mr85x|\
9192
mercusys,mr90x-v1|\
9293
routerich,ax3000|\
9394
routerich,ax3000-v1|\

‎package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq807x‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ case "$board" in
1111
aliyun,ap8220|\
1212
compex,wpq873|\
1313
edgecore,eap102|\
14-
zyxel,nbg7815)
14+
zyxel,nbg7815|\
15+
zyxel,nwa210ax)
1516
ubootenv_add_mtd "0:appsblenv" "0x0" "0x10000" "0x10000"
1617
;;
1718
dynalink,dl-wrx36|\

‎package/firmware/ipq-wifi/Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ ALLWIFIBOARDS:= \
102102
zte_mf286c \
103103
zte_mf287 \
104104
zte_mf287plus \
105-
zyxel_nbg7815
105+
zyxel_nbg7815 \
106+
zyxel_nwa210ax
106107

107108
ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
108109

@@ -281,5 +282,6 @@ $(eval $(call generate-ipq-wifi-package,zte_mf286c,ZTE MF286C))
281282
$(eval $(call generate-ipq-wifi-package,zte_mf287,ZTE MF287))
282283
$(eval $(call generate-ipq-wifi-package,zte_mf287plus,ZTE MF287Plus))
283284
$(eval $(call generate-ipq-wifi-package,zyxel_nbg7815,Zyxel NBG7815))
285+
$(eval $(call generate-ipq-wifi-package,zyxel_nwa210ax,Zyxel NWA210AX))
284286

285287
$(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))

‎package/kernel/button-hotplug/src/button-hotplug.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ extern u64 uevent_next_seqnum(void);
7272
.name = (_name), \
7373
}
7474

75-
static struct bh_map button_map[] = {
75+
static const struct bh_map button_map[] = {
7676
BH_MAP(BTN_0, "BTN_0"),
7777
BH_MAP(BTN_1, "BTN_1"),
7878
BH_MAP(BTN_2, "BTN_2"),

‎package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ extern u64 uevent_next_seqnum(void);
7272
.name = (_name), \
7373
}
7474

75-
static struct bh_map button_map[] = {
75+
static const struct bh_map button_map[] = {
7676
BH_MAP(BTN_0, "BTN_0"),
7777
BH_MAP(BTN_1, "BTN_1"),
7878
BH_MAP(BTN_2, "BTN_2"),
@@ -463,13 +463,12 @@ static int gpio_keys_button_probe(struct platform_device *pdev,
463463
return -EINVAL;
464464
}
465465

466-
buttons = devm_kzalloc(dev, pdata->nbuttons * sizeof(struct gpio_keys_button),
466+
buttons = devm_kmemdup_array(dev, pdata->buttons, pdata->nbuttons, sizeof(struct gpio_keys_button),
467467
GFP_KERNEL);
468468
if (!buttons) {
469469
dev_err(dev, "no memory for button data\n");
470470
return -ENOMEM;
471471
}
472-
memcpy(buttons, pdata->buttons, pdata->nbuttons * sizeof(struct gpio_keys_button));
473472

474473
bdev = devm_kzalloc(dev, sizeof(struct gpio_keys_button_dev) +
475474
pdata->nbuttons * sizeof(struct gpio_keys_button_data),

‎package/kernel/lantiq/ltq-adsl-mei/src/drv_mei_cpe.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,8 +1286,7 @@ IFX_MEI_RunAdslModem (DSL_DEV_Device_t *pDev)
12861286
// DSL_DEV_WinHost_Message_t m;
12871287

12881288
if (mei_arc_swap_buff == NULL) {
1289-
mei_arc_swap_buff =
1290-
(u32 *) kmalloc (MAXSWAPSIZE * 4, GFP_KERNEL);
1289+
mei_arc_swap_buff = kmalloc (MAXSWAPSIZE * 4, GFP_KERNEL);
12911290
if (mei_arc_swap_buff == NULL) {
12921291
IFX_MEI_EMSG (">>> malloc fail for codeswap buff!!! <<<\n");
12931292
return DSL_DEV_MEI_ERR_FAILURE;

‎package/kernel/lantiq/ltq-adsl-mei/src/ifxmips_mei_interface.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ typedef struct _arc_img_hdr {
418418
u32 size; // Size of binary image in bytes
419419
u32 checksum; // Checksum for image
420420
u32 count; // Count of swp pages in image
421-
ARC_SWP_PAGE_HDR page[1]; // Should be "count" pages - '1' to make compiler happy
421+
ARC_SWP_PAGE_HDR page[]; // Should be "count" pages - '1' to make compiler happy
422422
} ARC_IMG_HDR;
423423

424424
typedef struct smmu_mem_info {

0 commit comments

Comments
 (0)