Browse Source

add some aranym fine tuning

Waldemar Brodkorb 10 years ago
parent
commit
6762595496
4 changed files with 12 additions and 1 deletions
  1. 1 0
      .gitignore
  2. 2 1
      target/config/Config.in.runtime
  3. 8 0
      target/m68k/Makefile
  4. 1 0
      target/m68k/kernel/aranym-m68k

+ 1 - 0
.gitignore

@@ -53,3 +53,4 @@
 /target/config/Config.in.system
 /target/config/Config.in.native
 /target/config/Config.in.arch
+/target/m68k/aranym.cfg

+ 2 - 1
target/config/Config.in.runtime

@@ -59,6 +59,7 @@ config ADK_RUNTIME_GETTY_VGA
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_IBM_X40
+	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default n
 	help
           Start getty on VGA console. (tty1-tty6)
@@ -69,6 +70,7 @@ config ADK_RUNTIME_GETTY_SERIAL
 	default n if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n if ADK_TARGET_SYSTEM_IBM_X40
+	default n if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y
 	help
 	  Start getty on serial console.
@@ -80,7 +82,6 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
 	default "ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB || ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
 	default "ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB
 	default "ttymxc0" if ADK_TARGET_SYSTEM_CUBOX_I
-	default "nfcon0" if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default "ttyS0"
 
 config ADK_RUNTIME_CONSOLE_SERIAL_SPEED

+ 8 - 0
target/m68k/Makefile

@@ -26,6 +26,14 @@ imageinstall: $(FW_DIR)/$(INITRAMFS)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
+ifeq ($(ADK_TARGET_SYSTEM_ARANYM_M68K),y)
+	@sed -e "s#@@KERNEL@@#$(FW_DIR)/$(TARGET_KERNEL)#" \
+	    -e "s#@@INITRAMFS@@#${FW_DIR}/${INITRAMFS}#" \
+		$(TOPDIR)/target/m68k/aranym.cfg.in \
+		> $(TOPDIR)/target/m68k/aranym.cfg
+	@echo 'Start aranym with: aranym-mmu -l -c target/m68k/aranym.cfg'
+	@echo 'Ungrab mouse with middle mouse click'
+endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
 imageinstall: createinitramfs

+ 1 - 0
target/m68k/kernel/aranym-m68k

@@ -4,6 +4,7 @@ CONFIG_M68KCLASSIC=y
 CONFIG_M68040=y
 CONFIG_FPU=y
 CONFIG_ATARI=y
+CONFIG_NATFEAT=y
 CONFIG_NFETH=y
 CONFIG_SERIO=y
 CONFIG_SERIO_SERPORT=y