Skip to content

Commit

Permalink
update CI/CD
Browse files Browse the repository at this point in the history
  • Loading branch information
jtzhpf committed Dec 28, 2023
1 parent 50abb70 commit da61043
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 38 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/actions/setup-qemu/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ runs:
uses: actions/cache/restore@v3
with:
path: qemu_build
key1: qemu-${{ inputs.qemu-version }}
key2: qemu-6.2.50
key: qemu-${{ inputs.qemu-version }}

- name: Download and build QEMU
if: steps.cache-qemu.outputs.cache-hit != 'true'
env:
Expand All @@ -29,25 +29,25 @@ runs:
&& ./configure --prefix=$PREFIX --target-list=x86_64-softmmu,riscv64-softmmu,aarch64-softmmu \
&& make -j > /dev/null 2>&1 \
&& make install
- name: Download and build QEMU for loongarch64
- name: Download and build QEMU for loongarch
if: steps.cache-qemu.outputs.cache-hit != 'true'
env:
QEMU_PATH: qemu-6.2.50
QEMU_PATH: qemu-${{ inputs.qemu-version }}
PREFIX: ${{ github.workspace }}/qemu_build
shell: bash
run: |
git clone https://github.com/foxsen/qemu.git $QEMU_PATH
cd $QEMU_PATH \
&& ./configure --prefix=$PREFIX --target-list=loongarch64-softmmu \
&& make -j > /dev/null 2>&1 \
&& make install
git clone https://github.com/foxsen/qemu qemu-6.2.50
cd qemu-6.2.50
./configure --prefix=$PREFIX --target-list=loongarch64-softmmu
make -j
make install
- uses: actions/cache/save@v3
if: steps.cache-qemu.outputs.cache-hit != 'true'
with:
path: qemu_build
key1: qemu-${{ inputs.qemu-version }}
key2: qemu-6.2.50
key: qemu-${{ inputs.qemu-version }}

- name: Install QEMU
shell: bash
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,16 @@ jobs:
with:
arch: x86_64

- name: Build helloworld for loongarch-2k500
run: make PLATFORM=loongarch64-2k500 A=apps/helloworld
- name: Build fs/shell for loongarch-2k500
run: make PLATFORM=loongarch64-2k500 A=apps/fs/shell FEATURES=driver-ramdisk

- name: Build helloworld for loongarch-2k1000
run: make PLATFORM=loongarch64-2k1000 A=apps/helloworld
- name: Build fs/shell for loongarch-2k1000
run: make PLATFORM=loongarch64-2k1000 A=apps/fs/shell FEATURES=driver-ramdisk

- name: Build helloworld for x86_64-pc-oslab
run: make PLATFORM=x86_64-pc-oslab A=apps/helloworld
- name: Build net/httpserver for x86_64-pc-oslab
Expand All @@ -137,16 +147,6 @@ jobs:
- name: Build helloworld for aarch64-bsta1000b
run: make PLATFORM=aarch64-bsta1000b A=apps/helloworld

- name: Build helloworld for loongarch-2k500
run: make PLATFORM=loongarch-2k500 A=apps/helloworld
- name: Build fs/shell for loongarch-2k500
run: make PLATFORM=loongarch-2k500 A=apps/fs/shell FEATURES=driver-ramdisk

- name: Build helloworld for loongarch-2k1000
run: make PLATFORM=loongarch-2k1000 A=apps/helloworld
- name: Build fs/shell for loongarch-2k1000
run: make PLATFORM=loongarch-2k1000 A=apps/fs/shell FEATURES=driver-ramdisk

build-apps-for-std:
runs-on: ${{ matrix.os }}
strategy:
Expand Down
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@
/.vscode
.DS_Store
*.asm
*.img
disk.img
actual.out
qemu.log
rusty-tags.vi
.idea
*.log
*.bin.gz
uImage
efi-virtio.rom
riscv64-linux-musl-cross/
Binary file removed apps/c/testcase/interrupts-test/interrupts-test-1
Binary file not shown.
Binary file removed apps/c/testcase/interrupts-test/interrupts-test-2
Binary file not shown.
2 changes: 1 addition & 1 deletion crates/page_table/src/arch/loongarch64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ impl const PagingMetaData for LA64MetaData {
const PA_MAX_BITS: usize = 48;
const VA_MAX_BITS: usize = 48;
}

/// LoongArch64 page table.
pub type LA64PageTable<I> = PageTable64<LA64MetaData, LA64PTE, I>;
6 changes: 4 additions & 2 deletions crates/page_table_entry/src/arch/loongarch64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ bitflags::bitflags! {
const D = 1 << 1;
/// Privilege Level with 2 bits.
const PLVL = 1 << 2;
/// Privilege Level with 2 bits.
const PLVH = 1 << 3;
/// Memory Access Type controls the type of access, such as whether it
/// can be cached by Cache, etc.
/// Memory Access Type controls the type of access, such as whether it can be cached by Cache, etc.
const MATL = 1 << 4;
/// Memory Access Type controls the type of access, such as whether it can be cached by Cache, etc.
const MATH = 1 << 5;
/// Designates a global mapping OR Whether the page is huge page.
const GH = 1 << 6;
Expand Down Expand Up @@ -86,6 +87,7 @@ impl From<MappingFlags> for PTEFlags {
}
}

/// page table entry for LoongArch64 systems.
#[derive(Clone, Copy)]
#[repr(transparent)]
pub struct LA64PTE(u64);
Expand Down
Binary file added efi-virtio.rom
Binary file not shown.
12 changes: 0 additions & 12 deletions issues_recorded.md

This file was deleted.

Binary file added modules/axfs/resources/fat16.img
Binary file not shown.
Binary file added tools/loongarch64/efi-virtio.rom
Binary file not shown.

0 comments on commit da61043

Please sign in to comment.