confd: fix annoying warning in log

This fixes the annoying libyang warning after commit da29771.

    confd[3375]: libyang[0]: Invalid argument ctx_node (lyd_find_xpath()).

This happens when the diff is used in the wrong event when it is NULL.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

.github/CHECKLIST.md

@@ -3,39 +3,41 @@ Checklists for Pull Requests and Releases
 
 Maintainer checklists for reviewing pull requests and doing releases.
 
+
 Pull Requests
 -------------
 
-- If applicable, is there a readable ChangeLog entry?
-- If any LICENSE file has been updated, has the `.hash` file been updated?
-- If any change to a Finit `.svc` file, does any run/task linger?  
-  I.e., is there a runlevel and/or condition defined to prevent them
-  from running outside of their intended runlevel?
-- If any change to grub or qemu/qeneth setup, has it been tested in GNS3?
-  - If any change to u-boot/buildroot, has it been tested with `<booloader>_defconfig`
-- If any change to logging, have the resulting logs been audited?
-  - Check for duplicate entries, misspellings
-  - Check for sneaky severity changes, e.g., error vs note, error vs warning
-- If new subsystem, or major changes to a subsystem, have the docs been updated?
-- If change to mDNS, has it been tested with netbrowse?
-- If change to `_defconfig`, verify `local.mk` and sync with other archs
-  - Test manually as well, e.g., CLI changes do not have ha regression tests
-  - Build from distclean, or use artifacts built by build servers, for manual tests
+ - If applicable, is there a readable ChangeLog entry?
+ - If any LICENSE file has been updated, has the `.hash` file been updated?
+ - If any change to a Finit `.svc` file, does any run/task linger?  
+   I.e., is there a runlevel and/or condition defined to prevent them
+   from running outside of their intended runlevel?
+ - If any change to grub or qemu/qeneth setup, has it been tested in GNS3?
+   - If any change to u-boot/buildroot, has it been tested with `<booloader>_defconfig`
+ - If any change to logging, have the resulting logs been audited?
+   - Check for duplicate entries, misspellings
+   - Check for sneaky severity changes, e.g., error vs note, error vs warning
+ - If new subsystem, or major changes to a subsystem, have the docs been updated?
+ - If change to mDNS, has it been tested with netbrowse?
+ - If change to `_defconfig`, verify `local.mk` and sync with other archs
+   - Test manually as well, e.g., CLI changes do not have ha regression tests
+   - Build from distclean, or use artifacts built by build servers, for manual tests
+
 
 Releases
 --------
 
 Recommended checkpoints, use at your own discretion:
 
-- Make at least one -betaN release to verify the GitHub workflow well in time release day
-  - Stuff happens, remember kernelkit/infix#735
-- Make at least one -rcN to flush out any issues in customer repos
-  - Easy to forget adaptations/hacks in customer repos -- may need Infix change/support
-- Verify release artifacts (checksums, completeness, no corrupted files)
-- Test on actual hardware for at least one architecture
-- Review ChangeLog for completeness
-- Check for release-blocking issues
-- Verify generated GNS3 appliance, no marketplace update on -rc builds
-- Ensure the markdown link for the release diff is updated
-- Ensure subrepos are tagged (can be automated, see kernelkit/infix#393)
-- Sync tags for all repo. sync activities
+ - Make at least one -betaN release to verify the GitHub workflow well in time release day
+   - Stuff happens, remember kernelkit/infix#735
+ - Make at least one -rcN to flush out any issues in customer repos
+   - Easy to forget adaptations/hacks in customer repos -- may need Infix change/support
+ - Verify release artifacts (checksums, completeness, no corrupted files)
+ - Test on actual hardware for at least one architecture
+ - Review ChangeLog for completeness
+ - Check for release-blocking issues
+ - Verify generated GNS3 appliance, no marketplace update on -rc builds
+ - Ensure the markdown link for the release diff is updated
+ - Ensure subrepos are tagged (can be automated, see kernelkit/infix#393)
+ - Sync tags for all repo. sync activities

.github/CONTRIBUTING.md

@@ -9,15 +9,15 @@ forms of collaboration as well.  [Let's talk!][support] :handshake:
 
 If you are unsure how to start implementing an idea or fix:
 
-- :bug: open an issue, there are human friendly templates for _bugs_
-  and _feature requests_ at <https://github.com/kernelkit/infix/issues>
-- :speech_balloon: use the [Q&A Forum][discuss]
-- :technologist: The [Developer's Guide][devguide] is also a useful start
+ - :bug: open an issue, there are human friendly templates for _bugs_
+   and _feature requests_ at <https://github.com/kernelkit/infix/issues>
+ - :speech_balloon: use the [Q&A Forum][discuss]
+ - :technologist: The [Developer's Guide][devguide] is also a useful start
 
-> [!IMPORTANT]
-> Talking about code and problems first is often the best way to get
+> _Talking about code and problems first is often the best way to get
 > started before submitting a pull request.  We have found it always
-> saves time, yours and ours.
+> saves time, yours and ours._
+
 
 :sparkles: General Guidelines
 -----------------------------
@@ -27,20 +27,21 @@ version the change is made against, what it does, and, more importantly
 *why* -- from your perspective, why is it a bug, why does the code need
 changing in this way.  Start with why.
 
-- :bug: Bug reports need metadata like Infix version or commit hash
-- :adhesive_bandage: Bug fixes also need version, and (preferably) a
-  corresponding issue number for the ChangeLog
-- :new: New features, you need to get approval of the YANG model first!  
-  :speech_balloon: Please use the [Forum][discuss], e.g., category:
-  *Ideas*, or open a :pray: feature request issue
-- :white_check_mark: New features also need new regression tests, this
-  can be basic tests or more complex use-case tests comprising multiple
-  subsystems, see [Testing Changes](#test_tube-testing-changes), below
+ - :bug: Bug reports need metadata like Infix version or commit hash
+ - :adhesive_bandage: Bug fixes also need version, and (preferably) a
+   corresponding issue number for the ChangeLog
+ - :new: New features, you need to get approval of the YANG model first!  
+   :speech_balloon: Please use the [Forum][discuss], e.g., category:
+   *Ideas*, or open a :pray: feature request issue
+ - :white_check_mark: New features also need new regression tests, this
+   can be basic tests or more complex use-case tests comprising multiple
+   subsystems, see [Testing Changes](#test_tube-testing-changes), below
 
 Please take care to ensure you follow the project coding style and the
 commit message format.  If you follow these recommendations you help
 the maintainers and make it easier for them to include your code.
 
+
 :woman_technologist: Coding Style
 ---------------------------------
 
@@ -50,40 +51,39 @@ and it is expected that you provide a human-readable summary for the
 release notes (ChangeLog) and at least a configuration example in the
 manual for new features.
 
-> [!TIP]
-> Consider ["Readme driven development"][RDD] for new features.  It is
-> amazing how many flaws in your own bright ideas come to bare when you
-> suddenly have to explain them to someone else!
+> **Tip:** consider ["Readme driven development"][RDD] for new features.
+> It is amazing how many flaws in your own bright ideas come to bare
+> when you suddenly have to explain them to someone else!
 
 We expect code contributions for:
 
-- C code in [Linux Coding Style][Linux]
-- Python code should follow [PEP-8][]
+ - C code in [Linux Coding Style][Linux]
+ - Python code should follow [PEP-8][]
 
-> [!IMPORTANT]
 > **However,** always submit code that follows the style of surrounding
 > code!  Legacy takes precedence, and remember, we read code a lot more
 > than write it, so legibility is important.
 
 The ChangeLog deserves a separate mention:
 
-- Releases are listed in reverse chronological order order, so the
-  latest/next release is at the beginning of the file
-- Only *user-facing bugs and features* are detailed, so code refactor,
-  new tests, etc. are not listed.
-- Add your changes/features to the Changes section
-- Add your Fix line in the Fixes section, in numeric order
-- Changes and fixes without an issue number are listed after all
-  numbered ones
-- YANG model changes are documented in their respective model, for
-  standard models, e.g., for `ietf-interfaces.yang`, the corresponding
-  `infix-interfaces.yang` detail augments/deviations as revisions.
+ - Releases are listed in reverse chronological order order, so the
+   latest/next release is at the beginning of the file
+ - Only *user-facing bugs and features* are detailed, so code refactor,
+   new tests, etc. are not listed.
+ - Add your changes/features to the Changes section
+ - Add your Fix line in the Fixes section, in numeric order 
+ - Changes and fixes without an issue number are listed after all
+   numbered ones
+ - YANG model changes are documented in their respective model, for
+   standard models, e.g., for `ietf-interfaces.yang`, the corresponding
+   `infix-interfaces.yang` detail augments/deviations as revisions.
 
 A final note, lines of code are allowed to be longer than 72 characters
 these days, unless you live by PEP-8 (see above).  There is no enforced
 maximum, but the team usually keep it around 100 characters for both C
 and Python.
 
+
 :test_tube: Testing Changes
 ---------------------------
 
@@ -97,8 +97,9 @@ the same pull request.
 
 For help getting started with testing, see the following resources:
 
-- [Developer's Guide][devguide]
-- [Regression Testing][testing]
+ - [Developer's Guide][devguide]
+ - [Regression Testing][testing]
+
 
 :memo: Commit Messages
 ----------------------
@@ -109,135 +110,45 @@ proud of your work and set up a proper GIT identity for your commits:
 
 <img src="../doc/jack.png" width=70 align="right">
 
-```bash
-$ git config --global user.name "Jacky Linker"
-$ git config --global user.email jacky.linker@example.com
-```
+    $ git config --global user.name "Jacky Linker"
+    $ git config --global user.email jacky.linker@example.com
 
 Example commit message from one of many [online guides][cbeams].  Use
 `git commit -s` to automatically add a `Signed-off-by` for proof of
 origin, see [DCO][] for more info.
 
-```text
-subsystem: brief, but clear and concise summary of changes
+    subsystem: brief, but clear and concise summary of changes
+    
+    More detailed explanatory text, if necessary.  Wrap it to about 72
+    characters or so.  In some contexts, the first line is treated as
+    the subject of an email and the rest of the text as the body.  The
+    empty line separating summary from body is critical.  Tools like
+    rebase can get confused if the empty line is missing.
+    
+    Further paragraphs should be separated with empty lines.
+    
+     - Bullet points are okay, too
+    
+     - Typically a hyphen or asterisk is used for the bullet, preceded
+       by a single space, with blank lines in between, but conventions
+       vary here
 
-More detailed explanatory text, if necessary.  Wrap it to about 72
-characters or so.  In some contexts, the first line is treated as
-the subject of an email and the rest of the text as the body.  The
-empty line separating summary from body is critical.  Tools like
-rebase can get confused if the empty line is missing.
+	If you use an issue tracker, put references to them at the bottom,
+	like this:
 
-Further paragraphs should be separated with empty lines.
+	Resolves: #123
+	See also: #456, #789
 
- - Bullet points are okay, too
-
- - Typically a hyphen or asterisk is used for the bullet, preceded
-   by a single space, with blank lines in between, but conventions
-   vary here
-
-If you use an issue tracker, put references to them at the bottom,
-like this:
-
-Resolves: #123
-See also: #456, #789
-
-Signed-off-by: Jacky Linker <jacky.linker@example.com>
-```
+    Signed-off-by: Jacky Linker <jacky.linker@example.com>
 
 This is an example of how to [automatically close][closing] an issue
 when the commit is merged to mainline.  Several keywords are available.
 
-:lock_with_ink_pen: Signing Commits with GPG
----------------------------------------------
-
-To ensure the authenticity and integrity of your contributions, we
-**require** all commits to be signed with GPG.  This cryptographically
-verifies that commits come from a trusted source.
-
-### Generating a GPG Key
-
-If you don't already have a GPG key, generate one:
-
-```bash
-$ gpg --full-generate-key
-```
-
-When prompted, choose:
-- Key type: `RSA and RSA` (default)
-- Key size: `4096` bits (recommended for security)
-- Expiration: `0` (key does not expire)
-- Real name and email: Use the same email as your Git configuration
-
-> [!NOTE]
-> We recommend keys that do not expire for signing commits.  Expiration
-> creates a "usability time bomb" without providing meaningful security
-> benefits for code signing.  See [this article][pgpfan] for details.
-
-### Configuring Git to Sign Commits
-
-First, find your GPG key ID:
-
-```bash
-$ gpg --list-secret-keys --keyid-format=long
-```
-
-Look for the line starting with `sec`, the key ID is the part after the `/`.
-For example, in `sec   rsa4096/ABCD1234EFGH5678`, the key ID is `ABCD1234EFGH5678`.
-
-Configure Git to use your GPG key:
-
-```bash
-$ git config --global user.signingkey ABCD1234EFGH5678
-$ git config --global commit.gpgsign true
-```
-
-The second command enables automatic signing for all commits.  Alternatively,
-you can sign individual commits with `git commit -S`.
-
-### Publishing Your Public Key
-
-To allow others to verify your signatures, publish your public key to a
-keyserver:
-
-```bash
-$ gpg --keyserver hkps://keys.openpgp.org --send-keys ABCD1234EFGH5678
-```
-
-> [!IMPORTANT]
-> The keyserver will send a verification email to the address associated
-> with your key.  You **must** click the link in that email to confirm
-> ownership before your key becomes searchable by email address.
-
-Alternative keyservers you can use:
-- `hkps://keyserver.ubuntu.com`
-- `hkps://pgp.mit.edu`
-
-### Adding Your GPG Key to GitHub
-
-For GitHub to show your commits as "Verified", you need to add your public
-key to your account:
-
-1. Export your public key:
-   ```bash
-   $ gpg --armor --export ABCD1234EFGH5678
-   ```
-
-2. Copy the entire output, including the `-----BEGIN PGP PUBLIC KEY BLOCK-----`
-   and `-----END PGP PUBLIC KEY BLOCK-----` lines.
-
-3. Go to [GitHub Settings → SSH and GPG keys](https://github.com/settings/keys)
-
-4. Click **New GPG key** and paste your public key.
-
-Now your signed commits will display a "Verified" badge on GitHub! :white_check_mark:
-
-For more details, see GitHub's [official documentation on commit signature verification][gpg-verify].
 
 :twisted_rightwards_arrows: Pull Requests
 -----------------------------------------
 
-> [!NOTE]
-> _The git repository is the canonical location for all information._
+> _The git repository is the canonical location for information._
 
 A pull request should preferably address a single issue or change.  This
 may of course include multiple related changes, but what is important to
@@ -256,6 +167,7 @@ Buildroot, consider the pull request message body similar to the cover
 letter for a series of patches -- it's a summary of changes, and it is
 lost when the changes are merged to the mainline branch.
 
+
 :balance_scale: Code of Conduct
 -------------------------------
 
@@ -272,8 +184,6 @@ other contributions that are not aligned to this Code of Conduct."*
 [PEP-8]:    https://peps.python.org/pep-0008/
 [RDD]:      https://tom.preston-werner.com/2010/08/23/readme-driven-development
 [cbeams]:   https://cbea.ms/git-commit/#seven-rules
-[conduct]:    CODE-OF-CONDUCT.md
-[DCO]:        https://developercertificate.org/
-[closing]:    https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests
-[gpg-verify]: https://docs.github.com/en/authentication/managing-commit-signature-verification
-[pgpfan]:     https://articles.59.ca/doku.php?id=pgpfan:expire
+[conduct]:  CODE-OF-CONDUCT.md
+[DCO]:      https://developercertificate.org/
+[closing]:  https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests

.github/SUPPORT.md

@@ -1,10 +1,8 @@
 Limited free support is only available using the online resources of the
-project on GitHub, and Discord, see <https://github.com/kernelkit/infix>:
+project on GitHub, and Discord, see <https://github.com/kernelkit>:
 
-&nbsp;&nbsp; :house: <https://www.kernelkit.org> — home page, blog, news, howto's and tutorials  
-&nbsp;&nbsp; :package: <https://github.com/kernelkit/infix/releases/latest> — latest release  
 &nbsp;&nbsp; :speech_balloon: <https://github.com/orgs/kernelkit/discussions>  
-&nbsp;&nbsp; :bug: <https://github.com/kernelkit/infix/issues>  
+&nbsp;&nbsp; :bug: <https://github.com/kernelkit/infix/issues>
 
 Support contracts, development of new features, fast-tracking of reviews
 and contributions, customer branding of Infix, and even customer specific

.github/workflows/build-boot.yml

@@ -17,19 +17,11 @@ jobs:
       matrix:
         defconfig:
           - aarch64_qemu_boot
-          - bpi_r3_sd_boot
-          - bpi_r3_emmc_boot
-          - bpi_r4_sd_boot
-          - bpi_r4_emmc_boot
-          - bpi_r64_sd_boot
-          - bpi_r64_emmc_boot
+          - bpi_r3_boot
           - cn9130_crb_boot
           - fireant_boot
           - nanopi_r2s_boot
-          - rpi2_boot
           - rpi64_boot
-          - sama7g54_ek_emmc_boot
-          - sama7g54_ek_sd_boot
     env:
       MAKEFLAGS: -j5
     steps:
@@ -70,11 +62,24 @@ jobs:
 
           echo "Building ${defconfig}_defconfig, version ${version}-${rev}, artifact ${archive} ..."
 
-      - uses: kernelkit/actions/cache-restore@v1
+      - name: Restore Cache of dl/
+        uses: actions/cache@v4
         with:
-          target: ${{ matrix.defconfig }}
-          dl-prefix: dl-boot
-          ccache-prefix: ccache-boot
+          path: dl/
+          key: dl-boot-${{ hashFiles('.git/modules/buildroot/HEAD', 'configs/*', 'package/*/*.hash') }}
+          restore-keys: |
+            dl-boot-
+            dl-
+
+      - name: Restore Cache of .ccache/
+        uses: actions/cache@v4
+        with:
+          path: .ccache/
+          key: ccache-boot-${{ matrix.defconfig }}-${{ hashFiles('.git/modules/buildroot/HEAD', 'package/*/*.hash') }}
+          restore-keys: |
+            ccache-boot-${{ matrix.defconfig }}-
+            ccache-boot-
+            ccache-
 
       - name: Configure ${{ matrix.defconfig }}_defconfig
         run: |

.github/workflows/build-image.yml

@@ -1,4 +1,4 @@
-name: Create SD Card & eMMC Images
+name: Create SD Card Images
 
 on:
   workflow_dispatch:
@@ -8,14 +8,14 @@ on:
         type: choice
         required: true
         options:
-          - raspberrypi-rpi2
           - raspberrypi-rpi64
           - bananapi-bpi-r3
-          - bananapi-bpi-r4
-          - bananapi-bpi-r64
           - friendlyarm-nanopi-r2s
-          - microchip-sama7g54-ek
         default: 'raspberrypi-rpi64'
+      use_latest_release:
+        description: 'Use latest release artifacts instead of workflow artifacts'
+        type: boolean
+        default: false
 
 jobs:
   create-image:
@@ -53,242 +53,136 @@ jobs:
       - name: Set bootloader and target based on board
         run: |
           case "${{ inputs.board }}" in
-            raspberrypi-rpi2)
-              echo "BOOTLOADER=rpi2-boot" >> $GITHUB_ENV
-              echo "ARCH=arm" >> $GITHUB_ENV
-              echo "BUILD_EMMC=false" >> $GITHUB_ENV
-              ;;
             raspberrypi-rpi64)
-              echo "BOOTLOADER=rpi64-boot" >> $GITHUB_ENV
-              echo "ARCH=aarch64" >> $GITHUB_ENV
-              echo "BUILD_EMMC=false" >> $GITHUB_ENV
+              echo "BOOTLOADER=rpi64_boot" >> $GITHUB_ENV
+              echo "TARGET=aarch64" >> $GITHUB_ENV
               ;;
             bananapi-bpi-r3)
-              echo "BOOTLOADER_SD=bpi-r3-sd-boot" >> $GITHUB_ENV
-              echo "BOOTLOADER_EMMC=bpi-r3-emmc-boot" >> $GITHUB_ENV
-              echo "ARCH=aarch64" >> $GITHUB_ENV
-              echo "BUILD_EMMC=true" >> $GITHUB_ENV
-              ;;
-            bananapi-bpi-r4)
-              echo "BOOTLOADER_SD=bpi-r4-sd-boot" >> $GITHUB_ENV
-              echo "BOOTLOADER_EMMC=bpi-r4-emmc-boot" >> $GITHUB_ENV
-              echo "ARCH=aarch64" >> $GITHUB_ENV
-              echo "BUILD_EMMC=true" >> $GITHUB_ENV
-              ;;
-            bananapi-bpi-r64)
-              echo "BOOTLOADER_SD=bpi-r64-sd-boot" >> $GITHUB_ENV
-              echo "BOOTLOADER_EMMC=bpi-r64-emmc-boot" >> $GITHUB_ENV
-              echo "ARCH=aarch64" >> $GITHUB_ENV
-              echo "BUILD_EMMC=true" >> $GITHUB_ENV
+              echo "BOOTLOADER=bpi_r3_boot" >> $GITHUB_ENV
+              echo "TARGET=aarch64" >> $GITHUB_ENV
               ;;
             friendlyarm-nanopi-r2s)
-              echo "BOOTLOADER=nanopi-r2s-boot" >> $GITHUB_ENV
-              echo "ARCH=aarch64" >> $GITHUB_ENV
-              echo "BUILD_EMMC=false" >> $GITHUB_ENV
-              ;;
-            microchip-sama7g54-ek)
-              echo "BOOTLOADER_SD=sama7g54-ek-sd-boot" >> $GITHUB_ENV
-              echo "BOOTLOADER_EMMC=sama7g54-ek-emmc-boot" >> $GITHUB_ENV
-              echo "ARCH=arm" >> $GITHUB_ENV
-              echo "BUILD_EMMC=true" >> $GITHUB_ENV
+              echo "BOOTLOADER=nanopi_r2s_boot" >> $GITHUB_ENV
+              echo "TARGET=aarch64" >> $GITHUB_ENV
               ;;
             *)
               echo "Error: Unknown board ${{ inputs.board }}"
               exit 1
               ;;
           esac
-          echo "Arch: $ARCH for board: ${{ inputs.board }}"
-          if [ "$BUILD_EMMC" = "true" ]; then
-            echo "Building both SD and eMMC images"
-            echo "SD Bootloader: $BOOTLOADER_SD"
-            echo "eMMC Bootloader: $BOOTLOADER_EMMC"
-          else
-            echo "Building SD image only"
-            echo "Bootloader: $BOOTLOADER"
-          fi
+          echo "Using bootloader: $BOOTLOADER and target: $TARGET for board: ${{ inputs.board }}"
 
       - name: Download bootloader artifacts
+        if: ${{ !inputs.use_latest_release }}
         run: |
-          # Download bootloader from latest-boot release tag
-          if [ "$BUILD_EMMC" = "true" ]; then
-            # Download both SD and eMMC bootloaders for boards that support both
-            echo "Downloading SD bootloader: ${BOOTLOADER_SD}"
-            gh release download latest-boot --pattern "*${BOOTLOADER_SD}*" --dir temp_bootloader_sd/
-            mkdir -p output_sd/images
-            cd temp_bootloader_sd/
-            tar -xzf *.tar.gz --strip-components=1 -C ../output_sd/images/
-            cd ../
-            rm -rf temp_bootloader_sd/
+          # Download from latest bootloader build workflow on main branch
+          gh run list --workflow=build-boot.yml --branch=main --limit=1 --status=success --json databaseId --jq '.[0].databaseId' > latest_boot_run_id
+          BOOT_RUN_ID=$(cat latest_boot_run_id)
 
-            echo "Downloading eMMC bootloader: ${BOOTLOADER_EMMC}"
-            gh release download latest-boot --pattern "*${BOOTLOADER_EMMC}*" --dir temp_bootloader_emmc/
-            mkdir -p output_emmc/images
-            cd temp_bootloader_emmc/
-            tar -xzf *.tar.gz --strip-components=1 -C ../output_emmc/images/
-            cd ../
-            rm -rf temp_bootloader_emmc/
+          gh run download ${BOOT_RUN_ID} --name artifact-${BOOTLOADER} --dir temp_bootloader/
 
-            echo "SD bootloader files:"
-            ls -la output_sd/images/
-            echo "eMMC bootloader files:"
-            ls -la output_emmc/images/
-          else
-            # Single bootloader for boards that only support SD
-            gh release download latest-boot --pattern "*${BOOTLOADER}*" --dir temp_bootloader/
+          # Extract bootloader directly to output/images
+          cd temp_bootloader/
+          tar -xzf *.tar.gz --strip-components=1 -C ../output/images/
+          cd ../
+          rm -rf temp_bootloader/
 
-            # Extract bootloader directly to output/images
-            cd temp_bootloader/
-            tar -xzf *.tar.gz --strip-components=1 -C ../output/images/
-            cd ../
-            rm -rf temp_bootloader/
-
-            echo "Bootloader files extracted to output/images:"
-            ls -la output/images/
-          fi
+          echo "Bootloader files extracted to output/images:"
+          ls -la output/images/
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Download Infix artifacts
+        if: ${{ !inputs.use_latest_release }}
         run: |
           # Download from latest Kernelkit Trigger workflow for main branch
           gh run list --workflow=164295764 --branch=main --limit=1 --status=success --json databaseId --jq '.[0].databaseId' > latest_infix_run_id
           INFIX_RUN_ID=$(cat latest_infix_run_id)
 
-          if [ "$BUILD_EMMC" = "true" ]; then
-            # Copy Infix artifacts to both SD and eMMC output directories
-            gh run download ${INFIX_RUN_ID} --name artifact-${ARCH} --dir temp_infix/
+          gh run download ${INFIX_RUN_ID} --name artifact-${TARGET} --dir temp_infix/
 
-            cd temp_infix/
-            tar -xzf *.tar.gz --strip-components=1 -C ../output_sd/images/
-            tar -xzf *.tar.gz --strip-components=1 -C ../output_emmc/images/
-            cd ../
-            rm -rf temp_infix/
+          # Extract Infix directly to output/images
+          cd temp_infix/
+          tar -xzf *.tar.gz --strip-components=1 -C ../output/images/
+          cd ../
+          rm -rf temp_infix/
 
-            echo "Infix files extracted to output_sd/images:"
-            ls -la output_sd/images/
-            echo "Infix files extracted to output_emmc/images:"
-            ls -la output_emmc/images/
-          else
-            # Single output directory for SD-only boards
-            gh run download ${INFIX_RUN_ID} --name artifact-${ARCH} --dir temp_infix/
+          echo "Infix files extracted to output/images:"
+          ls -la output/images/
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-            # Extract Infix directly to output/images
-            cd temp_infix/
-            tar -xzf *.tar.gz --strip-components=1 -C ../output/images/
-            cd ../
-            rm -rf temp_infix/
+      - name: Download from latest releases
+        if: ${{ inputs.use_latest_release }}
+        run: |
+          # Download latest bootloader release
+          gh release download latest-boot --pattern "*${BOOTLOADER}*" --dir temp_bootloader/
+          cd temp_bootloader/
+          tar -xzf *.tar.gz --strip-components=1 -C ../output/images/
+          cd ../
+          rm -rf temp_bootloader/
 
-            echo "Infix files extracted to output/images:"
-            ls -la output/images/
-          fi
+          # Download latest Infix release
+          gh release download latest --pattern "*${TARGET}*" --dir temp_infix/
+          cd temp_infix/
+          tar -xzf *.tar.gz --strip-components=1 -C ../output/images/
+          cd ../
+          rm -rf temp_infix/
+
+          echo "All files extracted to output/images:"
+          ls -la output/images/
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Verify extracted files
         run: |
-          if [ "$BUILD_EMMC" = "true" ]; then
-            echo "Files available for SD image:"
-            ls -la output_sd/images/
-            echo ""
-            echo "Files available for eMMC image:"
-            ls -la output_emmc/images/
-          else
-            echo "Files available for mkimage.sh:"
-            ls -la output/images/
-            echo ""
-            echo "File types:"
-            file output/images/* || true
-          fi
+          echo "Files available for mkimage.sh:"
+          ls -la output/images/
+          echo ""
+          echo "File types:"
+          file output/images/* || true
 
       - name: Create SD card image
         run: |
-          if [ "$BUILD_EMMC" = "true" ]; then
-            export BINARIES_DIR=$PWD/output_sd/images
-            export BUILD_DIR=$PWD/build
-            export BR2_EXTERNAL_INFIX_PATH=$PWD
-            export RELEASE=""
-            export INFIX_ID="infix"
-            ./utils/mkimage.sh -t sdcard ${{ inputs.board }}
-          else
-            export BINARIES_DIR=$PWD/output/images
-            export BUILD_DIR=$PWD/build
-            export BR2_EXTERNAL_INFIX_PATH=$PWD
-            export RELEASE=""
-            export INFIX_ID="infix"
-            ./utils/mkimage.sh -t sdcard ${{ inputs.board }}
-          fi
-
-      - name: Create eMMC image
-        if: ${{ env.BUILD_EMMC == 'true' }}
-        run: |
-          export BINARIES_DIR=$PWD/output_emmc/images
+          export BINARIES_DIR=$PWD/output/images
           export BUILD_DIR=$PWD/build
           export BR2_EXTERNAL_INFIX_PATH=$PWD
           export RELEASE=""
           export INFIX_ID="infix"
-          ./utils/mkimage.sh -t emmc ${{ inputs.board }}
+          ./utils/mkimage.sh ${{ inputs.board }}
 
-      - name: Verify created images
+      - name: Verify created image
         run: |
-          if [ "$BUILD_EMMC" = "true" ]; then
-            echo "SD card image:"
-            ls -lh output_sd/images/*-sdcard.img* 2>/dev/null || true
-            if ls output_sd/images/*-sdcard.img 1> /dev/null 2>&1; then
-              for img in output_sd/images/*-sdcard.img; do
-                echo "- $(basename $img)"
-                file "$img"
-                fdisk -l "$img" 2>/dev/null | head -20
-              done
-            fi
+          echo "Contents of output/images after mkimage.sh:"
+          ls -lh output/images/
 
-            echo ""
-            echo "eMMC image:"
-            ls -lh output_emmc/images/*-emmc.img* 2>/dev/null || true
-            if ls output_emmc/images/*-emmc.img 1> /dev/null 2>&1; then
-              for img in output_emmc/images/*-emmc.img; do
-                echo "- $(basename $img)"
-                file "$img"
-                fdisk -l "$img" 2>/dev/null | head -20
-              done
-            fi
-
-            # Copy both images to output/images for artifact upload
-            mkdir -p output/images
-            cp output_sd/images/*-sdcard.img* output/images/ 2>/dev/null || true
-            cp output_emmc/images/*-emmc.img* output/images/ 2>/dev/null || true
+          # Look for SD card image with pattern: *-sdcard.img
+          if ls output/images/*-sdcard.img 1> /dev/null 2>&1; then
+            echo "Found SD card image(s):"
+            for img in output/images/*-sdcard.img; do
+              echo "- $(basename $img)"
+              file "$img"
+              fdisk -l "$img" 2>/dev/null || true
+            done
           else
-            echo "Contents of output/images after mkimage.sh:"
-            ls -lh output/images/
-
-            # Look for SD card image with pattern: *-sdcard.img
-            if ls output/images/*-sdcard.img 1> /dev/null 2>&1; then
-              echo "Found SD card image(s):"
-              for img in output/images/*-sdcard.img; do
-                echo "- $(basename $img)"
-                file "$img"
-                fdisk -l "$img" 2>/dev/null || true
-              done
-            else
-              echo "No SD card image found matching pattern: *-sdcard.img"
-              echo "Available files:"
-              ls -la output/images/
-              exit 1
-            fi
+            echo "No SD card image found matching pattern: *-sdcard.img"
+            echo "Available files:"
+            ls -la output/images/
+            exit 1
           fi
 
-      - name: Upload images as artifacts
+      - name: Upload SD card image
         uses: actions/upload-artifact@v4
         with:
-          name: images-${{ inputs.board }}
+          name: sdcard-image-${{ inputs.board }}-${{ env.BOOTLOADER }}
           path: |
             output/images/*-sdcard.img*
-            output/images/*-emmc.img*
           retention-days: 30
 
       - name: Create checksums
         run: |
           cd output/images/
-          for file in *-sdcard.img *-emmc.img; do
+          for file in *-sdcard.img; do
             if [ -f "$file" ]; then
               sha256sum "$file" > "$file.sha256"
             fi
@@ -304,41 +198,21 @@ jobs:
           prerelease: true
           tag: "latest-boot"
           token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts: "output/images/*-sdcard.img*,output/images/*-emmc.img*"
+          artifacts: "output/images/*-sdcard.img*"
 
       - name: Generate summary
         run: |
-          if [ "$BUILD_EMMC" = "true" ]; then
-            cat <<EOF >> $GITHUB_STEP_SUMMARY
-          # SD Card & eMMC Image Build Complete! 🚀
-
-          **Board:** ${{ inputs.board }}
-          **Arch:** ${{ env.ARCH }}
-          **SD Bootloader:** ${{ env.BOOTLOADER_SD }}
-          **eMMC Bootloader:** ${{ env.BOOTLOADER_EMMC }}
-          **Bootloader Source:** latest-boot release
-          **Infix Source:** Latest workflow run on main
-
-          ## Created Images
-          $(find output/images/ -name "*.img" -o -name "*.img.bmap" | xargs ls -lh 2>/dev/null | awk '{print "- " $9 " (" $5 ")"}' || echo "- No images found")
-
-          ## Download
-          Both SD card and eMMC images are available as workflow artifacts above and in the latest-boot release.
-          EOF
-          else
-            cat <<EOF >> $GITHUB_STEP_SUMMARY
+          cat <<EOF >> $GITHUB_STEP_SUMMARY
           # SD Card Image Build Complete! 🚀
 
           **Board:** ${{ inputs.board }}
-          **Arch:** ${{ env.ARCH }}
+          **Target:** ${{ env.TARGET }}
           **Bootloader:** ${{ env.BOOTLOADER }}
-          **Bootloader Source:** latest-boot release
-          **Infix Source:** Latest workflow run on main
+          **Artifact Source:** ${{ inputs.use_latest_release && 'Latest Release' || 'Latest Workflow Run' }}
 
           ## Created Images
-          $(find output/images/ -name "*.img" -o -name "*.img.bmap" | xargs ls -lh 2>/dev/null | awk '{print "- " $9 " (" $5 ")"}' || echo "- No images found")
+          $(find output/images/ -name "*.img*" -o -name "*.qcow2" -o -name "*.raw" | xargs ls -lh 2>/dev/null | sed 's/^/- /' || echo "- No images found")
 
           ## Download
           The SD card image is available as a workflow artifact above.
           EOF
-          fi

.github/workflows/build-release.yml

@@ -1,6 +1,3 @@
-# Needed for make pkg-stats
-# sudo apt install python3-aiohttp
----
 name: Build Release
 
 on:
@@ -20,16 +17,24 @@ jobs:
     runs-on: [self-hosted, release]
     strategy:
       matrix:
-        target: [aarch64, arm, x86_64]
+        target: [aarch64, x86_64]
       fail-fast: false
     steps:
+      - name: Cleanup podman state
+        run: |
+          set -x
+          podman ps -a              || true
+          podman stop -a            || true
+          podman rm -a -f           || true
+          podman volume prune -f    || true
+          podman system prune -a -f || true
+          podman system migrate     || true
+
       - uses: actions/checkout@v4
         with:
           clean: true
           submodules: recursive
 
-      - uses: kernelkit/actions/podman-cleanup@v1
-
       - name: Set Release Variables
         id: vars
         run: |
@@ -40,10 +45,24 @@ jobs:
           echo "dir=infix-$target"        >> $GITHUB_OUTPUT
           echo "tgz=infix-$target.tar.gz" >> $GITHUB_OUTPUT
 
-      - uses: kernelkit/actions/cache-restore@v1
+      - name: Restore Cache of dl/
+        if: ${{ inputs.use_cache }}
+        uses: actions/cache@v4
         with:
-          target: ${{ matrix.target }}
-          enabled: ${{ inputs.use_cache }}
+          path: dl/
+          key: dl-${{ hashFiles('.git/modules/buildroot/HEAD', 'configs/*', 'package/*/*.hash') }}
+          restore-keys: |
+            dl-
+
+      - name: Restore Cache of .ccache/
+        if: ${{ inputs.use_cache }}
+        uses: actions/cache@v4
+        with:
+          path: .ccache/
+          key: ccache-${{ matrix.target }}-${{ hashFiles('.git/modules/buildroot/HEAD', 'package/*/*.hash') }}
+          restore-keys: |
+            ccache-${{ matrix.target }}-
+            ccache-
 
       - name: Configure & Build
         env:
@@ -56,12 +75,7 @@ jobs:
 
       - name: Generate SBOM from Build
         run: |
-          # Generate manifest files in CSV format for CycloneDX
           make legal-info
-          # Generate cpe.json for CycloneDX
-          make -s show-info > output/cpe.json
-          # Generate pkg-stats.{json,html} for humans
-          make pkg-stats
 
       - name: Build test specification
         run: |
@@ -70,22 +84,13 @@ jobs:
       - name: Prepare Artifacts
         run: |
           cd output/
-
-          # Collect relevant files for SBOM and CPE info. for more info, see:
-          # https://github.com/CycloneDX/cyclonedx-buildroot
-          mkdir               images/sbom
-          mv pkg-stats.*      images/sbom/
-          mv cpe.json         images/sbom/
-          mv legal-info/*.csv images/sbom/
-
-          # Remove rootfs.squashfs from release (can be extracted from rootfs.itb)
-          # Saves ~131MB per architecture. See issue #858
-          rm -f images/rootfs.squashfs
-
           mv images ${{ steps.vars.outputs.dir }}
           ln -s ${{ steps.vars.outputs.dir }} images
           tar cfz ${{ steps.vars.outputs.tgz }} ${{ steps.vars.outputs.dir }}
 
+          mv legal-info legal-info-${{ matrix.target }}-${{ steps.vars.outputs.ver }}
+          tar cfz legal-info-${{ matrix.target }}-${{ steps.vars.outputs.ver }}.tar.gz legal-info-${{ matrix.target }}-${{ steps.vars.outputs.ver }}
+
       - uses: actions/upload-artifact@v4
         with:
           name: artifact-${{ matrix.target }}

.github/workflows/build.yml

@@ -19,10 +19,6 @@ on:
         description: 'Repo to checkout (for spin overrides)'
         default: kernelkit/infix
         type: string
-      infix_branch:
-        description: 'Branch/tag/commit to checkout (for spin overrides)'
-        default: ''
-        type: string
 
   workflow_call:
     inputs:
@@ -36,30 +32,15 @@ on:
         required: false
         type: string
         default: kernelkit/infix
-      infix_branch:
-        required: false
-        type: string
-        default: ''
-        description: 'Branch/tag/commit to checkout (for spin overrides). Defaults to github.ref if not specified'
       parallel:
         required: false
         type: boolean
         default: true
-      pre_build_script:
-        required: false
-        type: string
-        default: ''
-        description: 'Optional script to run after checkout (for spin customization)'
-    secrets:
-      CHECKOUT_TOKEN:
-        required: false
-        description: 'Token for cross-repository access'
 
 env:
   NAME: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.name || inputs.name }}
   TARGET: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target || inputs.target }}
   INFIX_REPO: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.infix_repo || inputs.infix_repo }}
-  INFIX_BRANCH: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.infix_branch || inputs.infix_branch }}
 
 jobs:
   build:
@@ -78,27 +59,24 @@ jobs:
           rm -rf ./* || true
           rm -rf ./.??* || true
           ls -la ./
+      - name: Cleanup podman state
+        run: |
+          set -x
+          podman ps -a              || true
+          podman stop -a            || true
+          podman rm -a -f           || true
+          podman volume prune -f    || true
+          podman system prune -a -f || true
+          podman system migrate     || true
 
       - name: Checkout infix repo
         uses: actions/checkout@v4
         with:
           repository: ${{ env.INFIX_REPO }}
-          ref: ${{ env.INFIX_BRANCH != '' && env.INFIX_BRANCH || github.ref }}
+          ref: ${{ github.ref }}
           clean: true
           fetch-depth: 0
           submodules: recursive
-          token: ${{ secrets.CHECKOUT_TOKEN || github.token }}
-
-      - uses: kernelkit/actions/podman-cleanup@v1
-
-      - name: Run pre-build script
-        if: ${{ inputs.pre_build_script != '' }}
-        run: |
-          cat > ./pre-build.sh << 'EOF'
-          ${{ inputs.pre_build_script }}
-          EOF
-          chmod +x ./pre-build.sh
-          bash ./pre-build.sh
 
       - name: Set Build Variables
         id: vars
@@ -120,9 +98,22 @@ jobs:
           echo "tgz=${name}-${target}.tar.gz" >> $GITHUB_OUTPUT
           echo "Building target ${target}_defconfig"
 
-      - uses: kernelkit/actions/cache-restore@v1
+      - name: Restore Cache of dl/
+        uses: actions/cache@v4
         with:
-          target: ${{ env.TARGET }}
+          path: dl/
+          key: dl-${{ hashFiles('.git/modules/buildroot/HEAD', 'configs/*', 'package/*/*.hash') }}
+          restore-keys: |
+            dl-
+
+      - name: Restore Cache of .ccache/
+        uses: actions/cache@v4
+        with:
+          path: .ccache/
+          key: ccache-${{ env.TARGET }}-${{ hashFiles('.git/modules/buildroot/HEAD', 'package/*/*.hash') }}
+          restore-keys: |
+            ccache-${{ env.TARGET }}-
+            ccache-
 
       - name: Configure ${{ env.TARGET }}
         run: |
@@ -133,6 +124,10 @@ jobs:
           podman rm -af || true
           pkill -9 -f rootlessport || true
 
+      - name: Unit Test ${{ env.TARGET }}
+        run: |
+          make test-unit
+
       - name: Prepare parallel build
         id: parallel
         run: |

.github/workflows/check-kernel-release.yml

@@ -1,13 +1,10 @@
-name: Check Kernel 6.18 Release
+name: Check Kernel 6.12 Release
 
 on:
-  schedule:
-    - cron: '0 3 * * *'
-  workflow_dispatch:
+  workflow_dispatch: # Allow manual triggering
 
 jobs:
   check-kernel:
-    if: github.repository == 'kernelkit/infix'
     runs-on: ubuntu-latest
 
     steps:
@@ -17,12 +14,20 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.KERNEL_UPDATE_TOKEN }}
 
-      - name: Fetch kernel.org and check for 6.18 release
+      - name: Check out linux repository
+        uses: actions/checkout@v4
+        with:
+          repository: kernelkit/linux
+          path: linux
+          fetch-depth: 0
+          token: ${{ secrets.KERNEL_UPDATE_TOKEN }}
+
+      - name: Fetch kernel.org and check for 6.12 release
         id: check
         run: |
           set -e -o pipefail
-          # Fetch the kernel.org frontpage and extract 6.18 version
-          CURRENT_VERSION=$(curl -s https://www.kernel.org/ | grep -oP '6\.18\.\d+' | head -n1)
+          # Fetch the kernel.org frontpage and extract 6.12 version
+          CURRENT_VERSION=$(curl -s https://www.kernel.org/ | grep -oP '6\.12\.\d+' | head -n1)
 
           if [ -z "$CURRENT_VERSION" ]; then
             echo "Failed to fetch kernel version"
@@ -30,54 +35,24 @@ jobs:
           fi
 
           echo "current_version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
-          echo "Current 6.18 kernel version: $CURRENT_VERSION"
+          echo "Current 6.12 kernel version: $CURRENT_VERSION"
 
-          # Get the version from infix defconfig
-          INFIX_VERSION=$(grep 'BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=' configs/aarch64_defconfig | cut -d'"' -f2)
+          # Get the latest tag from our linux tree
+          cd linux
+          git fetch origin
+          LATEST_TAG=$(git tag -l "v6.12.*" | sort -V | tail -n1 | sed 's/^v//')
+          cd ..
 
-          echo "infix_version=$INFIX_VERSION" >> $GITHUB_OUTPUT
-          echo "Infix kernel version: $INFIX_VERSION"
+          echo "latest_tag=$LATEST_TAG" >> $GITHUB_OUTPUT
+          echo "Latest tag in our tree: $LATEST_TAG"
 
-          if [ "$CURRENT_VERSION" != "$INFIX_VERSION" ]; then
-            # Check if there's already an open PR for this version
-            PR_EXISTS=$(gh pr list --state open --search "Upgrade to kernel $CURRENT_VERSION in:title" --json number --jq 'length')
-
-            if [ "$PR_EXISTS" -gt 0 ]; then
-              echo "new_release=false" >> $GITHUB_OUTPUT
-              echo "PR already exists for kernel $CURRENT_VERSION, skipping"
-            else
-              echo "new_release=true" >> $GITHUB_OUTPUT
-              echo "🎉 New 6.18 kernel released: $CURRENT_VERSION (infix version: $INFIX_VERSION)"
-            fi
+          if [ "$CURRENT_VERSION" != "$LATEST_TAG" ]; then
+            echo "new_release=true" >> $GITHUB_OUTPUT
+            echo "🎉 New 6.12 kernel released: $CURRENT_VERSION (our version: $LATEST_TAG)"
           else
             echo "new_release=false" >> $GITHUB_OUTPUT
             echo "No change - still at $CURRENT_VERSION"
           fi
-        env:
-          GH_TOKEN: ${{ secrets.KERNEL_UPDATE_TOKEN }}
-
-      - name: Generate branch name
-        if: steps.check.outputs.new_release == 'true'
-        id: branch
-        run: |
-          BRANCH_NAME="kernel-upgrade-$(uuidgen | tr '[:upper:]' '[:lower:]')"
-          echo "name=$BRANCH_NAME" >> $GITHUB_OUTPUT
-          echo "Branch name: $BRANCH_NAME"
-
-      - name: Import GPG key
-        if: steps.check.outputs.new_release == 'true'
-        run: |
-          # Import the GPG key
-          echo "${{ secrets.AEL_BOT_GPG_PRIVATE_KEY }}" | gpg --batch --import
-
-          # Get the key ID
-          GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format=long | grep '^sec' | head -1 | awk '{print $2}' | cut -d'/' -f2)
-          echo "GPG_KEY_ID=$GPG_KEY_ID" >> $GITHUB_ENV
-
-          # Configure GPG agent for non-interactive use
-          echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf
-          echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf
-          gpg-connect-agent reloadagent /bye || true
 
       - name: Set up git credentials
         if: steps.check.outputs.new_release == 'true'
@@ -85,8 +60,6 @@ jobs:
           set -e -o pipefail
           git config --global user.email "ael-bot@users.noreply.github.com"
           git config --global user.name "ael-bot"
-          git config --global commit.gpgsign true
-          git config --global user.signingkey ${{ env.GPG_KEY_ID }}
 
           # Configure git to use the token for HTTPS operations
           git config --global url."https://ael-bot:${{ secrets.KERNEL_UPDATE_TOKEN }}@github.com/".insteadOf "git@github.com:"
@@ -96,10 +69,9 @@ jobs:
         if: steps.check.outputs.new_release == 'true'
         env:
           GIT_TERMINAL_PROMPT: 0
-          BRANCH_NAME: ${{ steps.branch.outputs.name }}
         run: |
           set -e -o pipefail
-          ./utils/kernel-upgrade.sh linux 6.18 "$BRANCH_NAME"
+          ./utils/kernel-upgrade.sh linux
 
       - name: Create pull request
         if: steps.check.outputs.new_release == 'true'
@@ -107,6 +79,7 @@ jobs:
         with:
           github-token: ${{ secrets.KERNEL_UPDATE_TOKEN }}
           script: |
+            // Check if PR already exists
             const { data: pulls } = await github.rest.pulls.list({
               owner: context.repo.owner,
               repo: context.repo.repo,
@@ -119,11 +92,12 @@ jobs:
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 title: `Upgrade to kernel ${{ steps.check.outputs.current_version }}`,
-                head: '${{ steps.branch.outputs.name }}',
+                head: 'kernel-upgrade',
                 base: 'main',
-                body: `Automated kernel upgrade to version ${{ steps.check.outputs.current_version }}.\n\n**Previous version:** ${{ steps.check.outputs.infix_version }}\n**New version:** ${{ steps.check.outputs.current_version }}\n**Source:** https://www.kernel.org/\n\nThis PR was automatically created by the kernel release monitoring workflow.`
+                body: `Automated kernel upgrade to version ${{ steps.check.outputs.current_version }}.\n\n**Previous version:** ${{ steps.check.outputs.latest_tag }}\n**New version:** ${{ steps.check.outputs.current_version }}\n**Source:** https://www.kernel.org/\n\nThis PR was automatically created by the kernel release monitoring workflow.`
               });
 
+              // Add label
               await github.rest.issues.addLabels({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
@@ -131,6 +105,7 @@ jobs:
                 labels: ['ci:main']
               });
 
+              // Request reviews
               await github.rest.pulls.requestReviewers({
                 owner: context.repo.owner,
                 repo: context.repo.repo,

.github/workflows/coverity.yml

@@ -8,8 +8,6 @@ on:
 env:
   PROJECT_NAME: Infix
   CONTACT_EMAIL: troglobit@gmail.com
-  LIBYANG_VERSION: 4.2.2
-  SYSREPO_VERSION: 4.2.10
 
 jobs:
   coverity:
@@ -57,32 +55,24 @@ jobs:
           sudo apt-get -y update
           sudo apt-get -y install pkg-config libjansson-dev libev-dev \
                        libcrypt-dev libglib2.0-dev libpcre2-dev       \
-                       libuev-dev libavahi-client-dev
+                       libuev-dev
 
       - name: Build dependencies
         run: |
-          git clone -b v${LIBYANG_VERSION} --depth 1 https://github.com/CESNET/libyang.git
-          for p in patches/libyang/${LIBYANG_VERSION}/*.patch; do
-            git -C libyang apply < "$p"
-          done
+          git clone https://github.com/CESNET/libyang.git
           mkdir libyang/build
           (cd libyang/build && cmake .. && make all && sudo make install)
-
-          git clone -b v${SYSREPO_VERSION} --depth 1 https://github.com/sysrepo/sysrepo.git
-          for p in patches/sysrepo/${SYSREPO_VERSION}/*.patch; do
-            git -C sysrepo apply < "$p"
-          done
+          git clone https://github.com/sysrepo/sysrepo.git
           mkdir sysrepo/build
           (cd sysrepo/build && cmake .. && make all && sudo make install)
-
           git clone https://github.com/troglobit/libite.git
           (cd libite && ./autogen.sh && ./configure && make && sudo make install)
           make dep
 
-      - name: Build applications for Coverity
+      - name: Check applications
         run: |
           export PATH=`pwd`/coverity/bin:$PATH
-          cov-build --dir cov-int make coverity
+          cov-build --dir cov-int make check
 
       - name: Submit results to Coverity Scan
         env:

.github/workflows/inventory.yml

@@ -45,10 +45,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: kernelkit/actions/cache-restore@v1
+      - name: Restore Cache of dl/
+        uses: actions/cache@v4
         with:
-          target: x86_64
-          dl-prefix: dl-netconf
+          path: dl/
+          key: dl-netconf-${{ hashFiles('.git/modules/buildroot/HEAD', 'configs/*', 'package/*/*.hash') }}
+          restore-keys: |
+            dl-netconf-
+            dl-
+      - name: Restore Cache of .ccache/
+        uses: actions/cache@v4
+        with:
+          path: .ccache/
+          key: ccache-x86_64-${{ hashFiles('.git/modules/buildroot/HEAD', 'package/*/*.hash') }}
+          restore-keys: |
+            ccache-x86_64-
+            ccache-
       - name: Disk inventory (2/2) ...
         run: |
           echo "df -h ========================================================================="

.github/workflows/release.yml

@@ -48,12 +48,20 @@ jobs:
       contents: write
       discussions: write
     steps:
+      - name: Cleanup podman state
+        run: |
+          set -x
+          podman ps -a              || true
+          podman stop -a            || true
+          podman rm -a -f           || true
+          podman volume prune -f    || true
+          podman system prune -a -f || true
+          podman system migrate     || true
+
       - uses: actions/checkout@v4
         with:
           submodules: 'true'
 
-      - uses: kernelkit/actions/podman-cleanup@v1
-
       - name: Set Release Variables
         id: rel
         run: |
@@ -67,7 +75,7 @@ jobs:
           if echo $ver | grep -qE 'v[0-9.]+(-alpha|-beta|-rc)[0-9]*'; then
             echo "pre=true"     >> $GITHUB_OUTPUT
             echo "latest=false" >> $GITHUB_OUTPUT
-          elif echo $ver | grep -qE '^v[0-9]+\.[0-9]+(\.0)?$'; then
+          elif echo $ver | grep -qE '^v[0-9.]+\.[0-9.]+(\.[0-9]+)?$'; then
             echo "pre=false"    >> $GITHUB_OUTPUT
             echo "latest=true"  >> $GITHUB_OUTPUT
             echo "cat=Releases" >> $GITHUB_OUTPUT
@@ -96,7 +104,11 @@ jobs:
 
       - name: Extract ChangeLog entry ...
         run: |
-          cat doc/ChangeLog.md | ./utils/extract-changelog.sh > release.md
+          awk '/^-----*$/{if (x == 1) exit; x=1;next}x' doc/ChangeLog.md \
+              |head -n -1 > release.md
+          echo "" >> release.md
+          echo "> [!TIP]" >> release.md
+          echo "> **Try Infix in GNS3!** Download the appliance from the [GNS3 Marketplace](https://gns3.com/marketplace/appliances/infix) to test Infix in a virtual network environment without hardware." >> release.md
           cat release.md
 
       - uses: ncipollo/release-action@v1
@@ -105,7 +117,7 @@ jobs:
           prerelease: ${{ steps.rel.outputs.pre }}
           makeLatest: ${{ steps.rel.outputs.latest }}
           discussionCategory: ${{ steps.rel.outputs.cat }}
-          bodyFile: release.md
+          bodyFile:  release.md
           artifacts: "*.tar.gz*,*.qcow2*"
 
       - name: Summary

.github/workflows/test.yml

@@ -8,10 +8,6 @@ on:
         required: false
         default: kernelkit/infix
         type: string
-      infix_branch:
-        description: 'Branch/tag/commit to checkout (for spin overrides)'
-        default: ''
-        type: string
 
   workflow_call:
     inputs:
@@ -25,11 +21,6 @@ on:
         required: false
         type: string
         default: kernelkit/infix
-      infix_branch:
-        required: false
-        type: string
-        default: ''
-        description: 'Branch/tag/commit to checkout (for spin overrides). Defaults to github.ref if not specified'
       ninepm-conf:
         required: false
         type: string
@@ -38,20 +29,10 @@ on:
         required: false
         type: string
         default: 'test'
-      pre_test_script:
-        required: false
-        type: string
-        default: ''
-        description: 'Optional script to run after checkout (for spin customization)'
-    secrets:
-      CHECKOUT_TOKEN:
-        required: false
-        description: 'Token for cross-repository access'
 
 env:
   TARGET: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target || inputs.target }}
   INFIX_REPO: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.infix_repo || inputs.infix_repo }}
-  INFIX_BRANCH: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.infix_branch || inputs.infix_branch }}
   NINEPM_CONF: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.ninepm-conf || inputs.ninepm-conf }}
   TEST_PATH: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.test-path || inputs.test-path }}
 
@@ -60,26 +41,24 @@ jobs:
     name: Regression Test ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.name || inputs.name }} ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target || inputs.target }}
     runs-on: [self-hosted, regression]
     steps:
+      - name: Cleanup podman state
+        run: |
+          set -x
+          podman ps -a              || true
+          podman stop -a            || true
+          podman rm -a -f           || true
+          podman volume prune -f    || true
+          podman system prune -a -f || true
+          podman system migrate     || true
+
       - name: Checkout infix repo
         uses: actions/checkout@v4
         with:
           repository: ${{ env.INFIX_REPO }}
-          ref: ${{ env.INFIX_BRANCH != '' && env.INFIX_BRANCH || github.ref }}
+          ref: ${{ github.ref }}
           clean: true
           fetch-depth: 0
           submodules: recursive
-          token: ${{ secrets.CHECKOUT_TOKEN || github.token }}
-
-      - uses: kernelkit/actions/podman-cleanup@v1
-
-      - name: Run pre-test script
-        if: ${{ inputs.pre_test_script != '' }}
-        run: |
-          cat > ./pre-test.sh << 'EOF'
-          ${{ inputs.pre_test_script }}
-          EOF
-          chmod +x ./pre-test.sh
-          bash ./pre-test.sh
 
       - name: Set Build Variables
         id: vars

.github/workflows/trigger.yml

@@ -1,4 +1,4 @@
-name: CI
+name: Kernelkit Trigger
 
 on:
   pull_request:
@@ -28,7 +28,6 @@ jobs:
     outputs:
       x86_64_target: ${{ steps.set-targets.outputs.x86_64_target }}
       aarch64_target: ${{ steps.set-targets.outputs.aarch64_target }}
-      arm_target: ${{ steps.set-targets.outputs.arm_target }}
     steps:
       - run: |
           echo "Triggering build, logging meta data ..."
@@ -44,40 +43,25 @@ jobs:
              | grep -q "ci:main"; then
             echo "x86_64_target=x86_64_minimal" >> $GITHUB_OUTPUT
             echo "aarch64_target=aarch64_minimal" >> $GITHUB_OUTPUT
-            echo "arm_target=arm_minimal" >> $GITHUB_OUTPUT
           else
             echo "x86_64_target=x86_64" >> $GITHUB_OUTPUT
             echo "aarch64_target=aarch64" >> $GITHUB_OUTPUT
-            echo "arm_target=arm" >> $GITHUB_OUTPUT
           fi
-  unit-test:
-    needs: check-trigger
-    uses: ./.github/workflows/unit-test.yml
-    with:
-      name: "infix"
-      target: ${{ needs.check-trigger.outputs.x86_64_target }}
 
   build-x86_64:
-    needs: [check-trigger, unit-test]
+    needs: check-trigger
     uses: ./.github/workflows/build.yml
     with:
       name: "infix"
       target: ${{ needs.check-trigger.outputs.x86_64_target }}
 
   build-aarch64:
-    needs: [check-trigger, unit-test]
+    needs: check-trigger
     uses: ./.github/workflows/build.yml
     with:
       name: "infix"
       target: ${{ needs.check-trigger.outputs.aarch64_target }}
 
-  build-arm:
-    needs: [check-trigger, unit-test]
-    uses: ./.github/workflows/build.yml
-    with:
-      name: "infix"
-      target: ${{ needs.check-trigger.outputs.arm_target }}
-
   test-run-x86_64:
     needs: [check-trigger, build-x86_64]
     uses: ./.github/workflows/test.yml

.github/workflows/unit-test.yml

@@ -1,116 +0,0 @@
-name: unit-test
-
-on:
-  workflow_dispatch:
-    inputs:
-      target:
-        description: "Build target (e.g. aarch64 or aarch64_minimal)"
-        default: "x86_64"
-        type: string
-      parallel:
-        description: 'Massive parallel build of each image'
-        default: true
-        type: boolean
-      name:
-        description: "Name (for spin overrides)"
-        default: "infix"
-        type: string
-      infix_repo:
-        description: 'Repo to checkout (for spin overrides)'
-        default: kernelkit/infix
-        type: string
-      infix_branch:
-        description: 'Branch/tag/commit to checkout (for spin overrides)'
-        default: ''
-        type: string
-
-  workflow_call:
-    inputs:
-      target:
-        required: true
-        type: string
-      name:
-        required: true
-        type: string
-      infix_repo:
-        required: false
-        type: string
-        default: kernelkit/infix
-      infix_branch:
-        required: false
-        type: string
-        default: ''
-        description: 'Branch/tag/commit to checkout (for spin overrides). Defaults to github.ref if not specified'
-      parallel:
-        required: false
-        type: boolean
-        default: true
-      pre_build_script:
-        required: false
-        type: string
-        default: ''
-        description: 'Optional script to run after checkout (for spin customization)'
-    secrets:
-      CHECKOUT_TOKEN:
-        required: false
-        description: 'Token for cross-repository access'
-
-env:
-  NAME: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.name || inputs.name }}
-  TARGET: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target || inputs.target }}
-  INFIX_REPO: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.infix_repo || inputs.infix_repo }}
-  INFIX_BRANCH: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.infix_branch || inputs.infix_branch }}
-
-jobs:
-  unit-tests:
-    name: Build ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.name || inputs.name }} ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target || inputs.target }}
-    runs-on: [ self-hosted, latest ]
-    env:
-      PARALLEL: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.parallel == 'true' || github.event_name != 'workflow_dispatch' && inputs.parallel == true }}
-    strategy:
-      fail-fast: false
-    steps:
-      - name: Cleanup Build Folder
-        run: |
-          ls -la ./
-          rm -rf ./* || true
-          rm -rf ./.??* || true
-          ls -la ./
-
-      - name: Checkout infix repo
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ env.INFIX_REPO }}
-          ref: ${{ env.INFIX_BRANCH != '' && env.INFIX_BRANCH || github.ref }}
-          clean: true
-          fetch-depth: 0
-          submodules: recursive
-          token: ${{ secrets.CHECKOUT_TOKEN || github.token }}
-
-      - uses: kernelkit/actions/podman-cleanup@v1
-
-      - name: Run pre-build script
-        if: ${{ inputs.pre_build_script != '' }}
-        run: |
-          cat > ./pre-build.sh << 'EOF'
-          ${{ inputs.pre_build_script }}
-          EOF
-          chmod +x ./pre-build.sh
-          bash ./pre-build.sh
-
-      - uses: kernelkit/actions/cache-restore@v1
-        with:
-          target: ${{ env.TARGET }}
-
-      - name: Configure ${{ env.TARGET }}
-        run: |
-          make ${{ env.TARGET }}_defconfig
-
-      - name: Cleanup stale containers and ports
-        run: |
-          podman rm -af || true
-          pkill -9 -f rootlessport || true
-
-      - name: Unit Test ${{ env.TARGET }}
-        run: |
-          make test-unit

.gitignore

@@ -1,8 +1,5 @@
 *~
-.claude
 .gdb_history
-.claude
-AGENTS.md
 /.backup
 /.ccache
 /dl

Makefile

@@ -16,7 +16,8 @@ bmake   = $(MAKE) -C buildroot O=$(O) $1
 all: $(config) buildroot/Makefile
 	@+$(call bmake,$@)
 
-check dep coverity:
+check dep:
+	@echo "Starting local check, stage $@ ..."
 	@make -C src $@
 
 $(config):
@@ -32,11 +33,6 @@ $(config):
 legal-info: | buildroot/Makefile
 	$(call bmake,legal-info LINUX_LICENSE_FILES=COPYING)
 
-cyclonedx: | buildroot/Makefile
-	@echo "Generating package information..."
-	@$(MAKE) --no-print-directory -C buildroot O=$(O) show-info | ./buildroot/utils/generate-cyclonedx > $(O)/cyclonedx-sbom.json
-	@echo "CycloneDX SBOM generated: $(O)/cyclonedx-sbom.json"
-
 # Workaround, see board/x86_64/board.mk
 test:
 	@+$(call bmake,$@)
@@ -44,4 +40,4 @@ test:
 buildroot/Makefile:
 	@git submodule update --init
 
-.PHONY: all check coverity dep test cyclonedx
+.PHONY: all check test

README.md

@@ -16,12 +16,10 @@ if something goes wrong.  Deploy once, trust forever.
 
 **🤝 Friendly**  
 Actually easy to use. Auto-generated CLI from standard YANG models comes
-with built-in help for every command — just hit <kbd>?</kbd> or
-<kbd>TAB</kbd> for context-aware assistance.
-
-Familiar NETCONF & RESTCONF APIs and [comprehensive documentation][4]
-mean you're never stuck.  Whether you're learning networking or managing
-enterprise infrastructure.
+with built-in help for every command — just hit `?` or TAB for
+context-aware assistance.  Familiar NETCONF/RESTCONF APIs and
+[comprehensive documentation][4] mean you're never stuck.  Whether
+you're learning networking or managing enterprise infrastructure.
 
 **🛡️ Secure**  
 Built with security as a foundation, not an afterthought.  Minimal
@@ -55,24 +53,27 @@ your device, your rules.
    Consistent tooling from development to production deployment.  
    How about a digital twin using raw Qemu or [GNS3](https://gns3.com/infix)!
 
-## Quick Example
+## See It In Action
 
 Configure an interface in seconds - the CLI guides you with built-in help:
 
-<pre><code>admin@infix-12-34-56:/> <b>configure</b>
-admin@infix-12-34-56:/config/> <b>edit interface eth0</b>
-admin@infix-12-34-56:/config/interface/eth0/> <b>set ipv4</b> <kbd>TAB</kbd>
-      address     autoconf      bind-ni-name     dhcp 
-      enabled     forwarding    mtu              neighbor
-admin@infix-12-34-56:/config/interface/eth0/> <b>set ipv4 address 192.168.2.200 prefix-length 24</b>
-admin@infix-12-34-56:/config/interface/eth0/> <b>show</b>
+<details><summary><b>Click Here for an example CLI Session</b></summary>
+
+```bash
+admin@infix-12-34-56:/> configure
+admin@infix-12-34-56:/config/> edit interface eth0
+admin@infix-12-34-56:/config/interface/eth0/> set ipv4 <TAB>
+      address     autoconf bind-ni-name      enabled
+      forwarding  mtu      neighbor
+admin@infix-12-34-56:/config/interface/eth0/> set ipv4 address 192.168.2.200 prefix-length 24
+admin@infix-12-34-56:/config/interface/eth0/> show
 type ethernet;
 ipv4 {
   address 192.168.2.200 {
     prefix-length 24;
   }
 }
-admin@infix-12-34-56:/config/interface/eth0/> <b>diff</b>
+admin@infix-12-34-56:/config/interface/eth0/> diff
 interfaces {
   interface eth0 {
 +    ipv4 {
@@ -82,23 +83,25 @@ interfaces {
 +    }
   }
 }
-admin@infix-12-34-56:/config/interface/eth0/> <b>leave</b>
-admin@infix-12-34-56:/> <b>show interfaces</b>
-<u>INTERFACE       PROTOCOL   STATE       DATA                                  </u>
-lo              ethernet   UP          00:00:00:00:00:00
-                ipv4                   127.0.0.1/8 (static)
-                ipv6                   ::1/128 (static)
+admin@infix-12-34-56:/config/interface/eth0/> leave
+admin@infix-12-34-56:/> show interfaces
+INTERFACE       PROTOCOL   STATE       DATA
 eth0            ethernet   UP          52:54:00:12:34:56
                 ipv4                   192.168.2.200/24 (static)
                 ipv6                   fe80::5054:ff:fe12:3456/64 (link-layer)
-admin@infix-12-34-56:/> <b>copy running startup</b>
-</code></pre>
+lo              ethernet   UP          00:00:00:00:00:00
+                ipv4                   127.0.0.1/8 (static)
+                ipv6                   ::1/128 (static)
+admin@infix-12-34-56:/> copy running-config startup-config
+```
 
-Notice how <kbd>TAB</kbd> completion shows available options, `show`
-displays current config, and `diff` shows exactly what changed before
-you commit your changes with the `leave` command.
+Notice how TAB completion shows available options, `show` displays
+current config, and `diff` shows exactly what changed before you
+commit your changes with the `leave` command.
 
-For more information, see [CLI documentation][3].
+</details>
+
+> [Full CLI documentation →][3]
 
 ## Get Started
 
@@ -108,13 +111,12 @@ containers for any custom functionality you need.
 
 ### Supported Platforms
 
-- **Raspberry Pi 2B/3B/4B/CM4** - Perfect for home labs, learning, and prototyping
+- **Raspberry Pi 4B** - Perfect for home labs, learning, and prototyping
 - **Banana Pi-R3** - Your next home router and gateway
 - **NanoPi R2S** - Compact dual-port router in a tiny package
 - **x86_64** - Run in VMs or on mini PCs for development and testing
 - **Marvell CN9130 CRB, EspressoBIN** - High-performance ARM64 platforms
 - **Microchip SparX-5i** - Enterprise switching capabilities
-- **Microchip SAMA7G54-EK** - ARM Cortex-A7
 - **NXP i.MX8MP EVK** - Highly capable ARM64 SoC
 - **StarFive VisionFive2** - RISC-V architecture support
 
@@ -168,13 +170,13 @@ APIs.
 [0]: https://www.kernel.org
 [1]: https://buildroot.org/ "Buildroot Homepage"
 [2]: https://www.sysrepo.org/ "Sysrepo Homepage"
-[3]: https://www.kernelkit.org/infix/latest/cli/introduction/
-[4]: https://www.kernelkit.org/infix/
-[5]: https://github.com/kernelkit/infix/releases/latest
+[3]: https://kernelkit.org/infix/latest/cli/introduction/
+[4]: https://kernelkit.org/infix/
+[5]: https://github.com/kernelkit/infix/releases
 [Latest Build]:    https://github.com/kernelkit/infix/releases/tag/latest "Latest build"
 [License]:         https://en.wikipedia.org/wiki/GPL_license
 [License Badge]:   https://img.shields.io/badge/License-GPL%20v2-blue.svg
-[Release]:         https://github.com/kernelkit/infix/releases/latest
+[Release]:         https://github.com/kernelkit/infix/releases
 [Release Badge]:   https://img.shields.io/github/v/release/kernelkit/infix 
 [GitHub]:          https://github.com/kernelkit/infix/actions/workflows/build.yml/
 [GitHub Status]:   https://github.com/kernelkit/infix/actions/workflows/build.yml/badge.svg

board/Config.in

@@ -1,6 +1,5 @@
 menu "Board Support"
 
-source "$BR2_EXTERNAL_INFIX_PATH/board/arm/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/board/riscv64/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/board/x86_64/Config.in"

board/README.md

@@ -1,18 +0,0 @@
-Board Support
-=============
-
-The board support for an architecture always starts with Qemu support,
-this is what each `linux_defconfig` at the very least sets up.  Then
-each `$BR2_ARCH` has additional BSPs, e.g., Banana Pi BPI-R3.
-
-The `board/` directory is matched with the `configs/*_defconfigs` and
-the only execption is `board/common/`, which holds all shared files for
-Infix builds.
-
-Each `board/$BR2_ARCH/` can then have vendor/product sub-directories
-for the BSPs which may contain "fixups" to the base kernel config and
-any additional device tree files that should be included as well.
-
-To rebuild a board-specific package, e.g. NanoPi R2S:
-
-    make friendlyarm-nanopi-r2s-rebuild all

board/aarch64/Config.in

@@ -2,8 +2,6 @@ if BR2_aarch64
 
 source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/alder-alder/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/bananapi-bpi-r3/Config.in"
-source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/bananapi-bpi-r4/Config.in"
-source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/bananapi-bpi-r64/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/freescale-imx8mp-evk/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/friendlyarm-nanopi-r2s/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/marvell-cn9130-crb/Config.in"

board/aarch64/README.md

@@ -4,10 +4,8 @@ aarch64
 Board Specific Documentation
 ----------------------------
 
-- [Banana Pi BPi-R3](bananapi-bpi-r3/)
-- [Banana Pi BPi-R4](bananapi-bpi-r4/)
-- [Banana Pi BPi-R64](bananapi-bpi-r64/)
-- [Marvell CN9130-CRB](marvell-cn9130-crb/)
-- [Microchip SparX-5i PCB135 (eMMC)](microchip-sparx5-pcb135/)
-- [NanoPi R2S](friendlyarm-nanopi-r2s/)
-- [Raspberry Pi 64-bit](raspberrypi-rpi64/)
+- [Banana Pi R3](banana-pi-r3/)
+- [Marvell CN9130-CRB](cn9130-crb/)
+- [Microchip SparX-5i PCB135 (eMMC)](sparx5-pcb135/)
+- [NanoPi R2S](r2s/)
+- [Raspberry Pi 64-bit](raspberry-pi64/)

board/aarch64/alder-alder/Config.in

@@ -1,6 +1,5 @@
 config BR2_PACKAGE_ALDER_ALDER
 	bool "Alder"
 	depends on BR2_aarch64
-	select BR2_PACKAGE_LINUX_FIRMWARE_INSIDE_SECURE_MINIFW
 	help
 	  Alder

board/aarch64/alder-alder/alder-alder.hash

@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  d2f96418893ac66156d0e691cda189b0d85ae1d814065d1d9aa1845383100f46  LICENSE

board/aarch64/bananapi-bpi-r3/Config.in

@@ -5,7 +5,6 @@ config BR2_PACKAGE_BANANAPI_BPI_R3
 	select BR2_PACKAGE_LINUX_FIRMWARE
 	select BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK
 	select BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7986
-	select BR2_PACKAGE_LINUX_FIRMWARE_AIROHA_EN8811H
 	select SDCARD_AUX
 	help
 	  Build Banana PI R3 support

board/aarch64/bananapi-bpi-r3/README.md

@@ -1,273 +1,27 @@
-# Banana Pi BPI-R3 / BPI-R3 Mini
+# Banana Pi R3
+
+## Support level
+Full support for all Infix enabled features including switched ethernet ports, WiFi,
+and SFP interfaces. The board includes comprehensive hardware support for
+MediaTek MT7986 SoC features.
+
+### Hardware features
+The Banana Pi R3 is a high-performance networking board featuring:
+- MediaTek MT7986 ARM Cortex-A53 quad-core processor
+- 4x Gigabit LAN ports (lan1-lan4)
+- 1x Gigabit WAN port
+- 2x SFP ports (sfp1, sfp2) for fiber connectivity
+- Dual WiFi interfaces (wifi0 for 2.4GHz, wifi1 for 5GHz)
+- USB support
+- SD card boot support
+
+### Network configuration
+The board comes preconfigured with:
+- 4 switched LAN ports for internal networking
+- Dedicated WAN port with DHCP client enabled
+- SFP ports for high-speed fiber connections
+- Dual WiFi interfaces for wireless connectivity
+
+### Pre-built images
+SD card image: [infix-bpi-r3-sdcard.img](https://github.com/kernelkit/infix/releases/download/latest-boot/infix-bpi-r3-sdcard.img)
 
-<img src="bananapi-bpi-r3.webp" alt="The board" width=800 padding=10>
-
-## Overview
-
-The Banana Pi BPI-R3 and BPI-R3 Mini are high-performance networking
-boards with full Infix support for all enabled features including
-Ethernet, WiFi, and SFP interfaces.
-
-Both boards share the same SoC and most peripherals.  The key
-differences are:
-
-| Feature         | BPI-R3             | BPI-R3 Mini             |
-|-----------------|--------------------|-------------------------|
-| Ethernet switch | Yes (4x LAN + WAN) | No (WAN/LAN ports only) |
-| SD card slot    | Yes                | No                      |
-
-### Hardware Features
-
-- MediaTek MT7986 ARM Cortex-A53 quad-core processor @ 2.0 GHz
-- 2 GB DDR4 RAM
-- 8 GB eMMC storage
-- microSD card slot (BPI-R3 only)
-- 5x Gigabit Ethernet ports with switch core (BPI-R3 only)
-- 2x SFP cages for fiber connectivity (1G/2.5G) (BPI-R3 only)
-- Dual-band WiFi (2.4 GHz + 5 GHz)
-- USB 3.0 port
-- Mini PCIe slot
-
-### Default Network Configuration
-
-Infix comes preconfigured with:
-
-- **LAN ports** (lan1-lan4): Bridged for internal networking (BPI-R3 only)
-- **WAN port**: DHCP client enabled for internet connectivity
-- **SFP ports** (sfp1, sfp2): Available for configuration (BPI-R3 only)
-- **WiFi interfaces** (wifi0, wifi1): Available for configuration
-
-## Getting Started
-
-### BPI-R3: Quick Start with SD Card
-
-The easiest way to get started with the BPI-R3 is using an SD card:
-
-> [!NOTE]
-> SD card boot works but we have observed stability issues. For production
-> use or long-term reliability, we recommend installing to eMMC (see below).
-
-1. **Download the SD card image:** [infix-bpi-r3-sdcard.img][2]
-2. **Flash the image to an SD card:** see [this guide][0]
-3. **Set boot switches:**
-   - Set DIP switches to **0000** (SD card boot mode)
-   - Switch positions are on the underside of the board near the SD slot
-4. **Boot the board:**
-   - Insert the SD card
-   - Connect power
-   - Connect to LAN port or console (115200 8N1)
-   - Default login: `admin` / `admin`
-
-### BPI-R3 Mini: Getting Started
-
-The BPI-R3 Mini does not have an SD card slot, so you must install
-directly to eMMC.  See [Installing to eMMC — BPI-R3
-Mini](#bpi-r3-mini) below.
-
-### Boot Switch Reference
-
-The BPI-R3 has a 4-position DIP switch that controls boot media:
-
-<img align="right" src="bootstrap-switch.webp" alt="DIP switches" width=200 padding=10>
-
-| Position | Mode        | Description                           |
-|----------|-------------|---------------------------------------|
-| 0000     | SD card     | Boot from microSD card                |
-| 0110     | eMMC        | Boot from internal eMMC (recommended) |
-| 1010     | SPI NAND    | Boot from SPI NAND (advanced users)   |
-
-> [!NOTE]
-> Switch position is read from left to right: "0" = OFF, "1" = ON.
-> When the DIP switch is in the "UP" position it is OFF(0).
-
-## Installing to eMMC
-
-For production deployments or better performance, you can install Infix
-to the internal eMMC storage.
-
-> [!IMPORTANT]
-> While Infix boots on both SD card and eMMC on the BPI-R3, we have
-> observed stability issues with SD cards on this platform. **eMMC is
-> recommended** for reliable operation.
-
-### Prerequisites
-
-- FTDI USB-to-serial cable (3.3V) for console access
-- USB flash drive (FAT32 formatted)
-- microSD card with Infix, for initial boot (BPI-R3 only)
-- Downloaded files (see below)
-
-### Required Files
-
-Download and place these files on a FAT32-formatted USB drive:
-
-1. **Infix eMMC image:**
-   - [infix-bpi-r3-emmc.img][3] (Complete system image)
-2. **eMMC bootloader** (extracted from):
-   - [bpi-r3-emmc-boot-2025.01-latest.tar.gz][4]
-   - Extract `bl2.img` from the tarball to your USB drive
-3. **Intermediate NAND bootloader** (BPI-R3 only, from Frank-W's U-Boot):
-   - [bpi-r3_spim-nand_bl2.img][5] (BL2 loader)
-   - [bpi-r3_spim-nand_fip.bin][6] (FIP image)
-
-> [!WARNING]
-> The following process involves multiple boot mode changes.  Take your
-> time and verify each step carefully.
-
-### BPI-R3
-
-#### Step 1: Boot from SD card
-
-1. Set boot switches to **0000** (SD card mode)
-2. Insert SD card with Infix
-3. Power on and break into U-Boot (press Ctrl-C during boot)
-
-#### Step 2: Flash intermediate NAND bootloader
-
-This step installs a temporary bootloader to NAND that will help us
-flash the eMMC. From the U-Boot prompt:
-
-```
-usb start
-mtd erase spi-nand0
-fatload usb 0:1 0x50000000 bpi-r3_spim-nand_bl2.img
-mtd write spi-nand0 0x50000000 0x0 0x100000
-fatload usb 0:1 0x50000000 bpi-r3_spim-nand_fip.bin
-mtd write spi-nand0 0x50000000 0x380000 0x200000
-```
-
-#### Step 3: Boot from NAND
-
-1. Power off the board
-2. Set boot switches to **1010** (NAND mode)
-3. Power on - you should boot into U-Boot again
-
-#### Step 4: Write Infix image to eMMC
-
-From the U-Boot prompt:
-
-```
-usb start
-fatload usb 0:1 0x50000000 infix-bpi-r3-emmc.img
-setexpr blocks ${filesize} / 0x200
-mmc write 0x50000000 0x0 ${blocks}
-```
-
-This writes the complete Infix system (partitions, rootfs, etc.) to eMMC.
-
-#### Step 5: Configure eMMC boot
-
-Now configure the eMMC boot partition and write the bootloader:
-
-```
-mmc partconf 0 1 1 1
-mmc erase 0x0 0x400
-fatload usb 0:1 0x50000000 bl2.img
-mmc write 0x50000000 0x0 0x400
-mmc partconf 0 1 1 0
-```
-
-#### Step 6: Boot from eMMC
-
-1. Power off the board
-2. Set boot switches to **0110** (eMMC mode)
-3. Remove SD card (optional, but recommended to verify eMMC boot)
-4. Power on
-
-Your BPI-R3 should now boot Infix from internal eMMC storage!
-
-### BPI-R3 Mini
-
-The BPI-R3 Mini does not have an SD card slot, so you have to go
-through the factory-installed Linux (OpenWRT) to flash the Infix
-bootloader and OS to eMMC.
-
-#### Step 1: Boot from NAND (factory default)
-
-<img src="r3mini_nandboot2.png" alt="BPI-R3 Mini NAND boot switch position" width=400>
-
-1. Ensure boot switches are set to NAND mode (factory default)
-2. Place `infix-bpi-r3-emmc.img` and `bl2.img` on a USB drive
-3. Power on and boot into Linux
-4. Mount the USB drive to `/mnt`
-
-#### Step 2: Flash Infix to eMMC
-
-From the Linux shell:
-
-```
-echo 0 > /proc/sys/kernel/printk
-dd if=/mnt/infix-bpi-r3-emmc.img of=/dev/mmcblk0
-echo 0 > /sys/block/mmcblk0boot0/force_ro
-dd if=/mnt/bl2.img of=/dev/mmcblk0boot0
-sync
-```
-
-#### Step 3: Boot from eMMC
-
-<img src="r3mini_emmcboot.png" alt="BPI-R3 Mini eMMC boot switch position" width=400>
-
-1. Power off the board
-2. Set boot switches to eMMC mode (see image above)
-3. Power on
-
-## Troubleshooting
-
-### Board won't boot
-
-- Verify boot switch positions (check twice!)
-- Ensure power supply provides adequate current (12V/2A recommended)
-- Try booting from SD card with switches at **0000** (BPI-R3 only)
-
-### Can't break into U-Boot
-
-- Ensure serial console is connected properly (115200 8N1, 3.3V)
-- Press Ctrl-C immediately when you see boot messages
-- Try power cycling and pressing Ctrl-C repeatedly
-
-### eMMC boot fails after installation
-
-- Boot from NAND (**1010**) and verify eMMC image was written
-- Check USB drive contents - ensure all files are present
-- Re-run the eMMC boot configuration step
-
-### Reverting to SD card (BPI-R3 only)
-
-Simply set boot switches back to **0000** and boot from SD card. The
-eMMC installation does not affect SD card functionality.
-
-## Additional Resources
-
-- [Infix Documentation][1]
-- [Official BPI-R3 Wiki][7]
-- [Release Downloads][8]
-
-## Building Custom Images
-
-See the main Infix documentation for building from source. To build both
-SD card and eMMC images locally:
-
-```bash
-# Build bootloaders for both SD and eMMC
-make x-bpi-r3-sd-boot
-make x-bpi-r3-emmc-boot
-
-# Build main system
-make aarch64
-
-# Create SD card image
-./utils/mkimage.sh -od bananapi-bpi-r3
-
-# Create eMMC image
-./utils/mkimage.sh -odt emmc bananapi-bpi-r3
-```
-
-[0]: https://www.kernelkit.org/posts/flashing-sdcard/
-[1]: https://www.kernelkit.org/infix/latest/
-[2]: https://github.com/kernelkit/infix/releases/download/latest-boot/infix-bpi-r3-sdcard.img
-[3]: https://github.com/kernelkit/infix/releases/download/latest-boot/infix-bpi-r3-emmc.img
-[4]: https://github.com/kernelkit/infix/releases/download/latest-boot/bpi-r3-emmc-boot-2025.01-latest.tar.gz
-[5]: https://github.com/frank-w/u-boot/releases/download/CI-BUILD-2025-10-bpi-2025.10-2025-10-13_1032/bpi-r3_spim-nand_bl2.img
-[6]: https://github.com/frank-w/u-boot/releases/download/CI-BUILD-2025-10-bpi-2025.10-2025-10-13_1032/bpi-r3_spim-nand_fip.bin
-[7]: https://wiki.banana-pi.org/Banana_Pi_BPI-R3
-[8]: https://github.com/kernelkit/infix/releases/tag/latest-boot

board/aarch64/bananapi-bpi-r3/bananapi-bpi-r3.hash

@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  dbe4eae8debbba8135297e15f24aeefef0b4c03781f3f9328db4398d58a728b3  LICENSE

board/aarch64/bananapi-bpi-r3/bananapi-bpi-r3.mk

@@ -6,10 +6,9 @@ define BANANAPI_BPI_R3_LINUX_CONFIG_FIXUPS
 	$(call KCONFIG_SET_OPT,CONFIG_I2C_GPIO,y)
 	$(call KCONFIG_SET_OPT,CONFIG_MTK_THERMAL,m)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_MTK_UART)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MEDIATEK_WATCHDOG)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_MTK_WATCHDOG)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_MEDIATEK_GE_PHY)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_REALTEK_PHY)
-	$(call KCONFIG_SET_OPT,CONFIG_AIR_EN8811H_PHY,m)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_NET_VENDOR_MEDIATEK)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_NET_MEDIATEK_SOC)
 	$(call KCONFIG_SET_OPT,CONFIG_NET_DSA_MT7530,m)

board/aarch64/bananapi-bpi-r3/dts/Makefile

@@ -1 +1 @@
-dtb-y += mediatek/mt7986a-bananapi-bpi-r3-sd.dtb mediatek/mt7986a-bananapi-bpi-r3-emmc.dtb mediatek/mt7986a-bananapi-bpi-r3-mini.dtb
+dtb-y += mediatek/mt7986a-bananapi-bpi-r3-sd.dtb

board/aarch64/bananapi-bpi-r3/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dts

@@ -1,4 +0,0 @@
-#include <arm64/mediatek/mt7986a-bananapi-bpi-r3.dts>
-
-#include "mt7986a-bananapi-bpi-r3.dtsi"
-#include "mt7986a-bananapi-bpi-r3-emmc.dtsi"

board/aarch64/bananapi-bpi-r3/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dtsi

@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/*
- * Copyright (C) 2021 MediaTek Inc.
- * Author: Sam.Shih <sam.shih@mediatek.com>
- */
-
-/*
-This is copied from linux where it is an overlay, unfortunatly it is not
-possible to use dtbo in sysboot unless present in syslinux.conf
-*/
-&{/soc/mmc@11230000} {
-        bus-width = <8>;
-        max-frequency = <200000000>;
-        cap-mmc-highspeed;
-        mmc-hs200-1_8v;
-        mmc-hs400-1_8v;
-        hs400-ds-delay = <0x14014>;
-        non-removable;
-        no-sd;
-        no-sdio;
-        status = "okay";
-};

board/aarch64/bananapi-bpi-r3/dts/mediatek/mt7986a-bananapi-bpi-r3-mini.dts

@@ -1,12 +0,0 @@
-#include <arm64/mediatek/mt7986a-bananapi-bpi-r3-mini.dts>
-
-#include "mt7986a-bananapi-bpi-r3.dtsi"
-#include "mt7986a-bananapi-bpi-r3-emmc.dtsi"
-
-&phy0 {
-	compatible = "ethernet-phy-id03a2.a411";
-};
-&phy1 {
-	compatible = "ethernet-phy-id03a2.a411";
-};
-

board/aarch64/bananapi-bpi-r3/dts/mediatek/mt7986a-bananapi-bpi-r3-mini.dtsi

@@ -1,2 +0,0 @@
-#include "mt7986a-bananapi-bpi-r3.dtsi"
-#include "mt7986a-bananapi-bpi-r3-emmc.dtsi"

board/aarch64/bananapi-bpi-r3/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dts

@@ -1,4 +1,2 @@
-#include <arm64/mediatek/mt7986a-bananapi-bpi-r3.dts>
-
 #include "mt7986a-bananapi-bpi-r3.dtsi"
 #include "mt7986a-bananapi-bpi-r3-sd.dtsi"

board/aarch64/bananapi-bpi-r3/dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi

@@ -1,3 +1,5 @@
+#include <arm64/mediatek/mt7986a-bananapi-bpi-r3.dts>
+
 / {
 	chosen {
 		infix {
@@ -8,22 +10,7 @@
 		};
 	};
 };
-/*
-From 236317dd4e55512933dcdaec3d0b4a0824f5e5bd Mon Sep 17 00:00:00 2001
-From: Shiji Yang <yangshiji66@outlook.com>
-Date: Sun, 10 Aug 2025 18:11:01 +0800
-Subject: [PATCH] arm64: dts: mediatek: mt7986: increase ATF reserved memory to
- 256 kiB
 
-The latest Mediatek open-source Trusted Firmware-A project has
-reserved 256 KiB for BL2 and BL31. It is better to increase the
-reserved memory region in the Linux kernel to protect the data.
-
-https://github.com/openwrt/openwrt/blob/main/target/linux/mediatek/patches-6.12/199-arm64-dts-mediatek-mt7986-increase-ATF-reserved-memo.patch
-*/
-&secmon_reserved {
-	reg = <0 0x43000000 0 0x40000>;
-};
 &cpu_thermal {
 	/delete-node/ trips;
 	/delete-node/ cooling-maps;

board/aarch64/bananapi-bpi-r3/genimage.cfg.in

@@ -24,7 +24,7 @@ image var.ext4 {
         }
 }
 
-image #INFIX_ID##VERSION#-bpi-r3-#TARGET#.img {
+image #INFIX_ID##VERSION#-bpi-r3-sdcard.img {
         hdimage {
                 partition-table-type = "gpt"
 
@@ -51,11 +51,6 @@ image #INFIX_ID##VERSION#-bpi-r3-#TARGET#.img {
                 size = 4096s
         }
 
-	partition en8811h_fw {
-		size = 10M
-		image = "en8811h-fw.bin"
-	}
-
         partition aux {
                 partition-uuid = D4EF35A0-0652-45A1-B3DE-D63339C82035
                 image = "aux.ext4"

board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/factory-config.cfg

@@ -17,24 +17,6 @@
         "state": {
           "admin-state": "unlocked"
         }
-      },
-      {
-        "name": "radio0",
-        "class": "infix-hardware:wifi",
-        "infix-hardware:wifi-radio": {
-          "country-code": "DE",
-          "band": "2.4GHz",
-          "channel": "auto"
-        }
-      },
-      {
-        "name": "radio1",
-        "class": "infix-hardware:wifi",
-        "infix-hardware:wifi-radio": {
-          "country-code": "DE",
-          "band": "5GHz",
-          "channel": "auto"
-        }
       }
     ]
   },
@@ -117,119 +99,47 @@
       {
         "name": "wan",
         "type": "infix-if-type:ethernet",
+        "ietf-ip:ipv6": {},
         "ietf-ip:ipv4": {
           "infix-dhcp-client:dhcp": {
             "option": [
-              {
-                "id": "ntp-server"
-              },
-              {
-                "id": "broadcast"
-              },
-              {
-                "id": "domain"
-              },
-              {
-                "id": "hostname",
-                "value": "auto"
-              },
-              {
-                "id": "dns-server"
-              },
-              {
-                "id": "router"
-              },
-              {
-                "id": "netmask"
-              },
-              {
-                "id": "vendor-class",
-                "value": "Banana Pi BPI-R3"
-              }
-            ]
-          }
-        },
-        "ietf-ip:ipv6": {
-          "infix-dhcpv6-client:dhcp": {
-            "option": [
-              {
-                "id": "ntp-server"
-              },
-              {
-                "id": "client-fqdn"
-              },
-              {
-                "id": "domain-search"
-              },
-              {
-                "id": "dns-server"
-              }
+              {"id": "ntp-server"},
+              {"id": "broadcast"},
+              {"id": "domain"},
+              {"id": "hostname"},
+              {"id": "dns-server"},
+              {"id": "router"},
+              {"id": "netmask"}
             ]
           }
         }
       },
       {
-        "name": "wifi0-ap",
-        "type": "infix-if-type:wifi",
-        "infix-interfaces:wifi": {
-          "radio": "radio0",
-          "access-point": {
-            "ssid": "Infix",
-            "security": {
-              "secret": "wifi"
-            }
-          }
-        },
-        "infix-interfaces:bridge-port": {
-          "bridge": "br0"
-        }
+        "name": "wifi0",
+        "type": "infix-if-type:wifi"
       },
       {
-        "name": "wifi1-ap",
-        "type": "infix-if-type:wifi",
-        "infix-interfaces:wifi": {
-          "radio": "radio1",
-          "access-point": {
-            "ssid": "Infix5Ghz",
-            "security": {
-              "secret": "wifi"
-            }
-          }
-        },
-        "infix-interfaces:bridge-port": {
-          "bridge": "br0"
-        }
+        "name": "wifi1",
+        "type": "infix-if-type:wifi"
       }
     ]
   },
   "ietf-keystore:keystore": {
-    "asymmetric-keys": {
-      "asymmetric-key": [
-        {
-          "name": "genkey",
-          "public-key-format": "infix-crypto-types:ssh-public-key-format",
-          "public-key": "",
-          "private-key-format": "infix-crypto-types:rsa-private-key-format",
-          "cleartext-private-key": "",
-          "certificates": {}
+        "asymmetric-keys": {
+            "asymmetric-key": [
+                {
+                    "name": "genkey",
+                    "public-key-format": "infix-crypto-types:ssh-public-key-format",
+                    "public-key": "",
+                    "private-key-format": "infix-crypto-types:rsa-private-key-format",
+                    "cleartext-private-key": "",
+                    "certificates": {}
+                }
+            ]
         }
-      ]
-    },
-    "symmetric-keys": {
-      "symmetric-key": [
-        {
-          "name": "wifi",
-          "cleartext-symmetric-key": "aW5maXhpbmZpeA==",
-          "key-format": "infix-crypto-types:passphrase-key-format"
-        }
-      ]
-    }
   },
   "ietf-netconf-acm:nacm": {
     "enable-nacm": true,
-    "read-default": "permit",
-    "write-default": "permit",
-    "exec-default": "permit",
     "groups": {
       "group": [
         {
@@ -237,14 +147,6 @@
           "user-name": [
             "admin"
           ]
-        },
-        {
-          "name": "operator",
-          "user-name": []
-        },
-        {
-          "name": "guest",
-          "user-name": []
         }
       ]
     },
@@ -264,37 +166,6 @@
           }
         ]
       },
-      {
-        "name": "operator-acl",
-        "group": [
-          "operator"
-        ],
-        "rule": [
-          {
-            "name": "permit-system-rpcs",
-            "module-name": "ietf-system",
-            "rpc-name": "*",
-            "access-operations": "exec",
-            "action": "permit",
-            "comment": "Operators can reboot, shutdown, and set system time."
-          }
-        ]
-      },
-      {
-        "name": "guest-acl",
-        "group": [
-          "guest"
-        ],
-        "rule": [
-          {
-            "name": "deny-all-write+exec",
-            "module-name": "*",
-            "access-operations": "create update delete exec",
-            "action": "deny",
-            "comment": "Guests cannot change anything or exec rpcs."
-          }
-        ]
-      },
       {
         "name": "default-deny-all",
         "group": [
@@ -302,25 +173,11 @@
         ],
         "rule": [
           {
-            "name": "deny-password-access",
+            "name": "deny-password-read",
+            "module-name": "ietf-system",
             "path": "/ietf-system:system/authentication/user/password",
             "access-operations": "*",
-            "action": "deny",
-            "comment": "No user except admins can access password hashes."
-          },
-          {
-            "name": "deny-keystore-access",
-            "module-name": "ietf-keystore",
-            "access-operations": "*",
-            "action": "deny",
-            "comment": "No user except admins can access cryptographic keys."
-          },
-          {
-            "name": "deny-truststore-access",
-            "module-name": "ietf-truststore",
-            "access-operations": "*",
-            "action": "deny",
-            "comment": "No user except admins can access trust store."
+            "action": "deny"
           }
         ]
       }
@@ -334,11 +191,7 @@
             "name": "default-ssh",
             "ssh": {
               "tcp-server-parameters": {
-                "local-bind": [
-                  {
-                    "local-address": "::"
-                  }
-                ]
+                "local-address": "::"
               },
               "ssh-server-parameters": {
                 "server-identity": {
@@ -430,7 +283,6 @@
     "policy": [
       {
         "name": "lan-to-wan",
-        "action": "accept",
         "ingress": [
           "lan"
         ],
@@ -442,7 +294,7 @@
     ]
   },
   "infix-meta:meta": {
-    "version": "1.7"
+    "version": "1.6"
   },
   "infix-services:mdns": {
     "enabled": true
@@ -478,3 +330,4 @@
     }
   }
 }
+

board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/product/init.d/S01-trigger-udev.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+udevadm control --reload-rules
+udevadm trigger --subsystem-match=net --action=add

board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/product/interface-quirks.json

@@ -1,11 +0,0 @@
-{
-    "sfp1": {
-	"comment": "Reports it supports autoneg, but if setting it, dagger crashes",
-	"broken-autoneg": true
-    },
-    "sfp2": {
-	"comment": "Reports it supports autoneg, but if setting it, dagger crashes",
-	"broken-autoneg": true
-    }
-
-}

board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3mini/etc/factory-config.cfg

@@ -1,446 +0,0 @@
-{
-  "ieee802-dot1ab-lldp:lldp": {
-    "infix-lldp:enabled": true
-  },
-  "ietf-hardware:hardware": {
-    "component": [
-      {
-        "name": "USB",
-        "class": "infix-hardware:usb",
-        "state": {
-          "admin-state": "unlocked"
-        }
-      },
-      {
-        "class": "infix-hardware:usb",
-        "name": "USB2",
-        "state": {
-          "admin-state": "unlocked"
-        }
-      },
-      {
-        "name": "radio0",
-        "class": "infix-hardware:wifi",
-        "infix-hardware:wifi-radio": {
-          "country-code": "DE",
-          "band": "2.4GHz",
-          "channel": "auto"
-        }
-      },
-      {
-        "name": "radio1",
-        "class": "infix-hardware:wifi",
-        "infix-hardware:wifi-radio": {
-          "country-code": "DE",
-          "band": "5GHz",
-          "channel": "auto"
-        }
-      }
-    ]
-  },
-  "ietf-interfaces:interfaces": {
-    "interface": [
-      {
-        "name": "br0",
-        "type": "infix-if-type:bridge",
-        "ietf-ip:ipv4": {
-          "address": [
-            {
-              "ip": "192.168.0.1",
-              "prefix-length": 24
-            }
-          ]
-        }
-      },
-      {
-        "name": "lan",
-        "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv6": {},
-        "infix-interfaces:bridge-port": {
-          "bridge": "br0"
-        }
-      },
-      {
-        "name": "lo",
-        "type": "infix-if-type:loopback",
-        "ietf-ip:ipv4": {
-          "address": [
-            {
-              "ip": "127.0.0.1",
-              "prefix-length": 8
-            }
-          ]
-        },
-        "ietf-ip:ipv6": {
-          "address": [
-            {
-              "ip": "::1",
-              "prefix-length": 128
-            }
-          ]
-        }
-      },
-      {
-        "name": "wan",
-        "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv4": {
-          "infix-dhcp-client:dhcp": {
-            "option": [
-              {
-                "id": "ntp-server"
-              },
-              {
-                "id": "broadcast"
-              },
-              {
-                "id": "domain"
-              },
-              {
-                "id": "hostname",
-                "value": "auto"
-              },
-              {
-                "id": "dns-server"
-              },
-              {
-                "id": "router"
-              },
-              {
-                "id": "netmask"
-              },
-              {
-                "id": "vendor-class",
-                "value": "Banana Pi BPI-R3"
-              }
-            ]
-          }
-        },
-        "ietf-ip:ipv6": {
-          "infix-dhcpv6-client:dhcp": {
-            "option": [
-              {
-                "id": "ntp-server"
-              },
-              {
-                "id": "client-fqdn"
-              },
-              {
-                "id": "domain-search"
-              },
-              {
-                "id": "dns-server"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "wifi0-ap",
-        "type": "infix-if-type:wifi",
-        "infix-interfaces:wifi": {
-          "radio": "radio0",
-          "access-point": {
-            "ssid": "Infix",
-            "security": {
-              "secret": "wifi"
-            }
-          }
-        },
-        "infix-interfaces:bridge-port": {
-          "bridge": "br0"
-        }
-      },
-      {
-        "name": "wifi1-ap",
-        "type": "infix-if-type:wifi",
-        "infix-interfaces:wifi": {
-          "radio": "radio1",
-          "access-point": {
-            "ssid": "Infix5Ghz",
-            "security": {
-              "secret": "wifi"
-            }
-          }
-        },
-        "infix-interfaces:bridge-port": {
-          "bridge": "br0"
-        }
-      }
-    ]
-  },
-  "ietf-keystore:keystore": {
-    "asymmetric-keys": {
-      "asymmetric-key": [
-        {
-          "name": "genkey",
-          "public-key-format": "infix-crypto-types:ssh-public-key-format",
-          "public-key": "",
-          "private-key-format": "infix-crypto-types:rsa-private-key-format",
-          "cleartext-private-key": "",
-          "certificates": {}
-        }
-      ]
-    },
-    "symmetric-keys": {
-      "symmetric-key": [
-        {
-          "name": "wifi",
-          "cleartext-symmetric-key": "aW5maXhpbmZpeA==",
-          "key-format": "infix-crypto-types:passphrase-key-format"
-        }
-      ]
-    }
-  },
-  "ietf-netconf-acm:nacm": {
-    "enable-nacm": true,
-    "read-default": "permit",
-    "write-default": "permit",
-    "exec-default": "permit",
-    "groups": {
-      "group": [
-        {
-          "name": "admin",
-          "user-name": [
-            "admin"
-          ]
-        },
-        {
-          "name": "operator",
-          "user-name": []
-        },
-        {
-          "name": "guest",
-          "user-name": []
-        }
-      ]
-    },
-    "rule-list": [
-      {
-        "name": "admin-acl",
-        "group": [
-          "admin"
-        ],
-        "rule": [
-          {
-            "name": "permit-all",
-            "module-name": "*",
-            "access-operations": "*",
-            "action": "permit",
-            "comment": "Allow 'admin' group complete access to all operations and data."
-          }
-        ]
-      },
-      {
-        "name": "operator-acl",
-        "group": [
-          "operator"
-        ],
-        "rule": [
-          {
-            "name": "permit-system-rpcs",
-            "module-name": "ietf-system",
-            "rpc-name": "*",
-            "access-operations": "exec",
-            "action": "permit",
-            "comment": "Operators can reboot, shutdown, and set system time."
-          }
-        ]
-      },
-      {
-        "name": "guest-acl",
-        "group": [
-          "guest"
-        ],
-        "rule": [
-          {
-            "name": "deny-all-write+exec",
-            "module-name": "*",
-            "access-operations": "create update delete exec",
-            "action": "deny",
-            "comment": "Guests cannot change anything or exec rpcs."
-          }
-        ]
-      },
-      {
-        "name": "default-deny-all",
-        "group": [
-          "*"
-        ],
-        "rule": [
-          {
-            "name": "deny-password-access",
-            "path": "/ietf-system:system/authentication/user/password",
-            "access-operations": "*",
-            "action": "deny",
-            "comment": "No user except admins can access password hashes."
-          },
-          {
-            "name": "deny-keystore-access",
-            "module-name": "ietf-keystore",
-            "access-operations": "*",
-            "action": "deny",
-            "comment": "No user except admins can access cryptographic keys."
-          },
-          {
-            "name": "deny-truststore-access",
-            "module-name": "ietf-truststore",
-            "access-operations": "*",
-            "action": "deny",
-            "comment": "No user except admins can access trust store."
-          }
-        ]
-      }
-    ]
-  },
-  "ietf-netconf-server:netconf-server": {
-    "listen": {
-      "endpoints": {
-        "endpoint": [
-          {
-            "name": "default-ssh",
-            "ssh": {
-              "tcp-server-parameters": {
-                "local-bind": [
-                  {
-                    "local-address": "::"
-                  }
-                ]
-              },
-              "ssh-server-parameters": {
-                "server-identity": {
-                  "host-key": [
-                    {
-                      "name": "default-key",
-                      "public-key": {
-                        "central-keystore-reference": "genkey"
-                      }
-                    }
-                  ]
-                }
-              }
-            }
-          }
-        ]
-      }
-    }
-  },
-  "ietf-system:system": {
-    "hostname": "bpi-%m",
-    "ntp": {
-      "server": [
-        {
-          "name": "default",
-          "udp": {
-            "address": "pool.ntp.org"
-          }
-        }
-      ]
-    },
-    "authentication": {
-      "user": [
-        {
-          "name": "admin",
-          "password": "$factory$",
-          "infix-system:shell": "bash"
-        }
-      ]
-    },
-    "infix-system:motd-banner": "Li0tLS0tLS0uCnwgIC4gLiAgfCBJbmZpeCBPUyDigJQgSW1tdXRhYmxlLkZyaWVuZGx5LlNlY3VyZQp8LS4gdiAuLXwgaHR0cHM6Ly9rZXJuZWxraXQub3JnCictJy0tLSctJwo="
-  },
-  "infix-dhcp-server:dhcp-server": {
-    "option": [
-      {
-        "id": "ntp-server",
-        "address": "auto"
-      },
-      {
-        "id": "dns-server",
-        "address": "auto"
-      },
-      {
-        "id": "router",
-        "address": "auto"
-      }
-    ],
-    "subnet": [
-      {
-        "subnet": "192.168.0.0/24",
-        "pool": {
-          "start-address": "192.168.0.100",
-          "end-address": "192.168.0.250"
-        }
-      }
-    ]
-  },
-  "infix-firewall:firewall": {
-    "default": "wan",
-    "zone": [
-      {
-        "name": "lan",
-        "action": "accept",
-        "interface": [
-          "br0"
-        ]
-      },
-      {
-        "name": "wan",
-        "action": "drop",
-        "interface": [
-          "wan"
-        ],
-        "service": [
-          "dhcpv6-client"
-        ]
-      }
-    ],
-    "policy": [
-      {
-        "name": "lan-to-wan",
-        "action": "accept",
-        "ingress": [
-          "lan"
-        ],
-        "egress": [
-          "wan"
-        ],
-        "masquerade": true
-      }
-    ]
-  },
-  "infix-meta:meta": {
-    "version": "1.7"
-  },
-  "infix-services:mdns": {
-    "enabled": true
-  },
-  "infix-services:ssh": {
-    "enabled": true,
-    "hostkey": [
-      "genkey"
-    ],
-    "listen": [
-      {
-        "name": "ipv4",
-        "address": "0.0.0.0",
-        "port": 22
-      },
-      {
-        "name": "ipv6",
-        "address": "::",
-        "port": 22
-      }
-    ]
-  },
-  "infix-services:web": {
-    "enabled": true,
-    "console": {
-      "enabled": true
-    },
-    "netbrowse": {
-      "enabled": true
-    },
-    "restconf": {
-      "enabled": true
-    }
-  }
-}

board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3mini/etc/udev/rules.d/90-bpi-r3-mini-rename-ethernet.rules

@@ -1,2 +0,0 @@
-ACTION=="add", SUBSYSTEM=="net", DEVPATH=="/devices/platform/soc/15100000.ethernet/net/eth0", NAME="lan"
-ACTION=="add", SUBSYSTEM=="net", DEVPATH=="/devices/platform/soc/15100000.ethernet/net/eth1", NAME="wan"

board/aarch64/bananapi-bpi-r3/uboot/emmc-extras.config

@@ -1,3 +0,0 @@
-CONFIG_DEVICE_TREE_INCLUDES="infix-env.dtsi infix-key.dtsi mt7986-emmc-env.dtsi"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BOOT_DEVICE=emmc DRAM_USE_DDR4=1 USE_MKIMAGE=1  MKIMAGE=$(HOST_DIR)/bin/mkimage"
-CONFIG_SUPPORT_EMMC_BOOT=y

board/aarch64/bananapi-bpi-r3/uboot/extras.config

@@ -3,43 +3,10 @@ CONFIG_BOOTDELAY=2
 # CONFIG_MMC_PCI is not set
 CONFIG_ENV_IS_NOWHERE=y
 # CONFIG_ENV_IS_IN_MMC is not set
-CONFIG_MULTI_DTB_FIT=y
-CONFIG_OF_LIST="mt7986a-bpi-r3-sd mt7986a-bpi-r3-emmc mt7986a-bpi-r3-mini"
-
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_MTK=y
 CONFIG_USB_MTU3=y
+CONFIG_CMD_USB=y
 CONFIG_PHY=y
 CONFIG_PHY_MTK_TPHY=y
-
-CONFIG_MTK_SPIM=y
-CONFIG_SPI=y
-CONFIG_DM_SPI=y
-CONFIG_SPI_FLASH=y
-CONFIG_DM_SPI_FLASH=y
-CONFIG_SPI_FLASH_MTD=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_MTD=y
-CONFIG_DM_MTD=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_SPI_NAND=y
-CONFIG_MTK_SPIM=y
-CONFIG_MTK_SNOR=y
-
-CONFIG_DM_MDIO=y
-CONFIG_DM_ETH_PHY=y
-CONFIG_PHY_ETHERNET_ID=y
-
-CONFIG_PHY_AIROHA=y
-CONFIG_PHY_AIROHA_EN8811H=y
-CONFIG_PHY_AIROHA_FW_IN_MMC=y
-
-CONFIG_CMD_SF=y
-CONFIG_CMD_USB=y
-CONFIG_CMD_MTD=y
-CONFIG_CMD_MDIO=y
-CONFIG_CMD_MTDPARTS=y
-CONFIG_CMD_DM=y

board/aarch64/bananapi-bpi-r3/uboot/mt7986-emmc-env.dtsi

@@ -1,5 +0,0 @@
-#include <mt7986-env.dtsi>
-
-&env {
-      fdtfile = "mediatek/mt7986a-bananapi-bpi-r3-emmc.dtb";
-};

board/aarch64/bananapi-bpi-r3/uboot/mt7986-env.dtsi

@@ -15,10 +15,6 @@
                        scriptaddr = "0x48000000";
                        ramdisk_addr_r = "0x4A000000";
 
-		en8811h_fw_part = "0#en8811h_fw";
-		en8811h_fw_dm_dir = "EthMD32.dm.bin";
-		en8811h_fw_dsp_dir = "EthMD32.DSP.bin";
-
                        /* This is a development platform, keep
                         * developer mode statically enabled.
                         */

board/aarch64/bananapi-bpi-r4/Config.in

@@ -1,11 +0,0 @@
-config BR2_PACKAGE_BANANAPI_BPI_R4
-	bool "Banana Pi R4"
-	depends on BR2_aarch64
-	select BR2_PACKAGE_FEATURE_WIFI
-	select BR2_PACKAGE_LINUX_FIRMWARE
-	select BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK
-	select BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7988
-	select BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7996
-	select SDCARD_AUX
-	help
-	  Build Banana PI R4 support

board/aarch64/bananapi-bpi-r4/LICENSE

@@ -1,13 +0,0 @@
-Copyright (c) 2026 The KernelKit Authors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

board/aarch64/bananapi-bpi-r4/README.md

@@ -1,360 +0,0 @@
-# Banana Pi BPI-R4 / BPI-R4-2g5 / BPI-R4P
-
-<img src="banana_pi_bpi-r4_poe.jpg" alt="The board" width=800 padding=10>
-
-## Overview
-
-The Banana Pi BPI-R4 is a high-performance networking board built around the
-MediaTek MT7988A SoC (Filogic 880).  It is a successor to the BPI-R3 and
-represents a significant step up: the CPU switches from in-order Cortex-A53
-cores to out-of-order Cortex-A73 cores, and the MT7531 switch is now part of
-the SOC. The base model comes with two SFP+ cages supporting 1.25/2.5/5/10
-Gbps, and the R4P model comes with one SFP+ cage and one 2.5 Gbps RJ45 jack,
-which with an optional PoE board means the board can act as PD.  Unlike the
-BPi-R3, however, there is no on-board WiFi support, that requires an external
-tri-band WiFi 7 (IEEE 802.11be) card.
-
-### Variants
-
-| **Feature**      | **BPI-R4**       | **BPI-R4-2g5**    | **BPI-R4P**               |
-|------------------|------------------|-------------------|---------------------------|
-| 1G switch ports  | wan, lan1–lan3   | lan0–lan3         | lan0–lan3                 |
-| 2.5G RJ45 (WAN)  | —                | wan               | wan (PoE input)           |
-| SFP+ port(s)     | sfp1, sfp2 (10G) | sfp1 (10G)        | sfp1 (10G)                |
-| Linux DT         | bpi-r4           | bpi-r4-2g5        | bpi-r4-2g5 (same)         |
-
-On the standard BPI-R4 the four 1G switch ports are labeled `wan`, `lan1`, `lan2`,
-and `lan3`.  On the R4-2g5 and R4P, the port that would otherwise be `wan` on the
-switch is relabeled `lan0` via a device tree overlay, since the actual WAN port on
-those variants is the dedicated 2.5G internal PHY on the separate RJ45 jack.
-
-The BPI-R4P is mechanically and electrically identical to the BPI-R4-2g5
-with an additional PoE daughterboard header.  From a Linux kernel and
-Infix perspective the two boards are treated identically.
-
-### SoC: MediaTek MT7988A vs MT7986 (BPI-R3)
-
-The MT7988A (Filogic 880) and MT7986 (Filogic 820) may look similar from
-their part numbers, but they are built on entirely different silicon with
-distinct system architectures:
-
-| **Aspect**       | **MT7988A (BPI-R4)**     | **MT7986 (BPI-R3)**       |
-|------------------|--------------------------|---------------------------|
-| CPU cores        | 4x Cortex-A73 @ 1.8 GHz  | 4x Cortex-A53 @ 2.0 GHz   |
-| CPU architecture | ARMv8-A, out-of-order    | ARMv8-A, in-order         |
-| Internal switch  | 1 Gbps per port          | 1 Gbps per port           |
-| Uplinks          | USXGMII (native 10 Gbps) | USXGMII (native 2.5 Gbps) |
-| WiFi             | MT7996E PCIe module      | MT7915E (built-in)        |
-| WiFi standard    | WiFi 7 (802.11be)        | WiFi 6 (802.11ax)         |
-| WiFi bands       | 2.4 / 5 / 6 GHz          | 2.4 / 5 GHz               |
-| Hardware crypto  | EIP-197 NPU              | EIP-93                    |
-| PCIe slots       | 4 (2x mPCIe, 2x M.2)     | 1 mPCIe                   |
-| Boot ROM offset  | Sector 1024 (0x80000)    | Sector 1024 (0x80000)     |
-
-### Hardware Features
-
-- **SoC:** MediaTek MT7988A (Filogic 880)
-- **CPU:** Quad-core ARM Cortex-A73, up to 1.8 GHz
-- **RAM:** 4 GB DDR4
-- **Storage:** 8 GB eMMC, microSD card slot, SPI NAND flash
-- **Ethernet switch:** 4-port 1 GbE (10/100/1000) internal DSA switch
-- **SFP+ ports:** 2x 10 Gbps USXGMII (standard R4) or 1x SFP+ (R4-2g5/R4P)
-- **WiFi:** optional MediaTek MT7996E PCIe module — tri-band WiFi 7 (2.4/5/6 GHz)
-- **USB:** 1x USB 3.0 (xHCI)
-- **PCIe:** 2x mPCIe (SIM2/SIM3), 1x M.2 Key-B (SIM1), 1x M.2 Key-M (SSD)
-- **RTC:** PCF8563 on I2C
-- **Fan:** PWM-controlled cooling with thermal management
-- **Console:** UART at 115200 8N1 (3.3 V, USB-to-serial adapter required)
-
-### Default Network Configuration
-
-Infix ships with the following factory defaults.
-
-**Standard BPI-R4:**
-
-- **LAN bridge** (`br0`, 192.168.0.1/24): `lan1`, `lan2`, `lan3` (1G switch ports)
-- **WAN port** (`wan`): DHCP client, used for internet uplink (1G switch port)
-- **SFP+ ports** (`sfp1`, `sfp2`): Present but unconfigured
-
-**BPI-R4-2g5 and BPI-R4P:**
-
-- **LAN bridge** (`br0`, 192.168.0.1/24): `lan0`, `lan1`, `lan2`, `lan3` (1G switch ports)
-- **WAN port** (`wan`): DHCP client, used for internet uplink (2.5G internal PHY)
-- **SFP+ port** (`sfp1`): Present but unconfigured
-
-> [!NOTE]
-> If an optional WiFi 7 (MT7996E) PCIe card is installed, the radio interfaces
-> are bridged into the LAN as access points.  WiFi is not included with the board
-> and is not part of the factory default configuration.
-
-
-## Getting Started
-
-<img align="right" src="console-header.png" alt="Console header pins" width=200 padding=10>
-
-### Quick Start with SD Card
-
-1. **Download the SD card image:** [infix-bpi-r4-sdcard.img][2]
-2. **Flash the image to an SD card:** see [this guide][0]
-3. **Set boot switches to SD card mode** (see Boot Switch Reference below)
-4. **Insert the SD card, connect power and a serial console (115200 8N1)**
-5. Default login: `admin` / `admin`
-
-### Boot Switch Reference
-
-<img align="right" src="bootstrap-sw3.png" alt="DIP switches" width=140 padding=10>
-
-The BPI-R4 has a 2-position DIP switch (SW3) that selects the boot media.
-Switch positions are printed on the board near the SD card slot.
-
-| A   | B   | Boot media (SW3) |
-|-----|-----|------------------|
-| OFF | ON  | SPI NAND         |
-| ON  | OFF | eMMC             |
-| ON  | ON  | SD card          |
-
-> [!NOTE]
-> "OFF" = switch in the UP position = logical 0.
-
-## Installing to eMMC
-
-For production use or better reliability, install Infix to the internal
-eMMC storage.
-
-> [!IMPORTANT]
-> The MT7988A has a single MMC controller that can only operate in one mode
-> (SD or eMMC) per boot session.  The SD card U-Boot cannot switch to eMMC
-> mode mid-session, so an intermediate NAND bootloader step is required to
-> write the eMMC — the same approach as BPi-R3.
->
-> The MT7988A boot chain is: **BROM → BL2 → FIP (BL31 + U-Boot)**.  The FIP
-> (Firmware Image Package) bundles ARM Trusted Firmware (BL31) and U-Boot
-> together; it is not just a U-Boot binary.  When BL2 runs, it loads the FIP
-> from a fixed offset and hands off to BL31, which then jumps into U-Boot.
->
-> The factory SPI NAND contains a minimal recovery U-Boot that only supports
-> TFTP — it has no USB command.  You cannot use it to load files from a USB
-> drive.  Similarly, the factory eMMC ships with a basic OpenWRT image.
-> You must first flash a full-featured U-Boot (from Frank-W) to SPI NAND via
-> the SD card U-Boot before you can write the eMMC.
->
-> This process involves three boot mode changes and multiple flash operations.
-> Take your time and verify each step carefully.
-
-### Prerequisites
-
-- USB-to-serial adapter (3.3 V) for console access
-- USB flash drive (FAT32 formatted)
-- microSD card with Infix SD image, for initial boot
-- Downloaded files (see below)
-
-### Required Files
-
-Place these files on a FAT32-formatted USB drive:
-
-1. **Infix eMMC image:** [infix-bpi-r4-emmc.img][3]
-2. **eMMC bootloader** (from): [bpi-r4-emmc-boot-2026.01-latest.tar.gz][4]
-   - Extract `bl2.img` from the tarball to your USB drive
-3. **Intermediate NAND bootloader** from Frank-W's U-Boot (for BPI-R4, SPI NAND):
-   - [bpi-r4_spim-nand_bl2.img][13] — BL2 first-stage loader
-   - [bpi-r4_spim-nand_fip.bin][14] — FIP image (BL31 + U-Boot)
-
-### Step 1: Boot from SD card
-
-1. Set boot switches to **SD card mode** (SW3: A=ON, B=ON)
-2. Insert the SD card with the Infix image
-3. Power on and break into U-Boot (press Ctrl-C during countdown)
-
-### Step 2: Flash intermediate NAND bootloader
-
-This installs a full-featured U-Boot to SPI NAND so the board can load files
-from USB in the next step.  From the SD card U-Boot prompt:
-
-```
-usb start
-mtd erase spi-nand0
-fatload usb 0:1 0x50000000 bpi-r4_spim-nand_bl2.img
-mtd write spi-nand0 0x50000000 0x0 0x100000
-fatload usb 0:1 0x50000000 bpi-r4_spim-nand_fip.bin
-mtd write spi-nand0 0x50000000 0x580000 0x200000
-```
-
-### Step 3: Boot from NAND
-
-1. Power off the board
-2. Set boot switches to **SPI NAND mode** (SW3: A=OFF, B=ON)
-3. Power on — you should boot into U-Boot again
-
-### Step 4: Write Infix image to eMMC
-
-From the U-Boot prompt:
-
-```
-usb start
-fatload usb 0:1 0x50000000 infix-bpi-r4-emmc.img
-setexpr blocks ${filesize} / 0x200
-mmc write 0x50000000 0x0 ${blocks}
-```
-
-### Step 5: Configure eMMC boot partition
-
-Write the BL2 bootloader to the eMMC boot partition:
-
-```
-mmc partconf 0 1 1 1
-mmc erase 0x0 0x400
-fatload usb 0:1 0x50000000 bl2.img
-mmc write 0x50000000 0x0 0x400
-mmc partconf 0 1 1 0
-```
-
-### Step 6: Boot from eMMC
-
-1. Power off the board
-2. Set boot switches to **eMMC mode** (SW3: A=ON, B=OFF)
-3. Remove the SD card (optional, recommended to verify eMMC boot)
-4. Power on
-
-Your BPI-R4 should now boot Infix from internal eMMC storage.
-
-## Troubleshooting
-
-### Board won't boot
-
-- Verify boot switch positions — double-check against the wiki
-- Ensure the power supply provides adequate current (12 V / 3 A recommended)
-- Check the serial console output at 115200 8N1
-
-### Can't break into U-Boot
-
-- Connect the serial console before powering on
-- Press Ctrl-C immediately when boot messages appear
-- Try power cycling and pressing Ctrl-C repeatedly during the countdown
-
-### eMMC boot fails after installation
-
-- Boot from NAND (SW3=ON) and verify the eMMC write completed without errors
-- Re-run the `mmc partconf` sequence — a missed step is the most common
-  cause of failure
-- Use `mmc info` to confirm the eMMC is detected
-
-### No network connectivity
-
-The interface names on BPI-R4 differ from BPI-R3.  Confirm what Linux
-has created with `ip link` and compare with the factory configuration:
-
-- `wan`, `lan1`–`lan3`: 1G switch ports (standard R4)
-- `wan`, `lan0`–`lan3`: on R4-2g5/R4P, `wan` is the 2.5G internal PHY; `lan0`–`lan3` are 1G switch ports
-- `sfp1` (and `sfp2` on standard R4): 10G SFP+ cage(s)
-
-If interface renames look wrong, check `dmesg | grep renamed` and if
-you spot any errors, please report as an issue to the Infix tracker
-on GitHub.
-
-## Board Variants
-
-### BPI-R4
-
-The base model BPi-R4 ports look like this, the `wan` port is the same physical
-switch port as `lan0` on the R4-2g5/R4P, but here it serves as the WAN port in
-the factory default configuration.
-
-```
-.-.
-| |                      .-----.-----.-----.-----.
-| |   _______   _______  |     |     |     |     | .---.
-| |  |       | |       | |     |     |     |     | |   | .-----.
-'-'  '-------' '-------' '-----'-----'-----'-----' '---' '-----'
-USB1    sfp1      sfp2     wan  lan1  lan2  lan3   DC12V  PD20V
-```
-
-### BPI-R4-2g5 and BPI-R4P
-
-These variants substitute one SFP+ cage for an internal 2.5 Gbps PHY
-connected to a standard RJ45 jack.  From a kernel perspective they use
-the `mt7988a-bananapi-bpi-r4-2g5` device tree.
-
-The BPI-R4P additionally supports an optional PoE input daughterboard on
-the 2.5 Gbps RJ45 port.  The PoE circuitry is passive with respect to
-Linux — no special kernel driver is required for basic operation.
-
-For these board variants, the WAN role moves to the dedicated 2.5G internal PHY,
-so all four switch ports become LAN ports (`lan0`–`lan3`) instead of three:
-
-```
-.-.
-| |            .-----.   .-----.-----.-----.-----.
-| |   _______  |     |   |     |     |     |     | .---.
-| |  |       | |     |   |     |     |     |     | |   | .-----.
-'-'  '-------' '-----'   '-----'-----'-----'-----' '---' '-----'
-USB1    sfp1     wan      lan0  lan1  lan2  lan3   DC12V  PD20V
-```
-
-### Selecting the Board Variant
-
-U-Boot cannot automatically distinguish the standard R4 from the R4-2g5/R4P at
-boot time (the on-board EEPROM is not programmed from factory).  Instead, the
-variant is read from the persistent U-Boot environment on the `aux` partition,
-and you have to set it manually using `fw_setenv` from a UNIX shell:
-
-```bash
-# For BPI-R4-2g5 or BPI-R4P (1x SFP+ + 1x 2.5 Gbps RJ45):
-sudo fw_setenv BOARD_VARIANT 2g5
-
-# To revert to the standard BPI-R4 (2x SFP+) clear the setting:
-sudo fw_setenv BOARD_VARIANT
-```
-
-> [!IMPORTANT]
-> The change takes effect on the next reboot.  No re-flashing is required, but
-> you may want to do a factory reset to activate the changes in your system
-> `startup-config`: `sudo factory -y` from shell, or the CLI.
-
-`fw_setenv` writes to the `uboot.env` file on the aux partition.  U-Boot
-reads this at every boot (before loading the kernel) and selects the
-matching device tree:
-
-| `BOARD_VARIANT` | Device tree loaded                |
-|-----------------|-----------------------------------|
-| *(unset)*       | `mt7988a-bananapi-bpi-r4.dtb`     |
-| `2g5`           | `mt7988a-bananapi-bpi-r4-2g5.dtb` |
-
-## Additional Resources
-
-- [Infix Documentation][1]
-- [Official BPI-R4 Page][7]
-- [BPI-R4 Forum][8]
-- [Frank-W's site][9]
-- [Release Downloads][10]
-- [Bootloader Builds][11]
-
-## Building Custom Images
-
-```bash
-# Build bootloaders for SD and eMMC
-make x-bpi-r4-sd-boot
-make x-bpi-r4-emmc-boot
-
-# Build main system
-make aarch64
-
-# Create SD card image
-./utils/mkimage.sh -od bananapi-bpi-r4
-
-# Create eMMC image
-./utils/mkimage.sh -odt emmc bananapi-bpi-r4
-```
-
-[0]: https://www.kernelkit.org/posts/flashing-sdcard/
-[1]: https://www.kernelkit.org/infix/latest/
-[2]: https://github.com/kernelkit/infix/releases/download/latest-boot/infix-bpi-r4-sdcard.img
-[3]: https://github.com/kernelkit/infix/releases/download/latest-boot/infix-bpi-r4-emmc.img
-[4]: https://github.com/kernelkit/infix/releases/download/latest-boot/bpi-r4-emmc-boot-2026.01-latest.tar.gz
-[7]: https://docs.banana-pi.org/en/BPI-R4/BananaPi_BPI-R4
-[8]: https://forum.banana-pi.org/
-[9]: https://wiki.fw-web.de/doku.php?id=en:bpi-r4:start
-[10]: https://github.com/kernelkit/infix/releases/tag/latest
-[11]: https://github.com/kernelkit/infix/releases/tag/latest-boot
-[12]: https://github.com/frank-w/u-boot/releases
-[13]: https://github.com/frank-w/u-boot/releases/download/CI-BUILD-2026-01-bpi-2026.01-2026-01-15_2013/bpi-r4_spim-nand_bl2.img
-[14]: https://github.com/frank-w/u-boot/releases/download/CI-BUILD-2026-01-bpi-2026.01-2026-01-15_2013/bpi-r4_spim-nand_fip.bin

board/aarch64/bananapi-bpi-r4/bananapi-bpi-r4.hash

@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  d48246c717b505cc11df95171f2fd548b389e1a463f1af4c68d0b69fe0d1009b  LICENSE

board/aarch64/bananapi-bpi-r4/bananapi-bpi-r4.mk

@@ -1,49 +0,0 @@
-define BANANAPI_BPI_R4_LINUX_CONFIG_FIXUPS
-	$(call KCONFIG_ENABLE_OPT,CONFIG_ARCH_MEDIATEK)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MACH_MT7988)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_PINCTRL_MT7988)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_SERIAL_8250_MT6577)
-	$(call KCONFIG_SET_OPT,CONFIG_I2C_GPIO,y)
-	$(call KCONFIG_SET_OPT,CONFIG_MTK_THERMAL,m)
-	$(call KCONFIG_SET_OPT,CONFIG_MTK_LVTS_THERMAL,m)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MTK_UART)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MEDIATEK_WATCHDOG)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MEDIATEK_GE_PHY)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MEDIATEK_GE_SOC_PHY)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_NET_VENDOR_MEDIATEK)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_NET_MEDIATEK_SOC)
-	$(call KCONFIG_SET_OPT,CONFIG_NET_DSA_MT7530,m)
-	$(call KCONFIG_SET_OPT,CONFIG_MT7996E,m)
-	$(call KCONFIG_SET_OPT,CONFIG_PCIE_MEDIATEK_GEN3,m)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MTK_SCPSYS)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MMC_MTK)
-	$(call KCONFIG_SET_OPT,CONFIG_I2C_MT65XX,m)
-	$(call KCONFIG_SET_OPT,CONFIG_USB_XHCI_MTK,m)
-	$(call KCONFIG_SET_OPT,CONFIG_PHY_MTK_TPHY,m)
-	$(call KCONFIG_SET_OPT,CONFIG_PHY_MTK_XSPHY,m)
-	$(call KCONFIG_SET_OPT,CONFIG_PHY_MTK_XFI_TPHY,m)
-	$(call KCONFIG_SET_OPT,CONFIG_PCS_STANDALONE,y)
-	$(call KCONFIG_SET_OPT,CONFIG_PCS_MTK_USXGMII,y)
-	$(call KCONFIG_SET_OPT,CONFIG_PWM_MEDIATEK,m)
-	$(call KCONFIG_SET_OPT,CONFIG_SENSORS_PWM_FAN,m)
-	$(call KCONFIG_SET_OPT,CONFIG_NVMEM_MTK_EFUSE,m)
-	$(call KCONFIG_SET_OPT,CONFIG_MEDIATEK_2P5GE_PHY,m)
-	$(call KCONFIG_SET_OPT,CONFIG_CRYPTO_DEV_SAFEXCEL,m)
-endef
-
-LINUX_DTS_MT7988 = $(LINUX_DIR)/arch/arm64/boot/dts/mediatek
-
-define BANANAPI_BPI_R4_KERNEL_DTBS_INSTALL_TARGET
-	@$(call MESSAGE,"Installing kernel DTBs and DTBOs for BPI-R4")
-	$(foreach f, \
-		mt7988a-bananapi-bpi-r4.dtb \
-		mt7988a-bananapi-bpi-r4-2g5.dtb \
-		mt7988a-bananapi-bpi-r4-sd.dtbo \
-		mt7988a-bananapi-bpi-r4-emmc.dtbo, \
-		$(INSTALL) -D $(LINUX_DTS_MT7988)/$(f) \
-			$(TARGET_DIR)/boot/mediatek/$(f)$(sep))
-endef
-BANANAPI_BPI_R4_POST_INSTALL_TARGET_HOOKS += BANANAPI_BPI_R4_KERNEL_DTBS_INSTALL_TARGET
-
-$(eval $(ix-board))
-$(eval $(generic-package))

board/aarch64/bananapi-bpi-r4/dts/Makefile

@@ -1,2 +0,0 @@
-dtb-y += infix/bananapi,bpi-r4.dtbo
-dtb-y += infix/bananapi,bpi-r4-2g5.dtbo

board/aarch64/bananapi-bpi-r4/dts/infix/bananapi,bpi-r4-2g5.dtso

@@ -1,32 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/dts-v1/;
-/plugin/;
-
-/ {
-	compatible = "bananapi,bpi-r4-2g5";
-};
-
-/*
- * On the 2g5 variant, GMAC1 uses the internal 2.5G PHY (eth1 renamed to
- * "wan" by udev).  The switch's port0, which is labeled "wan" in the base
- * DTS, would cause a name collision when the switch driver registers it.
- * Rename it to "lan0" here so the kernel names it correctly from the start.
- */
-&gsw_port0 {
-	label = "lan0";
-};
-
-/*
- * The upstream mt7988a.dtsi sets compatible = "ethernet-phy-ieee802.3-c45"
- * on the internal 2.5G PHY node.  That gives genphy_c45 (built-in) OF-match
- * priority over the PHY-ID-based mtk-2p5ge driver, leaving the PHY powered
- * down and unclaimed.  Replace it with the standard ethernet-phy-idXXXX.XXXX
- * form so of_get_phy_id() registers the PHY as C22 with explicit ID 0x00339c11.
- * mtk-2p5ge then matches via PHY_ID_MATCH_VENDOR(0x00339c00) instead of
- * genphy_c45 winning via OF-match.
- * Note: /delete-property/ is not used because U-Boot fdt apply does not
- * implement property deletion in overlays.
- */
-&int_2p5g_phy {
-	compatible = "ethernet-phy-id0033.9c11";
-};

board/aarch64/bananapi-bpi-r4/dts/infix/bananapi,bpi-r4.dtso

@@ -1,28 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/dts-v1/;
-/plugin/;
-
-/ {
-	compatible = "bananapi,bpi-r4", "mediatek,mt7988a";
-};
-
-/*
- * The upstream mt7988a-bananapi-bpi-r4.dtsi sets stdout-path = "serial0:..."
- * but the aliases node there only has ethernet entries.  Linux resolves
- * stdout-path by looking in /aliases, so we must add serial0 here.
- * Path references in overlay aliases cannot use &label, so use the full path.
- */
-&{/} {
-	aliases {
-		serial0 = "/soc/serial@11000000";
-	};
-
-	chosen {
-		infix {
-			/* Default admin user password: 'admin' */
-			factory-password-hash = "$5$mI/zpOAqZYKLC2WU$i7iPzZiIjOjrBF3NyftS9CCq8dfYwHwrmUK097Jca9A";
-			usb-ports = <&ssusb1>;
-			usb-port-names = "USB";
-		};
-	};
-};

board/aarch64/bananapi-bpi-r4/genimage.cfg.in

@@ -1,81 +0,0 @@
-image cfg.ext4 {
-        empty = true
-        temporary = true
-        size = 128M
-        ext4 {
-                label = "cfg"
-                use-mke2fs = true
-                features = "uninit_bg"
-                extraargs = "-m 0 -i 4096"
-        }
-}
-
-# The /var partition will be expanded automatically at first boot
-# to use the full size of the SD-card or eMMC media.
-image var.ext4 {
-        empty = true
-        temporary = true
-        size = 128M
-        ext4 {
-                label = "var"
-                use-mke2fs = true
-                features = "uninit_bg"
-                extraargs = "-m 0 -i 4096"
-        }
-}
-
-image #INFIX_ID##VERSION#-bpi-r4-#TARGET#.img {
-        hdimage {
-                partition-table-type = "gpt"
-                gpt-no-backup = true
-        }
-        # BL2 bootloader partition (MediaTek official location)
-	partition bl2 {
-		  image = "bl2.img"
-		  offset = 1024s   # 0x80000 = sector 1024
-		  size = 4M        # 0x400000
-		  bootable = true
-	}
-
-	# Factory/calibration data (sectors 9216-13311)
-	partition factory {
-		offset = 4608K  # 0x480000
-		size = 2M       # 0x200000
-	}
-
-	# FIP partition - BL31 + U-Boot (sectors 13312-17407)
-        partition fip {
-                image = "fip.bin"
-                offset = 13312s
-                size = 4096s
-        }
-
-        partition aux {
-                partition-uuid = D4EF35A0-0652-45A1-B3DE-D63339C82035
-                image = "aux.ext4"
-        }
-
-        partition primary {
-                partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4
-                bootable = true
-                size = 250M
-                image = "rootfs.squashfs"
-        }
-
-        partition secondary {
-                partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4
-                bootable = true
-                size = 250M
-                image = "rootfs.squashfs"
-        }
-
-        partition cfg {
-                partition-uuid = 7aa497f0-73b5-47e5-b2ab-8752d8a48105
-                image = "cfg.ext4"
-        }
-
-        partition var {
-                partition-uuid = 8046A06A-E45A-4A14-A6AD-6684704A393F
-                image = "var.ext4"
-        }
-}

board/aarch64/bananapi-bpi-r4/rootfs/boot/syslinux/bananapi,bpi-r4-2g5-emmc-syslinux.conf

@@ -1,5 +0,0 @@
-label Infix (aarch64)
-	kernel /boot/Image
-	fdtdir /boot
-	fdtoverlays /boot/mediatek/mt7988a-bananapi-bpi-r4-emmc.dtbo /boot/infix/bananapi,bpi-r4.dtbo /boot/infix/bananapi,bpi-r4-2g5.dtbo
-	append ${bootargs_root} ${bootargs_log} usbcore.authorized_default=2 -- ${bootargs_user}

board/aarch64/bananapi-bpi-r4/rootfs/boot/syslinux/bananapi,bpi-r4-2g5-sdmmc-syslinux.conf

@@ -1,5 +0,0 @@
-label Infix (aarch64)
-	kernel /boot/Image
-	fdtdir /boot
-	fdtoverlays /boot/mediatek/mt7988a-bananapi-bpi-r4-sd.dtbo /boot/infix/bananapi,bpi-r4.dtbo /boot/infix/bananapi,bpi-r4-2g5.dtbo
-	append ${bootargs_root} ${bootargs_log} usbcore.authorized_default=2 -- ${bootargs_user}

board/aarch64/bananapi-bpi-r4/rootfs/boot/syslinux/bananapi,bpi-r4-emmc-syslinux.conf

@@ -1,5 +0,0 @@
-label Infix (aarch64)
-	kernel /boot/Image
-	fdtdir /boot
-	fdtoverlays /boot/mediatek/mt7988a-bananapi-bpi-r4-emmc.dtbo /boot/infix/bananapi,bpi-r4.dtbo
-	append ${bootargs_root} ${bootargs_log} usbcore.authorized_default=2 -- ${bootargs_user}

board/aarch64/bananapi-bpi-r4/rootfs/boot/syslinux/bananapi,bpi-r4-sdmmc-syslinux.conf

@@ -1,5 +0,0 @@
-label Infix (aarch64)
-	kernel /boot/Image
-	fdtdir /boot
-	fdtoverlays /boot/mediatek/mt7988a-bananapi-bpi-r4-sd.dtbo /boot/infix/bananapi,bpi-r4.dtbo
-	append ${bootargs_root} ${bootargs_log} usbcore.authorized_default=2 -- ${bootargs_user}

board/aarch64/bananapi-bpi-r4/rootfs/usr/share/product/bananapi,bpi-r4-2g5/etc/factory-config.cfg

@@ -1,404 +0,0 @@
-{
-  "ieee802-dot1ab-lldp:lldp": {
-    "infix-lldp:enabled": true
-  },
-  "ietf-hardware:hardware": {
-    "component": [
-      {
-        "name": "USB",
-        "class": "infix-hardware:usb",
-        "state": {
-          "admin-state": "unlocked"
-        }
-      }
-    ]
-  },
-  "ietf-interfaces:interfaces": {
-    "interface": [
-      {
-        "name": "br0",
-        "type": "infix-if-type:bridge",
-        "ietf-ip:ipv4": {
-          "address": [
-            {
-              "ip": "192.168.0.1",
-              "prefix-length": 24
-            }
-          ]
-        }
-      },
-      {
-        "name": "lan0",
-        "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv6": {},
-        "infix-interfaces:bridge-port": {
-          "bridge": "br0"
-        }
-      },
-      {
-        "name": "lan1",
-        "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv6": {},
-        "infix-interfaces:bridge-port": {
-          "bridge": "br0"
-        }
-      },
-      {
-        "name": "lan2",
-        "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv6": {},
-        "infix-interfaces:bridge-port": {
-          "bridge": "br0"
-        }
-      },
-      {
-        "name": "lan3",
-        "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv6": {},
-        "infix-interfaces:bridge-port": {
-          "bridge": "br0"
-        }
-      },
-      {
-        "name": "lo",
-        "type": "infix-if-type:loopback",
-        "ietf-ip:ipv4": {
-          "address": [
-            {
-              "ip": "127.0.0.1",
-              "prefix-length": 8
-            }
-          ]
-        },
-        "ietf-ip:ipv6": {
-          "address": [
-            {
-              "ip": "::1",
-              "prefix-length": 128
-            }
-          ]
-        }
-      },
-      {
-        "name": "wan",
-        "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv4": {
-          "infix-dhcp-client:dhcp": {
-            "option": [
-              {
-                "id": "ntp-server"
-              },
-              {
-                "id": "broadcast"
-              },
-              {
-                "id": "domain"
-              },
-              {
-                "id": "hostname",
-                "value": "auto"
-              },
-              {
-                "id": "dns-server"
-              },
-              {
-                "id": "router"
-              },
-              {
-                "id": "netmask"
-              },
-              {
-                "id": "vendor-class",
-                "value": "Banana Pi BPI-R4"
-              }
-            ]
-          }
-        },
-        "ietf-ip:ipv6": {
-          "infix-dhcpv6-client:dhcp": {
-            "option": [
-              {
-                "id": "ntp-server"
-              },
-              {
-                "id": "client-fqdn"
-              },
-              {
-                "id": "domain-search"
-              },
-              {
-                "id": "dns-server"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  },
-  "ietf-keystore:keystore": {
-    "asymmetric-keys": {
-      "asymmetric-key": [
-        {
-          "name": "genkey",
-          "public-key-format": "infix-crypto-types:ssh-public-key-format",
-          "public-key": "",
-          "private-key-format": "infix-crypto-types:rsa-private-key-format",
-          "cleartext-private-key": "",
-          "certificates": {}
-        }
-      ]
-    }
-  },
-  "ietf-netconf-acm:nacm": {
-    "enable-nacm": true,
-    "read-default": "permit",
-    "write-default": "permit",
-    "exec-default": "permit",
-    "groups": {
-      "group": [
-        {
-          "name": "admin",
-          "user-name": [
-            "admin"
-          ]
-        },
-        {
-          "name": "operator",
-          "user-name": []
-        },
-        {
-          "name": "guest",
-          "user-name": []
-        }
-      ]
-    },
-    "rule-list": [
-      {
-        "name": "admin-acl",
-        "group": [
-          "admin"
-        ],
-        "rule": [
-          {
-            "name": "permit-all",
-            "module-name": "*",
-            "access-operations": "*",
-            "action": "permit",
-            "comment": "Allow 'admin' group complete access to all operations and data."
-          }
-        ]
-      },
-      {
-        "name": "operator-acl",
-        "group": [
-          "operator"
-        ],
-        "rule": [
-          {
-            "name": "permit-system-rpcs",
-            "module-name": "ietf-system",
-            "rpc-name": "*",
-            "access-operations": "exec",
-            "action": "permit",
-            "comment": "Operators can reboot, shutdown, and set system time."
-          }
-        ]
-      },
-      {
-        "name": "guest-acl",
-        "group": [
-          "guest"
-        ],
-        "rule": [
-          {
-            "name": "deny-all-write+exec",
-            "module-name": "*",
-            "access-operations": "create update delete exec",
-            "action": "deny",
-            "comment": "Guests cannot change anything or exec rpcs."
-          }
-        ]
-      },
-      {
-        "name": "default-deny-all",
-        "group": [
-          "*"
-        ],
-        "rule": [
-          {
-            "name": "deny-password-access",
-            "path": "/ietf-system:system/authentication/user/password",
-            "access-operations": "*",
-            "action": "deny",
-            "comment": "No user except admins can access password hashes."
-          },
-          {
-            "name": "deny-keystore-access",
-            "module-name": "ietf-keystore",
-            "access-operations": "*",
-            "action": "deny",
-            "comment": "No user except admins can access cryptographic keys."
-          },
-          {
-            "name": "deny-truststore-access",
-            "module-name": "ietf-truststore",
-            "access-operations": "*",
-            "action": "deny",
-            "comment": "No user except admins can access trust store."
-          }
-        ]
-      }
-    ]
-  },
-  "ietf-netconf-server:netconf-server": {
-    "listen": {
-      "endpoints": {
-        "endpoint": [
-          {
-            "name": "default-ssh",
-            "ssh": {
-              "tcp-server-parameters": {
-                "local-bind": [
-                  {
-                    "local-address": "::"
-                  }
-                ]
-              },
-              "ssh-server-parameters": {
-                "server-identity": {
-                  "host-key": [
-                    {
-                      "name": "default-key",
-                      "public-key": {
-                        "central-keystore-reference": "genkey"
-                      }
-                    }
-                  ]
-                }
-              }
-            }
-          }
-        ]
-      }
-    }
-  },
-  "ietf-system:system": {
-    "hostname": "bpi-%m",
-    "ntp": {
-      "server": [
-        {
-          "name": "default",
-          "udp": {
-            "address": "pool.ntp.org"
-          }
-        }
-      ]
-    },
-    "authentication": {
-      "user": [
-        {
-          "name": "admin",
-          "password": "$factory$",
-          "infix-system:shell": "bash"
-        }
-      ]
-    },
-    "infix-system:motd-banner": "Li0tLS0tLS0uCnwgIC4gLiAgfCBJbmZpeCBPUyDigJQgSW1tdXRhYmxlLkZyaWVuZGx5LlNlY3VyZQp8LS4gdiAuLXwgaHR0cHM6Ly9rZXJuZWxraXQub3JnCictJy0tLSctJwo="
-  },
-  "infix-dhcp-server:dhcp-server": {
-    "option": [
-      {
-        "id": "ntp-server",
-        "address": "auto"
-      },
-      {
-        "id": "dns-server",
-        "address": "auto"
-      },
-      {
-        "id": "router",
-        "address": "auto"
-      }
-    ],
-    "subnet": [
-      {
-        "subnet": "192.168.0.0/24",
-        "pool": {
-          "start-address": "192.168.0.100",
-          "end-address": "192.168.0.250"
-        }
-      }
-    ]
-  },
-  "infix-firewall:firewall": {
-    "default": "wan",
-    "zone": [
-      {
-        "name": "lan",
-        "action": "accept",
-        "interface": [
-          "br0"
-        ]
-      },
-      {
-        "name": "wan",
-        "action": "drop",
-        "interface": [
-          "wan"
-        ],
-        "service": [
-          "dhcpv6-client"
-        ]
-      }
-    ],
-    "policy": [
-      {
-        "name": "lan-to-wan",
-        "action": "accept",
-        "ingress": [
-          "lan"
-        ],
-        "egress": [
-          "wan"
-        ],
-        "masquerade": true
-      }
-    ]
-  },
-  "infix-meta:meta": {
-    "version": "1.7"
-  },
-  "infix-services:mdns": {
-    "enabled": true
-  },
-  "infix-services:ssh": {
-    "enabled": true,
-    "hostkey": [
-      "genkey"
-    ],
-    "listen": [
-      {
-        "name": "ipv4",
-        "address": "0.0.0.0",
-        "port": 22
-      },
-      {
-        "name": "ipv6",
-        "address": "::",
-        "port": 22
-      }
-    ]
-  },
-  "infix-services:web": {
-    "enabled": true,
-    "console": {
-      "enabled": true
-    },
-    "netbrowse": {
-      "enabled": true
-    },
-    "restconf": {
-      "enabled": true
-    }
-  }
-}

board/aarch64/bananapi-bpi-r4/rootfs/usr/share/product/bananapi,bpi-r4-2g5/etc/udev/rules.d/60-mtk-2p5ge-phy.rules

@@ -1,5 +0,0 @@
-# The mtk-2p5ge PHY driver uses MDIO PHY ID matching, not OF compatible
-# matching.  udev auto-loading is based on MODALIAS, which for DT-described
-# devices is "of:N...C<compatible>" — a format that never matches the driver's
-# "mdio:..." module alias.  Match on OF_COMPATIBLE_0 explicitly instead.
-ACTION=="add", SUBSYSTEM=="mdio_bus", ENV{OF_COMPATIBLE_0}=="ethernet-phy-id0033.9c11", RUN+="/sbin/modprobe -b mtk-2p5ge"

board/aarch64/bananapi-bpi-r4/rootfs/usr/share/product/bananapi,bpi-r4-2g5/etc/udev/rules.d/90-bpi-r4-rename-ifaces.rules

@@ -1,2 +0,0 @@
-ACTION=="add", SUBSYSTEM=="net", DEVPATH=="/devices/platform/soc/15100000.ethernet/net/eth1", NAME="wan"
-ACTION=="add", SUBSYSTEM=="net", DEVPATH=="/devices/platform/soc/15100000.ethernet/net/eth2", NAME="sfp1"

board/aarch64/bananapi-bpi-r4/rootfs/usr/share/product/bananapi,bpi-r4/etc/factory-config.cfg

@@ -1,396 +0,0 @@
-{
-  "ieee802-dot1ab-lldp:lldp": {
-    "infix-lldp:enabled": true
-  },
-  "ietf-hardware:hardware": {
-    "component": [
-      {
-        "name": "USB",
-        "class": "infix-hardware:usb",
-        "state": {
-          "admin-state": "unlocked"
-        }
-      }
-    ]
-  },
-  "ietf-interfaces:interfaces": {
-    "interface": [
-      {
-        "name": "br0",
-        "type": "infix-if-type:bridge",
-        "ietf-ip:ipv4": {
-          "address": [
-            {
-              "ip": "192.168.0.1",
-              "prefix-length": 24
-            }
-          ]
-        }
-      },
-      {
-        "name": "lan1",
-        "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv6": {},
-        "infix-interfaces:bridge-port": {
-          "bridge": "br0"
-        }
-      },
-      {
-        "name": "lan2",
-        "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv6": {},
-        "infix-interfaces:bridge-port": {
-          "bridge": "br0"
-        }
-      },
-      {
-        "name": "lan3",
-        "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv6": {},
-        "infix-interfaces:bridge-port": {
-          "bridge": "br0"
-        }
-      },
-      {
-        "name": "lo",
-        "type": "infix-if-type:loopback",
-        "ietf-ip:ipv4": {
-          "address": [
-            {
-              "ip": "127.0.0.1",
-              "prefix-length": 8
-            }
-          ]
-        },
-        "ietf-ip:ipv6": {
-          "address": [
-            {
-              "ip": "::1",
-              "prefix-length": 128
-            }
-          ]
-        }
-      },
-      {
-        "name": "wan",
-        "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv4": {
-          "infix-dhcp-client:dhcp": {
-            "option": [
-              {
-                "id": "ntp-server"
-              },
-              {
-                "id": "broadcast"
-              },
-              {
-                "id": "domain"
-              },
-              {
-                "id": "hostname",
-                "value": "auto"
-              },
-              {
-                "id": "dns-server"
-              },
-              {
-                "id": "router"
-              },
-              {
-                "id": "netmask"
-              },
-              {
-                "id": "vendor-class",
-                "value": "Banana Pi BPI-R4"
-              }
-            ]
-          }
-        },
-        "ietf-ip:ipv6": {
-          "infix-dhcpv6-client:dhcp": {
-            "option": [
-              {
-                "id": "ntp-server"
-              },
-              {
-                "id": "client-fqdn"
-              },
-              {
-                "id": "domain-search"
-              },
-              {
-                "id": "dns-server"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  },
-  "ietf-keystore:keystore": {
-    "asymmetric-keys": {
-      "asymmetric-key": [
-        {
-          "name": "genkey",
-          "public-key-format": "infix-crypto-types:ssh-public-key-format",
-          "public-key": "",
-          "private-key-format": "infix-crypto-types:rsa-private-key-format",
-          "cleartext-private-key": "",
-          "certificates": {}
-        }
-      ]
-    }
-  },
-  "ietf-netconf-acm:nacm": {
-    "enable-nacm": true,
-    "read-default": "permit",
-    "write-default": "permit",
-    "exec-default": "permit",
-    "groups": {
-      "group": [
-        {
-          "name": "admin",
-          "user-name": [
-            "admin"
-          ]
-        },
-        {
-          "name": "operator",
-          "user-name": []
-        },
-        {
-          "name": "guest",
-          "user-name": []
-        }
-      ]
-    },
-    "rule-list": [
-      {
-        "name": "admin-acl",
-        "group": [
-          "admin"
-        ],
-        "rule": [
-          {
-            "name": "permit-all",
-            "module-name": "*",
-            "access-operations": "*",
-            "action": "permit",
-            "comment": "Allow 'admin' group complete access to all operations and data."
-          }
-        ]
-      },
-      {
-        "name": "operator-acl",
-        "group": [
-          "operator"
-        ],
-        "rule": [
-          {
-            "name": "permit-system-rpcs",
-            "module-name": "ietf-system",
-            "rpc-name": "*",
-            "access-operations": "exec",
-            "action": "permit",
-            "comment": "Operators can reboot, shutdown, and set system time."
-          }
-        ]
-      },
-      {
-        "name": "guest-acl",
-        "group": [
-          "guest"
-        ],
-        "rule": [
-          {
-            "name": "deny-all-write+exec",
-            "module-name": "*",
-            "access-operations": "create update delete exec",
-            "action": "deny",
-            "comment": "Guests cannot change anything or exec rpcs."
-          }
-        ]
-      },
-      {
-        "name": "default-deny-all",
-        "group": [
-          "*"
-        ],
-        "rule": [
-          {
-            "name": "deny-password-access",
-            "path": "/ietf-system:system/authentication/user/password",
-            "access-operations": "*",
-            "action": "deny",
-            "comment": "No user except admins can access password hashes."
-          },
-          {
-            "name": "deny-keystore-access",
-            "module-name": "ietf-keystore",
-            "access-operations": "*",
-            "action": "deny",
-            "comment": "No user except admins can access cryptographic keys."
-          },
-          {
-            "name": "deny-truststore-access",
-            "module-name": "ietf-truststore",
-            "access-operations": "*",
-            "action": "deny",
-            "comment": "No user except admins can access trust store."
-          }
-        ]
-      }
-    ]
-  },
-  "ietf-netconf-server:netconf-server": {
-    "listen": {
-      "endpoints": {
-        "endpoint": [
-          {
-            "name": "default-ssh",
-            "ssh": {
-              "tcp-server-parameters": {
-                "local-bind": [
-                  {
-                    "local-address": "::"
-                  }
-                ]
-              },
-              "ssh-server-parameters": {
-                "server-identity": {
-                  "host-key": [
-                    {
-                      "name": "default-key",
-                      "public-key": {
-                        "central-keystore-reference": "genkey"
-                      }
-                    }
-                  ]
-                }
-              }
-            }
-          }
-        ]
-      }
-    }
-  },
-  "ietf-system:system": {
-    "hostname": "bpi-%m",
-    "ntp": {
-      "server": [
-        {
-          "name": "default",
-          "udp": {
-            "address": "pool.ntp.org"
-          }
-        }
-      ]
-    },
-    "authentication": {
-      "user": [
-        {
-          "name": "admin",
-          "password": "$factory$",
-          "infix-system:shell": "bash"
-        }
-      ]
-    },
-    "infix-system:motd-banner": "Li0tLS0tLS0uCnwgIC4gLiAgfCBJbmZpeCBPUyDigJQgSW1tdXRhYmxlLkZyaWVuZGx5LlNlY3VyZQp8LS4gdiAuLXwgaHR0cHM6Ly9rZXJuZWxraXQub3JnCictJy0tLSctJwo="
-  },
-  "infix-dhcp-server:dhcp-server": {
-    "option": [
-      {
-        "id": "ntp-server",
-        "address": "auto"
-      },
-      {
-        "id": "dns-server",
-        "address": "auto"
-      },
-      {
-        "id": "router",
-        "address": "auto"
-      }
-    ],
-    "subnet": [
-      {
-        "subnet": "192.168.0.0/24",
-        "pool": {
-          "start-address": "192.168.0.100",
-          "end-address": "192.168.0.250"
-        }
-      }
-    ]
-  },
-  "infix-firewall:firewall": {
-    "default": "wan",
-    "zone": [
-      {
-        "name": "lan",
-        "action": "accept",
-        "interface": [
-          "br0"
-        ]
-      },
-      {
-        "name": "wan",
-        "action": "drop",
-        "interface": [
-          "wan"
-        ],
-        "service": [
-          "dhcpv6-client"
-        ]
-      }
-    ],
-    "policy": [
-      {
-        "name": "lan-to-wan",
-        "action": "accept",
-        "ingress": [
-          "lan"
-        ],
-        "egress": [
-          "wan"
-        ],
-        "masquerade": true
-      }
-    ]
-  },
-  "infix-meta:meta": {
-    "version": "1.7"
-  },
-  "infix-services:mdns": {
-    "enabled": true
-  },
-  "infix-services:ssh": {
-    "enabled": true,
-    "hostkey": [
-      "genkey"
-    ],
-    "listen": [
-      {
-        "name": "ipv4",
-        "address": "0.0.0.0",
-        "port": 22
-      },
-      {
-        "name": "ipv6",
-        "address": "::",
-        "port": 22
-      }
-    ]
-  },
-  "infix-services:web": {
-    "enabled": true,
-    "console": {
-      "enabled": true
-    },
-    "netbrowse": {
-      "enabled": true
-    },
-    "restconf": {
-      "enabled": true
-    }
-  }
-}

board/aarch64/bananapi-bpi-r4/rootfs/usr/share/product/bananapi,bpi-r4/etc/udev/rules.d/90-bpi-r4-rename-ifaces.rules

@@ -1,2 +0,0 @@
-ACTION=="add", SUBSYSTEM=="net", DEVPATH=="/devices/platform/soc/15100000.ethernet/net/eth1", NAME="sfp2"
-ACTION=="add", SUBSYSTEM=="net", DEVPATH=="/devices/platform/soc/15100000.ethernet/net/eth2", NAME="sfp1"

board/aarch64/bananapi-bpi-r4/uboot/emmc-extras.config

@@ -1 +0,0 @@
-CONFIG_DEVICE_TREE_INCLUDES="infix-env.dtsi infix-key.dtsi mt7988-emmc-env.dtsi"

board/aarch64/bananapi-bpi-r4/uboot/extras.config

@@ -1,40 +0,0 @@
-CONFIG_AUTOBOOT=y
-CONFIG_BOOTDELAY=2
-# CONFIG_MMC_PCI is not set
-CONFIG_ENV_IS_NOWHERE=y
-# CONFIG_ENV_IS_IN_MMC is not set
-CONFIG_MULTI_DTB_FIT=y
-CONFIG_OF_LIST="mt7988a-bananapi-bpi-r4 mt7988a-bananapi-bpi-r4-2g5"
-
-CONFIG_USB=y
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_XHCI_MTK=y
-CONFIG_USB_MTU3=y
-CONFIG_PHY=y
-CONFIG_PHY_MTK_TPHY=y
-
-CONFIG_MTK_SPIM=y
-CONFIG_SPI=y
-CONFIG_DM_SPI=y
-CONFIG_SPI_FLASH=y
-CONFIG_DM_SPI_FLASH=y
-CONFIG_SPI_FLASH_MTD=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_MTD=y
-CONFIG_DM_MTD=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_SPI_NAND=y
-CONFIG_MTK_SPIM=y
-CONFIG_MTK_SNOR=y
-
-CONFIG_BUTTON=y
-CONFIG_BUTTON_CMD=y
-CONFIG_BUTTON_GPIO=y
-
-CONFIG_CMD_SF=y
-CONFIG_CMD_USB=y
-CONFIG_CMD_MTD=y
-CONFIG_CMD_MTDPARTS=y
-CONFIG_CMD_DM=y

board/aarch64/bananapi-bpi-r4/uboot/mt7988-emmc-env.dtsi

@@ -1,7 +0,0 @@
-#include <mt7988-env.dtsi>
-
-&env {
-      fdtfile = "mediatek/mt7988a-bananapi-bpi-r4.dtb";
-      board   = "bananapi,bpi-r4-emmc";
-      ixvariant = "if test \"${BOARD_VARIANT}\" = \"2g5\"; then setenv fdtfile mediatek/mt7988a-bananapi-bpi-r4-2g5.dtb; setenv board bananapi,bpi-r4-2g5-emmc; fi";
-};

board/aarch64/bananapi-bpi-r4/uboot/mt7988-env.dtsi

@@ -1,27 +0,0 @@
-/ {
-       config {
-               env: environment {
-                       bootcmd = "run ixboot";
-                       boot_targets = "mmc0";
-                       ethprime = "eth0";
-                       fdt_addr_r = "0x43f00000";
-                       kernel_addr_r = "0x44000000";
-                       fdtoverlay_addr_r = "0x47f00000";
-                       scriptaddr = "0x48000000";
-                       ramdisk_addr_r = "0x4A000000";
-
-                       /*
-                        * Apply BOARD_VARIANT from aux uboot.env.
-                        * Infix writes BOARD_VARIANT=2g5 via fw_setenv on
-                        * BPI-R4-2g5 / BPI-R4P boards to select the correct
-                        * device tree.  Unset = standard R4 (2x SFP+).
-                        */
-                       ixvariant = "if test \"${BOARD_VARIANT}\" = \"2g5\"; then setenv fdtfile mediatek/mt7988a-bananapi-bpi-r4-2g5.dtb; fi";
-
-                       /* This is a development platform, keep
-                        * developer mode statically enabled.
-                        */
-                       ixbtn-devmode = "setenv dev_mode yes; echo Enabled";
-               };
-       };
-};

board/aarch64/bananapi-bpi-r4/uboot/mt7988-sd-env.dtsi

@@ -1,7 +0,0 @@
-#include <mt7988-env.dtsi>
-
-&env {
-      fdtfile = "mediatek/mt7988a-bananapi-bpi-r4.dtb";
-      board   = "bananapi,bpi-r4-sdmmc";
-      ixvariant = "if test \"${BOARD_VARIANT}\" = \"2g5\"; then setenv fdtfile mediatek/mt7988a-bananapi-bpi-r4-2g5.dtb; setenv board bananapi,bpi-r4-2g5-sdmmc; fi";
-};

board/aarch64/bananapi-bpi-r4/uboot/sd-extras.config

@@ -1,2 +0,0 @@
-CONFIG_DEVICE_TREE_INCLUDES="infix-env.dtsi infix-key.dtsi mt7988-sd-env.dtsi"
-CONFIG_OF_LIST="mt7988a-bananapi-bpi-r4-sd"

board/aarch64/bananapi-bpi-r64/Config.in

@@ -1,7 +0,0 @@
-config BR2_PACKAGE_BANANAPI_BPI_R64
-	bool "Banana Pi R64"
-	depends on BR2_aarch64
-	select BR2_PACKAGE_FEATURE_WIFI
-	select SDCARD_AUX
-	help
-	  Build Banana PI R64 support

board/aarch64/bananapi-bpi-r64/LICENSE

@@ -1,13 +0,0 @@
-Copyright (c) 2026 The KernelKit Authors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

board/aarch64/bananapi-bpi-r64/README.md

@@ -1,135 +0,0 @@
-# Banana Pi BPI-R64
-
-## Overview
-
-<img align="right" src="banana_pi_bpi-r64_interface.jpg" alt="Board Overview" width=400 padding=10>
-
-The Banana Pi BPI-R64 is a networking board based on the MediaTek MT7622
-(dual Cortex-A53, AArch64) SoC.
-
-### Hardware Features
-
-- MediaTek MT7622 ARM Cortex-A53 dual-core processor @ 1.35 GHz
-- 1 GB DDR3L RAM
-- 8 GB eMMC storage
-- microSD card slot
-- MT7531 Gigabit Ethernet switch (4x LAN + 1x WAN)
-- MT7603E built-in 2.4 GHz WiFi
-- USB 3.0 port
-- 2x Mini PCIe slots
-
-### Default Network Configuration
-
-Infix comes preconfigured with:
-
-- **LAN ports** (lan0-lan3): Bridged for internal networking
-- **WAN port**: DHCP client enabled for internet connectivity
-- **WiFi** (wifi0-ap): Bridged to LAN (MT7615 PCIe card if fitted, otherwise MT7603E)
-
-## Boot Switch Reference
-
-<img align="right" src="bpi-r64-sw1.png" alt="SW1 Boot Switch" width=90 padding=10>
-
-The BPI-R64 has a 2-position DIP switch (SW1) for selecting the boot device.
-The MT7622 Boot ROM always tries SD first if a card is present, so you can
-leave SW1 in the OFF (eMMC) position and simply insert or remove an SD card
-to control boot device selection.
-
-| SW1 | Boot device |
-|-----|-------------|
-| OFF | eMMC        |
-| ON  | SD card     |
-
-## Getting Started
-
-### Quick Start with SD Card
-
-1. **Flash the image to an SD card** (the filename includes the version, e.g.
-   `infix-25.01-bpi-r64-sdcard.img`):
-
-<img align="right" src="debug-uart.png" alt="Debug UART" width=100 padding=10>
-
-   ```sh
-   dd if=infix-*-bpi-r64-sdcard.img of=/dev/sdX bs=4M status=progress
-   ```
-
-2. **Insert SD card and power on**
-3. **Connect console:** 115200 8N1 — use the dedicated Debug UART header
-   just below the 40-pin GPIO header; pins are labeled GND, RX, TX on the board
-4. **Default login:** `admin` / `admin`
-
-## Installing to eMMC
-
-Unlike the BPI-R3 (where SD and eMMC share a bus, requiring a NAND intermediate
-step), the BPI-R64 has separate controllers for SD (mmc1/MSDC1) and eMMC
-(mmc0/MSDC0).  You can write directly to eMMC while booted from SD.
-
-### eMMC Boot ROM Behaviour
-
-> [!IMPORTANT]
-> The MT7622 Boot ROM reads BL2 from the eMMC BOOT0 hardware partition (offset
-> 0), not from the User Data Area where the main disk image lives.  The
-> installation procedure below writes BL2 to BOOT0 separately to handle this.
-
-### Procedure
-
-Boot from SD and write the eMMC image from U-Boot using a FAT32-formatted USB
-drive.
-
-#### Step 1: Boot from SD card
-
-1. Insert SD card with Infix
-2. Power on and break into U-Boot (press Ctrl-C during boot)
-
-#### Step 2: Write the eMMC image from U-Boot
-
-Place `infix-bpi-r64-emmc.img` and `bl2.img` on a FAT32-formatted USB drive,
-then from the U-Boot prompt:
-
-```
-usb start
-fatload usb 0:1 0x44000000 infix-bpi-r64-emmc.img
-setexpr blocks ${filesize} / 0x200
-mmc dev 0
-mmc write 0x44000000 0x0 ${blocks}
-```
-
-#### Step 3: Write BL2 to eMMC BOOT0
-
-```
-fatload usb 0:1 0x44000000 bl2.img
-mmc partconf 0 1 1 1
-setexpr blkcnt ${filesize} + 0x1ff
-setexpr blkcnt ${blkcnt} / 0x200
-mmc write 0x44000000 0x0 ${blkcnt}
-mmc partconf 0 1 1 0
-```
-
-#### Step 4: Boot from eMMC
-
-1. Power off the board
-2. Remove SD card and USB drive
-3. Power on
-
-## Platform Notes
-
-### mmc0 = eMMC, mmc1 = SD
-
-On MT7622, MSDC0 (mmc0) is the 8-bit eMMC controller and MSDC1 (mmc1) is the
-4-bit SD card controller — the reverse of many other platforms.
-
-## Building
-
-```sh
-# Bootloader only (SD)
-make O=x-boot-bpir64-sd bpi_r64_sd_boot_defconfig && make O=x-boot-bpir64-sd
-
-# Bootloader only (eMMC)
-make O=x-boot-bpir64-emmc bpi_r64_emmc_boot_defconfig && make O=x-boot-bpir64-emmc
-
-# Compose SD image (pass the Infix rootfs output directory)
-utils/mkimage.sh -b x-boot-bpir64-sd -r x-aarch64/images bananapi-bpi-r64
-
-# Compose eMMC image
-utils/mkimage.sh -b x-boot-bpir64-emmc -r x-aarch64/images -t emmc bananapi-bpi-r64
-```

board/aarch64/bananapi-bpi-r64/bananapi-bpi-r64.hash

@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  d48246c717b505cc11df95171f2fd548b389e1a463f1af4c68d0b69fe0d1009b  LICENSE

board/aarch64/bananapi-bpi-r64/bananapi-bpi-r64.mk

@@ -1,35 +0,0 @@
-define BANANAPI_BPI_R64_LINUX_CONFIG_FIXUPS
-	$(call KCONFIG_ENABLE_OPT,CONFIG_ARCH_MEDIATEK)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MACH_MT7622)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_PINCTRL_MT7622)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_SERIAL_8250_MT6577)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MTK_UART)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MEDIATEK_WATCHDOG)
-	# Ethernet subsystem clock controller — required for the eth MAC,
-	# MT7531 DSA switch, and HSDMA to get their clocks from &ethsys.
-	# Without this, eth probe fails and the switch is never detected.
-	$(call KCONFIG_ENABLE_OPT,CONFIG_COMMON_CLK_MT7622_ETHSYS)
-	# HIF subsystem clock controller — required for PCIe and USB.
-	$(call KCONFIG_ENABLE_OPT,CONFIG_COMMON_CLK_MT7622_HIFSYS)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MEDIATEK_GE_PHY)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_REALTEK_PHY)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_NET_VENDOR_MEDIATEK)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_NET_MEDIATEK_SOC)
-	$(call KCONFIG_SET_OPT,CONFIG_NET_DSA_MT7530,m)
-	$(call KCONFIG_SET_OPT,CONFIG_MT7603E,m)
-	$(call KCONFIG_SET_OPT,CONFIG_PCIE_MEDIATEK,m)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MMC_MTK)
-	$(call KCONFIG_SET_OPT,CONFIG_USB_XHCI_MTK,m)
-	$(call KCONFIG_SET_OPT,CONFIG_PHY_MTK_TPHY,m)
-	$(call KCONFIG_SET_OPT,CONFIG_MTK_THERMAL,m)
-	$(call KCONFIG_SET_OPT,CONFIG_MTK_SOC_THERMAL,m)
-	$(call KCONFIG_SET_OPT,CONFIG_I2C_MT65XX,m)
-	$(call KCONFIG_SET_OPT,CONFIG_PWM_MEDIATEK,m)
-	$(call KCONFIG_SET_OPT,CONFIG_REGULATOR_MT6380,m)
-	$(call KCONFIG_SET_OPT,CONFIG_NVMEM_MTK_EFUSE,m)
-	$(call KCONFIG_SET_OPT,CONFIG_CRYPTO_DEV_SAFEXCEL,m)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_RTC_DRV_MT7622)
-endef
-
-$(eval $(ix-board))
-$(eval $(generic-package))

board/aarch64/bananapi-bpi-r64/dts/Makefile

@@ -1 +0,0 @@
-dtb-y += mediatek/mt7622-bananapi-bpi-r64.dtb

board/aarch64/bananapi-bpi-r64/dts/mediatek/mt7622-bananapi-bpi-r64.dts

@@ -1,3 +0,0 @@
-#include <arm64/mediatek/mt7622-bananapi-bpi-r64.dts>
-
-#include "mt7622-bananapi-bpi-r64.dtsi"

board/aarch64/bananapi-bpi-r64/dts/mediatek/mt7622-bananapi-bpi-r64.dtsi

@@ -1,10 +0,0 @@
-/ {
-	chosen {
-		infix {
-			/* Default admin user password: 'admin' */
-			factory-password-hash = "$5$mI/zpOAqZYKLC2WU$i7iPzZiIjOjrBF3NyftS9CCq8dfYwHwrmUK097Jca9A";
-			usb-ports = <&ssusb>;
-			usb-port-names = "USB";
-		};
-	};
-};

board/aarch64/bananapi-bpi-r64/genimage.cfg.in

@@ -1,89 +0,0 @@
-image cfg.ext4 {
-        empty = true
-        temporary = true
-        size = 128M
-        ext4 {
-                label = "cfg"
-                use-mke2fs = true
-                features = "uninit_bg"
-                extraargs = "-m 0 -i 4096"
-        }
-}
-
-# The /var partition will be expanded automatically at first boot
-# to use the full size of the SD-card or eMMC media.
-image var.ext4 {
-        empty = true
-        temporary = true
-        size = 128M
-        ext4 {
-                label = "var"
-                use-mke2fs = true
-                features = "uninit_bg"
-                extraargs = "-m 0 -i 4096"
-        }
-}
-
-image #INFIX_ID##VERSION#-bpi-r64-#TARGET#.img {
-        hdimage {
-                partition-table-type = "hybrid"
-                # MT7622 TF-A partition driver detects GPT by checking MBR[0]
-                # for the 0xEE protective entry.  Place it first so that BL2
-                # (with partition-type = 0x83) lands at MBR slot 1.
-                gpt-protective-first = true
-        }
-
-        # BL2 bootloader at sector 1024 (0x80000). The MT7622 Boot ROM scans
-        # the hybrid MBR for a bootable entry and loads BL2 from its offset.
-        # partition-type makes it visible in the MBR at slot 1 (slot 0 holds
-        # the 0xEE protective entry required by the TF-A partition driver).
-        partition bl2 {
-                partition-type = 0x83
-                image = "bl2.img"
-                offset = 1024s
-                size = 1024s
-                bootable = true
-        }
-
-        # Factory/calibration data at fixed offset
-        partition factory {
-                offset = 4608K
-                size = 2M
-        }
-
-        # FIP partition - BL31 + U-Boot
-        partition fip {
-                image = "fip.bin"
-                offset = 13312s
-                size = 4096s
-        }
-
-        partition aux {
-                partition-uuid = D4EF35A0-0652-45A1-B3DE-D63339C82035
-                image = "aux.ext4"
-        }
-
-        partition primary {
-                partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4
-                bootable = true
-                size = 250M
-                image = "rootfs.squashfs"
-        }
-
-        partition secondary {
-                partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4
-                bootable = true
-                size = 250M
-                image = "rootfs.squashfs"
-        }
-
-        partition cfg {
-                partition-uuid = 7aa497f0-73b5-47e5-b2ab-8752d8a48105
-                image = "cfg.ext4"
-        }
-
-        partition var {
-                partition-uuid = 8046A06A-E45A-4A14-A6AD-6684704A393F
-                image = "var.ext4"
-        }
-}

board/aarch64/bananapi-bpi-r64/rootfs/usr/share/product/bananapi,bpi-r64/etc/factory-config.cfg

@@ -1,438 +0,0 @@
-{
-  "ieee802-dot1ab-lldp:lldp": {
-    "infix-lldp:enabled": true
-  },
-  "ietf-hardware:hardware": {
-    "component": [
-      {
-        "name": "USB",
-        "class": "infix-hardware:usb",
-        "state": {
-          "admin-state": "unlocked"
-        }
-      },
-      {
-        "name": "radio0",
-        "class": "infix-hardware:wifi",
-        "infix-hardware:wifi-radio": {
-          "country-code": "DE",
-          "band": "2.4GHz",
-          "channel": "auto"
-        }
-      }
-    ]
-  },
-  "ietf-interfaces:interfaces": {
-    "interface": [
-      {
-        "name": "br0",
-        "type": "infix-if-type:bridge",
-        "ietf-ip:ipv4": {
-          "address": [
-            {
-              "ip": "192.168.0.1",
-              "prefix-length": 24
-            }
-          ]
-        }
-      },
-      {
-        "name": "lan0",
-        "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv6": {},
-        "infix-interfaces:bridge-port": {
-          "bridge": "br0"
-        }
-      },
-      {
-        "name": "lan1",
-        "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv6": {},
-        "infix-interfaces:bridge-port": {
-          "bridge": "br0"
-        }
-      },
-      {
-        "name": "lan2",
-        "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv6": {},
-        "infix-interfaces:bridge-port": {
-          "bridge": "br0"
-        }
-      },
-      {
-        "name": "lan3",
-        "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv6": {},
-        "infix-interfaces:bridge-port": {
-          "bridge": "br0"
-        }
-      },
-      {
-        "name": "lo",
-        "type": "infix-if-type:loopback",
-        "ietf-ip:ipv4": {
-          "address": [
-            {
-              "ip": "127.0.0.1",
-              "prefix-length": 8
-            }
-          ]
-        },
-        "ietf-ip:ipv6": {
-          "address": [
-            {
-              "ip": "::1",
-              "prefix-length": 128
-            }
-          ]
-        }
-      },
-      {
-        "name": "wan",
-        "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv4": {
-          "infix-dhcp-client:dhcp": {
-            "option": [
-              {
-                "id": "ntp-server"
-              },
-              {
-                "id": "broadcast"
-              },
-              {
-                "id": "domain"
-              },
-              {
-                "id": "hostname",
-                "value": "auto"
-              },
-              {
-                "id": "dns-server"
-              },
-              {
-                "id": "router"
-              },
-              {
-                "id": "netmask"
-              },
-              {
-                "id": "vendor-class",
-                "value": "Banana Pi BPI-R64"
-              }
-            ]
-          }
-        },
-        "ietf-ip:ipv6": {
-          "infix-dhcpv6-client:dhcp": {
-            "option": [
-              {
-                "id": "ntp-server"
-              },
-              {
-                "id": "client-fqdn"
-              },
-              {
-                "id": "domain-search"
-              },
-              {
-                "id": "dns-server"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "wifi0-ap",
-        "type": "infix-if-type:wifi",
-        "infix-interfaces:wifi": {
-          "radio": "radio0",
-          "access-point": {
-            "ssid": "Infix",
-            "security": {
-              "secret": "wifi"
-            }
-          }
-        },
-        "infix-interfaces:bridge-port": {
-          "bridge": "br0"
-        }
-      }
-    ]
-  },
-  "ietf-keystore:keystore": {
-    "asymmetric-keys": {
-      "asymmetric-key": [
-        {
-          "name": "genkey",
-          "public-key-format": "infix-crypto-types:ssh-public-key-format",
-          "public-key": "",
-          "private-key-format": "infix-crypto-types:rsa-private-key-format",
-          "cleartext-private-key": "",
-          "certificates": {}
-        }
-      ]
-    },
-    "symmetric-keys": {
-      "symmetric-key": [
-        {
-          "name": "wifi",
-          "cleartext-symmetric-key": "aW5maXhpbmZpeA==",
-          "key-format": "infix-crypto-types:passphrase-key-format"
-        }
-      ]
-    }
-  },
-  "ietf-netconf-acm:nacm": {
-    "enable-nacm": true,
-    "read-default": "permit",
-    "write-default": "permit",
-    "exec-default": "permit",
-    "groups": {
-      "group": [
-        {
-          "name": "admin",
-          "user-name": [
-            "admin"
-          ]
-        },
-        {
-          "name": "operator",
-          "user-name": []
-        },
-        {
-          "name": "guest",
-          "user-name": []
-        }
-      ]
-    },
-    "rule-list": [
-      {
-        "name": "admin-acl",
-        "group": [
-          "admin"
-        ],
-        "rule": [
-          {
-            "name": "permit-all",
-            "module-name": "*",
-            "access-operations": "*",
-            "action": "permit",
-            "comment": "Allow 'admin' group complete access to all operations and data."
-          }
-        ]
-      },
-      {
-        "name": "operator-acl",
-        "group": [
-          "operator"
-        ],
-        "rule": [
-          {
-            "name": "permit-system-rpcs",
-            "module-name": "ietf-system",
-            "rpc-name": "*",
-            "access-operations": "exec",
-            "action": "permit",
-            "comment": "Operators can reboot, shutdown, and set system time."
-          }
-        ]
-      },
-      {
-        "name": "guest-acl",
-        "group": [
-          "guest"
-        ],
-        "rule": [
-          {
-            "name": "deny-all-write+exec",
-            "module-name": "*",
-            "access-operations": "create update delete exec",
-            "action": "deny",
-            "comment": "Guests cannot change anything or exec rpcs."
-          }
-        ]
-      },
-      {
-        "name": "default-deny-all",
-        "group": [
-          "*"
-        ],
-        "rule": [
-          {
-            "name": "deny-password-access",
-            "path": "/ietf-system:system/authentication/user/password",
-            "access-operations": "*",
-            "action": "deny",
-            "comment": "No user except admins can access password hashes."
-          },
-          {
-            "name": "deny-keystore-access",
-            "module-name": "ietf-keystore",
-            "access-operations": "*",
-            "action": "deny",
-            "comment": "No user except admins can access cryptographic keys."
-          },
-          {
-            "name": "deny-truststore-access",
-            "module-name": "ietf-truststore",
-            "access-operations": "*",
-            "action": "deny",
-            "comment": "No user except admins can access trust store."
-          }
-        ]
-      }
-    ]
-  },
-  "ietf-netconf-server:netconf-server": {
-    "listen": {
-      "endpoints": {
-        "endpoint": [
-          {
-            "name": "default-ssh",
-            "ssh": {
-              "tcp-server-parameters": {
-                "local-bind": [
-                  {
-                    "local-address": "::"
-                  }
-                ]
-              },
-              "ssh-server-parameters": {
-                "server-identity": {
-                  "host-key": [
-                    {
-                      "name": "default-key",
-                      "public-key": {
-                        "central-keystore-reference": "genkey"
-                      }
-                    }
-                  ]
-                }
-              }
-            }
-          }
-        ]
-      }
-    }
-  },
-  "ietf-system:system": {
-    "hostname": "bpi-%m",
-    "ntp": {
-      "server": [
-        {
-          "name": "default",
-          "udp": {
-            "address": "pool.ntp.org"
-          }
-        }
-      ]
-    },
-    "authentication": {
-      "user": [
-        {
-          "name": "admin",
-          "password": "$factory$",
-          "infix-system:shell": "bash"
-        }
-      ]
-    },
-    "infix-system:motd-banner": "Li0tLS0tLS0uCnwgIC4gLiAgfCBJbmZpeCBPUyDigJQgSW1tdXRhYmxlLkZyaWVuZGx5LlNlY3VyZQp8LS4gdiAuLXwgaHR0cHM6Ly9rZXJuZWxraXQub3JnCictJy0tLSctJwo="
-  },
-  "infix-dhcp-server:dhcp-server": {
-    "option": [
-      {
-        "id": "ntp-server",
-        "address": "auto"
-      },
-      {
-        "id": "dns-server",
-        "address": "auto"
-      },
-      {
-        "id": "router",
-        "address": "auto"
-      }
-    ],
-    "subnet": [
-      {
-        "subnet": "192.168.0.0/24",
-        "pool": {
-          "start-address": "192.168.0.100",
-          "end-address": "192.168.0.250"
-        }
-      }
-    ]
-  },
-  "infix-firewall:firewall": {
-    "default": "wan",
-    "zone": [
-      {
-        "name": "lan",
-        "action": "accept",
-        "interface": [
-          "br0"
-        ]
-      },
-      {
-        "name": "wan",
-        "action": "drop",
-        "interface": [
-          "wan"
-        ],
-        "service": [
-          "dhcpv6-client"
-        ]
-      }
-    ],
-    "policy": [
-      {
-        "name": "lan-to-wan",
-        "action": "accept",
-        "ingress": [
-          "lan"
-        ],
-        "egress": [
-          "wan"
-        ],
-        "masquerade": true
-      }
-    ]
-  },
-  "infix-meta:meta": {
-    "version": "1.7"
-  },
-  "infix-services:mdns": {
-    "enabled": true
-  },
-  "infix-services:ssh": {
-    "enabled": true,
-    "hostkey": [
-      "genkey"
-    ],
-    "listen": [
-      {
-        "name": "ipv4",
-        "address": "0.0.0.0",
-        "port": 22
-      },
-      {
-        "name": "ipv6",
-        "address": "::",
-        "port": 22
-      }
-    ]
-  },
-  "infix-services:web": {
-    "enabled": true,
-    "console": {
-      "enabled": true
-    },
-    "netbrowse": {
-      "enabled": true
-    },
-    "restconf": {
-      "enabled": true
-    }
-  }
-}

board/aarch64/bananapi-bpi-r64/rootfs/usr/share/product/bananapi,bpi-r64/etc/udev/rules.d/90-bpi-r64-rename-ethernet.rules

@@ -1,14 +0,0 @@
-# Rename MT7531 external switch ports by DT node path.
-
-# The DTS already contains this but it has been observed in the wild
-# that we may end up with names like lan118 rather than by DTS label,
-# so this set of rules, that run after most other rules, match on the
-# OF_FULLNAME which is a stable reference.
-#
-# MT7622 / BPI-R64 switch topology (switch@1f, ports):
-#   port@0 = wan, port@1..4 = lan0..lan3, port@5,6 = cpu
-ACTION=="add", SUBSYSTEM=="net", ENV{OF_FULLNAME}=="*/switch@1f/ports/port@0", NAME="wan"
-ACTION=="add", SUBSYSTEM=="net", ENV{OF_FULLNAME}=="*/switch@1f/ports/port@1", NAME="lan0"
-ACTION=="add", SUBSYSTEM=="net", ENV{OF_FULLNAME}=="*/switch@1f/ports/port@2", NAME="lan1"
-ACTION=="add", SUBSYSTEM=="net", ENV{OF_FULLNAME}=="*/switch@1f/ports/port@3", NAME="lan2"
-ACTION=="add", SUBSYSTEM=="net", ENV{OF_FULLNAME}=="*/switch@1f/ports/port@4", NAME="lan3"

board/aarch64/bananapi-bpi-r64/uboot/emmc-extras.config

@@ -1,3 +0,0 @@
-CONFIG_DEVICE_TREE_INCLUDES="infix-env.dtsi infix-key.dtsi mt7622-emmc-env.dtsi"
-CONFIG_SUPPORT_EMMC_BOOT=y
-CONFIG_CMD_MMC_PARTCONF=y

board/aarch64/bananapi-bpi-r64/uboot/extras.config

@@ -1,19 +0,0 @@
-CONFIG_AUTOBOOT=y
-CONFIG_BOOTDELAY=2
-# CONFIG_MMC_PCI is not set
-CONFIG_ENV_IS_NOWHERE=y
-# CONFIG_ENV_IS_IN_MMC is not set
-
-CONFIG_USB=y
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_XHCI_MTK=y
-CONFIG_PHY=y
-CONFIG_PHY_MTK_TPHY=y
-
-CONFIG_DM_MDIO=y
-CONFIG_DM_ETH_PHY=y
-CONFIG_PHY_ETHERNET_ID=y
-
-CONFIG_CMD_MDIO=y
-CONFIG_CMD_USB=y
-CONFIG_CMD_DM=y

board/aarch64/bananapi-bpi-r64/uboot/mt7622-emmc-env.dtsi

@@ -1,5 +0,0 @@
-#include <mt7622-env.dtsi>
-
-&env {
-	fdtfile = "mediatek/mt7622-bananapi-bpi-r64.dtb";
-};

board/aarch64/bananapi-bpi-r64/uboot/mt7622-env.dtsi

@@ -1,18 +0,0 @@
-/ {
-	config {
-		env: environment {
-			bootcmd = "run ixboot";
-			boot_targets = "mmc0";
-			ethprime = "eth0";
-			fdt_addr_r = "0x43f00000";
-			kernel_addr_r = "0x44000000";
-			scriptaddr = "0x48000000";
-			ramdisk_addr_r = "0x4A000000";
-
-			/* This is a development platform, keep
-			 * developer mode statically enabled.
-			 */
-			ixbtn-devmode = "setenv dev_mode yes; echo Enabled";
-		};
-	};
-};

board/aarch64/bananapi-bpi-r64/uboot/mt7622-sd-env.dtsi

@@ -1,6 +0,0 @@
-#include <mt7622-env.dtsi>
-
-&env {
-	boot_targets = "mmc1";   /* SD = mmc1 on MT7622 */
-	fdtfile = "mediatek/mt7622-bananapi-bpi-r64.dtb";
-};

board/aarch64/bananapi-bpi-r64/uboot/sd-extras.config

@@ -1,3 +0,0 @@
-CONFIG_DEVICE_TREE_INCLUDES="infix-env.dtsi infix-key.dtsi mt7622-sd-env.dtsi"
-CONFIG_SUPPORT_EMMC_BOOT=y
-CONFIG_CMD_MMC_PARTCONF=y

board/aarch64/board.mk

@@ -1,4 +1,3 @@
-include $(sort $(wildcard $(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/*/*.mk))
 
 .PHONY: board-enable-qemu-uboot
 board-enable-qemu-uboot:
@@ -20,6 +19,13 @@ board-enable-qemu-uboot:
 			'$$(BR2_EXTERNAL_INFIX_PATH)/board/common/uboot/extras.config' \
 		--enable TARGET_UBOOT_FORMAT_DTB
 
+.PHONY: board-enable-sparx-fit
+board-enable-sparx-fit:
+	@$(call IXMSG,"Enabling SparX-5i compatible FIT options")
+	@BR2_PREFIX= ./utils/config --file $(BR2_CONFIG) \
+	 	--enable FIT_IMAGE \
+	 	--set-str FIT_KERNEL_LOAD_ADDR "0x7 0x00000000"
+
 .PHONY: board-sparx-flash-uboot
 board-sparx-flash-uboot: $(BINARIES_DIR)/u-boot.bin
 	@grep -q 'BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mscc_fireant_pcb135_emmc"' $(BR2_CONFIG) || \

board/aarch64/freescale-imx8mp-evk/freescale-imx8mp-evk.hash

@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  d2f96418893ac66156d0e691cda189b0d85ae1d814065d1d9aa1845383100f46  LICENSE

board/aarch64/friendlyarm-nanopi-r2s/Config.in

@@ -4,7 +4,6 @@ config BR2_PACKAGE_FRIENDLYARM_NANOPI_R2S
 	select SDCARD_AUX
 	select BR2_PACKAGE_INPUT_EVENT_DAEMON
 	select BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X
-	select BR2_PACKAGE_INPUT_EVENT_DAEMON
 	help
 	  FriendlyElec NanoPi R2S is a compact router board based on
 	  the Rockchip RK3328 SoC with dual Gigabit Ethernet ports.

board/aarch64/friendlyarm-nanopi-r2s/friendlyarm-nanopi-r2s.hash

@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  dbe4eae8debbba8135297e15f24aeefef0b4c03781f3f9328db4398d58a728b3  LICENSE