Harmonize machine naming

Signed-off-by: Hannu Lyytinen <[email protected]>
tiiuae · Apr 16, 2024 · 356198f · 356198f
1 parent b038cdd
commit 356198f
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/.github/actions/sel4-build/action.yml b/.github/actions/sel4-build/action.yml
@@ -7,7 +7,7 @@ inputs:
   config:
     description: 'Make config'
     required: true
-    default: 'rpi4_defconfig'
+    default: 'raspberrypi4-64_defconfig'
 
   target:
     description: 'VM make target'

diff --git a/.github/workflows/build-vm-images.yml b/.github/workflows/build-vm-images.yml
@@ -32,7 +32,7 @@ on:
         required: false
       platform:
         description: 'Platform config'
-        default: 'rpi4_defconfig'
+        default: 'raspberrypi4-64_defconfig'
         required: false
         type: string
 

diff --git a/.github/workflows/trigger-release.yml b/.github/workflows/trigger-release.yml
@@ -14,7 +14,7 @@ on:
         required: true
       platform:
         description: 'Platform config'
-        default: 'rpi4_defconfig'
+        default: 'raspberrypi4-64_defconfig'
         required: false
       manifest-url:
         description: 'Manifest repository'

diff --git a/README.md b/README.md
@@ -115,7 +115,7 @@ host% <b>make docker</b>
 ## Prepopulate build cache
 
 <pre>
-host% <b>make rpi4_defconfig</b>
+host% <b>make raspberrypi4-64_defconfig</b>
 host% <b>make build_cache</b>
 </pre>
 
@@ -126,7 +126,7 @@ host% <b>cd ${WORKSPACE}</b>
 
 # configure for Raspberry Pi 4
 
-host% <b>make rpi4_defconfig</b>
+host% <b>make raspberrypi4-64_defconfig</b>
 
 # simple seL4 microkernel test
 
@@ -215,7 +215,7 @@ host$ <b>repo sync</b>
 host$ <b>make docker</b>
 
 # configure for Raspberry Pi 4
-host$ <b>make rpi4_defconfig</b>
+host$ <b>make raspberrypi4-64_defconfig</b>
 
 # build VM root filesystems, Linux kernel and initramfs
 host$ <b>make linux-image</b>

diff --git a/configs/qemu_aarch64_defconfig → configs/qemuarm64_defconfig b/configs/qemu_aarch64_defconfig → configs/qemuarm64_defconfig
diff --git a/configs/rpi4_defconfig → configs/raspberrypi4-64_defconfig b/configs/rpi4_defconfig → configs/raspberrypi4-64_defconfig
diff --git a/configs/rpi4_trace_defconfig → configs/raspberrypi4-64_trace_defconfig b/configs/rpi4_trace_defconfig → configs/raspberrypi4-64_trace_defconfig