diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-15 19:26:42 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-15 19:26:42 +0100 |
| commit | e7540c9fa814f9b41f80e72bc160ce504e26cda6 (patch) | |
| tree | 8c1e66138dd42c19d45cdff55a36d343e4c3a098 /target/arm | |
| parent | 0975f98bebcefd325c641b202d715522f5710700 (diff) | |
startup fixes
- always use /sbin/init, even for initramfs
- mount devtmpfs for initramfs automatically in kernel space
- fix armhf for adk-test-framework
- remove mdev -s on boot, I think it is unneeded, takes very long on
Qemu systems
- add alias for ro/rw remounts of /
- remove old /init and rc.shutdown, both unused
Diffstat (limited to 'target/arm')
| -rw-r--r-- | target/arm/Makefile | 6 | ||||
| -rw-r--r-- | target/arm/sys-available/qemu-armhf | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index e2194f1d3..77148e261 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -61,7 +61,7 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) @echo "Use following command to install it on SD card:" @echo "sudo ./scripts/install-rpi.sh /dev/sdb $(FW_DIR)/$(ROOTFSTARBALL)" endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y) +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" @@ -75,7 +75,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' -ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y) +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y) ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) @echo 'qemu-system-arm -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 -net nic,model=virtio -net user' else @@ -88,7 +88,7 @@ ifeq ($(ADK_TARGET_FS),initramfs-piggyback) imageinstall: createinitramfs @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' -ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y) +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y) @echo "Start qemu with following command line:" @echo 'qemu-system-arm -M $(MACH) -nographic $(NET) -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif diff --git a/target/arm/sys-available/qemu-armhf b/target/arm/sys-available/qemu-armhf index 798391b8c..85cc9c00f 100644 --- a/target/arm/sys-available/qemu-armhf +++ b/target/arm/sys-available/qemu-armhf @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARMHF bool "Qemu Emulator (hard-float)" select ADK_arm - select ADK_qemu_arm + select ADK_qemu_armhf select ADK_little select ADK_hard_float select ADK_eabihf |