Skip to content

ARC: Correction of uImage target build #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: arc64
Choose a base branch
from
Open

ARC: Correction of uImage target build #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e021f4
ARCv3: Add missing dependency for uImage
xxkent Sep 7, 2023
cba4d85
ARC: Github CI: Add uImage binaries building
xxkent Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ jobs:
libelf-dev \
libncurses5-dev \
libssl-dev \
u-boot-tools \
make

- name: Download toolchain
Expand Down Expand Up @@ -146,16 +147,15 @@ jobs:
;;
esac

make -j $(nproc) uImage

if [[ "${{ matrix.targets.cpu }}" =~ ^(hs5x|hs6x) ]]; then
image_name="loader"
image_path=${{ github.workspace }}/arch/arc/boot/loader
cp ${{ github.workspace }}/arch/arc/boot/loader vmlinux-${{ matrix.targets.cpu }}
else
image_name="vmlinux"
image_path="${{ github.workspace }}/vmlinux"
cp ${{ github.workspace }}/vmlinux vmlinux-${{ matrix.targets.cpu }}
fi

make -j $(nproc) ${image_name}
cp $image_path vmlinux-${{ matrix.targets.cpu }}
cp ${{ github.workspace }}/arch/arc/boot/uImage uImage-${{ matrix.targets.cpu }}
shell: bash

- name: Upload ${{ matrix.targets.cpu }} vmlinux
Expand All @@ -165,6 +165,13 @@ jobs:
path: vmlinux-${{ matrix.targets.cpu }}
retention-days: 5

- name: Upload ${{ matrix.targets.cpu }} uImage
uses: actions/upload-artifact@v3
with:
name: uImage-${{ matrix.targets.cpu }}
path: uImage-${{ matrix.targets.cpu }}
retention-days: 5

test:
needs: [build]
runs-on: nsim
Expand Down
12 changes: 12 additions & 0 deletions arch/arc/boot/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,25 @@ $(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE
$(call if_changed,lzma)

ifeq ($(CONFIG_ISA_ARCV3),y)
$(obj)/uImage.bin: $(obj)/vmlinux.bin $(obj)/loader FORCE
else
$(obj)/uImage.bin: $(obj)/vmlinux.bin FORCE
endif
$(call if_changed,uimage,none)

ifeq ($(CONFIG_ISA_ARCV3),y)
$(obj)/uImage.gz: $(obj)/vmlinux.bin.gz $(obj)/loader FORCE
else
$(obj)/uImage.gz: $(obj)/vmlinux.bin.gz FORCE
endif
$(call if_changed,uimage,gzip)

ifeq ($(CONFIG_ISA_ARCV3),y)
$(obj)/uImage.lzma: $(obj)/vmlinux.bin.lzma $(obj)/loader FORCE
else
$(obj)/uImage.lzma: $(obj)/vmlinux.bin.lzma FORCE
endif
$(call if_changed,uimage,lzma)

$(obj)/loader.o: $(src)/loader.S $(obj)/vmlinux.bin
Expand Down