test: case: user_scripts: Add test

Verify that:
- Scripts are executed when the service is enabled
- Scripts are not enabled when the service is disabled

.github/CHECKLIST.md

@@ -1,41 +0,0 @@
-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
-
-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

.github/CONTRIBUTING.md

@@ -1,48 +1,25 @@
-Contributing Guidelines
+Contributing to Infix
-=======================
+=====================
 
-Thank :heart: you for taking the time to read this!
+We welcome any and all help in the form of bug reports, fixes, patches
+to add new features -- *preferably as GitHub pull requests*.
 
-We welcome any help in the form of bug reports, fixes, or patches to add
+If you are unsure of what to do, or how to implement an idea or bug fix,
-new features.  We *prefer* GitHub pull requests, but are open to other
+open an issue with `"[RFC]: Unsure if this is a bug ... ?"`, or use the
-forms of collaboration as well.  [Let's talk!][support] :handshake:
+[GitHub discussions forum](https://github.com/orgs/kernelkit/discussions).
+Talking about code and problems first is often the best way to get started
+before submitting a pull request.
 
-If you are unsure how to start implementing an idea or fix:
+When submitting a bug report, patch, or pull request, please start by
-
+stating the version the change is made against, what it does, *and why*.
-- :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
-> started before submitting a pull request.  We have found it always
-> saves time, yours and ours.
-
-:sparkles: General Guidelines
------------------------------
-
-When submitting bug reports or patches to bugs, please state which
-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
 
 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.
+the maintainer(s) and make it easier for them to include your code.
 
-:woman_technologist: Coding Style
+
----------------------------------
+Coding Style
+------------
 
 Before jumping into code, remember to **document new features** and bug
 fixes.  Both the manual and ChangeLog are in the `doc/` sub-directory
@@ -50,230 +27,66 @@ 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]
+> **Tip:** consider ["Readme driven development"][RDD] for new features.
-> Consider ["Readme driven development"][RDD] for new features.  It is
+> It is amazing how many flaws in your own bright ideas come to bare
-> amazing how many flaws in your own bright ideas come to bare when you
+> when you suddenly have to explain them to someone else!
-> suddenly have to explain them to someone else!
 
 We expect code contributions for:
 
-- C code in [Linux Coding Style][Linux]
+ - C code in [Linux Coding Style][Linux]
-- Python code should follow [PEP-8][]
+ - 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:
+As a final note, lines are allowed to be longer than 72 characters these
+days.  There is no enforced maximum, but the team usually keep it around
+100 characters for both C and Python.
 
-- 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
+Commit Messages
-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
----------------------------
-
-Please test your changes, no matter how trivial or obviously correct
-they may seem.  Nobody is infallible, making mistakes is only human.
-It is also the best insurance policy for your feature, it ensures your
-use-case will remain functional as the source base evolves.
-
-For new functionality we expect new regression tests to be added in
-the same pull request.
-
-For help getting started with testing, see the following resources:
-
-- [Developer's Guide][devguide]
-- [Regression Testing][testing]
-
-:memo: Commit Messages
-----------------------
 
 Commit messages exist to track *why* a change was made.  Try to be as
 clear and concise as possible in your commit messages, and always, be
 proud of your work and set up a proper GIT identity for your commits:
 
-<img src="../doc/jack.png" width=70 align="right">
+    $ git config --global user.name "Jacky Linker"
+    $ git config --global user.email jacky.linker@example.com
 
-```bash
+Example commit message from the [Pro Git][gitbook] online book, notice
-$ git config --global user.name "Jacky Linker"
+how `git commit -s` is used to automatically add a `Signed-off-by`:
-$ git config --global user.email jacky.linker@example.com
-```
 
-Example commit message from one of many [online guides][cbeams].  Use
+    subsystem: brief, but clear and concise summary of changes
-`git commit -s` to automatically add a `Signed-off-by` for proof of
+    
-origin, see [DCO][] for more info.
+    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
+    
+    Signed-off-by: Jacky Linker <jacky.linker@example.com>
 
-```text
-subsystem: brief, but clear and concise summary of changes
 
-More detailed explanatory text, if necessary.  Wrap it to about 72
+Code of Conduct
-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
-
-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>
-```
-
-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._
-
-A pull request should preferably address a single issue or change.  This
-may of course include multiple related changes, but what is important to
-remember is the bandwidth of the maintainers.  A smaller well documented
-PR is more likely to get attention quicker in some reviewer's busy day.
-
-Well documented here means that each commit message stands on its own,
-telling the complete story of the change.  In fact each commit should,
-as much as possible, be independent of other changes.  This is very
-important, not only when digging though logs to understand why a piece
-of code exists, but also when bisecting a problem -- each single commit
-should also compile and be possible to run.
-
-If you've worked on projects that send patches, like the Linux kernel or
-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
--------------------------------
 
 It is expected of everyone to respect the [Code of Conduct][conduct].
 The *"maintainers have the right and responsibility to remove, edit, or
 reject comments, commits, code, discussion forum threads, issues, and
 other contributions that are not aligned to this Code of Conduct."*
 
-[support]:  https://github.com/kernelkit/infix/blob/main/.github/SUPPORT.md
+[Linux]:   https://www.kernel.org/doc/html/v6.9/process/coding-style.html
-[discuss]:  https://github.com/orgs/kernelkit/discussions
+[PEP-8]:   https://peps.python.org/pep-0008/
-[testing]:  https://github.com/kernelkit/infix/blob/main/doc/testing.md
+[RDD]:     https://tom.preston-werner.com/2010/08/23/readme-driven-development
-[devguide]: https://github.com/kernelkit/infix/blob/main/doc/developers-guide.md
+[gitbook]: https://git-scm.com/book/ch5-2.html
-[Linux]:    https://www.kernel.org/doc/html/v6.9/process/coding-style.html
+[conduct]: CODE-OF-CONDUCT.md
-[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

.github/SECURITY.md

@@ -1,26 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-If you discover a security vulnerability in Infix, please use GitHub's built-in
-[Report a Vulnerability](https://github.com/kernelkit/infix/security/advisories/new)
-feature for a private and secure disclosure.
-
-When reporting, include:
-
-- A clear description of the vulnerability.
-- Steps to reproduce the issue.
-- Potential impact of the vulnerability.
-
-## Supported Versions
-
-We provide security updates only for the main branch.
-
-Individual support contracts are provided by _Wires_. See
-[Support](https://github.com/kernelkit/infix/blob/main/.github/SUPPORT.md)
-for more information.
-
-## Acknowledgments
-
-We appreciate the efforts of the security community to help improve the security
-of Infix. Thank you for your responsible disclosure.

.github/SUPPORT.md

@@ -1,12 +1 @@
-Limited free support is only available using the online resources of the
+Paid support and development provided by Addiva Elektronik <https://addiva.se>
-project on GitHub, and Discord, see <https://github.com/kernelkit>:
-
-&nbsp;&nbsp; :speech_balloon: <https://github.com/orgs/kernelkit/discussions>  
-&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
-features for dedicated products is provided by _Wires_.
-
-&nbsp;&nbsp; :globe_with_meridians: <https://www.wires.se>  
-&nbsp;&nbsp; :e-mail: <mailto:infix@wires.se>

.github/actions/cache-restore/action.yml

@@ -1,41 +0,0 @@
-name: 'Restore Build Caches'
-description: 'Restore dl/ and .ccache/ caches for Buildroot builds'
-inputs:
-  target:
-    description: 'Build target for cache key differentiation'
-    required: true
-  dl-prefix:
-    description: 'Prefix for dl/ cache key (e.g., "dl", "dl-boot")'
-    required: false
-    default: 'dl'
-  ccache-prefix:
-    description: 'Prefix for .ccache/ cache key (e.g., "ccache", "ccache-boot")'
-    required: false
-    default: 'ccache'
-  enabled:
-    description: 'Set to false to skip cache restoration'
-    required: false
-    default: 'true'
-runs:
-  using: 'composite'
-  steps:
-    - name: Restore Cache of dl/
-      if: ${{ inputs.enabled == 'true' }}
-      uses: actions/cache@v4
-      with:
-        path: dl/
-        key: ${{ inputs.dl-prefix }}-${{ hashFiles('.git/modules/buildroot/HEAD', 'configs/*', 'package/*/*.hash') }}
-        restore-keys: |
-          ${{ inputs.dl-prefix }}-
-          dl-
-
-    - name: Restore Cache of .ccache/
-      if: ${{ inputs.enabled == 'true' }}
-      uses: actions/cache@v4
-      with:
-        path: .ccache/
-        key: ${{ inputs.ccache-prefix }}-${{ inputs.target }}-${{ hashFiles('.git/modules/buildroot/HEAD', 'package/*/*.hash') }}
-        restore-keys: |
-          ${{ inputs.ccache-prefix }}-${{ inputs.target }}-
-          ${{ inputs.ccache-prefix }}-
-          ccache-

.github/actions/podman-cleanup/action.yml

@@ -1,15 +0,0 @@
-name: 'Podman Cleanup'
-description: 'Clean up stale podman state from previous runs'
-runs:
-  using: 'composite'
-  steps:
-    - name: Cleanup podman state
-      shell: bash
-      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

.github/pull_request_template.md

@@ -5,6 +5,12 @@
   -- Remember: assign a reviewer, or use @mentions if org. member.
   -->
 
+
+## Other information
+
+<!-- Other relevant info, e.g., before/after screenshots -->
+
+
 ## Checklist
 
 Tick *relevant* boxes, this PR is-a or has-a:
@@ -17,12 +23,9 @@ Tick *relevant* boxes, this PR is-a or has-a:
   - [ ] Regression tests added?
   - [ ] ChangeLog updates (for next release)
   - [ ] Documentation added?
-- [ ] Test changes
-  - [ ] Checked in changed Readme.adoc (make test-spec)
-  - [ ] Added new test to group Readme.adoc and yaml file
 - [ ] Code style update (formatting, renaming)
 - [ ] Refactoring (please detail in commit messages)
 - [ ] Build related changes
 - [ ] Documentation content changes
-  - [ ] ChangeLog updated (for major changes)
 - [ ] Other (please describe):
+

.github/workflows/add-issue-to-project.yml

@@ -1,16 +0,0 @@
-name: Adds all issues to project Infix & C:o
-
-on:
-  issues:
-    types:
-      - opened
-
-jobs:
-  add-to-project:
-    name: Add issue to project Infix&co
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/add-to-project@v1.0.2
-        with:
-          project-url: https://github.com/orgs/kernelkit/projects/3
-          github-token: ${{ secrets.ADD_TO_PROJECT }}

.github/workflows/bitsign.yml

@@ -1,215 +0,0 @@
-name: bitSign Infix Release
-
-on:
-  workflow_dispatch:
-    inputs:
-      release_version:
-        description: 'Release version (e.g., v25.08.0)'
-        required: true
-        type: string
-  push:
-    branches: [ sign-with-bitsign ]
-
-jobs:
-  sign-infix-release:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-
-    - name: Validate release version format
-      id: validate
-      run: |
-        # Use default version for push events, input version for manual dispatch
-        if [ "${{ github.event_name }}" = "push" ]; then
-          VERSION="v25.08.0"
-          echo "Using default version for push trigger: $VERSION"
-        else
-          VERSION="${{ inputs.release_version }}"
-          echo "Using input version for manual trigger: $VERSION"
-        fi
-
-        # Check if version starts with 'v' and has proper format
-        if ! echo "$VERSION" | grep -qE '^v[0-9]+\.[0-9]+(\.[0-9]+)?(-alpha[0-9]*|-beta[0-9]*|-rc[0-9]*)?$'; then
-          echo "❌ Invalid version format. Expected format: vYY.MM(.PP)(-alphaN|-betaN|-rcN)"
-          echo "Examples: v25.08.0, v25.08.0-alpha1, v25.08.0-rc1"
-          exit 1
-        fi
-
-        # Extract version without 'v' prefix for filename
-        FILE_VERSION="${VERSION#v}"
-        FILENAME="infix-x86_64-${FILE_VERSION}.tar.gz"
-        RELEASE_URL="https://github.com/kernelkit/infix/releases/download/${VERSION}/${FILENAME}"
-
-        echo "✅ Version format valid"
-        echo "file_version=${FILE_VERSION}" >> $GITHUB_OUTPUT
-        echo "filename=${FILENAME}" >> $GITHUB_OUTPUT
-        echo "release_url=${RELEASE_URL}" >> $GITHUB_OUTPUT
-
-    - name: Download Infix release
-      run: |
-        RELEASE_URL="${{ steps.validate.outputs.release_url }}"
-        FILENAME="${{ steps.validate.outputs.filename }}"
-
-        echo "Downloading Infix release: $FILENAME"
-        echo "From: $RELEASE_URL"
-
-        if ! curl -L "$RELEASE_URL" -o "$FILENAME" --fail --show-error --progress-bar; then
-          echo "❌ Failed to download release file from: $RELEASE_URL"
-          echo "Please verify that the release version exists and contains the x86_64 build."
-          echo "You can check available releases at: https://github.com/kernelkit/infix/releases"
-          exit 1
-        fi
-
-        # Verify download
-        if [ -f "$FILENAME" ] && [ -s "$FILENAME" ]; then
-          FILE_SIZE=$(ls -lh "$FILENAME" | awk '{print $5}')
-          echo "✅ Successfully downloaded: $FILENAME ($FILE_SIZE)"
-        else
-          echo "❌ Failed to download release file"
-          exit 1
-        fi
-
-    - name: Create signing request
-      id: create_request
-      run: |
-        FILENAME="${{ steps.validate.outputs.filename }}"
-        FILE_VERSION="${{ steps.validate.outputs.file_version }}"
-        RELEASE="infix-x86_64-${FILE_VERSION}"
-
-        echo "Creating signing request for $FILENAME..."
-        echo "RELEASE parameter: $RELEASE"
-
-        # Create signing request using bitSign API
-        RESPONSE=$(curl -s -X POST "https://portal.bitsign.se/api/v1/requests" \
-          -H "Authorization: Bearer ${{ secrets.BITSIGN_API_KEY }}" \
-          -F "file=@$FILENAME" \
-          -F "key=bit42-Demo1" \
-          -F "job=Infix-x86" \
-          -F "parameters={\"RELEASE\": \"$RELEASE\"}")
-
-        echo "API Response: $RESPONSE"
-
-        # Check if request was successful
-        if echo "$RESPONSE" | jq -e '.success == true' > /dev/null; then
-          REQUEST_ID=$(echo "$RESPONSE" | jq -r '.requestId')
-          echo "✅ Request created successfully with ID: $REQUEST_ID"
-          echo "request_id=$REQUEST_ID" >> $GITHUB_OUTPUT
-        else
-          echo "❌ Failed to create signing request"
-          echo "$RESPONSE" | jq -r '.error // .message // "Unknown error"'
-          exit 1
-        fi
-
-    - name: Wait for signing completion
-      id: wait_completion
-      run: |
-        REQUEST_ID="${{ steps.create_request.outputs.request_id }}"
-        echo "Waiting for signing completion for request: $REQUEST_ID"
-
-        # Poll status for up to 10 minutes (600 seconds) - longer timeout for larger files
-        MAX_WAIT=600
-        WAITED=0
-
-        while [ $WAITED -lt $MAX_WAIT ]; do
-          RESPONSE=$(curl -s -X GET "https://portal.bitsign.se/api/v1/requests/$REQUEST_ID/status" \
-            -H "Authorization: Bearer ${{ secrets.BITSIGN_API_KEY }}")
-
-          STATUS=$(echo "$RESPONSE" | jq -r '.status')
-          echo "Current status: $STATUS (waited ${WAITED}s)"
-
-          if [ "$STATUS" = "completed" ]; then
-            echo "✅ Signing completed successfully!"
-            break
-          elif [ "$STATUS" = "failed" ]; then
-            echo "❌ Signing failed"
-            echo "$RESPONSE" | jq -r '.error // .message // "Unknown error"'
-            exit 1
-          fi
-
-          sleep 10
-          WAITED=$((WAITED + 10))
-        done
-
-        if [ $WAITED -ge $MAX_WAIT ]; then
-          echo "❌ Timeout: Signing did not complete within ${MAX_WAIT} seconds"
-          exit 1
-        fi
-
-    - name: Download signed file
-      id: download_signed
-      run: |
-        REQUEST_ID="${{ steps.create_request.outputs.request_id }}"
-        FILENAME="${{ steps.validate.outputs.filename }}"
-        FILE_VERSION="${{ steps.validate.outputs.file_version }}"
-        SIGNED_FILENAME="infix-x86_64-${FILE_VERSION}-signed.tar.gz"
-
-        echo "Downloading signed file for request: $REQUEST_ID"
-        echo "Expected signed filename: $SIGNED_FILENAME"
-
-        # Download the signed file
-        curl -X GET "https://portal.bitsign.se/api/v1/requests/$REQUEST_ID/download" \
-          -H "Authorization: Bearer ${{ secrets.BITSIGN_API_KEY }}" \
-          -o "$SIGNED_FILENAME" \
-          --fail --show-error
-
-        if [ -f "$SIGNED_FILENAME" ] && [ -s "$SIGNED_FILENAME" ]; then
-          FILE_SIZE=$(ls -lh "$SIGNED_FILENAME" | awk '{print $5}')
-          echo "Successfully downloaded signed file: $SIGNED_FILENAME ($FILE_SIZE)"
-          echo "signed_filename=$SIGNED_FILENAME" >> $GITHUB_OUTPUT
-
-          # Calculate SHA256 checksums for both files
-          ORIGINAL_SHA256=$(sha256sum "$FILENAME" | cut -d' ' -f1)
-          SIGNED_SHA256=$(sha256sum "$SIGNED_FILENAME" | cut -d' ' -f1)
-          echo "original_sha256=$ORIGINAL_SHA256" >> $GITHUB_OUTPUT
-          echo "signed_sha256=$SIGNED_SHA256" >> $GITHUB_OUTPUT
-        else
-          echo "Failed to download signed file"
-          exit 1
-        fi
-
-    - name: Upload signed artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: signed-infix-${{ steps.validate.outputs.file_version }}
-        path: ${{ steps.download_signed.outputs.signed_filename }}
-        retention-days: 90
-
-    - name: Summary
-      run: |
-        # Determine the actual version used (could be from push or input)
-        if [ "${{ github.event_name }}" = "push" ]; then
-          ACTUAL_VERSION="v25.08.0"
-        else
-          ACTUAL_VERSION="${{ inputs.release_version }}"
-        fi
-
-        cat >> $GITHUB_STEP_SUMMARY << EOF
-        # bitSign Infix Release Signing Complete
-
-        The Infix release has been successfully signed using the bitSign API.
-
-        ## Signing Details
-
-        | Property | Value |
-        |----------|-------|
-        | 📦 **Original File** | \`${{ steps.validate.outputs.filename }}\` (\`${{ steps.download_signed.outputs.original_sha256 }}\`) |
-        | ✍️ **Signed File** | \`${{ steps.download_signed.outputs.signed_filename }}\` (\`${{ steps.download_signed.outputs.signed_sha256 }}\`) |
-        | 🔑 **Signing Key** | \`bit42-Demo1\` |
-        | ⚙️ **Job Type** | \`Infix-x86\` |
-        | 🆔 **Request ID** | \`${{ steps.create_request.outputs.request_id }}\` |
-        | 📋 **Release Version** | \`\$ACTUAL_VERSION\` |
-        | 🌐 **API Endpoint** | \`portal.bitsign.se\` |
-
-        ## Download Files
-
-        > **The signed release file is available as a workflow artifact:**
-        > **\`signed-infix-${{ steps.validate.outputs.file_version }}\`**
-        >
-        > The artifact contains the signed file: \`${{ steps.download_signed.outputs.signed_filename }}\`
-
-        ---
-
-        **Next Steps:** The signed release can now be distributed with cryptographic verification of authenticity.
-        EOF

.github/workflows/build-boot.yml

@@ -1,136 +0,0 @@
-name: Build Bootloaders
-
-on:
-  workflow_dispatch:
-    inputs:
-      branch:
-        description: 'Branch to build from'
-        default: 'main'
-        type: string
-
-jobs:
-  build:
-    name: Build ${{ matrix.defconfig }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        defconfig:
-          - aarch64_qemu_boot
-          - bpi_r3_sd_boot
-          - bpi_r3_emmc_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:
-      - name: Cleanup Build Folder
-        run: |
-          ls -la ./
-          rm -rf ./* || true
-          rm -rf ./.??* || true
-          ls -la ./
-
-      - name: Checkout infix repo
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.branch || github.ref }}
-          clean: true
-          fetch-depth: 0
-          submodules: recursive
-
-      - name: Set Build Variables
-        id: vars
-        run: |
-          defconfig=${{ matrix.defconfig }}
-          version=$(awk -F'"' '/BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE=/ {print $2}' configs/${defconfig}_defconfig)
-          version=${version:-git}
-          filename=$(echo "${defconfig}" | tr '_' '-')
-
-          # TODO: Replace hardcoded rev with actual revision stepping
-          rev="latest"
-
-          archive="${filename}-${version}-${rev}.tar.gz"
-          dirname="${filename}-${version}-${rev}"
-
-          echo "defconfig=${defconfig}" >> $GITHUB_OUTPUT
-          echo "version=${version}"     >> $GITHUB_OUTPUT
-          echo "rev=${rev}"             >> $GITHUB_OUTPUT
-          echo "archive=${archive}"     >> $GITHUB_OUTPUT
-          echo "dirname=${dirname}"     >> $GITHUB_OUTPUT
-
-          echo "Building ${defconfig}_defconfig, version ${version}-${rev}, artifact ${archive} ..."
-
-      - uses: ./.github/actions/cache-restore
-        with:
-          target: ${{ matrix.defconfig }}
-          dl-prefix: dl-boot
-          ccache-prefix: ccache-boot
-
-      - name: Configure ${{ matrix.defconfig }}_defconfig
-        run: |
-          make ${{ matrix.defconfig }}_defconfig
-
-      - name: Build ${{ matrix.defconfig }}_defconfig
-        run: |
-          echo "Building ${{ matrix.defconfig }}_defconfig ..."
-          make -j$((`getconf _NPROCESSORS_ONLN` / 2 + 2))
-
-      - name: Resulting size of build
-        run: |
-          printf "Size of output/images/: "
-          ls -l output/images/
-
-      - name: Prepare ${{ matrix.defconfig }} Artifact
-        run: |
-          cd output/
-          mv images ${{ steps.vars.outputs.dirname }}
-          tar cfz ${{ steps.vars.outputs.archive }} ${{ steps.vars.outputs.dirname }}/
-
-      - uses: actions/upload-artifact@v4
-        with:
-          path: output/${{ steps.vars.outputs.archive }}
-          name: artifact-${{ matrix.defconfig }}
-
-  publish:
-    name: Upload Bootloader Artifacts
-    runs-on: ubuntu-latest
-    needs: build
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: "artifact-*"
-          merge-multiple: true
-
-      - name: Create checksums ...
-        run: |
-          for file in *.tar.gz; do
-              sha256sum $file > $file.sha256
-          done
-
-      - uses: ncipollo/release-action@v1
-        with:
-          allowUpdates: true
-          omitName: true
-          omitBody: true
-          omitBodyDuringUpdate: true
-          prerelease: true
-          tag: "latest-boot"
-          token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts: "*.tar.gz*"
-
-      - name: Summary
-        run: |
-          cat <<EOF >> $GITHUB_STEP_SUMMARY
-          # Bootloader Build Complete! :rocket:
-
-          For the public download links of these bootloader artifacts, please see:
-           <https://github.com/kernelkit/infix/releases/tag/latest-boot>
-          EOF

.github/workflows/build-image.yml

@@ -1,330 +0,0 @@
-name: Create SD Card & eMMC Images
-
-on:
-  workflow_dispatch:
-    inputs:
-      board:
-        description: 'Board to create image for'
-        type: choice
-        required: true
-        options:
-          - raspberrypi-rpi2
-          - raspberrypi-rpi64
-          - bananapi-bpi-r3
-          - friendlyarm-nanopi-r2s
-          - microchip-sama7g54-ek
-        default: 'raspberrypi-rpi64'
-
-jobs:
-  create-image:
-    name: Create SD Card Image for ${{ inputs.board }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          clean: true
-          fetch-depth: 0
-          submodules: recursive
-
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            genimage \
-            u-boot-tools \
-            parted \
-            gdisk \
-            qemu-utils \
-            dosfstools \
-            e2fsprogs \
-            genext2fs \
-            mtools \
-            jq
-
-      - name: Prepare build environment
-        run: |
-          # Set up directory structure similar to buildroot build
-          mkdir -p output/images
-          mkdir -p build
-
-      - 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
-              ;;
-            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
-              ;;
-            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 "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
-
-      - name: Download bootloader artifacts
-        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/
-
-            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/
-
-            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/
-
-            echo "Bootloader files extracted to output/images:"
-            ls -la output/images/
-          fi
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Download Infix artifacts
-        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/
-
-            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/
-
-            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/
-
-            # 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/images:"
-            ls -la output/images/
-          fi
-        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
-
-      - 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 BUILD_DIR=$PWD/build
-          export BR2_EXTERNAL_INFIX_PATH=$PWD
-          export RELEASE=""
-          export INFIX_ID="infix"
-          ./utils/mkimage.sh -t emmc ${{ inputs.board }}
-
-      - name: Verify created images
-        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 ""
-            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
-          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
-          fi
-
-      - name: Upload images as artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: images-${{ inputs.board }}
-          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
-            if [ -f "$file" ]; then
-              sha256sum "$file" > "$file.sha256"
-            fi
-          done
-
-      - name: Upload to release
-        uses: ncipollo/release-action@v1
-        with:
-          allowUpdates: true
-          omitName: true
-          omitBody: true
-          omitBodyDuringUpdate: true
-          prerelease: true
-          tag: "latest-boot"
-          token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts: "output/images/*-sdcard.img*,output/images/*-emmc.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
-          # SD Card Image Build Complete! 🚀
-
-          **Board:** ${{ inputs.board }}
-          **Arch:** ${{ env.ARCH }}
-          **Bootloader:** ${{ env.BOOTLOADER }}
-          **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
-          The SD card image is available as a workflow artifact above.
-          EOF
-          fi

.github/workflows/build-release.yml

@@ -1,97 +0,0 @@
-# Needed for make pkg-stats
-# sudo apt install python3-aiohttp
----
-name: Build Release
-
-on:
-  workflow_call:
-    inputs:
-      version:
-        required: true
-        type: string
-      use_cache:
-        required: false
-        type: boolean
-        default: true
-
-jobs:
-  build:
-    name: Build Infix ${{ inputs.version }} [${{ matrix.target }}]
-    runs-on: [self-hosted, release]
-    strategy:
-      matrix:
-        target: [aarch64, arm, x86_64]
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          clean: true
-          submodules: recursive
-
-      - uses: ./.github/actions/podman-cleanup
-
-      - name: Set Release Variables
-        id: vars
-        run: |
-          ver=${{ inputs.version }}
-          echo "ver=${ver}" >> $GITHUB_OUTPUT
-          fver=${ver#v}
-          target=${{ matrix.target }}-${fver}
-          echo "dir=infix-$target"        >> $GITHUB_OUTPUT
-          echo "tgz=infix-$target.tar.gz" >> $GITHUB_OUTPUT
-
-      - uses: ./.github/actions/cache-restore
-        with:
-          target: ${{ matrix.target }}
-          enabled: ${{ inputs.use_cache }}
-
-      - name: Configure & Build
-        env:
-          INFIX_RELEASE: ${{ steps.vars.outputs.ver }}
-        run: |
-          target=${{ matrix.target }}_defconfig
-          echo "Building $target ..."
-          make $target
-          make
-
-      - 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: |
-          make test-spec
-
-      - 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 }}
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: artifact-${{ matrix.target }}
-          path: output/*.tar.gz
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: artifact-disk-image-${{ matrix.target }}
-          path: output/images/*.qcow2

.github/workflows/build.yml

@@ -1,184 +1,102 @@
-name: Build
+name: Bob the Builder
 
 on:
+  push:
+    branches:
+      - main
   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:
   build:
-    name: Build ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.name || inputs.name }} ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target || inputs.target }}
+    name: Build Infix ${{ matrix.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:
+      matrix:
+        target: [aarch64, x86_64]
       fail-fast: false
-    outputs:
-      build_id: ${{ steps.vars.outputs.INFIX_BUILD_ID }}
     steps:
-      - name: Cleanup Build Folder
+      - uses: actions/checkout@v4
-        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: ./.github/actions/podman-cleanup
-
-      - 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
         run: |
-          if [ -n "${{ github.event.pull_request.head.sha }}" ]; then
+          target=${{ matrix.target }}
-              # Since PRs are built from an internally generated merge
+          echo "dir=infix-$target"        >> $GITHUB_OUTPUT
-              # commit, reverse lookups of PRs and/or commits from
+          echo "tgz=infix-$target.tar.gz" >> $GITHUB_OUTPUT
-              # image version information are cumbersome.  Therefore:
-              # explicitly set a build id that references both the PR
-              # and the commit.
-              printf "INFIX_BUILD_ID=pr%d.%.7s\n" \
-                  "${{ github.event.number }}" "${{ github.event.pull_request.head.sha }}" \
-                  | tee -a $GITHUB_OUTPUT $GITHUB_ENV
-          fi
 
-          target=${{ env.TARGET }}
+      - name: Restore Cache of dl/
-          name=${{ env.NAME }}
+        uses: actions/cache@v4
-          echo "dir=${name}-${target}"        >> $GITHUB_OUTPUT
-          echo "tgz=${name}-${target}.tar.gz" >> $GITHUB_OUTPUT
-          echo "Building target ${target}_defconfig"
-
-      - uses: ./.github/actions/cache-restore
         with:
-          target: ${{ env.TARGET }}
+          path: dl/
+          key: dl-${{ hashFiles('.git/modules/buildroot/HEAD', 'configs/*', 'package/*/*.hash') }}
+          restore-keys: |
+            dl-
 
-      - name: Configure ${{ env.TARGET }}
+      - name: Restore Cache of .ccache/
+        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
         run: |
-          make ${{ env.TARGET }}_defconfig
+          target=${{ matrix.target }}_defconfig
+          echo "Building $target ..."
+          make $target
+          make
 
-      - name: Cleanup stale containers and ports
+      - name: Prepare Artifact
-        run: |
-          podman rm -af || true
-          pkill -9 -f rootlessport || true
-
-      - name: Prepare parallel build
-        id: parallel
-        run: |
-
-          if [ "$PARALLEL" == "true" ]; then
-             echo "BR2_PER_PACKAGE_DIRECTORIES=y" >> output/.config
-             MAKE="make -j$((`getconf _NPROCESSORS_ONLN` / 2 + 2))"
-             echo "Building in parallel with -j$((`getconf _NPROCESSORS_ONLN` / 2 + 2))"
-          else
-             echo "Disabling parallel build"
-             MAKE="make"
-          fi
-          echo "MAKE=$MAKE" >> $GITHUB_OUTPUT
-
-      - name: Build ${{ env.TARGET }}
-        run: |
-          echo "Building ${{ env.TARGET }}_defconfig ..."
-          eval "${{ steps.parallel.outputs.MAKE }}"
-
-      - name:  Check SBOM from Build
-        run: |
-          make legal-info
-
-      - name: Build test specification
-        run: |
-          make test-spec
-
-      - name: Resulting size of build
-        run: |
-          printf "Size of complete tree : "
-          du -sh .
-          printf "Size of output/       : "
-          du -sh output
-          printf "Size of dl/           : "
-          du -sh dl
-          printf "Size of output/images/: "
-          ls -l output/images/
-
-      - name: Prepare ${{ env.TARGET }} Artifact
         run: |
           cd output/
           mv images ${{ steps.vars.outputs.dir }}
           ln -s ${{ steps.vars.outputs.dir }} images
-          tar cfz ${{ steps.vars.outputs.tgz }} ${{ steps.vars.outputs.dir }}
+          tar chfz ${{ steps.vars.outputs.tgz }} ${{ steps.vars.outputs.dir }}
+
+      - name: Test
+        if: matrix.target == 'x86_64'
+        run: |
+          make test
 
       - uses: actions/upload-artifact@v4
         with:
           path: output/${{ steps.vars.outputs.tgz }}
-          name: artifact-${{ env.TARGET }}
+          name: artifact-${{ matrix.target }}
+
+  release:
+    if: ${{github.repository_owner == 'kernelkit' && github.ref_name == 'main'}}
+    name: Upload Latest Build
+    needs: build
+    runs-on: [ self-hosted, latest ]
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: "artifact-*"
+          merge-multiple: true
+
+      - uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          omitName: true
+          omitBody: true
+          omitBodyDuringUpdate: true
+          prerelease: true
+          tag: "latest"
+          token: ${{ secrets.GITHUB_TOKEN }}
+          artifacts: "*.tar.gz"
+
+      - name: Summary
+        run: |
+          cat <<EOF >> $GITHUB_STEP_SUMMARY
+          # Latest Build Complete! :rocket:
+          
+          For the public download links of these build artifacts, please see:
+           <https://github.com/kernelkit/infix/releases/tag/latest>
+          EOF

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

@@ -1,140 +0,0 @@
-name: Check Kernel 6.18 Release
-
-on:
-  schedule:
-    - cron: '0 3 * * *'
-  workflow_dispatch:
-
-jobs:
-  check-kernel:
-    if: github.repository == 'kernelkit/infix'
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out infix repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.KERNEL_UPDATE_TOKEN }}
-
-      - name: Fetch kernel.org and check for 6.18 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)
-
-          if [ -z "$CURRENT_VERSION" ]; then
-            echo "Failed to fetch kernel version"
-            exit 1
-          fi
-
-          echo "current_version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
-          echo "Current 6.18 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)
-
-          echo "infix_version=$INFIX_VERSION" >> $GITHUB_OUTPUT
-          echo "Infix kernel version: $INFIX_VERSION"
-
-          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
-          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'
-        run: |
-          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:"
-          git config --global url."https://ael-bot:${{ secrets.KERNEL_UPDATE_TOKEN }}@github.com/".insteadOf "https://github.com/"
-
-      - name: Run kernel upgrade script
-        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"
-
-      - name: Create pull request
-        if: steps.check.outputs.new_release == 'true'
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.KERNEL_UPDATE_TOKEN }}
-          script: |
-            const { data: pulls } = await github.rest.pulls.list({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              head: `${context.repo.owner}:kernel-upgrade`,
-              state: 'open'
-            });
-
-            if (pulls.length === 0) {
-              const { data: pr } = await github.rest.pulls.create({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                title: `Upgrade to kernel ${{ steps.check.outputs.current_version }}`,
-                head: '${{ steps.branch.outputs.name }}',
-                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.`
-              });
-
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: pr.number,
-                labels: ['ci:main']
-              });
-
-              await github.rest.pulls.requestReviewers({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                pull_number: pr.number,
-                reviewers: ['troglobit', 'wkz', 'mattiaswal']
-              });
-            }

.github/workflows/coverity.yml

@@ -2,7 +2,7 @@ name: Coverity Scan
 
 on:
   schedule:
-    - cron: '5 0 * * 6'
+    - cron: '5 0 * * *'
   workflow_dispatch:
 
 env:
@@ -54,8 +54,8 @@ jobs:
         run: |
           sudo apt-get -y update
           sudo apt-get -y install pkg-config libjansson-dev libev-dev \
-                       libcrypt-dev libglib2.0-dev libpcre2-dev       \
+                       libaugeas-dev libglib2.0-dev libpcre2-dev      \
-                       libuev-dev
+                       libuev-dev libite-dev
 
       - name: Build dependencies
         run: |
@@ -65,14 +65,12 @@ jobs:
           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/docs.yml

@@ -1,68 +0,0 @@
-name: User Guide Generator
-
-on:
-  push:
-    branches:
-      - doc
-      - main
-    tags:
-      - 'v*'
-    paths:
-      - 'doc/**'
-      - 'mkdocs.yml'
-      - '.github/workflows/docs.yml'
-
-permissions:
-  contents: write
-
-concurrency:
-  group: "docs-${{ github.ref }}"
-  cancel-in-progress: false
-
-jobs:
-  docs:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-
-      - name: Install dependencies
-        run: |
-          pipx install mkdocs
-          pipx inject mkdocs mkdocs-material
-          pipx inject mkdocs pymdown-extensions
-          pipx inject mkdocs mkdocs-callouts
-          pipx inject mkdocs mike
-          pipx inject mkdocs mkdocs-to-pdf
-          pipx inject mkdocs mkdocs-glightbox
-          # Workaround, if pipx inject fails to install symlink
-          ln -s "$(pipx environment -V PIPX_LOCAL_VENVS)/mkdocs/bin/mike" \
-                "$(pipx environment -V PIPX_BIN_DIR)/mike" || true
-
-      - name: Configure Git
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-
-      - name: Deploy dev version
-        if: github.event_name == 'push' && (github.ref == 'refs/heads/doc' || github.ref == 'refs/heads/main')
-        run: |
-          mike deploy --push --update-aliases dev latest
-          mike set-default --push latest
-
-      - name: Deploy tagged version
-        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
-        run: |
-          TAG=${GITHUB_REF#refs/tags/v}
-          # Extract YEAR.MONTH from tag (e.g., v25.06.0-beta1 -> 25.06)
-          VERSION=$(echo $TAG | sed -E 's/^([0-9]+\.[0-9]+)(\.[0-9]+)?(-.*)?$/\1/')
-          echo "Deploying tag $TAG as docs version $VERSION"
-          mike deploy --push --update-aliases $VERSION latest
-          mike set-default --push latest

.github/workflows/generic-x86-build.yml

@@ -1,84 +0,0 @@
-name: Generic X86 GitHub Build
-
-on:
-  push:
-
-jobs:
-  build:
-    if: github.repository != 'kernelkit/infix'
-    name: Infix x86_64
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Free Disk Space
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: true
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: false
-
-      - name: Install build dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            bc binutils build-essential bzip2 cpio \
-            diffutils file findutils git gzip \
-            libncurses-dev libssl-dev perl patch \
-            python3 rsync sed tar unzip wget \
-            autopoint bison flex autoconf automake \
-            mtools
-
-      - name: Checkout infix repo
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ github.repository }}
-          ref: ${{ github.ref }}
-          fetch-depth: 0
-          submodules: recursive
-
-      - name: Set Build Variables
-        id: vars
-        run: |
-          echo "INFIX_BUILD_ID=${{ github.run_id }}" >> $GITHUB_OUTPUT
-          echo "dir=Infix-x86_64" >> $GITHUB_OUTPUT
-          echo "tgz=Infix-x86_64.tar.gz" >> $GITHUB_OUTPUT
-
-      - name: Configure x86_64_minimal
-        run: |
-          make x86_64_minimal_defconfig
-
-      - name: Unit Test x86_64
-        run: |
-          make test-unit
-
-      - name: Build x86_64_minimal
-        run: |
-          make
-
-      - name: Check SBOM
-        run: |
-          make legal-info
-
-      - name: Report Build Size
-        run: |
-          du -sh .
-          du -sh output
-          du -sh dl || true
-          ls -l output/images/
-
-      - name: Prepare Artifact
-        run: |
-          cd output/
-          mv images Infix-x86_64
-          ln -s Infix-x86_64 images
-          tar cfz Infix-x86_64.tar.gz Infix-x86_64
-
-      - uses: actions/upload-artifact@v4
-        with:
-          path: output/Infix-x86_64.tar.gz
-          name: artifact-x86_64
-

.github/workflows/inventory.yml

@@ -45,10 +45,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/cache-restore
+      - name: Restore Cache of dl/
+        uses: actions/cache@v4
         with:
-          target: x86_64
+          path: dl/
-          dl-prefix: dl-netconf
+          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/publish.yml

@@ -1,44 +0,0 @@
-name: Publish latest Infix
-
-on:
-  workflow_dispatch:
-  workflow_call:
-
-jobs:
-  publish:
-    name: Upload Latest Build
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: "artifact-*"
-          merge-multiple: true
-
-      - name: Create checksums ...
-        run: |
-          for file in *.tar.gz; do
-              sha256sum $file > $file.sha256
-          done
-
-      - uses: ncipollo/release-action@v1
-        with:
-          allowUpdates: true
-          replacesArtifacts: true
-          omitName: true
-          omitBody: true
-          omitBodyDuringUpdate: true
-          prerelease: true
-          tag: "latest"
-          token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts: "*.tar.gz*"
-
-      - name: Summary
-        run: |
-          cat <<EOF >> $GITHUB_STEP_SUMMARY
-          # Latest Build Complete! :rocket:
-
-          For the public download links of these build artifacts, please see:
-           <https://github.com/kernelkit/infix/releases/tag/latest>
-          EOF

.github/workflows/regression.yml

@@ -0,0 +1,94 @@
+name: Reggie Regression
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches:
+      - '*'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: Regression Testing ${{ matrix.target }}
+    runs-on: [ self-hosted, regression ]
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    strategy:
+      matrix:
+        target: [aarch64, x86_64]
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          clean: true
+          submodules: recursive
+
+      - name: Clean up cruft ...
+        run: |
+          ./test/env -c
+
+      - name: Set Build Variables
+        id: vars
+        run: |
+          target=${{ matrix.target }}
+          echo "dir=infix-$target"        >> $GITHUB_OUTPUT
+          echo "tgz=infix-$target.tar.gz" >> $GITHUB_OUTPUT
+
+      - name: Restore Cache of dl/
+        uses: actions/cache@v4
+        with:
+          path: dl/
+          key: dl-netconf-${{ 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-x86_64-${{ hashFiles('.git/modules/buildroot/HEAD', 'package/*/*.hash') }}
+          restore-keys: |
+            ccache-${{ matrix.target }}-
+            ccache-
+
+      - name: Configure ${{ matrix.target }}
+        run: |
+          target=${{ matrix.target }}_defconfig
+          echo "Building $target ..."
+          make $target
+
+      - name: Unit Test
+        run: |
+          make test-unit
+
+      - name: Build
+        run: |
+          make
+
+      - name: Prepare Artifact
+        run: |
+          cd output/
+          mv images ${{ steps.vars.outputs.dir }}
+          ln -s ${{ steps.vars.outputs.dir }} images
+          tar cfz ${{ steps.vars.outputs.tgz }} ${{ steps.vars.outputs.dir }}
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          path: output/${{ steps.vars.outputs.tgz }}
+          name: artifact-${{ matrix.target }}
+
+      - name: Regression Test
+        if: matrix.target == 'x86_64'
+        run: |
+          make test
+
+      - name: Publish Test Result
+        # Ensure this runs even if Regression Test fails
+        if: always()
+        run: cat test/.log/last/result-gh.md >> $GITHUB_STEP_SUMMARY

.github/workflows/release.yml

@@ -18,42 +18,90 @@ on:
         type: string
 
 jobs:
-  set-version:
+  build:
     if: github.repository == 'kernelkit/infix' && startsWith(github.ref, 'refs/tags/')
-    runs-on: ubuntu-latest
+    name: Build Infix ${{ github.ref_name }} [${{ matrix.target }}]
-    outputs:
+    runs-on: [ self-hosted, release ]
-      version: ${{ steps.set-ver.outputs.version }}
+    strategy:
+      matrix:
+        target: [aarch64, x86_64]
+      fail-fast: false
     steps:
-      - id: set-ver
+      - uses: actions/checkout@v4
+        with:
+          clean: true
+          submodules: recursive
+
+      - name: Set Release Variables
+        id: vars
         run: |
           if [ -n "${{ inputs.version }}" ]; then
               ver=${{ inputs.version }}
           else
               ver=${GITHUB_REF#refs/tags/}
           fi
-          echo "version=${ver}" >> $GITHUB_OUTPUT
+          echo "ver=${ver}" >> $GITHUB_OUTPUT
+          fver=${ver#v}
+          target=${{ matrix.target }}-${fver}
+          echo "dir=infix-$target"        >> $GITHUB_OUTPUT
+          echo "tgz=infix-$target.tar.gz" >> $GITHUB_OUTPUT
 
-  build:
+      - name: Restore Cache of dl/
-    needs: set-version
+        uses: actions/cache@v4
-    uses: ./.github/workflows/build-release.yml
+        with:
-    with:
+          path: dl/
-      version: ${{ needs.set-version.outputs.version }}
+          key: dl-${{ hashFiles('.git/modules/buildroot/HEAD', 'configs/*', 'package/*/*.hash') }}
-      use_cache: true
+          restore-keys: |
+            dl-
+
+      - name: Restore Cache of .ccache/
+        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:
+          INFIX_RELEASE: ${{ steps.vars.outputs.ver }}
+        run: |
+          target=${{ matrix.target }}_defconfig
+          echo "Building $target ..."
+          make $target
+          make
+
+      - name: Generate SBOM from Build
+        run: |
+          make legal-info
+
+      - name: Prepare Artifacts
+        run: |
+          cd output/
+          mv images ${{ steps.vars.outputs.dir }}
+          ln -s ${{ steps.vars.outputs.dir }} images
+          tar chfz ${{ steps.vars.outputs.tgz }} ${{ steps.vars.outputs.dir }}
+
+          mv legal-info legal-info-$target
+          tar chfz legal-info-$target.tar.gz legal-info-$target
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: artifact-${{ matrix.target }}
+          path: output/*.tar.gz
 
   release:
     name: Release Infix ${{ github.ref_name }}
     needs: build
-    runs-on: [self-hosted, release]
+    runs-on: [ self-hosted, release ]
     permissions:
       contents: write
-      discussions: write
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: 'true'
 
-      - uses: ./.github/actions/podman-cleanup
-
       - name: Set Release Variables
         id: rel
         run: |
@@ -63,14 +111,12 @@ jobs:
               ver=${GITHUB_REF#refs/tags/}
           fi
           echo "ver=${ver}"     >> $GITHUB_OUTPUT
-          echo "cat="           >> $GITHUB_OUTPUT
           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
           else
             echo "pre=false"    >> $GITHUB_OUTPUT
             echo "latest=false" >> $GITHUB_OUTPUT
@@ -88,15 +134,11 @@ jobs:
           for file in *.tar.gz; do
               sha256sum $file > $file.sha256
           done
-          if ls *.qcow2 &>/dev/null; then
-            for file in *.qcow2; do
-              sha256sum "$file" > "$file.sha256"
-            done
-          fi
 
       - 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
           cat release.md
 
       - uses: ncipollo/release-action@v1
@@ -104,15 +146,14 @@ jobs:
           name: Infix ${{ github.ref_name }}
           prerelease: ${{ steps.rel.outputs.pre }}
           makeLatest: ${{ steps.rel.outputs.latest }}
-          discussionCategory: ${{ steps.rel.outputs.cat }}
+          bodyFile:  release.md
-          bodyFile: release.md
+          artifacts: "*.tar.gz*"
-          artifacts: "*.tar.gz*,*.qcow2*"
 
       - name: Summary
         run: |
           cat <<EOF >> $GITHUB_STEP_SUMMARY
           # Infix ${{ github.ref_name }} Released! :rocket:
-
+          
           For the public download links of this release, please see:
            <https://github.com/kernelkit/infix/releases/tag/${{ github.ref_name }}>
           EOF

.github/workflows/sync-fork.yml

@@ -0,0 +1,28 @@
+# To enable automatic sync of your Infix fork every day, or on dispatch,
+# set the repoistory or organisation variable (not secret):
+#
+#     SYNC_FORK = true
+#
+# You also need a GH_SYNC_REPO token allowed to update workflows.  For
+# more information on variables and secrets, see the GitHub docs.
+# See https://docs.github.com/en/actions/learn-github-actions/variables
+name: Synchronize your fork of Infix with upstream
+
+on:
+  schedule:
+    - cron: 42 2 * * *
+  workflow_dispatch:
+
+jobs:
+  sync_fork:
+    if: ${{github.repository_owner != 'kernelkit' && vars.SYNC_FORK == 'true' }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: TobKed/github-forks-sync-action@master
+        with:
+          github_token: ${{ secrets.GH_SYNC_REPO }}
+          upstream_repository: KernelKit/infix
+          upstream_branch: main
+          target_branch: main
+          force: false
+          tags: true

.github/workflows/test.yml

@@ -1,137 +0,0 @@
-name: Test Infix
-
-on:
-  workflow_dispatch:
-    inputs:
-      infix_repo:
-        description: 'Repo to checkout (for spin overrides)'
-        required: false
-        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'
-      ninepm-conf:
-        required: false
-        type: string
-        default: ''
-      test-path:
-        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 }}
-
-jobs:
-  test:
-    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: 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: ./.github/actions/podman-cleanup
-
-      - 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
-        run: |
-          if [ -n "${{ needs.build.outputs.build_id }}" ]; then
-              echo "INFIX_BUILD_ID=${{ needs.build.outputs.build_id }}" \
-                   >>$GITHUB_ENV
-          fi
-
-      - name: Configure ${{ env.TARGET }}
-        run: |
-          make ${{ env.TARGET }}_defconfig
-
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: "artifact-*"
-          merge-multiple: true
-
-      - name: Restore ${{ env.TARGET }} output/
-        run: |
-          target=${{ env.TARGET }}
-          name=${{ inputs.name }}
-
-          ls -l
-          mkdir -p output
-          mv ${name}-${target}.tar.gz output/
-          cd output/
-          tar xf ${name}-${target}.tar.gz
-          ln -s ${name}-${target} images
-
-      - name: Regression Test ${{ env.TARGET }}
-        run: |
-          if [ -n "$NINEPM_CONF" ]; then
-            export NINEPM_PROJ_CONFIG="${GITHUB_WORKSPACE}/$NINEPM_CONF"
-            echo "DEBUG: NINEPM_PROJ_CONFIG is '$NINEPM_PROJ_CONFIG'"
-          fi
-          make test
-
-      - name: Publish Test Result for ${{ env.TARGET }}
-        # Ensure this runs even if Regression Test fails
-        if: always()
-        run: |
-          cat $TEST_PATH/.log/last/result-gh.md >> $GITHUB_STEP_SUMMARY
-
-      - name: Generate Test Report for ${{ env.TARGET }}
-        # Ensure this runs even if Regression Test fails
-        if: always()
-        run: |
-          make test-dir="$(pwd)/$TEST_PATH" test-report
-
-      - name: Upload Test Report as Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: test-report
-          path: output/images/test-report.pdf

.github/workflows/trigger.yml

@@ -1,91 +0,0 @@
-name: CI
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-  push:
-    branches:
-      - main
-      - ci-work
-  workflow_dispatch:
-
-concurrency:
-  group: ci-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  # Gate all builds through this check to prevent wasted runs.  Only run on
-  # 'labeled' events when the label is actually 'ci:main'.  Concurrency control
-  # above handles canceling the 'opened' event when 'labeled' arrives quickly
-  # after (e.g., when creating a PR with ci:main already attached). See #1154.
-  check-trigger:
-    if: |
-      startsWith(github.repository, 'kernelkit/') &&
-      (github.event_name != 'pull_request' ||
-       github.event.action != 'labeled' ||
-       github.event.label.name == 'ci:main')
-    runs-on: ubuntu-latest
-    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 ..."
-          echo "Event  : ${{ github.event_name }}"
-          echo "Action : ${{ github.event.action }}"
-          echo "Ref    : ${{ github.ref }}"
-          echo "PR     : ${{ github.event.pull_request.number }}"
-          echo "Label  : ${{ github.event.label.name }}"
-      - id: set-targets
-        run: |
-          if [[ "${{ github.event_name }}" == "pull_request" ]] &&           \
-             ! echo '${{ toJSON(github.event.pull_request.labels.*.name) }}' \
-             | 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]
-    uses: ./.github/workflows/build.yml
-    with:
-      name: "infix"
-      target: ${{ needs.check-trigger.outputs.x86_64_target }}
-
-  build-aarch64:
-    needs: [check-trigger, unit-test]
-    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
-    with:
-      target: ${{ needs.check-trigger.outputs.x86_64_target }}
-      name: "infix"
-
-  test-publish-x86_64:
-    if: ${{ github.repository_owner == 'kernelkit' && github.ref_name == 'main' }}
-    needs: test-run-x86_64
-    uses: ./.github/workflows/publish.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: ./.github/actions/podman-cleanup
-
-      - 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: ./.github/actions/cache-restore
-        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

.github/workflows/weekly.yml

@@ -1,68 +0,0 @@
-# Weekly release build to catch flaky tests and verify clean builds.
-# Runs without caches (ccache) to ensure reproducibility. See issue #1003.
-name: Weekly Build
-
-on:
-  schedule:
-    - cron: '5 0 * * 6'  # Saturday at 00:05 UTC, same as Coverity
-  workflow_dispatch:
-
-jobs:
-  build:
-    if: github.repository == 'kernelkit/infix'
-    uses: ./.github/workflows/build-release.yml
-    with:
-      version: "latest"
-      use_cache: false
-
-  publish:
-    name: Publish Weekly Build
-    needs: build
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: "artifact-*"
-          merge-multiple: true
-
-      - name: Create checksums
-        run: |
-          for file in *.tar.gz; do
-            sha256sum $file > $file.sha256
-          done
-          if ls *.qcow2 &>/dev/null; then
-            for file in *.qcow2; do
-              sha256sum "$file" > "$file.sha256"
-            done
-          fi
-
-      - uses: ncipollo/release-action@v1
-        with:
-          tag: latest
-          name: "Latest Weekly Build"
-          prerelease: true
-          makeLatest: false
-          allowUpdates: true
-          removeArtifacts: true
-          body: |
-            Automated weekly build from `${{ github.sha }}`.
-
-            This build runs without caches to catch potential flaky tests and build issues.
-            Not intended for production use - use official releases instead.
-
-            **Commit:** ${{ github.sha }}
-            **Built:** ${{ github.run_id }}
-          artifacts: "*.tar.gz*,*.qcow2*"
-
-      - name: Summary
-        run: |
-          cat <<EOF >> $GITHUB_STEP_SUMMARY
-          # Weekly Build Published! :package:
-
-          Latest artifacts uploaded to:
-           <https://github.com/kernelkit/infix/releases/tag/latest>
-
-          Built from commit: \`${{ github.sha }}\`
-          EOF

.gitignore

@@ -1,8 +1,5 @@
 *~
-.claude
 .gdb_history
-.claude
-AGENTS.md
 /.backup
 /.ccache
 /dl
@@ -11,4 +8,3 @@ AGENTS.md
 /test/.venv
 /test/.log
 /local.mk
-/test/spec/Readme.adoc

Config.in

@@ -1,5 +1,3 @@
-source "$BR2_EXTERNAL_INFIX_PATH/board/Config.in"
-
 menu "Branding"
 
 config INFIX_VENDOR
@@ -54,20 +52,9 @@ config INFIX_IMAGE_ID
 	  Mandatory.  When INFIX_RELEASE is set, this string is appended to
 	  the IMAGE_ID with a '-' separator.
 
-config INFIX_COMPATIBLE
-	string "Operating system compatible string"
-	default "${INFIX_IMAGE_ID}"
-	help
-	  A lower-case string (no spaces or other characters outside of 0–9,
-	  a–z, ".", "_" and "-"), used for image identification at upgrade.
-	  E.g., the RAUC [system] compatible string.
-
-	  Mandatory.  Defaults to $INFIX_IMAGE_ID, which in turn is composed
-	  of $INFIX_ID-$BR2_ARCH.
-
 config INFIX_TAGLINE
 	string "Operating system tagline"
-	default "Infix OS — Immutable.Friendly.Secure"
+	default "Infix -- a Network Operating System"
 	help
 	  Mandatory. Used for identifying the OS, e.g. as PRETTY_NAME in
 	  /etc/os-release and description in the GNS3 appliance.
@@ -125,6 +112,10 @@ config INFIX_ARCH
 	default "riscv64" if BR2_riscv
 	default "x86_64"  if BR2_x86_64
 
+menu "Packages"
+
 source "$BR2_EXTERNAL_INFIX_PATH/package/Config.in"
-source "$BR2_EXTERNAL_INFIX_PATH/package/Config.in.host"
+
+endmenu
+
 source "$BR2_EXTERNAL_INFIX_PATH/board/common/Config.in"

Makefile

@@ -1,13 +1,8 @@
-export BR2_EXTERNAL ?= $(CURDIR)
+export BR2_EXTERNAL := $(CURDIR)
 export PATH         := $(CURDIR)/bin:$(PATH)
 
 ARCH ?= $(shell uname -m)
-O    ?= output
+O    ?= $(CURDIR)/output
-
-# If a relative output path is specified, we have to translate it to
-# an absolute one before handing over control to Buildroot, which will
-# otherwise treat it as relative to ./buildroot.
-override O := $(if $(filter /%,$O),$O,$(CURDIR)/$O)
 
 config := $(O)/.config
 bmake   = $(MAKE) -C buildroot O=$(O) $1
@@ -16,7 +11,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 +28,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 +35,4 @@ test:
 buildroot/Makefile:
 	@git submodule update --init
 
-.PHONY: all check coverity dep test cyclonedx
+.PHONY: all check test

README.md

@@ -1,78 +1,66 @@
-[![License Badge][]][License] [![Release Badge][]][Release] [![GitHub Status][]][GitHub] [![Coverity Status][]][Coverity Scan] [![Discord][discord-badge]][discord-url]
+[![License Badge][]][License] [![GitHub Status][]][GitHub] [![Coverity Status][]][Coverity Scan] [![Discord][discord-badge]][discord-url]
 
-<img align="right" src="doc/logo.png" alt="Infix — Immutable.Friendly.Secure" width=480 padding=10>
+<img align="right" src="doc/logo.png" alt="Infix - Linux <3 NETCONF" width=480 border=10>
 
-Turn any ARM or x86 device into a powerful, manageable network appliance
+Infix is a free, Linux based, immutable Network Operating System (NOS)
-in minutes. From $35 Raspberry Pi boards to enterprise switches — deploy
+built on [Buildroot][1], and [sysrepo][2].  A powerful mix that ease
-routers, IoT gateways, edge devices, or custom network solutions that
+porting to different platforms, simplify long-term maintenance, and
-just work.
+provide made-easy management using NETCONF[^1] or the built-in command
+line interface (CLI) from a console or SSH login.
 
-## Our Values
+> Click the **▶ Example CLI Session** foldout below for an example, or
+> head on over to the [Infix Documentation](doc/README.md) for more
+> information on how to set up the system.
 
-**🔒 Immutable**  
+Although primarily focused on switches and routers, the core values
-Your system never breaks.  Read-only filesystem with atomic upgrades
+may be appealing for other use-cases as well:
-means no configuration drift, no corrupted updates, and instant rollback
-if something goes wrong.  Deploy once, trust forever.
 
-**🤝 Friendly**  
+- Runs from a squashfs image on a read-only partition
-Actually easy to use. Auto-generated CLI from standard YANG models comes
+- Single configuration file on a separate partition
-with built-in help for every command — just hit <kbd>?</kbd> or
+- Built around YANG with standard IETF models
-<kbd>TAB</kbd> for context-aware assistance.
+- Linux switchdev provides open switch APIs
+- Atomic upgrades to secondary partition
+- Highly security focused
 
-Familiar NETCONF & RESTCONF APIs and [comprehensive documentation][4]
+An immutable[^2] operating system enhances security and inherently makes
-mean you're never stuck.  Whether you're learning networking or managing
+it maintenance-free.  Configuration and data, e.g, containers, is stored
-enterprise infrastructure.
+on separate partitions to ensure complete separation from system files
+and allow for seamless backup, restore, and provisioning.
 
-**🛡️ Secure**  
+In itself Infix is perfectly suited for dedicated networking tasks and
-Built with security as a foundation, not an afterthought.  Minimal
+native support for Docker containers provides a versatile platform that
-attack surface, separation between system and data, and container
+can easily be adapted to any customer need.  Be it legacy applications,
-isolation.  Sleep better knowing your infrastructure is protected.
+network protocols, process monitoring, or edge data analysis, it can run
+close to end equipment.  Either directly connected on dedicated Ethernet
+ports or indirectly using virtual network cables to exist on the same
+LAN as other connected equipment.
 
-## Why Choose Infix
+The simple design of Infix provides complete control over both system
+and data, minimal cognitive burden, and makes it incredibly easy to get
+started.
 
-**Hardware Flexibility**: Start with a $35 Raspberry Pi, scale to
+<details><summary><b>Example CLI Session</b></summary>
-enterprise switching hardware.  Same OS, same tools, same reliability.
 
-**Standards-Based**: Built around YANG models and IETF standards. Learn
+The CLI configure context is automatically generated from the loaded
-once, use everywhere - no vendor lock-in.
+YANG models and their corresponding [sysrepo][2] plugins.  The following
+is brief example of how to set the IP address of an interface:
 
-**Container Ready**: Run your applications alongside networking
+```
-functions.  GPIO access, dedicated Ethernet ports, custom protocols —
+admin@infix-12-34-56:/> configure
-your device, your rules.
+admin@infix-12-34-56:/config/> edit interface eth0
-
+admin@infix-12-34-56:/config/interface/eth0/> set ipv4 <TAB>
-## Use Cases
+      address     autoconf bind-ni-name      enabled
-
+	  forwarding  mtu      neighbor
-1. **Home Labs & Hobbyists**:  
+admin@infix-12-34-56:/config/interface/eth0/> set ipv4 address 192.168.2.200 prefix-length 24
-   Transform a Raspberry Pi into a full-featured router with WiFi  
+admin@infix-12-34-56:/config/interface/eth0/> show
-1. **IoT & Edge Computing**:  
-   Bridge devices to the cloud with reliable, updatable gateways  
-1. **Small Business Networks**:  
-   Enterprise-grade features without the complexity or cost  
-1. **Developers & Makers**:  
-   Test networking concepts, prototype IoT solutions, or build custom
-   appliances
-1. **Network Professionals**:  
-   Consistent tooling from development to production deployment.  
-   How about a digital twin using raw Qemu or [GNS3](https://gns3.com/infix)!
-
-## Quick Example
-
-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>
 type ethernet;
 ipv4 {
   address 192.168.2.200 {
     prefix-length 24;
   }
 }
-admin@infix-12-34-56:/config/interface/eth0/> <b>diff</b>
+ipv6
+admin@infix-12-34-56:/config/interface/eth0/> diff
 interfaces {
   interface eth0 {
 +    ipv4 {
@@ -82,99 +70,55 @@ interfaces {
 +    }
   }
 }
-admin@infix-12-34-56:/config/interface/eth0/> <b>leave</b>
+admin@infix-12-34-56:/config/interface/eth0/> leave
-admin@infix-12-34-56:/> <b>show interfaces</b>
+admin@infix-12-34-56:/> show interfaces
-<u>INTERFACE       PROTOCOL   STATE       DATA                                  </u>
+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)
 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:/> <b>copy running startup</b>
+admin@infix-12-34-56:/> copy running-config startup-config
-</code></pre>
+```
 
-Notice how <kbd>TAB</kbd> completion shows available options, `show`
+[Click here][3] for more details.
-displays current config, and `diff` shows exactly what changed before
+</details>
-you commit your changes with the `leave` command.
 
-For more information, see [CLI documentation][3].
+Infix can run on many different types of architectures and boards, much
+thanks to Linux and Buildroot.  Currently the focus is on 64-bit ARM
+devices, optionally with switching fabric supported by Linux switchdev.
+The [following boards](board/aarch64/README.md) are fully supported:
 
-## Get Started
+ - Marvell CN9130 CRB
+ - Marvell EspressoBIN
+ - Microchip SparX-5i PCB135 (eMMC)
+ - NanoPi R2S
 
-Get [pre-built images][5] for your hardware.  Use the CLI, web
+An x86_64 build is also available, primarily intended for development
-interface, or standard NETCONF/RESTCONF tools, e.g., `curl`.  Add
+and testing, but can also be used for evaluation and demo purposes.  For
-containers for any custom functionality you need.
+more information, see: [Infix in Virtual Environments](doc/virtual.md).
 
-### Supported Platforms
+> See the [GitHub Releases](https://github.com/kernelkit/infix/releases)
+> page for our pre-built images.  The *[Latest Build][]* has bleeding
+> edge images, if possible we recommend using a versioned release.
+>
+> For *customer specific builds* of Infix, see your product repository.
 
-- **Raspberry Pi 2B/3B/4B/CM4** - Perfect for home labs, learning, and prototyping
+[^1]: NETCONF or RESTCONF, <https://datatracker.ietf.org/doc/html/rfc8040>
-- **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
-- **NXP i.MX8MP EVK** - Highly capable ARM64 SoC
-- **StarFive VisionFive2** - RISC-V architecture support
 
-*Why start with Raspberry Pi?* It's affordable, widely available, has
+[^2]: An immutable operating system is one with read-only file systems,
-built-in WiFi + Ethernet, and runs the exact same Infix OS you'd deploy
+    atomic updates, rollbacks, declarative configuration, and workload
-in production. Perfect for learning, prototyping, or even small-scale
+    isolation.  All to improve reliability, scalability, and security.
-deployments.
+    For more information, see <https://ceur-ws.org/Vol-3386/paper9.pdf>
+    and <https://www.zdnet.com/article/what-is-immutable-linux-heres-why-youd-run-an-immutable-linux-distro/>.
 
-> 📖 **[Complete documentation][4]** • 💬 **[Join our Discord][discord-url]**
+[1]: https://buildroot.org/
-
+[2]: https://www.sysrepo.org/
-## Technical Details
+[3]: doc/cli/introduction.md
-
+[Latest Build]:    https://github.com/kernelkit/infix/releases/tag/latest
-<a href="https://bitsign.se">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://bitsign.se/assets/badges/bitsign-badge-dark-mode.png">
-    <source media="(prefers-color-scheme: light)" srcset="https://bitsign.se/assets/badges/bitsign-badge-light-mode.png">
-    <img alt="bitSign - Code Signing" src="https://bitsign.se/assets/badges/bitsign-badge-light-mode.png" align="right" width=150 padding=10>
-  </picture>
-</a>
-
-Built on proven open-source foundations: [Linux][0], [Buildroot][1], and
-[sysrepo][2] — for reliability you can trust:
-
-- **Immutable OS**: Read-only filesystem, atomic updates, instant rollback
-- **YANG Configuration**: Industry-standard models with auto-generated tooling
-- **Hardware Acceleration**: Linux switchdev support for wire-speed packet processing
-- **Container Integration**: Docker support with flexible network and hardware access
-- **Memory Efficient**: Runs comfortably on devices with as little as 256 MB RAM
-- **Code Signing**: Releases are cryptographically signed for integrity verification
-
-Perfect for everything from resource-constrained edge devices to
-high-throughput network appliances.
-
-With the entire system modeled in YANG, scalability is no longer an
-issue, be it in development, testing, or end users deploying and
-monitoring their devices.  All knobs and dials are accessible from the
-CLI (console/SSH), or remotely using the native NETCONF or RESTCONF
-APIs.
-
-> Check the *[Latest Build][]* for bleeding-edge features.
-
----
-
-<div align="center">
-  <a href="https://github.com/wires-se"><img src="https://raw.githubusercontent.com/wires-se/.github/main/profile/play.svg" width=300></a>
-  <br />Infix development is sponsored by <a href="https://wires.se">Wires</a>
-</div>
-
-![Alt](https://repobeats.axiom.co/api/embed/5ce7a2a67edc923823afa0f60c327a6e8575b6e9.svg "Repobeats analytics image")
-
-[0]: https://www.kernel.org
-[1]: https://buildroot.org/ "Buildroot Homepage"
-[2]: https://www.sysrepo.org/ "Sysrepo Homepage"
-[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
-[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
 [Coverity Scan]:   https://scan.coverity.com/projects/29393

board/Config.in

@@ -1,8 +0,0 @@
-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"
-
-endmenu

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

@@ -1,13 +0,0 @@
-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/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"
-source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/marvell-espressobin/Config.in"
-source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/microchip-sparx5-pcb135/Config.in"
-source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/raspberrypi-rpi64/Config.in"
-source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/styx-dcp-sc-28p/Config.in"
-
-endif

board/aarch64/README.md

@@ -3,9 +3,5 @@ aarch64
 
 Board Specific Documentation
 ----------------------------
-
-- [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,5 +0,0 @@
-config BR2_PACKAGE_ALDER_ALDER
-	bool "Alder"
-	depends on BR2_aarch64
-	help
-	  Alder

board/aarch64/alder-alder/LICENSE

@@ -1,13 +0,0 @@
-Copyright (c) 2024 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/alder-alder/alder-alder.mk

@@ -1,2 +0,0 @@
-$(eval $(ix-board))
-$(eval $(generic-package))

board/aarch64/alder-alder/dts/Makefile

@@ -1 +0,0 @@
-dtb-y += alder/alder.dtb

board/aarch64/alder-alder/dts/marvell/cn9130-patched.dtsi

@@ -1,12 +0,0 @@
-#include <arm64/marvell/cn9130.dtsi>
-
-&cp0_syscon0 {
-	cp0_pinctrl: pinctrl {
-		/* For some reason, this is missing from cn9130.dtsi */
-		compatible = "marvell,cp115-standalone-pinctrl";
-	};
-};
-
-&cp0_xmdio {
-	clock-names = "gop_clk", "mg_clk", "mg_core_clk", "axi_clk";
-};

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

@@ -1,11 +0,0 @@
-config BR2_PACKAGE_BANANAPI_BPI_R3
-	bool "Banana Pi R3"
-	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_MT7986
-	select BR2_PACKAGE_LINUX_FIRMWARE_AIROHA_EN8811H
-	select SDCARD_AUX
-	help
-	  Build Banana PI R3 support

board/aarch64/bananapi-bpi-r3/LICENSE

@@ -1,13 +0,0 @@
-Copyright (c) 2025 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-r3/README.md

@@ -1,273 +0,0 @@
-# Banana Pi BPI-R3 / BPI-R3 Mini
-
-<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://kernelkit.org/posts/flashing-sdcard/
-[1]: https://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.mk

@@ -1,37 +0,0 @@
-define BANANAPI_BPI_R3_LINUX_CONFIG_FIXUPS
-	$(call KCONFIG_ENABLE_OPT,CONFIG_ARCH_MEDIATEK)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MACH_MT7986)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_PINCTRL_MT7986)
-	$(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_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_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)
-	$(call KCONFIG_SET_OPT,CONFIG_MT7915E,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_ENABLE_OPT,CONFIG_MTK_HSDMA)
-	$(call KCONFIG_SET_OPT,CONFIG_MT7915E,m)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MT798X_WMAC)
-	$(call KCONFIG_SET_OPT,CONFIG_MTK_SOC_THERMAL,m)
-	$(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_REGULATOR_GPIO,y)
-	$(call KCONFIG_SET_OPT,CONFIG_REGULATOR_MT6380,m)
-	$(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_CRYPTO_DEV_SAFEXCEL,m)
-endef
-
-$(eval $(ix-board))
-$(eval $(generic-package))

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

@@ -1 +0,0 @@
-dtb-y += mediatek/mt7986a-bananapi-bpi-r3-sd.dtb mediatek/mt7986a-bananapi-bpi-r3-emmc.dtb mediatek/mt7986a-bananapi-bpi-r3-mini.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 +0,0 @@
-#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-sd.dtsi

@@ -1,16 +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 = <4>;
-	max-frequency = <52000000>;
-	cap-sd-highspeed;
-	status = "okay";
-};

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

@@ -1,57 +0,0 @@
-/ {
-	chosen {
-		infix {
-			/* Default admin user password: 'admin' */
-			factory-password-hash = "$5$mI/zpOAqZYKLC2WU$i7iPzZiIjOjrBF3NyftS9CCq8dfYwHwrmUK097Jca9A";
-			usb-ports = <&ssusb>;
-			usb-port-names = "USB";
-		};
-	};
-};
-
-&cpu_thermal {
-	/delete-node/ trips;
-	/delete-node/ cooling-maps;
-	trips {
-		cpu_trip_active_cool: cpu-trip-active-cool {
-			temperature = <40000>;   // 40°C
-			hysteresis = <2000>;     // 2°C hysteresis
-			type = "active";
-		};
-		cpu_trip_active_low: cpu-trip-active-low {
-			temperature = <45000>;   // 40°C
-			hysteresis = <2000>;     // 2°C hysteresis
-			type = "active";
-		};
-		cpu_trip_active_med: cpu-trip-active-med {
-			temperature = <60000>;   // 60°C
-			hysteresis = <2000>;     // 2°C hysteresis
-			type = "active";
-		};
-		cpu_trip_hot: cpu-trip-hot {
-			temperature = <80000>;   // 80°C
-			hysteresis = <2000>;     // 2°C hysteresis
-			type = "hot";
-		};
-		cpu_trip_critical: cpu-trip-critical {
-			temperature = <90000>;   // 90°C
-			hysteresis = <2000>;     // 2°C hysteresis
-			type = "critical";
-		};
-	};
-
-	cooling-maps {
-		map-cpu-40deg {
-			cooling-device = <&fan 0 0>;
-			trip = <&cpu_trip_active_cool>;
-		};
-		map-cpu-45deg {
-			cooling-device = <&fan 1 1>;
-			trip = <&cpu_trip_active_low>;
-		};
-		map-cpu-60deg {
-			cooling-device = <&fan 2 2>;
-			trip = <&cpu_trip_active_med>;
-		};
-	};
-};

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

@@ -1,87 +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-r3-#TARGET#.img {
-        hdimage {
-                partition-table-type = "gpt"
-
-        }
-        # 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 {
-#		partition-type = 0x83  # Linux filesystem
-                image = "fip.bin"
-                offset = 13312s
-                size = 4096s
-        }
-
-	partition en8811h_fw {
-		size = 10M
-		image = "en8811h-fw.bin"
-	}
-
-        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-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/factory-config.cfg

@@ -1,479 +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": "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": "lan4",
-        "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": "sfp1",
-        "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv6": {}
-      },
-      {
-        "name": "sfp2",
-        "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv6": {}
-      },
-      {
-        "name": "wan",
-        "type": "infix-if-type:ethernet",
-        "ietf-ip:ipv4": {
-          "infix-dhcp-client:dhcp": {
-            "option": [
-              {
-                "id": "ntp-server"
-              },
-              {
-                "id": "broadcast"
-              },
-              {
-                "id": "domain"
-              },
-              {
-                "id": "hostname"
-              },
-              {
-                "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-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-r3/etc/udev/rules.d/90-bpi-r3-rename-eth1.rules

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

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

@@ -1,445 +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"
-              },
-              {
-                "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

@@ -1,45 +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="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_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

@@ -1,29 +0,0 @@
-/ {
-       config {
-               env: environment {
-                       /* After the MMC driver has enabled bus power,
-                        * the controller seems to sometimes detect a
-                        * card removal state , which causes it to
-                        * disable power again. This hack re-enables the
-                        * bus power in those cases.
-                        */
-                       bootcmd = "run ixboot";
-                       boot_targets = "mmc0";
-                       ethprime = "eth0";
-                       fdt_addr_r = "0x43f00000";
-                       kernel_addr_r = "0x44000000";
-                       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.
-                        */
-                       ixbtn-devmode = "setenv dev_mode yes; echo Enabled";
-                       ixbtn-factory = "echo \"No button available, use bootmenu\"";
-               };
-       };
-};

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

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

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

@@ -1 +0,0 @@
-CONFIG_DEVICE_TREE_INCLUDES="infix-env.dtsi infix-key.dtsi mt7986-sd-env.dtsi"

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/cn9130-crb/README.md

@@ -118,8 +118,8 @@ the device is reasonably correct, and run the provisioning script:
 
     admin@infix:~$ sudo -i
     root@infix:~$ udhcpc -i e28
-    root@infix:~$ date -us YYYY-MM-DD
+	root@infix:~$ date -us YYYY-MM-DD
-    root@infix:~$ /usr/libexec/infix/prod/provision tftp://<PC-IP>/infix-aarch64.pkg /dev/mmcblk0
+	root@infix:~$ /libexec/infix/prod/provision tftp://<PC-IP>/infix-aarch64.pkg /dev/mmcblk0
 
 After successful completion, the device is fully provisioned. On the
 next boot, the device will boot of its own accord from the primary
@@ -128,9 +128,5 @@ SD-card partition.
 > If possible, serve `infix-aarch64.pkg` over HTTP instead, as
 > libcurl's TFTP implementation is quite slow.
 
-## Console Port
-
-The console port runs at 115200 baud, 8N1.
-
 [release]: https://github.com/kernelkit/infix/releases
 [mvebu64boot]: https://github.com/addiva-elektronik/mvebu64boot

board/aarch64/cn9130-crb/uboot/cn9130-crb-env.dtsi

@@ -16,12 +16,7 @@ run ixboot
 ";
 			boot_targets = "mmc1";
 			ethprime = "eth1";
-
+			bootdelay = "1";
-			/* This is a development platform, keep
-			 * developer mode statically enabled.
-			 */
-			ixbtn-devmode = "setenv dev_mode yes; echo Enabled";
-			ixbtn-factory = "echo \"No button available, use bootmenu\"";
 		};
 	};
 };

board/aarch64/dts/marvell/cn9130-crb-A.dts

@@ -3,7 +3,7 @@
  * Copyright (C) 2020 Marvell International Ltd.
  */
 
-#include "arm64/marvell/cn9130-crb.dtsi"
+#include "cn9130-crb.dtsi"
 
 / {
 	model = "Marvell Armada CN9130-CRB-A";

board/aarch64/dts/marvell/cn9130-patched.dtsi

@@ -1,4 +1,4 @@
-#include <arm64/marvell/cn9130.dtsi>
+#include "cn9130.dtsi"
 
 &cp0_syscon0 {
 	cp0_pinctrl: pinctrl {

board/aarch64/dts/microchip/sparx5_pcb135_emmc_no_psci.dts

@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <arm64/microchip/sparx5_pcb135_emmc.dts>
+#include "sparx5_pcb135_emmc.dts"
 
 &cpu0 {
 	enable-method = "spin-table";

board/aarch64/dts/styx/styx-mpp.h

@@ -1,5 +1,5 @@
-#ifndef _DCP_SC_28P_MPP_H
+#ifndef _STYX_MPP_H
-#define _DCP_SC_28P_MPP_H
+#define _STYX_MPP_H
 
 #define SFP0_TX_DISABLE(X) X( "mpp0", cp0_gpio1,  0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)
 #define SFP1_TX_DISABLE(X) X( "mpp1", cp0_gpio1,  1, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)
@@ -73,4 +73,4 @@
 #define MPP_GPIO_REF_NO_CHIP(_mpp, _chip, _no, _flags) <_no (_flags)>
 #define MPP_IRQ_REF(_mpp, _chip, _no, _flags) <&_chip _no (_flags)>
 
-#endif	/* _DCP_SC_28P_MPP_H */
+#endif	/* _STYX_MPP_H */

board/aarch64/dts/styx/styx.dts

@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (C) 2021 Marvell International Ltd.
+ * Copyright (C) 2023 Addiva Elektronik AB
+ *
+ * Device tree for Styx board
+ */
+
+#include "styx.dtsi"

board/aarch64/dts/styx/styx.dtsi

@@ -3,7 +3,7 @@
  * Copyright (C) 2021 Marvell International Ltd.
  * Copyright (C) 2023 Addiva Elektronik AB
  *
- * Device tree base for DCP-SC-28P
+ * Device tree for Styx board
  */
 
 #include <dt-bindings/input/input.h>
@@ -12,10 +12,13 @@
 
 #include "../marvell/cn9130-patched.dtsi"
 
-#include "dcp-sc-28p-mpp.h"
+#include "styx-mpp.h"
 
 / {
-	model = "DCP-SC-28P";
+	model = "Styx";
+	compatible = "styx,styx",
+		"marvell,armada-ap807-quad",
+		"marvell,armada-ap807";
 
 	chosen {
 		stdout-path = "serial0:115200n8";
@@ -33,14 +36,6 @@
 	};
 };
 
-/*
- * RTC has no valid bit, and this board does not connect any
- * backup power (e.g. supercap) to it, so it returns garbage
- * after every cold reset.
- */
-&cp0_rtc {
-	status = "disabled";
-};
 
 /* UART0 (Console) */
 
@@ -97,7 +92,7 @@
 		compatible = "atmel,24c256";
                 reg = <0x50>;
 
-		infix,board = "product";
+		infix,board = "cpu";
 		infix,trusted;
 
 		nvmem-layout {
@@ -265,43 +260,25 @@
 	};
 };
 
-#define SWP_LED \
+#define SWP_LED(_func) \
 	leds { \
 		#address-cells = <1>; \
 		#size-cells = <0>; \
 		\
 		led@0 { \
 			reg = <0>; \
-			function = "tp"; \
+			function = _func; \
 			color = <LED_COLOR_ID_GREEN>; \
 			default-state = "keep"; \
 		}; \
 		led@1 { \
 			reg = <1>; \
-			function = "aux"; \
+			function = _func; \
-			color = <LED_COLOR_ID_GREEN>; \
+			color = <LED_COLOR_ID_YELLOW>; \
 			default-state = "off"; \
 		}; \
 	}
 
-/* SFP LEDs
- * Rev A. LEDs do not work at all
- * Rev B. only outer-most (green) LEDs work
- */
-
-#define SFP_LED \
-	leds { \
-		#address-cells = <1>; \
-		#size-cells = <0>; \
-		\
-		led@0 { \
-			reg = <0>; \
-			function = "sfp"; \
-			color = <LED_COLOR_ID_GREEN>; \
-			default-state = "keep"; \
-		}; \
-	}
-
 #define XSWP(_n, _label, _mac_offs, _sfp) \
 	port@_n { \
 		reg = <0x ## _n>; \
@@ -310,31 +287,8 @@
 		nvmem-cell-names = "mac-address"; \
 		phy-mode = "10gbase-r"; \
 		managed = "in-band-status"; \
-		sfp = <_sfp>; \
+		sfp = <&_sfp>; \
-		SFP_LED; \
+		SWP_LED("sfp"); \
-	}
-
-#define XSWCPU(_n, _eth) \
-	port@_n { \
-		reg = <0x ## _n>; \
-		label = "cpu"; \
-		ethernet = <_eth>; \
-		phy-mode = "10gbase-r"; \
-		fixed-link { \
-			speed = <10000>; \
-			full-duplex; \
-		}; \
-	}
-
-#define XSWLINK(_n, _link) \
-	port@_n { \
-		reg = <0x ## _n>; \
-		link = <_link>; \
-		phy-mode = "10gbase-r"; \
-		fixed-link { \
-			speed = <10000>; \
-			full-duplex; \
-		}; \
 	}
 
 #define GSWP(_n, _label, _mac_offs, _phy) \
@@ -344,8 +298,8 @@
 		nvmem-cells = <&base_mac _mac_offs>; \
 		nvmem-cell-names = "mac-address"; \
 		phy-mode = "gmii"; \
-		phy-handle = <_phy>; \
+		phy-handle = <&_phy>; \
-		SWP_LED; \
+		SWP_LED("tp"); \
 	}
 
 #define GPHY(_n) \
@@ -378,14 +332,52 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			GSWP(1,  "e22", 22, &sw3phy1);
+			port@9 {
-			GSWP(2,  "e21", 21, &sw3phy2);
+				reg = <0x9>;
-			GSWP(3,  "e24", 24, &sw3phy3);
+				label = "cpu";
-			GSWP(4,  "e23", 23, &sw3phy4);
+				ethernet = <&cp0_eth0>;
-			GSWP(5,  "e26", 26, &sw3phy5);
+				phy-mode = "10gbase-r";
-			GSWP(6,  "e25", 25, &sw3phy6);
+				fixed-link {
-			GSWP(7,  "e28", 28, &sw3phy7);
+					speed = <10000>;
-			GSWP(8,  "e27", 27, &sw3phy8);
+					full-duplex;
+				};
+			};
+
+			sw3p10: port@a {
+				reg = <0xa>;
+				link = <&sw2p10 &sw1p0>;
+				phy-mode = "10gbase-r";
+				fixed-link {
+					speed = <10000>;
+					full-duplex;
+				};
+			};
+
+			/* Can't use XSWP macro as port 0 does not have
+			 * any LEDs attached to it. LEDs for port 10 seem
+			 * to be wired to the corresponding SFP cage. Maybe
+			 * we can apply a static workaround by binding port
+			 * 10's green LED to "Special LED 1", so we can at
+			 * least see link/act.
+			 */
+			port@0 {
+				reg = <0>;
+				label = "e16";
+				nvmem-cells = <&base_mac 16>;
+				nvmem-cell-names = "mac-address";
+				phy-mode = "10gbase-r";
+				managed = "in-band-status";
+				sfp = <&sfp3>;
+			};
+
+			GSWP(1,  "e22", 22, sw3phy1);
+			GSWP(2,  "e21", 21, sw3phy2);
+			GSWP(3,  "e24", 24, sw3phy3);
+			GSWP(4,  "e23", 23, sw3phy4);
+			GSWP(5,  "e26", 26, sw3phy5);
+			GSWP(6,  "e25", 25, sw3phy6);
+			GSWP(7,  "e28", 28, sw3phy7);
+			GSWP(8,  "e27", 27, sw3phy8);
 		};
 
 		mdio {
@@ -420,14 +412,36 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			GSWP(1, "e10", 10, &sw2phy1);
+			sw2p0: port@0 {
-			GSWP(2,  "e9",  9, &sw2phy2);
+				reg = <0x0>;
-			GSWP(3, "e12", 12, &sw2phy3);
+				link = <&sw1p0>;
-			GSWP(4, "e11", 11, &sw2phy4);
+				phy-mode = "10gbase-r";
-			GSWP(5, "e18", 18, &sw2phy5);
+				fixed-link {
-			GSWP(6, "e17", 17, &sw2phy6);
+					speed = <10000>;
-			GSWP(7, "e20", 20, &sw2phy7);
+					full-duplex;
-			GSWP(8, "e19", 19, &sw2phy8);
+				};
+			};
+
+			sw2p10: port@a {
+				reg = <0xa>;
+				link = <&sw3p10>;
+				phy-mode = "10gbase-r";
+				fixed-link {
+					speed = <10000>;
+					full-duplex;
+				};
+			};
+
+
+			GSWP(1, "e10", 10, sw2phy1);
+			GSWP(2,  "e9",  9, sw2phy2);
+			GSWP(3, "e12", 12, sw2phy3);
+			GSWP(4, "e11", 11, sw2phy4);
+			GSWP(5, "e18", 18, sw2phy5);
+			GSWP(6, "e17", 17, sw2phy6);
+			GSWP(7, "e20", 20, sw2phy7);
+			GSWP(8, "e19", 19, sw2phy8);
+			XSWP(9, "e15", 15, sfp2);
 		};
 
 		mdio {
@@ -462,14 +476,26 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			GSWP(1,  "e2",  2, &sw1phy1);
+			sw1p0: port@0 {
-			GSWP(2,  "e1",  1, &sw1phy2);
+				reg = <0x0>;
-			GSWP(3,  "e4",  4, &sw1phy3);
+				link = <&sw2p0 &sw3p10>;
-			GSWP(4,  "e3",  3, &sw1phy4);
+				phy-mode = "10gbase-r";
-			GSWP(5,  "e6",  6, &sw1phy5);
+				fixed-link {
-			GSWP(6,  "e5",  5, &sw1phy6);
+					speed = <10000>;
-			GSWP(7,  "e8",  8, &sw1phy7);
+					full-duplex;
-			GSWP(8,  "e7",  7, &sw1phy8);
+				};
+			};
+
+			GSWP(1,  "e2",  2, sw1phy1);
+			GSWP(2,  "e1",  1, sw1phy2);
+			GSWP(3,  "e4",  4, sw1phy3);
+			GSWP(4,  "e3",  3, sw1phy4);
+			GSWP(5,  "e6",  6, sw1phy5);
+			GSWP(6,  "e5",  5, sw1phy6);
+			GSWP(7,  "e8",  8, sw1phy7);
+			GSWP(8,  "e7",  7, sw1phy8);
+			XSWP(9, "e14", 14, sfp1);
+			XSWP(a, "e13", 13, sfp0);
 		};
 
 		mdio {

board/aarch64/freescale-imx8mp-evk/Config.in

@@ -1,6 +0,0 @@
-config BR2_PACKAGE_FREESCALE_IMX8MP_EVK
-	bool "NXP i.MX8MP EVK"
-	depends on BR2_aarch64
-	help
-	  NXP i.MX8MP EVK
-

board/aarch64/freescale-imx8mp-evk/LICENSE

@@ -1,13 +0,0 @@
-Copyright (c) 2024 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/freescale-imx8mp-evk/dts/Makefile

@@ -1 +0,0 @@
-dtb-y += freescale/imx8mp-evk.dtb

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

@@ -1,113 +0,0 @@
-#include <arm64/freescale/imx8mp-evk.dts>
-#include <dt-bindings/usb/pd.h>
-&usb3_phy0 {
-
-	status = "okay";
-};
-&iomuxc {
-	pinctrl_typec_mux: typec1muxgrp {
-		fsl,pins = <
-		MX8MP_IOMUXC_SAI1_MCLK__GPIO4_IO20	0x16
-		>;
-	};
-	pinctrl_typec: typec1grp {
-		fsl,pins = <
-			MX8MP_IOMUXC_SAI1_TXD7__GPIO4_IO19	0x1c4
-		>;
-	};
-};
-
-&i2c2 {
-	ptn5110: tcpc@50 {
-		compatible = "nxp,ptn5110";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_typec>;
-		reg = <0x50>;
-		interrupt-parent = <&gpio4>;
-		interrupts = <19 8>;
-
-		port {
-			typec_dr_sw: endpoint {
-				remote-endpoint = <&usb3_drd_sw>;
-			};
-		};
-
-		usb_con: connector {
-			compatible = "usb-c-connector";
-			label = "USB-C";
-			power-role = "dual";
-			data-role = "dual";
-			try-power-role = "sink";
-			source-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
-			sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)
-			PDO_VAR(5000, 20000, 3000)>;
-			op-sink-microwatt = <15000000>;
-			self-powered;
-
-			ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				port@1 {
-					reg = <1>;
-					typec_con_ss: endpoint {
-						remote-endpoint = <&usb3_data_ss>;
-					};
-				};
-			};
-		};
-	};
-};
-&usb3_phy0 {
-	fsl,phy-tx-vref-tune = <0xe>;
-	fsl,phy-tx-preemp-amp-tune = <3>;
-	fsl,phy-tx-vboost-level = <5>;
-	fsl,phy-comp-dis-tune = <7>;
-	fsl,pcs-tx-deemph-3p5db = <0x21>;
-	fsl,phy-pcs-tx-swing-full = <0x7f>;
-	status = "okay";
-};
-
-&usb3_0 {
-	status = "okay";
-};
-
-&usb_dwc3_0 {
-	dr_mode = "otg";
-	hnp-disable;
-	srp-disable;
-	adp-disable;
-	usb-role-switch;
-	role-switch-default-mode = "none";
-	snps,dis-u1-entry-quirk;
-	snps,dis-u2-entry-quirk;
-	status = "okay";
-
-	port {
-		usb3_drd_sw: endpoint {
-			remote-endpoint = <&typec_dr_sw>;
-		};
-	};
-};
-
-/ {
-	gpio-sbu-mux {
-		compatible = "gpio-sbu-mux";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_typec_mux>;
-		switch-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>;
-		orientation-switch;
-
-		port {
-			usb3_data_ss: endpoint {
-				remote-endpoint = <&typec_con_ss>;
-			};
-		};
-	};
-        chosen {
-                infix {
-                        /* "admin" */
-                        factory-password-hash = "$5$mI/zpOAqZYKLC2WU$i7iPzZiIjOjrBF3NyftS9CCq8dfYwHwrmUK097Jca9A";
-                };
-        };
-};

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

@@ -1,46 +0,0 @@
-define FREESCALE_IMX8MP_EVK_LINUX_CONFIG_FIXUPS
-	$(call KCONFIG_ENABLE_OPT,CONFIG_ARCH_NXP)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_ARCH_MXC)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_FEC)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_NET_VENDOR_STMICRO)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_STMMAC_ETH)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_DWMAC_IMX8)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_SERIAL_IMX)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_SERIAL_IMX_CONSOLE)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_I2C_IMX)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_SPI_IMX)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_PINCTRL_IMX8MP)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_GPIO_MXC)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_IMX2_WDT)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MMC_SDHCI_OF_ESDHC)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MMC_SDHCI_ESDHC_IMX)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_CLK_IMX8MP)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_NVMEM_IMX_OCOTP)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_INTERCONNECT)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_INTERCONNECT_IMX)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_INTERCONNECT_IMX8MP)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_REALTEK_PHY)
-# For X
-	$(call KCONFIG_ENABLE_OPT,CONFIG_DRM)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_DRM_ETNAVIV)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_PHY_FSL_SAMSUNG_HDMI_PHY)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_DRM_IMX8MP_HDMI_PVI)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_DRM_IMX_LCDIF)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_INPUT_MOUSE)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_INPUT_MOUSEDEV)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_HID_GENERIC)
-
-# For USB
-	$(call KCONFIG_DISABLE_OPT,CONFIG_USB)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_USB)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_USB_DWC3)
-	$(call KCONFIG_DISABLE_OPT,CONFIG_USB_DWC3_GADGET)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_USB_DWC3_HOST)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_ARM_IMX_BUS_DEVFREQ)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_TYPEC_TCPCI)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_TYPEC_SWITCH_GPIO)
-endef
-
-$(eval $(ix-board))
-$(eval $(generic-package))

board/aarch64/freescale-imx8mp-evk/rootfs/usr/share/product/fsl,imx8mp-evk/etc/product/interface-quirks.json

@@ -1,8 +0,0 @@
-{
-    "eth0": {
-	"phy-detached-when-down": true
-    },
-    "eth1": {
-	"broken-mqprio": true
-    }
-}

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

@@ -1,10 +0,0 @@
-config BR2_PACKAGE_FRIENDLYARM_NANOPI_R2S
-	bool "FriendlyElec NanoPi R2S"
-	depends on BR2_aarch64
-	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/LICENSE

@@ -1,13 +0,0 @@
-Copyright (c) 2025 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/friendlyarm-nanopi-r2s/README.md

@@ -1,172 +0,0 @@
-FriendlyELC NanoPi R2S
-======================
-
-The [NanoPi R2S][1] is a very low-cost 64-bit ARM min router, powered by
-the Rockchip RK3328, quad-core Cortex-A53.
-
-The R2S does not have any onboard eMMC, so the only way to boot Infix on
-it is using and SD card.
-
-
-LEDs
-----
-
-The front system LEDs work as follows in Infix:
-
-| **Stage**      | **SYS** | **LAN** | **WAN** |
-|----------------|---------|---------|---------|
-| Power-on       | dimmed  | off     | off     |
-| Factory reset  | on      | on      | on      |
-| Linux loading  | on      | off     | off     |
-| System loading | 1 Hz    | off     | off     |
-| System up      | off     | on      | off     |
-| WAN address    | off     | on      | on      |
-| Locate         | 1 Hz    | 1 Hz    | 1 Hz    |
-| Fail safe      | 5 Hz    | off     | off     |
-| Panic          | 5 Hz    | 5 Hz    | 5 Hz    |
-
-Powering on the device the SYS LED is turned on faintly (dimmed).  It
-remains dimmed while U-Boot loads the kernel, and turns bright red when
-the kernel starts.  It remains steady on until the system has started
-the LED daemon, `iitod`, which sets it blinking at 1 Hz while the rest
-of the system starts up.  When the system has come up successfully, the
-SYS LED is turned off and the green LAN LED turns on.  The WAN LED will
-turn on (green) when the WAN interface is up and has an IP address.
-
-> Compared to the `x86_64` Qemu target, it takes a while to parse all
-> YANG models and load `startup-config`, but the whole process should
-> not take more than 60 seconds, and usually a lot less.
-
-If a "find my device" function exists, it will blink all LEDs at 1 Hz.
-
-If `startup-config` fails to load Ínfix reverts to `failure-config`,
-putting the device in fail safe (or fail secure) mode.  Indicated by
-the SYS LED blinking at 5 Hz instead of turning off.
-
-If Infix for some reason also fails to load `failure-config`, then all
-LEDs will blink at 5 Hz to clearly indicate something is very wrong.
-
-In all error cases the console shows the problem.
-
-
-Factory Reset
--------------
-
-The reset button on the side can be used not only to safely reboot the
-device, but can also be used to trigger a factory reset at power on.
-
-At power-on, keep the reset button pressed for 10 seconds.  The system
-LEDs (SYS, WAN, LAN) will all blink at 1 Hz, to help you count down the
-seconds.  When the 10 seconds have passed all LEDs are turned off before
-loading Linux.
-
-When Linux boots up it confirms the factory reset by lighting up the
-LEDs again, no blinking this time.  The LEDs stay on until all files and
-directories on read/writable partitions (`/cfg` and `/var`) have been
-safely erased.
-
-The system then continues loading, turning off all LEDs except SYS,
-which blinks calmly at 1 Hz as usual until the system has completed
-loading, this time with a `startup-config` freshly restored from the
-device's `factory-config`.
-
-
-How to Build
-------------
-
-```
-$ make r2s_defconfig
-$ make
-```
-
-Once the build has finished you will have `output/images/sdcard.img`
-which you can flash to an SD card.
-
-```
-$ sudo dd if=output/images/sdcard.img of=/dev/mmcblk0 bs=1M status=progress oflag=direct
-```
-
-> **WARNING:** ensure `/dev/mmcblk0` really is the correct device for
-> your SD card, and not used by the system!
-
-
-Booting the Board
------------------
-
- 1. Connect a TTL cable to three UART pins, GND is closest to the edge
- 2. Insert the flashed SD card
- 3. Power-up the board using an USB-C cable (ensure good power source!)
-
-Worth noting, unlike many other boards, the Rockchip family of chipsets
-runs the UART at 1500000 bps (1.5 Mbps) 8N1.
-
-
-Console Port
-------------
-
-Unlike many other boards, the NanoPi R2S console, and in fact all
-Rockchip family chipsets, runs at 1500000 bps (1.5 Mbps) 8N1. 
-
-
-Secure Boot
------------
-
-Like other Infix builds, the R2S enjoys secure boot.  Please note,
-however that the default signing keys are the public!
-
-Also, default builds allow modifying and saving the U-Boot environment
-(see below), which you may want to disable to secure the device.  The
-device also runs in *developer mode*, allowing full U-Boot shell access,
-which you may also want to disable in a full production setting.
-
-
-Caveat
-------
-
-Most (all?) of these boards do not have any Vital Product Data (VPD)
-EEPROM mounted.  This means they do not come with unique MAC addresses
-allocated to the two Ethernet ports.
-
-The bootloader (U-Boot) default environment for the board is usually
-what provides a default, the same default MAC addresses to Linux:
-
- - 4a:dc:d8:20:0d:84
- - 4a:dc:d8:20:0d:85
-
-This is important in case you want to run multiple R2S devices on the
-same LAN.  Meaning you either have to change the MAC address in the
-U-Boot environment (below), or use the `custom-phys-address` setting in
-Infix for the interface(s).
-
-Break into U-Boot using Ctrl-C at power-on, preferably when the text
-`Press Ctrl-C NOW to enter boot menu` is displayed.  Exit the menu to
-get to the prompt:
-
-```
-(r2s) printenv
-...
-eth1addr=4a:dc:d8:20:0d:84
-ethact=ethernet@ff540000
-ethaddr=4a:dc:d8:20:0d:85
-ethprime=eth0
-...
-```
-
-Here we change both addresses, using the *Locally Administered* bit:
-
-```
-(r2s) setenv eth1addr 02:00:c0:ff:ee:01
-(r2s) setenv ethaddr 02:00:c0:ff:ee:00
-(r2s) saveenv
-```
-
-Boot the system, log into Linux, and inspect the MAC addresses:
-
-```
-admin@infix-00-00-00:~$ ip -br l
-lo      UP     00:00:00:00:00:00 <LOOPBACK,UP,LOWER_UP>
-eth0    UP     02:00:c0:ff:ee:00 <BROADCAST,MULTICAST,UP,LOWER_UP>
-eth1    UP     02:00:c0:ff:ee:01 <BROADCAST,MULTICAST,UP,LOWER_UP>
-```
-
-[1]: https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R2S

board/aarch64/friendlyarm-nanopi-r2s/dts/Makefile

@@ -1 +0,0 @@
-dtb-y += rockchip/rk3328-nanopi-r2s.dtb

board/aarch64/friendlyarm-nanopi-r2s/dts/rockchip/infix.dtsi

@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Common Infix OS defaults
- */
-
-/ {
-	chosen {
-		infix {
-			/* Default admin user password: 'admin' */
-			factory-password-hash = "$5$mI/zpOAqZYKLC2WU$i7iPzZiIjOjrBF3NyftS9CCq8dfYwHwrmUK097Jca9A";
-		};
-	};
-};

board/aarch64/friendlyarm-nanopi-r2s/dts/rockchip/rk3328-nanopi-r2s.dts

@@ -1,23 +0,0 @@
-#include <arm64/rockchip/rk3328-nanopi-r2s.dts>
-#include "infix.dtsi"
-
-&rtl8153 {
-	/*
-	 * Fix port number: device is on port 1, not port 2
-	 *
-	 * The kernel's usb_of_get_connect_type() function checks for child
-	 * nodes with a 'reg' property matching the physical port number to
-	 * determine if a USB port is "hard-wired" (internal) vs external.
-	 * With authorized_default=2, only hard-wired ports are automatically
-	 * authorized. The RTL8153 shows up as device 3-1 (hub 3, port 1), so
-	 * reg must be <1> for the kernel to mark it as USB_PORT_CONNECT_TYPE_HARD_WIRED
-	 * and authorize it automatically at boot.
-	 */
-	reg = <1>;
-};
-
-&{/chosen/infix} {
-	/* Expose only the external USB 2.0 port for user management */
-	usb-ports = <&usb_host0_ehci>;
-	usb-port-names = "USB";
-};

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

@@ -1,85 +0,0 @@
-define FRIENDLYARM_NANOPI_R2S_LINUX_CONFIG_FIXUPS
-	# Rockchip RK3328 SoC
-	$(call KCONFIG_ENABLE_OPT,CONFIG_ARCH_ROCKCHIP)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_ROCKCHIP_IOMMU)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_ROCKCHIP_PM_DOMAINS)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_ROCKCHIP_IODOMAIN)
-	# TODO: for some reason this just locks up the device
-	#       so we'll have to rely on the softdog :-(
-	# $(call KCONFIG_ENABLE_OPT,CONFIG_DW_WATCHDOG)
-
-	# PHY drivers
-	$(call KCONFIG_ENABLE_OPT,CONFIG_PHY_ROCKCHIP_EMMC)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_PHY_ROCKCHIP_INNO_USB2)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_PHY_ROCKCHIP_TYPEC)
-	$(call KCONFIG_SET_OPT,CONFIG_PHY_ROCKCHIP_USB,m)
-	$(call KCONFIG_SET_OPT,CONFIG_PHY_ROCKCHIP_PCIE,m)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_ROCKCHIP_PHY)
-
-	# Clocks and Power Management
-	$(call KCONFIG_ENABLE_OPT,CONFIG_COMMON_CLK_ROCKCHIP)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_CLK_RK3328)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_COMMON_CLK_PWM)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_PWM_ROCKCHIP)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_REGULATOR_GPIO)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_REGULATOR_RK808)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_CHARGER_RK817)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_PINCTRL_RK805)
-
-	# I2C Controller
-	$(call KCONFIG_ENABLE_OPT,CONFIG_I2C_RK3X)
-
-	# I2C/SPI/MFD
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MFD_RK8XX_I2C)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MFD_RK8XX_SPI)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_SPI_ROCKCHIP)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_INPUT_RK805_PWRKEY)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_RTC_DRV_RK808)
-
-	# MMC/Storage
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MMC_DW_ROCKCHIP)
-
-	# PCIe
-	$(call KCONFIG_SET_OPT,CONFIG_PCIE_ROCKCHIP_HOST,m)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_PCIE_ROCKCHIP_DW_HOST)
-
-	# Thermal and ADC
-	$(call KCONFIG_SET_OPT,CONFIG_ROCKCHIP_THERMAL,m)
-	$(call KCONFIG_SET_OPT,CONFIG_ROCKCHIP_SARADC,m)
-
-	# Crypto
-	$(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_DEV_ROCKCHIP)
-
-	# NVMEM
-	$(call KCONFIG_SET_OPT,CONFIG_NVMEM_ROCKCHIP_EFUSE,m)
-	$(call KCONFIG_SET_OPT,CONFIG_NVMEM_ROCKCHIP_OTP,m)
-
-	# Input layer
-	$(call KCONFIG_ENABLE_OPT,CONFIG_INPUT_MISC)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_INPUT_RK805_PWRKEY)
-
-	# Network: STMMAC Ethernet (WAN port - RK3328 GMAC with RTL8211E PHY)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_NET_VENDOR_STMICRO)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_STMMAC_ETH)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_STMMAC_PLATFORM)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_DWMAC_ROCKCHIP)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_REALTEK_PHY)
-
-	# Network: USB Ethernet (LAN port - RTL8153 via USB 3.0)
-	$(call KCONFIG_SET_OPT,CONFIG_USB_NET_DRIVERS,m)
-	$(call KCONFIG_SET_OPT,CONFIG_USB_RTL8152,m)
-
-	# USB 3.0 xHCI Controller (required for RTL8153 LAN port)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_USB_XHCI_HCD)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_USB_XHCI_PLATFORM)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_USB_DWC3)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_USB_DWC3_HOST)
-
-	# USB 2.0 Host
-	$(call KCONFIG_ENABLE_OPT,CONFIG_USB_EHCI_HCD)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_USB_EHCI_HCD_PLATFORM)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_USB_EHCI_ROOT_HUB_TT)
-endef
-
-$(eval $(ix-board))
-$(eval $(generic-package))

board/aarch64/friendlyarm-nanopi-r2s/genimage.cfg.in

@@ -1,78 +0,0 @@
-image cfg.ext4 {
-	empty = true
-	temporary = true
-	size = 16M
-
-	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#-nanopi-r2s-sdcard.img {
-	hdimage {
-		partition-table-type = "gpt"
-	}
-
-	partition u-boot-tpl-spl-dtb {
-		in-partition-table = "no"
-		offset = 32K
-		image = "idbloader.img"
-	}
-
-	partition u-boot-dtb {
-		in-partition-table = "no"
-		offset = 8M
-		image = "u-boot.itb"
-	}
-
-	partition aux {
-		partition-uuid = D4EF35A0-0652-45A1-B3DE-D63339C82035
-		offset = 16M
-		image = "aux.ext4"
-	}
-
-	partition primary {
-		partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4
-		bootable = true
-		size = 200M
-		image = "rootfs.squashfs"
-	}
-
-	partition secondary {
-		partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4
-		bootable = true
-		size = 200M
-		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"
-	}
-}
-
-# Silence genimage warnings
-config {}

board/aarch64/friendlyarm-nanopi-r2s/rootfs/usr/share/product/friendlyarm,nanopi-r2s/etc/factory-config.cfg

@@ -1,379 +0,0 @@
-{
-  "ieee802-dot1ab-lldp:lldp": {
-    "infix-lldp:enabled": true
-  },
-  "ietf-hardware:hardware": {
-    "component": [
-      {
-        "class": "infix-hardware:usb",
-        "name": "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": "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"
-              },
-              {
-                "id": "dns-server"
-              },
-              {
-                "id": "router"
-              },
-              {
-                "id": "netmask"
-              },
-              {
-                "id": "vendor-class",
-                "value": "NanoPi R2S"
-              }
-            ]
-          }
-        },
-        "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": "r2s-%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/friendlyarm-nanopi-r2s/rootfs/usr/share/product/friendlyarm,nanopi-r2s/etc/finit.d/enabled/input-event-daemon.conf

@@ -1 +0,0 @@
-../available/input-event-daemon.conf

board/aarch64/friendlyarm-nanopi-r2s/rootfs/usr/share/product/friendlyarm,nanopi-r2s/etc/finit.d/wan-monitor.conf

@@ -1 +0,0 @@
-service [12345789] log wan-monitor.sh -- WAN Health monitor

board/aarch64/friendlyarm-nanopi-r2s/rootfs/usr/share/product/friendlyarm,nanopi-r2s/etc/iitod.json

@@ -1,91 +0,0 @@
-{
-    "input": {
-	"path": {
-	    "locate":       { "path": "/run/led/locate" },
-
-	    "status-prime": { "path": "/run/led/status-prime" },
-	    "status-ok":    { "path": "/run/led/status-ok" },
-	    "status-err":   { "path": "/run/led/status-err" },
-	    "status-crit":  { "path": "/run/led/status-crit" },
-
-	    "fault-prime":  { "path": "/run/led/fault-prime" },
-	    "fault-ok":     { "path": "/run/led/fault-ok" },
-	    "fault-err":    { "path": "/run/led/fault-err" },
-	    "fault-crit":   { "path": "/run/led/fault-crit" },
-
-	    "wan-up":       { "path": "/run/led/wan-up" },
-
-	    "startup":   { "path": "/run/finit/cond/run/startup/success" },
-	    "fail-safe": { "path": "/run/finit/cond/run/failure/success" },
-	    "panic":     { "path": "/run/finit/cond/run/failure/failure" }
-	},
-	"udev": {
-	    "power-a": { "subsystem": "power_supply" },
-	    "power-b": { "subsystem": "power_supply" }
-	}
-    },
-
-    "output": {
-	"led-group": {
-	    "port-link-act": {
-		"match": ["*:green:tp", "*:green:sfp", "*:green:port" ],
-
-		"rules": [
-		    { "if": "true", "then": { "trigger": "netdev", "link": 1, "rx": 1, "tx": 1 } }
-		]
-	    },
-	    "port-alarm": {
-		"match": ["*:yellow:tp", "*:yellow:sfp", "*:yellow:port" ],
-
-		"rules": [
-		]
-	    }
-	},
-	"led": {
-	    "nanopi-r2s:red:sys": {
-		"rules": [
-		    { "if": "locate",    "then": "@blink-1hz" },
-		    { "if": "panic",     "then": "@blink-5hz" },
-		    { "if": "fail-safe", "then": "@blink-5hz" },
-		    { "if": "startup",   "then": "@off" },
-		    { "if": "true",      "then": "@blink-1hz" }
-		]
-	    },
-
-	    "nanopi-r2s:green:lan": {
-		"rules": [
-		    { "if": "locate",  "then": "@blink-1hz" },
-		    { "if": "panic",   "then": "@blink-5hz" },
-		    { "if": "startup", "then": "@on" }
-		]
-	    },
-
-	    "nanopi-r2s:green:wan": {
-		"rules": [
-		    { "if": "locate", "then": "@blink-1hz" },
-		    { "if": "panic",  "then": "@blink-5hz" },
-		    { "if": "wan-up", "then": "@on" }
-		]
-	    }
-	}
-    },
-
-    "aliases": {
-	"on": {
-	    "brightness": true
-	},
-	"off": {
-	    "brightness": false
-	},
-	"blink-1hz": {
-	    "trigger": "timer",
-	    "delay_on": 500,
-	    "delay_off": 500
-	},
-	"blink-5hz": {
-	    "trigger": "timer",
-	    "delay_on": 100,
-	    "delay_off": 100
-	}
-    }
-}

board/aarch64/friendlyarm-nanopi-r2s/rootfs/usr/share/product/friendlyarm,nanopi-r2s/etc/input-event-daemon.conf

@@ -1,5 +0,0 @@
-[Global]
-listen = /dev/input/event1
-
-[Keys]
-RESTART = reboot