diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in.kernel | 3 | ||||
| -rw-r--r-- | target/config/Config.in.qemu | 16 | ||||
| -rw-r--r-- | target/linux/config/Config.in.ethernet | 11 | ||||
| -rw-r--r-- | target/linux/config/Config.in.serial | 16 | ||||
| -rw-r--r-- | target/m68k/Makefile | 6 | ||||
| -rw-r--r-- | target/m68k/kernel/qemu-m68k-mcf5208 (renamed from target/m68k/kernel/qemu-m68k) | 0 | ||||
| -rw-r--r-- | target/m68k/systems/qemu-m68k | 5 |
7 files changed, 50 insertions, 7 deletions
diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernel index decd0cba4..88da6de09 100644 --- a/target/config/Config.in.kernel +++ b/target/config/Config.in.kernel @@ -57,7 +57,6 @@ config ADK_TARGET_KERNEL_MINICONFIG default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64 default "qemu-xtensa" if ADK_TARGET_SYSTEM_QEMU_XTENSA default "qemu-alpha" if ADK_TARGET_SYSTEM_QEMU_ALPHA - default "qemu-m68k" if ADK_TARGET_SYSTEM_QEMU_M68K default "aranym-m68k" if ADK_TARGET_SYSTEM_ARANYM_M68K default "vbox-x86" if ADK_TARGET_SYSTEM_VBOX_X86 default "ibm-x40" if ADK_TARGET_SYSTEM_IBM_X40 @@ -80,3 +79,5 @@ config ADK_TARGET_KERNEL_MINICONFIG default "pcengines-alix" if ADK_TARGET_SYSTEM_PCENGINES_ALIX default "sim-bfin" if ADK_TARGET_SYSTEM_SIM_BFIN default "sim-h8300h" if ADK_TARGET_SYSTEM_SIM_H8300H + default "qemu-m68k-mcf5208" if ADK_TARGET_QEMU_M68K_MCF5208 + default "qemu-m68k-q800" if ADK_TARGET_QEMU_M68K_Q800 diff --git a/target/config/Config.in.qemu b/target/config/Config.in.qemu index adcf30569..f47f5fa62 100644 --- a/target/config/Config.in.qemu +++ b/target/config/Config.in.qemu @@ -18,6 +18,22 @@ config ADK_TARGET_QEMU_PPC_MACPPC endchoice choice +prompt "Qemu M68K Emulation" +depends on ADK_TARGET_SYSTEM_QEMU_M68K + +config ADK_TARGET_QEMU_M68K_Q800 + bool "M68K Q800" + select ADK_CPU_68040 + +config ADK_TARGET_QEMU_M68K_MCF5208 + bool "Coldfire MCF5208" + select ADK_CPU_CF_5208 + select ADK_TARGET_BINFMT_FLAT + select ADK_TARGET_UCLINUX + +endchoice + +choice prompt "Qemu MICROBLAZE Emulation" depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet index 17d84b7b0..4aeb0010e 100644 --- a/target/linux/config/Config.in.ethernet +++ b/target/linux/config/Config.in.ethernet @@ -64,9 +64,9 @@ config ADK_KERNEL_FEC select ADK_KERNEL_NET_VENDOR_FREESCALE select ADK_KERNEL_AT803X_PHY depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 || \ - ADK_TARGET_SYSTEM_QEMU_M68K + ADK_TARGET_QEMU_M68K_MCF5208 default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - default y if ADK_TARGET_SYSTEM_QEMU_M68K + default y if ADK_TARGET_QEMU_M68K_MCF5208 default n help FEC ethernet driver @@ -279,4 +279,11 @@ config ADK_KERNEL_ETRAX_ETHERNET default y if ADK_TARGET_ARCH_CRIS default n +config ADK_KERNEL_MACSONIC + bool "MAC sonic ethernet driver" + select ADK_KERNEL_NET_VENDOR_NATSEMI + depends on ADK_TARGET_QEMU_M68K_Q800 + default y if ADK_TARGET_QEMU_M68K_Q800 + default n + endmenu diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index ceba7c5c3..f88b05efb 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -10,6 +10,12 @@ config ADK_KERNEL_SERIAL_OF_PLATFORM config ADK_KERNEL_SERIAL_ETRAXFS_CONSOLE bool +config ADK_KERNEL_SERIAL_PMACZILOG_TTYS + bool + +config ADK_KERNEL_SERIAL_PMACZILOG_CONSOLE + bool + config ADK_KERNEL_SERIAL_ETRAXFS bool "ETRAXFS serial driver" select ADK_KERNEL_SERIAL_ETRAXFS_CONSOLE @@ -29,4 +35,14 @@ config ADK_KERNEL_SERIAL_8250 help Serial driver for 8250 UART chip. +config ADK_KERNEL_SERIAL_PMACZILOG + bool "pmac serial driver" + select ADK_KERNEL_SERIAL_PMACZILOG_TTYS + select ADK_KERNEL_SERIAL_PMACZILOG_CONSOLE + depends on ADK_TARGET_QEMU_M68K_Q800 + default y if ADK_TARGET_QEMU_M68K_Q800 + default n + help + Serial driver for PMAC Q800 M68K. + endmenu diff --git a/target/m68k/Makefile b/target/m68k/Makefile index 8e64dc764..2d6e08d75 100644 --- a/target/m68k/Makefile +++ b/target/m68k/Makefile @@ -8,8 +8,14 @@ include $(ADK_TOPDIR)/mk/kernel-build.mk include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/vmlinux + QEMU_ARGS:=${ADK_QEMU_ARGS} +ifeq ($(ADK_TARGET_QEMU_M68K_Q800),y) +QEMU_ARGS+=-M q800 +endif +ifeq ($(ADK_TARGET_QEMU_M68K_MCF5208),y) QEMU_ARGS+=-M mcf5208evb -cpu m5208 +endif # target helper text ifeq ($(ADK_TARGET_FS),archive) diff --git a/target/m68k/kernel/qemu-m68k b/target/m68k/kernel/qemu-m68k-mcf5208 index 3caa5323b..3caa5323b 100644 --- a/target/m68k/kernel/qemu-m68k +++ b/target/m68k/kernel/qemu-m68k-mcf5208 diff --git a/target/m68k/systems/qemu-m68k b/target/m68k/systems/qemu-m68k index a8f35ee3b..66f20b587 100644 --- a/target/m68k/systems/qemu-m68k +++ b/target/m68k/systems/qemu-m68k @@ -1,10 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_M68K bool "Qemu M68K" - select ADK_CPU_CF_5208 - select ADK_TARGET_UCLINUX select ADK_TARGET_QEMU - select ADK_TARGET_BINFMT_FLAT select ADK_TARGET_KERNEL_ZIMAGE help - Support for Qemu Emulator M68K/Coldfire without MMU. + Support for Qemu Emulator M68K/Coldfire. |