more arm fixes

Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
This commit is contained in:
Justin Cormack 2016-01-13 17:48:42 +00:00
parent 478677a809
commit 49b696967e
6 changed files with 30 additions and 40 deletions

View File

@ -1,10 +1,10 @@
FROM alpine:3.3
FROM ubuntu:15.10
COPY alpine/initrd-arm.img .
COPY alpine/kernel/zImage .
RUN apk update && apk add qemu-system-arm
RUN apt-get update && apt-get install -y qemu-system-arm
RUN gzip -9 initrd-arm.img
ENTRYPOINT [ "qemu-system-arm", "-cpu", "arm1176", "-M", "versatilepb", "-no-reboot", "-serial", "stdio", "-kernel", "zImage", "-initrd", "initrd-arm.img.gz", "-m", "256", "-append", "console=ttyAMA0", "-vnc", "none" ]
ENTRYPOINT [ "qemu-system-arm", "-machine", "vexpress-a9", "-cpu", "cortex-a9", "-no-reboot", "-serial", "stdio", "-kernel", "zImage", "-initrd", "initrd-arm.img.gz", "-m", "256", "-append", "console=ttyAMA0", "-vnc", "none" ]

1
alpine/.gitignore vendored
View File

@ -1,2 +1,3 @@
*.img
Dockerfile.armhf
etc/inittab

View File

@ -8,6 +8,7 @@ initrd.img: Dockerfile mkinitrd.sh repositories $(ETCFILES)
rm -f initrd.img
$(MAKE) -C packages
$(MAKE) -C kernel
cp inittab.x86_64 etc/inittab
docker build -t mobyinitrd:build .
docker run mobyinitrd:build /bin/mkinitrd.sh > $@
@ -20,11 +21,12 @@ initrd-arm.img: Dockerfile.armhf
rm -f initrd-arm.img
$(MAKE) -C packages arm
$(MAKE) -C kernel arm
cp inittab.armhf etc/inittab
docker build -f Dockerfile.armhf -t mobyinitrdarm:build .
docker run mobyinitrdarm:build /bin/mkinitrd.sh > $@
clean:
rm -f initrd.img initrd-arm.img Dockerfile.armhf
rm -f initrd.img initrd-arm.img Dockerfile.armhf etc/inittab
$(MAKE) -C packages clean
$(MAKE) -C kernel clean
docker images -q mobyinitrd:build | xargs docker rmi -f

13
alpine/inittab.armhf Normal file
View File

@ -0,0 +1,13 @@
# /etc/inittab
::sysinit:/sbin/rc sysinit
::wait:/sbin/rc default
# Put a getty on the serial port
ttyAMA0::respawn:/sbin/getty -L ttyAMA0 115200 vt100
# Stuff to do for the 3-finger salute
::ctrlaltdel:/sbin/reboot
# Stuff to do before rebooting
::shutdown:/sbin/rc shutdown

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.1.12 Kernel Configuration
# Linux/arm 4.1.15 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@ -352,7 +352,7 @@ CONFIG_ARCH_MULTI_V6=y
CONFIG_ARCH_MULTI_V7=y
CONFIG_ARCH_MULTI_V6_V7=y
# CONFIG_ARCH_MULTI_CPU_AUTO is not set
CONFIG_ARCH_VIRT=y
# CONFIG_ARCH_VIRT is not set
# CONFIG_ARCH_MVEBU is not set
# CONFIG_ARCH_ALPINE is not set
# CONFIG_ARCH_AT91 is not set
@ -573,9 +573,7 @@ CONFIG_FRONTSWAP=y
# CONFIG_ZSWAP is not set
# CONFIG_ZPOOL is not set
# CONFIG_ZBUD is not set
CONFIG_ZSMALLOC=y
# CONFIG_PGTABLE_MAPPING is not set
# CONFIG_ZSMALLOC_STAT is not set
# CONFIG_ZSMALLOC is not set
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_ALIGNMENT_TRAP=y
# CONFIG_UACCESS_WITH_MEMCPY is not set
@ -1283,7 +1281,6 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_NULL_BLK is not set
# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
# CONFIG_ZRAM is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_UMEM is not set
@ -1578,7 +1575,7 @@ CONFIG_UNIX98_PTYS=y
CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
# CONFIG_LEGACY_PTYS is not set
# CONFIG_SERIAL_NONSTANDARD is not set
CONFIG_NOZOMI=y
# CONFIG_NOZOMI is not set
# CONFIG_N_GSM is not set
# CONFIG_TRACE_SINK is not set
CONFIG_DEVMEM=y
@ -1602,9 +1599,11 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
#
# Non-8250 serial port support
#
# CONFIG_SERIAL_AMBA_PL010 is not set
# CONFIG_SERIAL_AMBA_PL011 is not set
# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set
CONFIG_SERIAL_AMBA_PL010=y
CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_JSM is not set
@ -1913,8 +1912,6 @@ CONFIG_HWMON=y
# CONFIG_SENSORS_SMSC47M192 is not set
# CONFIG_SENSORS_SMSC47B397 is not set
# CONFIG_SENSORS_SCH56XX_COMMON is not set
# CONFIG_SENSORS_SCH5627 is not set
# CONFIG_SENSORS_SCH5636 is not set
# CONFIG_SENSORS_SMM665 is not set
# CONFIG_SENSORS_ADC128D818 is not set
# CONFIG_SENSORS_ADS1015 is not set
@ -1956,30 +1953,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
#
# Texas Instruments thermal drivers
#
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
#
# Watchdog Device Drivers
#
CONFIG_SOFT_WATCHDOG=y
# CONFIG_GPIO_WATCHDOG is not set
# CONFIG_XILINX_WATCHDOG is not set
# CONFIG_ARM_SP805_WATCHDOG is not set
# CONFIG_CADENCE_WATCHDOG is not set
# CONFIG_DW_WATCHDOG is not set
# CONFIG_MAX63XX_WATCHDOG is not set
# CONFIG_ALIM7101_WDT is not set
# CONFIG_I6300ESB_WDT is not set
# CONFIG_MEN_A21_WDT is not set
# CONFIG_XEN_WDT is not set
#
# PCI-based Watchdog Cards
#
# CONFIG_PCIPCWATCHDOG is not set
# CONFIG_WDTPCI is not set
# CONFIG_WATCHDOG is not set
CONFIG_SSB_POSSIBLE=y
#