Skip to content

Commit 34f3bcf

Browse files
committed
update
1 parent 7edf61c commit 34f3bcf

Some content is hidden

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

49 files changed

+1057
-1555
lines changed

.github/workflows/Openwrt-AutoBuild.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
echo "MTARGET=arm_cortex-a7" >> $GITHUB_ENV
8080
elif [[ ${{matrix.target}} =~ (ipq40xx_generic|bcm27xx_bcm2709|sunxi_cortexa7) ]]; then
8181
echo "MTARGET=arm_cortex-a7_neon-vfpv4" >> $GITHUB_ENV
82-
elif [[ ${{matrix.target}} == "meson_meson8b" ]]; then
82+
elif [[ ${{matrix.target}} == "amlogic_meson8b" ]]; then
8383
echo "MTARGET=arm_cortex-a5_vfpv4" >> $GITHUB_ENV
8484
elif [[ ${{matrix.target}} == "bcm53xx" ]]; then
8585
echo "MTARGET=arm_cortex-a9" >> $GITHUB_ENV
@@ -219,7 +219,7 @@ jobs:
219219
run: |
220220
cd openwrt
221221
make defconfig
222-
if [[ ! "${{matrix.target}}" =~ (armsr_armv8|bcm27xx_*|rockchip_*|sunxi_*|x86_*|meson_meson8b) ]]; then
222+
if [[ ! "${{matrix.target}}" =~ (armsr_armv8|bcm27xx_*|rockchip_*|sunxi_*|x86_*) ]]; then
223223
sed -n '/# Wireless Drivers/,/# end of Wireless Drivers/p' .config | sed -e 's/=m/=n/' >>.config
224224
sed -i "s/\(kmod-qca.*\)=m/\1=n/" .config
225225
make defconfig

.github/workflows/repo-dispatcher.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,6 @@ jobs:
122122
-X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
123123
-H "Accept: application/vnd.github.everest-preview+json" \
124124
-H "Authorization: token ${{ secrets.TOKEN_KIDDIN9 }}" \
125-
-d '{"event_type": "mediatek_mt7981 ${{ github.event.inputs.param }}", "client_payload": {"target": "mediatek_mt7981"}}'
126-
curl \
127-
-X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
128-
-H "Accept: application/vnd.github.everest-preview+json" \
129-
-H "Authorization: token ${{ secrets.TOKEN_KIDDIN9 }}" \
130125
-d '{"event_type": "ipq50xx_arm ${{ github.event.inputs.param }}", "client_payload": {"target": "ipq50xx_arm"}}'
131126
curl \
132127
-X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
@@ -162,7 +157,7 @@ jobs:
162157
-X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
163158
-H "Accept: application/vnd.github.everest-preview+json" \
164159
-H "Authorization: token ${{ secrets.TOKEN_KIDDIN9 }}" \
165-
-d '{"event_type": "meson_meson8b ${{ github.event.inputs.param }}", "client_payload": {"target": "meson_meson8b"}}'
160+
-d '{"event_type": "amlogic_meson8b ${{ github.event.inputs.param }}", "client_payload": {"target": "amlogic_meson8b"}}'
166161
curl \
167162
-X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
168163
-H "Accept: application/vnd.github.everest-preview+json" \

devices/amlogic_meson8b/.config

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
2+
CONFIG_TARGET_amlogic=y
3+
CONFIG_TARGET_amlogic_meson8b=y
4+
CONFIG_TARGET_amlogic_meson8b_DEVICE_thunder-onecloud=y
5+
6+
CONFIG_TARGET_ROOTFS_SQUASHFS=n
7+
CONFIG_TARGET_ROOTFS_EXT4FS=y
8+
9+
CONFIG_PACKAGE_perf=n
10+
11+
CONFIG_PACKAGE_kmod-rt2x00-pci=n
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
66

77
bash $SHELL_FOLDER/../common/kernel_6.1.sh
88

9-
git_clone_path master https://github.com/coolsnowwolf/lede target/linux/meson
9+
git_clone_path master https://github.com/coolsnowwolf/lede target/linux/amlogic package/boot/uboot-amlogic
10+
11+
sed -i "s/wpad-openssl/wpad-basic-mbedtls/" target/linux/amlogic/image/meson8b.mk
1012

1113

1214

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- a/package/kernel/mac80211/broadcom.mk
2+
+++ b/package/kernel/mac80211/broadcom.mk
3+
@@ -437,6 +437,7 @@ define KernelPackage/brcmfmac/config
4+
default y if TARGET_starfive
5+
default y if TARGET_rockchip
6+
default y if TARGET_sunxi
7+
+ default y if TARGET_amlogic
8+
default n
9+
help
10+
Enable support for cards attached to an SDIO bus.
Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- a/target/linux/meson/image/Makefile
2-
+++ b/target/linux/meson/image/Makefile
3-
@@ -46,7 +46,8 @@ endef
1+
--- a/target/linux/amlogic/image/meson8b.mk
2+
+++ b/target/linux/amlogic/image/meson8b.mk
3+
@@ -11,7 +11,8 @@ endef
44

55
define Device/thunder-onecloud
66
DEVICE_DTS := meson8b-onecloud
@@ -10,14 +10,19 @@
1010
KERNEL_LOADADDR := 0x00208000
1111
IMAGE/emmc.img := boot-script onecloud | emmc-common $$(DEVICE_NAME)
1212
endef
13-
@@ -54,4 +55,10 @@ ifeq ($(SUBTARGET),meson8b)
14-
TARGET_DEVICES += thunder-onecloud
15-
endif
13+
14+
--- a/target/linux/amlogic/image/Makefile
15+
+++ b/target/linux/amlogic/image/Makefile
16+
@@ -88,4 +88,12 @@ endef
17+
18+
include $(SUBTARGET).mk
1619

1720
+define Image/Build
21+
+ if [ "$(PROFILE_SANITIZED)" == "thunder-onecloud" ]; then \
1822
+ export BIN_DIR=$(BIN_DIR); \
1923
+ cd /data/packit/openwrt-onecloud || true; \
20-
+ . ~/packit/packit_onecloud1.sh || true;
24+
+ . ~/packit/packit_onecloud1.sh || true; \
25+
+ fi
2126
+endef
2227
+
2328
$(eval $(call BuildImage))

devices/amlogic_mesongx/.config

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
CONFIG_TARGET_amlogic=y
3+
CONFIG_TARGET_amlogic_mesongx=y
4+
CONFIG_TARGET_amlogic_mesongx_DEVICE_phicomm_n1=y
5+
6+
CONFIG_TARGET_ROOTFS_SQUASHFS=n
7+
CONFIG_TARGET_ROOTFS_EXT4FS=y
8+
9+
CONFIG_PACKAGE_perf=n

devices/amlogic_mesongx/diy.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
3+
shopt -s extglob
4+
5+
SHELL_FOLDER=$(dirname $(readlink -f "$0"))
6+
7+
bash $SHELL_FOLDER/../common/kernel_6.1.sh
8+
9+
git_clone_path master https://github.com/coolsnowwolf/lede target/linux/amlogic package/boot/uboot-amlogic
10+
11+
sed -i "s/wpad-openssl/wpad-basic-mbedtls/" target/linux/amlogic/image/mesongx.mk
12+
13+
14+
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- a/package/kernel/mac80211/broadcom.mk
2+
+++ b/package/kernel/mac80211/broadcom.mk
3+
@@ -437,6 +437,7 @@ define KernelPackage/brcmfmac/config
4+
default y if TARGET_starfive
5+
default y if TARGET_rockchip
6+
default y if TARGET_sunxi
7+
+ default y if TARGET_amlogic
8+
default n
9+
help
10+
Enable support for cards attached to an SDIO bus.

devices/bcm27xx_bcm2712/.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ CONFIG_PACKAGE_kmod-of-mdio=n
1010

1111
CONFIG_PACKAGE_kmod-pcie_mhi=m
1212

13+
CONFIG_PACKAGE_kmod-codec-bcm2835=n
14+
CONFIG_PACKAGE_kmod-isp-bcm2835=n
15+

0 commit comments

Comments
 (0)