summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-09-14 11:31:31 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2015-09-14 11:31:31 +0200
commit18e5237a8f3a48efae61e2cd5cd41d1a168231ed (patch)
treeb5804aedabd9fc725df686f607c7742829e2b922
parente78748ce1aff1751fe2a3a10a513b37461d0aed6 (diff)
qemu-ppc-macppc: move serial driver away from mini.config, reduce
-rw-r--r--target/linux/config/Config.in.serial4
-rw-r--r--target/ppc/kernel/qemu-ppc-macppc8
2 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
index 446cd55e1..c3c6c21ce 100644
--- a/target/linux/config/Config.in.serial
+++ b/target/linux/config/Config.in.serial
@@ -95,8 +95,10 @@ 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_SYSTEM_QEMU_M68K_Q800
+ depends on ADK_TARGET_SYSTEM_QEMU_M68K_Q800 \
+ || ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC
default y if ADK_TARGET_SYSTEM_QEMU_M68K_Q800
+ default y if ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC
default n
help
Serial driver for PMAC Q800 M68K.
diff --git a/target/ppc/kernel/qemu-ppc-macppc b/target/ppc/kernel/qemu-ppc-macppc
index b18e0e2d4..7aa9658b9 100644
--- a/target/ppc/kernel/qemu-ppc-macppc
+++ b/target/ppc/kernel/qemu-ppc-macppc
@@ -1,14 +1,10 @@
CONFIG_PPC=y
CONFIG_PPC32=y
-CONFIG_32BIT=y
CONFIG_PPC_BOOK3S_32=y
CONFIG_PPC_BOOK3S=y
CONFIG_6xx=y
CONFIG_PPC_FPU=y
CONFIG_ALTIVEC=y
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-CONFIG_WORD_SIZE=32
CONFIG_GENERIC_NVRAM=y
CONFIG_PPC_OF=y
CONFIG_PPC_UDBG_16550=y
@@ -25,6 +21,4 @@ CONFIG_MACINTOSH_DRIVERS=y
CONFIG_ADB=y
CONFIG_ADB_CUDA=y
CONFIG_INPUT_ADBHID=y
-CONFIG_SERIAL_PMACZILOG=y
-CONFIG_SERIAL_PMACZILOG_TTYS=y
-CONFIG_SERIAL_PMACZILOG_CONSOLE=y
+CONFIG_CMDLINE_BOOL=y