From 676259549621ff73676d0cda40371594da4ea079 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Mar 2014 16:06:02 +0100
Subject: add some aranym fine tuning

---
 .gitignore                      | 1 +
 target/config/Config.in.runtime | 3 ++-
 target/m68k/Makefile            | 8 ++++++++
 target/m68k/kernel/aranym-m68k  | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 55f82fdd7..b2a8d1a21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,4 @@
 /target/config/Config.in.system
 /target/config/Config.in.native
 /target/config/Config.in.arch
+/target/m68k/aranym.cfg
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 721f623de..7acdd26ed 100644
--- a/target/config/Config.in.runtime
+++ b/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
diff --git a/target/m68k/Makefile b/target/m68k/Makefile
index 0e7324c25..78206042c 100644
--- a/target/m68k/Makefile
+++ b/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
diff --git a/target/m68k/kernel/aranym-m68k b/target/m68k/kernel/aranym-m68k
index 13757da5c..ac513fdc6 100644
--- a/target/m68k/kernel/aranym-m68k
+++ b/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
-- 
cgit v1.2.3