diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-17 19:18:17 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-17 19:18:17 +0100 |
| commit | 2e07ff18d429eba848413488bd220fef4b024dea (patch) | |
| tree | 32580004089bd6b61cf56447c4a1744186d28295 /target/x86_64 | |
| parent | ce0418c732e0d950d3a3c0b2b6726a691b8a0eca (diff) | |
| parent | 803b9757e040cc1a9090de4ac5572290c83d31fe (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/x86_64')
| -rw-r--r-- | target/x86_64/Makefile | 6 | ||||
| -rw-r--r-- | target/x86_64/kernel/qemu-x86_64 | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index 596f2923f..7087c9ca1 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -20,6 +20,12 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y) @echo 'qemu-system-x86_64 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif endif +ifeq ($(ADK_TARGET_FS),initramfsarchive) +imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) + @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) + @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" +endif ifeq ($(ADK_TARGET_FS),usb) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" diff --git a/target/x86_64/kernel/qemu-x86_64 b/target/x86_64/kernel/qemu-x86_64 index e0183cc39..baad58c81 100644 --- a/target/x86_64/kernel/qemu-x86_64 +++ b/target/x86_64/kernel/qemu-x86_64 @@ -1,5 +1,4 @@ CONFIG_X86=y -CONFIG_64BIT=y CONFIG_X86_64=y CONFIG_GENERIC_CPU=y CONFIG_PROCESSOR_SELECT=y |