Skip to content
This repository was archived by the owner on Apr 13, 2024. It is now read-only.

Commit 4e86683

Browse files
authored
Merge pull request #229 from nathanchance/s390
S390 support
2 parents fa15d66 + e72a396 commit 4e86683

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ jobs:
1818
env: ARCH=ppc64
1919
- name: "ARCH=ppc64le LD=ld.lld"
2020
env: ARCH=ppc64le LD=ld.lld-11
21+
- name: "ARCH=s390 BOOT=0"
22+
env: ARCH=s390
2123
- name: "ARCH=x86_64 LD=ld.lld"
2224
env: ARCH=x86_64 LD=ld.lld-11
2325
# linux (cron only)
@@ -47,6 +49,9 @@ jobs:
4749
- name: "ARCH=ppc64le LD=ld.lld REPO=linux-next"
4850
env: ARCH=ppc64le LD=ld.lld-11 REPO=linux-next
4951
if: type = cron
52+
- name: "ARCH=s390 BOOT=0 REPO=linux-next"
53+
env: ARCH=s390 REPO=linux-next
54+
if: type = cron
5055
- name: "ARCH=x86_64 LD=ld.lld REPO=linux-next"
5156
env: ARCH=x86_64 LD=ld.lld-11 REPO=linux-next
5257
if: type = cron

driver.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,13 @@ setup_variables() {
139139
export ARCH=powerpc
140140
export CROSS_COMPILE=powerpc64le-linux-gnu- ;;
141141

142+
"s390")
143+
config=defconfig
144+
image_name=bzImage
145+
using_qemu=false
146+
OBJDUMP=s390x-linux-gnu-objdump
147+
export CROSS_COMPILE=s390x-linux-gnu- ;;
148+
142149
"x86_64")
143150
case ${REPO} in
144151
android-*)
@@ -175,7 +182,7 @@ check_dependencies() {
175182
# Check for existence of needed binaries
176183
command -v nproc
177184
command -v "${CROSS_COMPILE:-}"as
178-
command -v ${qemu}
185+
${using_qemu:=true} && command -v ${qemu}
179186
command -v timeout
180187
command -v unbuffer
181188

@@ -345,8 +352,10 @@ build_linux() {
345352
}
346353

347354
boot_qemu() {
355+
if ! ${using_qemu}; then
356+
return 0;
357+
fi
348358
local kernel_image
349-
350359
if [[ ${image_name} = "vmlinux" ]]; then
351360
kernel_image=${tree}/vmlinux
352361
else

0 commit comments

Comments
 (0)