Browse Source

qemu-ppc-macppc: move serial driver away from mini.config, reduce

Waldemar Brodkorb 10 years ago
parent
commit
18e5237a8f
2 changed files with 4 additions and 8 deletions
  1. 3 1
      target/linux/config/Config.in.serial
  2. 1 7
      target/ppc/kernel/qemu-ppc-macppc

+ 3 - 1
target/linux/config/Config.in.serial

@@ -95,8 +95,10 @@ config ADK_KERNEL_SERIAL_PMACZILOG
 	bool "pmac serial driver"
 	bool "pmac serial driver"
 	select ADK_KERNEL_SERIAL_PMACZILOG_TTYS
 	select ADK_KERNEL_SERIAL_PMACZILOG_TTYS
 	select ADK_KERNEL_SERIAL_PMACZILOG_CONSOLE
 	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_M68K_Q800
+	default y if ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC
 	default n
 	default n
 	help
 	help
 	  Serial driver for PMAC Q800 M68K.
 	  Serial driver for PMAC Q800 M68K.

+ 1 - 7
target/ppc/kernel/qemu-ppc-macppc

@@ -1,14 +1,10 @@
 CONFIG_PPC=y
 CONFIG_PPC=y
 CONFIG_PPC32=y
 CONFIG_PPC32=y
-CONFIG_32BIT=y
 CONFIG_PPC_BOOK3S_32=y
 CONFIG_PPC_BOOK3S_32=y
 CONFIG_PPC_BOOK3S=y
 CONFIG_PPC_BOOK3S=y
 CONFIG_6xx=y
 CONFIG_6xx=y
 CONFIG_PPC_FPU=y
 CONFIG_PPC_FPU=y
 CONFIG_ALTIVEC=y
 CONFIG_ALTIVEC=y
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_32=y
-CONFIG_WORD_SIZE=32
 CONFIG_GENERIC_NVRAM=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_PPC_OF=y
 CONFIG_PPC_OF=y
 CONFIG_PPC_UDBG_16550=y
 CONFIG_PPC_UDBG_16550=y
@@ -25,6 +21,4 @@ CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_ADB=y
 CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_CUDA=y
 CONFIG_INPUT_ADBHID=y
 CONFIG_INPUT_ADBHID=y
-CONFIG_SERIAL_PMACZILOG=y
-CONFIG_SERIAL_PMACZILOG_TTYS=y
-CONFIG_SERIAL_PMACZILOG_CONSOLE=y
+CONFIG_CMDLINE_BOOL=y