scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-10-29 17:42:41 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

ucentral: development update

Browse Source 
* fix mediatek CI build
* add ucentral-event uci trigger
* update ucentral-client

Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2021-04-27 12:23:35 +02:00
parent 8e5fac246c
commit 6c4224bf4c
4 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
backports/0004-mediatek-update-to-latest-trunk-version.patch
View File

@@ -1,10 +1,12 @@
From 4cfe3cdd0f08c34fbc35f791cc9a753877eea996 Mon Sep 17 00:00:00 2001
From 690744436b9fe7bf5414c766e8bc8c8cc67758cc Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@nbd.name>
Date: Thu, 9 Apr 2020 09:53:24 +0200
Subject: [PATCH 4/9] mediatek: update to latest trunk version
Subject: [PATCH 01/38] mediatek: update to latest trunk version
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
package/boot/mt7623n-preloader/Makefile | 4 +-
package/boot/uboot-mediatek/Makefile | 2 +-
target/linux/mediatek/Makefile | 4 +-
.../dts/mt7622-buffalo-wsr-2533dhp2.dts | 339 +
.../mt7622-elecom-wrc-2533gent.dts | 3 +-
@@ -159,7 +161,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
.../boot/dts/mediatek/mt7622-rfb1-ubi.dts | 644 -
target/linux/mediatek/image/Makefile | 2 +-
.../mediatek/image/gen_mt7622_emmc_img.sh | 19 -
target/linux/mediatek/image/mt7622.mk | 176 +-
target/linux/mediatek/image/mt7622.mk | 173 +-
target/linux/mediatek/image/mt7623.mk | 2 +
.../mt7622/base-files/etc/board.d/01_leds | 17 +
.../mt7622/base-files/etc/board.d/02_network | 21 +-
@@ -212,7 +214,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
.../patches-5.4/0310-mtk-bmt-support.patch | 837 +
...trx-Allow-to-specify-trx-magic-in-DT.patch | 75 +
...ove-dependency-to-BRCM-architectures.patch | 23 +
207 files changed, 105053 insertions(+), 1562 deletions(-)
209 files changed, 105053 insertions(+), 1565 deletions(-)
create mode 100644 target/linux/mediatek/dts/mt7622-buffalo-wsr-2533dhp2.dts
rename target/linux/mediatek/{files-5.4/arch/arm64/boot/dts/mediatek => dts}/mt7622-elecom-wrc-2533gent.dts (99%)
create mode 100644 target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts
@@ -412,6 +414,28 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
create mode 100644 target/linux/mediatek/patches-5.4/0350-mtd-parsers-trx-Allow-to-specify-trx-magic-in-DT.patch
create mode 100644 target/linux/mediatek/patches-5.4/0351-mtd-parsers-Remove-dependency-to-BRCM-architectures.patch
diff --git a/package/boot/mt7623n-preloader/Makefile b/package/boot/mt7623n-preloader/Makefile
index 0faaf46d3f..f5b7d7309c 100644
--- a/package/boot/mt7623n-preloader/Makefile
+++ b/package/boot/mt7623n-preloader/Makefile
@@ -79,5 +79,5 @@ define Build/InstallDev
gunzip -c $(PKG_BUILD_DIR)/mt7623n_bpir2-preloader.bin.gz > $(STAGING_DIR_IMAGE)/mt7623n_bpir2-preloader.bin
endef
-$(eval $(call BuildPackage,mt7623n-preloader))
-$(eval $(call BuildPackage,mt7622-preloader))
+#$(eval $(call BuildPackage,mt7623n-preloader))
+#$(eval $(call BuildPackage,mt7622-preloader))
diff --git a/package/boot/uboot-mediatek/Makefile b/package/boot/uboot-mediatek/Makefile
index c46b906cb5..a4be43ae28 100644
--- a/package/boot/uboot-mediatek/Makefile
+++ b/package/boot/uboot-mediatek/Makefile
@@ -50,4 +50,4 @@ define Build/InstallDev
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-$(UBOOT_IMAGE)
endef
-$(eval $(call BuildPackage/U-Boot))
+#$(eval $(call BuildPackage/U-Boot))
diff --git a/target/linux/mediatek/Makefile b/target/linux/mediatek/Makefile
index c8ab5e01e6..0825b8c6ed 100644
--- a/target/linux/mediatek/Makefile
@@ -101336,10 +101360,10 @@ index d74068c7b1..0000000000
-dd bs="$BS" of="$OUTPUT_FILE" if="$ROOTFS_FILE" seek="$ROOTFS_OFFSET"
-dd if=/dev/zero of="$OUTPUT_FILE" bs=128k count=1 oflag=append conv=notrunc
diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk
index bf706930e4..2311887761 100644
index bf706930e4..63eecc2eab 100644
--- a/target/linux/mediatek/image/mt7622.mk
+++ b/target/linux/mediatek/image/mt7622.mk
@@ -1,51 +1,165 @@
@@ -1,51 +1,162 @@
-KERNEL_LOADADDR := 0x44080000
+DTS_DIR := $(DTS_DIR)/mediatek
@@ -101504,9 +101528,6 @@ index bf706930e4..2311887761 100644
+ KERNEL_INITRAMFS_SUFFIX := -recovery.itb
+ IMAGES := sysupgrade.itb
+ IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata
+ ARTIFACTS := preloader.bin bl31-uboot.fip
+ ARTIFACT/preloader.bin := bl2 snand-1ddr
+ ARTIFACT/bl31-uboot.fip := bl31-uboot linksys_e8450
+endef
+TARGET_DEVICES += linksys_e8450-ubi
+
@@ -101532,7 +101553,7 @@ index bf706930e4..2311887761 100644
UBINIZE_OPTS := -E 5
BLOCKSIZE := 128k
PAGESIZE := 2048
@@ -54,16 +168,16 @@ define Device/mediatek_mt7622-ubi
@@ -54,16 +165,16 @@ define Device/mediatek_mt7622-ubi
IMAGES += factory.bin
IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \
check-size $$$$(IMAGE_SIZE)

8
backports/0006-uboot-mediatek-add-support-for-linksys-e8450.patch
View File

@@ -1,7 +1,7 @@
From aa59e42ae6e3299f5d1b8015a8bd90d5ac34a510 Mon Sep 17 00:00:00 2001
From eed2e31cb32b565a3ebcc3bc2e9d7dc7a9550b4b Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Sat, 30 Jan 2021 13:58:16 +0000
Subject: [PATCH 6/9] uboot-mediatek: add support for linksys e8450
Subject: [PATCH 01/36] uboot-mediatek: add support for linksys e8450
Build U-Boot for the Linksys E8450 in order to have support for UBI.
The loader has a default environment with scripts handling the reset
@@ -44,7 +44,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
create mode 100644 package/boot/uboot-mediatek/patches/100-increase-CONFIG_SYS_BOOTM_LEN.patch
diff --git a/package/boot/uboot-mediatek/Makefile b/package/boot/uboot-mediatek/Makefile
index c46b906cb5..b61f432644 100644
index a4be43ae28..228cbe16ec 100644
--- a/package/boot/uboot-mediatek/Makefile
+++ b/package/boot/uboot-mediatek/Makefile
@@ -3,6 +3,7 @@ include $(INCLUDE_DIR)/kernel.mk
@@ -108,7 +108,7 @@ index c46b906cb5..b61f432644 100644
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-$(UBOOT_IMAGE)
endef
$(eval $(call BuildPackage/U-Boot))
#$(eval $(call BuildPackage/U-Boot))
diff --git a/package/boot/uboot-mediatek/patches/002-nand-add-spi-nand-driver.patch b/package/boot/uboot-mediatek/patches/002-nand-add-spi-nand-driver.patch
index dc3ebaf7af..5d3e94ac86 100644
--- a/package/boot/uboot-mediatek/patches/002-nand-add-spi-nand-driver.patch

2
feeds/ucentral/ucentral-client/Makefile
View File

@@ -6,7 +6,7 @@ PKG_RELEASE:=1
PKG_SOURCE_URL=https://github.com/blogic/ucentral-client.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2021-02-15
PKG_SOURCE_VERSION:=d7d9a22035e9a2295bcea2278d21855dd3cc270a
PKG_SOURCE_VERSION:=b41a3129fd8de33d045251cd83418e51fba448c2
PKG_LICENSE:=BSD-3-Clause
PKG_MAINTAINER:=John Crispin <john@phrozen.org>

4
feeds/ucentral/ucentral-event/files/ucentral-event
View File

@@ -5,6 +5,10 @@ START=80
USE_PROCD=1
PROG=/usr/sbin/ucentral-event
service_triggers() {
procd_add_reload_trigger ucentral
}
start_service() {
procd_open_instance
procd_set_param command "$PROG"