diff --git a/Dockerfile.qemu.armhf b/Dockerfile.qemu.armhf index 804cd4a63..ddb27d484 100644 --- a/Dockerfile.qemu.armhf +++ b/Dockerfile.qemu.armhf @@ -2,8 +2,8 @@ FROM justincormack/alpine-qemu COPY alpine/initrd-arm.img . COPY alpine/kernel/zImage . -COPY alpine/kernel/dtb . +COPY alpine/kernel/dtb dtb RUN gzip -9 initrd-arm.img -ENTRYPOINT [ "qemu-system-arm", "-machine", "vexpress-a15", "-cpu", "cortex-a15", "-no-reboot", "-netdev", "user,id=eth0", "-device", "virtio-net-device,netdev=eth0", "-serial", "stdio", "-kernel", "zImage", "-initrd", "initrd-arm.img.gz", "-dtb", "dtb", "-m", "256", "-append", "console=ttyAMA0,38400n8", "-vnc", "none" ] +ENTRYPOINT [ "qemu-system-arm", "-machine", "vexpress-a15", "-cpu", "cortex-a15", "-no-reboot", "-netdev", "user,id=eth0", "-device", "virtio-net-device,netdev=eth0", "-serial", "stdio", "-kernel", "zImage", "-initrd", "initrd-arm.img.gz", "-dtb", "dtb/vexpress-v2p-ca15-tc1.dtb", "-m", "256", "-append", "console=ttyAMA0,38400n8", "-vnc", "none" ] diff --git a/alpine/Makefile b/alpine/Makefile index 93b127752..2da22edf6 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -18,6 +18,8 @@ arm: initrd-arm.img Dockerfile.armhf: Dockerfile cat Dockerfile | \ sed 's@FROM alpine@FROM justincormack/armhf-alpine@' | \ + sed '/hv_/d' | \ + sed '/hvtools/d' | \ sed 's/syslinux//' | \ grep -v 'rc-update add binfmt_misc sysinit' > $@ diff --git a/alpine/kernel/.gitignore b/alpine/kernel/.gitignore index 9432f0121..9010dc23c 100644 --- a/alpine/kernel/.gitignore +++ b/alpine/kernel/.gitignore @@ -1,4 +1,3 @@ vmlinuz64 zImage aufs-utils.tar -dtb diff --git a/alpine/kernel/Dockerfile b/alpine/kernel/Dockerfile index b6010d7b7..379dc9bf2 100644 --- a/alpine/kernel/Dockerfile +++ b/alpine/kernel/Dockerfile @@ -26,7 +26,6 @@ RUN apt-get update && apt-get -y upgrade && apt-get -y install \ gcc-arm-linux-gnueabihf ADD https://www.kernel.org/pub/linux/kernel/v4.x/linux-${KERNEL_VERSION}.tar.xz . -ADD https://d-i.debian.org/daily-images/armhf/daily/device-tree/vexpress-v2p-ca15-tc1.dtb /dtb RUN cat linux-${KERNEL_VERSION}.tar.xz | tar --absolute-names -xJ && mv /linux-${KERNEL_VERSION} /linux diff --git a/alpine/kernel/dtb/sun4i-a10-cubieboard.dtb b/alpine/kernel/dtb/sun4i-a10-cubieboard.dtb new file mode 100644 index 000000000..0816af228 Binary files /dev/null and b/alpine/kernel/dtb/sun4i-a10-cubieboard.dtb differ diff --git a/alpine/kernel/dtb/sun7i-a20-cubieboard2.dtb b/alpine/kernel/dtb/sun7i-a20-cubieboard2.dtb new file mode 100644 index 000000000..475c2a30d Binary files /dev/null and b/alpine/kernel/dtb/sun7i-a20-cubieboard2.dtb differ diff --git a/alpine/kernel/dtb/sun7i-a20-cubietruck.dtb b/alpine/kernel/dtb/sun7i-a20-cubietruck.dtb new file mode 100644 index 000000000..618e13fab Binary files /dev/null and b/alpine/kernel/dtb/sun7i-a20-cubietruck.dtb differ diff --git a/alpine/kernel/dtb/sun9i-a80-cubieboard4.dtb b/alpine/kernel/dtb/sun9i-a80-cubieboard4.dtb new file mode 100644 index 000000000..89d7e669c Binary files /dev/null and b/alpine/kernel/dtb/sun9i-a80-cubieboard4.dtb differ diff --git a/alpine/kernel/dtb/vexpress-v2p-ca15-tc1.dtb b/alpine/kernel/dtb/vexpress-v2p-ca15-tc1.dtb new file mode 100644 index 000000000..83d5b94dc Binary files /dev/null and b/alpine/kernel/dtb/vexpress-v2p-ca15-tc1.dtb differ diff --git a/alpine/packages/Makefile b/alpine/packages/Makefile index 3ef7d67cc..014f78c59 100644 --- a/alpine/packages/Makefile +++ b/alpine/packages/Makefile @@ -12,7 +12,6 @@ arm: $(MAKE) -C mdnstool ARCH=arm $(MAKE) -C docker ARCH=arm $(MAKE) -C hupper ARCH=arm - $(MAKE) -C hvtools ARCH=arm clean: $(MAKE) -C 9pudc clean