diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-13 09:11:48 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-13 09:11:48 +0100 |
| commit | 607c3fcd1d10a37c077c870df450b5389fb519bf (patch) | |
| tree | 9c7c0e209d6373efe2296e379c63c29d27a8847b /target/x86_64 | |
| parent | c16eb800d935d903d2ab38b3da8270324284e973 (diff) | |
| parent | f42fb988bae9d402b0b204614b54ba9b4261d877 (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/sys-available/shuttle-sa76 | 16 | ||||
| -rw-r--r-- | target/x86_64/sys-available/tarox-pc | 15 |
3 files changed, 3 insertions, 34 deletions
diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index 0d0d213d4..596f2923f 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -17,7 +17,7 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y) @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" - @echo 'qemu-system-x86_64 -nographic -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @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),usb) @@ -32,7 +32,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS) @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-x86_64 -nographic -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @echo 'qemu-system-x86_64 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) @@ -41,7 +41,7 @@ imageinstall: createinitramfs @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-x86_64 -nographic -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-x86_64 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif ifeq ($(ADK_TARGET_FS),nfsroot) diff --git a/target/x86_64/sys-available/shuttle-sa76 b/target/x86_64/sys-available/shuttle-sa76 deleted file mode 100644 index 557cc77cd..000000000 --- a/target/x86_64/sys-available/shuttle-sa76 +++ /dev/null @@ -1,16 +0,0 @@ -config ADK_TARGET_SYSTEM_SHUTTLE_SA76 - bool "Shuttle SA76" - depends on ADK_BROKEN - select ADK_x86_64 - select ADK_shuttle_sa76 - select ADK_CPU_AMDFAM10 - select ADK_LINUX_64 - select ADK_KERNEL_SMP - select ADK_TARGET_WITH_VGA - select ADK_TARGET_WITH_SATA - select ADK_TARGET_WITH_INPUT - select ADK_TARGET_WITH_PCI - select ADK_TARGET_WITH_USB - select ADK_TARGET_WITH_USB_BOOT - help - Support for Shuttle SA76 XPC. diff --git a/target/x86_64/sys-available/tarox-pc b/target/x86_64/sys-available/tarox-pc deleted file mode 100644 index d6b068e06..000000000 --- a/target/x86_64/sys-available/tarox-pc +++ /dev/null @@ -1,15 +0,0 @@ -config ADK_TARGET_SYSTEM_TAROX_PC - bool "Tarox PC" - depends on ADK_BROKEN - select ADK_x86_64 - select ADK_tarox_pc - select ADK_LINUX_64 - select ADK_KERNEL_SMP - select ADK_TARGET_WITH_VGA - select ADK_TARGET_WITH_SATA - select ADK_TARGET_WITH_INPUT - select ADK_TARGET_WITH_PCI - select ADK_TARGET_WITH_USB - select ADK_TARGET_WITH_USB_BOOT - help - Support for Tarox Business PC. |