From 67dff418ddcc7b1d549b614dd87470c94849926e Mon Sep 17 00:00:00 2001
From: friWrt <110967316+frizkyiman@users.noreply.github.com>
Date: Tue, 2 Apr 2024 22:34:36 +0700
Subject: [PATCH 1/3] add nanopi r2s support

---
 .github/workflows/generate-friwrt.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/generate-friwrt.yml b/.github/workflows/generate-friwrt.yml
index a56f8ba5..6bca3f80 100644
--- a/.github/workflows/generate-friwrt.yml
+++ b/.github/workflows/generate-friwrt.yml
@@ -18,6 +18,7 @@ on:
           - all
           - Raspberry Pi 3B
           - Raspberry Pi 4B
+          - NanoPi-R2S
           - NanoPi-R5S
           - x86-64
       release_branch:
@@ -134,6 +135,14 @@ jobs:
             echo "ARCH_1=arm64" >> $GITHUB_ENV
             echo "ARCH_2=aarch64" >> $GITHUB_ENV
             echo "ARCH_3=aarch64_cortex-a72" >> $GITHUB_ENV
+          elif [ "$TARGET" == "NanoPi-R2S" ]; then
+            echo "PROFILE=friendlyarm_nanopi-r2s" >> $GITHUB_ENV
+            echo "TARGET_SYSTEM=rockchip/armv8" >> $GITHUB_ENV
+            echo "TARGET_NAME=rockchip-armv8" >> $GITHUB_ENV
+            TARGET_NAME="rockchip-armv8"
+            echo "ARCH_1=armv8" >> $GITHUB_ENV
+            echo "ARCH_2=aarch64" >> $GITHUB_ENV
+            echo "ARCH_3=aarch64_generic" >> $GITHUB_ENV
           elif [ "$TARGET" == "NanoPi-R5S" ]; then
             echo "PROFILE=friendlyarm_nanopi-r5s" >> $GITHUB_ENV
             echo "TARGET_SYSTEM=rockchip/armv8" >> $GITHUB_ENV

From a8ccf9939216eba431da98b2a392dee3a8e06ccd Mon Sep 17 00:00:00 2001
From: friWrt <110967316+frizkyiman@users.noreply.github.com>
Date: Tue, 2 Apr 2024 23:15:56 +0700
Subject: [PATCH 2/3] Update changelog.md

---
 changelog.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/changelog.md b/changelog.md
index 5133c2e1..4121b804 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,18 @@
 # What's New!
 
+**Changelog** (02-04-2024):
+- add release device NanoPi R5S and R2S (not tested)
+
+**Changelog** (30-03-2024):
+- update openwrt to 23.05.3 latest branch,
+- update immortalwrt to 23.05.2 latest branch,
+- add Neko and Passwall2 with new tunnel option,
+- update core script back to download latest mihomo meta core,
+- add Base62, Netmonitor packages,
+- remove expand root fs to remaining space on 21.02 branch due packages "parted" can't do the job (still looking for alternate way),
+- fix with update code and logic,
+- a few adjustment and tweaks.
+
 **Changelog** (11-03-2024):
 - add auto reconnect modemmanager (23-02-2024)
 - fix Modemmanager auto-reconnect

From b00844a9cffc6e5a8f01ac72815a31a3282f5b21 Mon Sep 17 00:00:00 2001
From: friWrt <110967316+frizkyiman@users.noreply.github.com>
Date: Tue, 2 Apr 2024 23:20:21 +0700
Subject: [PATCH 3/3] Update changelog_amlogic.md

---
 changelog_amlogic.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/changelog_amlogic.md b/changelog_amlogic.md
index 000c432e..c710f98f 100644
--- a/changelog_amlogic.md
+++ b/changelog_amlogic.md
@@ -1,7 +1,15 @@
 # What's New!
 
+**Changelog** (30-03-2024):
+- update openwrt to 23.05.3 latest branch,
+- update immortalwrt to 23.05.2 latest branch,
+- add Neko and Passwall2 with new tunnel option,
+- update core script back to download latest mihomo meta core,
+- add Base62, Netmonitor packages,
+- remove expand root fs to remaining space on 21.02 branch due packages "parted" can't do the job (still looking for alternate way),
+- fix with update code and logic,
+- a few adjustment and tweaks.
+
 **Changelog** (11-03-2024):
 - Initial release
 - small fix and adjustment
-
-**Changelog**