Commit f74680db authored by Jason Perlow's avatar Jason Perlow
Browse files

rename: machine cixpi -> cixmini 

The 'pi' suffix conflated the form-factor with the Raspberry-Pi target
(meta-nclawzero handles the Pi line). 'cixmini' reflects what this
target actually is — the Cix Sky1 / CP8180 SoC on the Minisforum MS-R1
mini PC form-factor.

Renamed:
- conf/machine/cixpi.conf -> conf/machine/cixmini.conf
- conf/templates/cixpi/ -> conf/templates/cixmini/
- recipes-core/images/nclawzero-image-cixpi.bb -> nclawzero-image-cixmini.bb
- COMPATIBLE_MACHINE in kernel + image recipes
- README + CI references throughout
- build-cixpi -> build-cixmini in CI scripts
parent 05b7192d

.github/workflows/pr-check.yml

+2 −2
Original line number Diff line number Diff line
@@ -47,10 +47,10 @@ jobs: 
        run: |

          set -euo pipefail

          cd poky

          source oe-init-build-env build-cixpi > /dev/null

          source oe-init-build-env build-cixmini > /dev/null

          bitbake-layers add-layer "$GITHUB_WORKSPACE/meta-cix"

          cat >> conf/local.conf <<'EOF'

          MACHINE = "cixpi"

          MACHINE = "cixmini"

          DISTRO = "nclawzero"

          EOF

          bitbake -p

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -56,11 +56,11 @@ bitbake-parse: 
      export LANG=en_US.UTF-8

      export LC_ALL=en_US.UTF-8

      cd /tmp/yocto-ci/poky

      rm -rf build-cixpi

      source oe-init-build-env build-cixpi > /dev/null

      rm -rf build-cixmini

      source oe-init-build-env build-cixmini > /dev/null

      bitbake-layers add-layer "$CI_PROJECT_DIR"

      cat >> conf/local.conf <<'EOF'

      MACHINE = "cixpi"

      MACHINE = "cixmini"

      DISTRO = "nclawzero"

      EOF

      bitbake -p

README.md

+9 −9
Original line number Diff line number Diff line 
# meta-cix



`meta-cix` is the first-pass Yocto BSP layer for the nclawzero `cixpi`

`meta-cix` is the first-pass Yocto BSP layer for the nclawzero `cixmini`

target: Cix Sky1 / CP8180 on the Minisforum MS-R1 edge device platform.



The hardware is not in hand yet, so this repository is intentionally a
@@ -10,13 +10,13 @@ MS-R1 arrives. 


## Target



- Machine: `cixpi`

- Machine: `cixmini`

- SoC family: Cix Sky1 / CP8180

- Reference platform: Minisforum MS-R1

- Architecture: `aarch64`

- Firmware model: UEFI + ACPI

- Yocto series: Scarthgap

- Image recipe: `nclawzero-image-cixpi`

- Image recipe: `nclawzero-image-cixmini`



The Cix mainline notes currently require `clk_ignore_unused` on the kernel

command line. The machine config appends it through `APPEND`.
@@ -81,10 +81,10 @@ git clone --depth=1 --branch=scarthgap https://git.yoctoproject.org/poky 
git clone https://gitlab.com/nclawzero/meta-cix.git



cd poky

source oe-init-build-env build-cixpi

source oe-init-build-env build-cixmini

bitbake-layers add-layer ../../meta-cix

cat >> conf/local.conf <<'EOF'

MACHINE = "cixpi"

MACHINE = "cixmini"

DISTRO = "nclawzero"

EOF

bitbake -p
@@ -93,17 +93,17 @@ bitbake -p 
When hardware blockers are resolved, the image entry point is:



```bash

bitbake nclawzero-image-cixpi

bitbake nclawzero-image-cixmini

```



## Layer Contents



- `conf/machine/cixpi.conf`: generic arm64 UEFI/ACPI machine config for Sky1

- `conf/machine/cixmini.conf`: generic arm64 UEFI/ACPI machine config for Sky1

- `conf/distro/nclawzero.conf`: Scarthgap distro config derived from Poky

- `recipes-bsp/cix-sky1-firmware`: platform firmware placeholders and DSP blob

- `recipes-kernel/linux-cix-ncz`: Sky1 kernel recipe scaffold

- `recipes-core/images/nclawzero-image-cixpi.bb`: headless first-pass image

- `conf/templates/cixpi`: sample `bblayers.conf` and `local.conf` snippets

- `recipes-core/images/nclawzero-image-cixmini.bb`: headless first-pass image

- `conf/templates/cixmini`: sample `bblayers.conf` and `local.conf` snippets



## Investigate Further

conf/machine/cixpi.conf→conf/machine/cixmini.conf

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# SPDX-License-Identifier: Apache-2.0

#

#@TYPE: Machine

#@NAME: cixpi

#@NAME: cixmini

#@DESCRIPTION: Cix Sky1 / CP8180 machine config for Minisforum MS-R1.



require conf/machine/include/arm/arch-armv8a.inc