diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-11 06:03:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-11 06:03:02 +0200 |
| commit | ab9b26ac83655f30c7297babf04efa56d3266563 (patch) | |
| tree | 7d825331b466b869e1cc8d5291805ade2925f61c /target/x86 | |
| parent | e7b6b54de4a0fd70ca950f7f08eea4e2dfad9972 (diff) | |
| parent | d6ce7a9b7c34b166d5e7e69aa840f628add622b4 (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/sys-available/intel-atom | 28 | ||||
| -rw-r--r-- | target/x86/sys-available/qemu-i686 (renamed from target/x86/sys-available/qemu-x86) | 6 |
3 files changed, 34 insertions, 6 deletions
diff --git a/target/x86/Makefile b/target/x86/Makefile index 436ca25ce..dc17f0756 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -23,7 +23,7 @@ endif ifeq ($(ADK_TARGET_FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" -ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86),y) +ifeq ($(ADK_HARDWARE_QEMU),y) @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) @echo "Use following command to create a QEMU Image:" @echo "sudo ./scripts/create-image.sh -f ${ADK_TARGET_ROOTFS} qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)" @@ -41,7 +41,7 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS) @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' -ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86),y) +ifeq ($(ADK_HARDWARE_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}' endif @@ -50,7 +50,7 @@ ifeq ($(ADK_TARGET_FS),initramfs-piggyback) imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs @cp $(KERNEL) $(BIN_DIR)/${TARGET_KERNEL} @echo 'The kernel+initramfs file is: $(BIN_DIR)/${TARGET_KERNEL}' -ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86),y) +ifeq ($(ADK_HARDWARE_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL)' endif diff --git a/target/x86/sys-available/intel-atom b/target/x86/sys-available/intel-atom new file mode 100644 index 000000000..392a74d64 --- /dev/null +++ b/target/x86/sys-available/intel-atom @@ -0,0 +1,28 @@ +config ADK_TARGET_SYSTEM_INTEL_ATOM + bool "Intel Atom (NM10)" + select ADK_x86 + select ADK_intel_atom + select ADK_CPU_ATOM + select ADK_KERNEL_MATOM + select ADK_KERNEL_MII + select ADK_TARGET_CPU_WITH_MMX + select ADK_TARGET_CPU_WITH_SSE + select ADK_TARGET_CPU_WITH_SSE2 + select ADK_TARGET_CPU_WITH_SSE3 + select ADK_TARGET_CPU_WITH_SSSE3 + select ADK_TARGET_CPU_WITH_HT + select ADK_TARGET_CPU_WITH_MTRR + select ADK_TARGET_WITH_USB_BOOT + select ADK_TARGET_WITH_USB + select ADK_TARGET_WITH_VGA + select ADK_TARGET_WITH_INPUT + select ADK_TARGET_WITH_RTC + select ADK_TARGET_WITH_CF + select ADK_TARGET_WITH_INPUT + select ADK_TARGET_WITH_HDD + select ADK_TARGET_WITH_PCI + select ADK_TARGET_WITH_ACPI + select ADK_TARGET_WITH_SATA + help + System profile for Intel Atom. + diff --git a/target/x86/sys-available/qemu-x86 b/target/x86/sys-available/qemu-i686 index 378d9fb8e..d77d074e3 100644 --- a/target/x86/sys-available/qemu-x86 +++ b/target/x86/sys-available/qemu-i686 @@ -1,7 +1,7 @@ -config ADK_TARGET_SYSTEM_QEMU_X86 +config ADK_TARGET_SYSTEM_QEMU_I686 bool "Qemu Emulator" select ADK_x86 - select ADK_qemu_x86 + select ADK_qemu_i686 select ADK_CPU_I686 select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_VGA @@ -9,5 +9,5 @@ config ADK_TARGET_SYSTEM_QEMU_X86 select ADK_TARGET_WITH_PCI select ADK_TARGET_WITH_HDD help - Support for Qemu Emulator. + Support for Qemu Emulator (i686). |