diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-17 14:39:19 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-17 14:39:19 +0100 |
| commit | ea4d154df11fa97233214642222b157cd0c61f22 (patch) | |
| tree | 883c592984dfe9f69a18da43a20605a3e51f3fb9 /target/x86 | |
| parent | 0ac75f038e3991d3e2f2fa773aad3b32413d09cf (diff) | |
| parent | 718043e164f93e243dad589af63ab68dbc0c7050 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/x86')
| -rw-r--r-- | target/x86/Makefile | 6 | ||||
| -rw-r--r-- | target/x86/kernel/qemu-i686 | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/target/x86/Makefile b/target/x86/Makefile index 91c9cef17..489d4dd1d 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -42,6 +42,12 @@ ifeq ($(ADK_HARDWARE_VBOX),y) @echo "./scripts/create.sh -T vdi vbox-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" 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/kernel/qemu-i686 b/target/x86/kernel/qemu-i686 index 275b49592..7eb708745 100644 --- a/target/x86/kernel/qemu-i686 +++ b/target/x86/kernel/qemu-i686 @@ -9,6 +9,3 @@ CONFIG_NET_VENDOR_INTEL=y CONFIG_E1000=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_SERIAL_8250_NR_UARTS=1 -CONFIG_SERIAL_8250_RUNTIME_UARTS=1 |