From df65d67520d9dc6d7947534fba3b4997b3c74afd Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 28 Dec 2017 23:04:42 +0100
Subject: generic config finetuning

---
 package/base-files/Makefile     | 4 ++--
 scripts/install.sh              | 2 +-
 target/config/Config.in.runtime | 8 ++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 3b822dc58..8d7599bcf 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.1
-PKG_RELEASE:=		25
+PKG_RELEASE:=		26
 PKG_SECTION:=		base/apps
 PKG_DESCR:=		basic files and scripts
 
@@ -65,7 +65,7 @@ ifeq ($(ADK_RUNTIME_INIT_SYSV),y)
 	cp ./files/inittab.sysv $(IDIR_BASE_FILES)/etc/inittab
 	test -z $(ADK_RUNTIME_SHELL) || \
 	    cat ./files/inittab.shell >> $(IDIR_BASE_FILES)/etc/inittab
-ifeq ($(ADK_TARGET_WITH_VGA),y)
+ifeq ($(ADK_TARGET_WITH_VGA)$(ADK_TARGET_GENERIC),y)
 	test -z $(ADK_RUNTIME_SHELL) || \
 		cat ./files/inittab.shellvga >> $(IDIR_BASE_FILES)/etc/inittab
 endif
diff --git a/scripts/install.sh b/scripts/install.sh
index 7e3245c31..afa74b0cc 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -687,7 +687,7 @@ if (( grub )); then
 		fi
 		print
 		print 'menuentry "GNU/Linux (OpenADK)" {'
-		linuxargs="root=PARTUUID=$partuuid $consargs"
+		linuxargs="root=PARTUUID=$partuuid $consargs rootwait"
 		(( panicreboot )) && linuxargs="$linuxargs panic=$panicreboot"
 		print "\tlinux /boot/kernel $linuxargs"
 		print '}'
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 0b3832673..9a82aac2d 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -304,7 +304,8 @@ endchoice
 
 config ADK_RUNTIME_GETTY_VGA
 	bool "start getty on VGA console (tty1-tty6)"
-	depends on ADK_RUNTIME_GETTY && ADK_TARGET_WITH_VGA
+	depends on ADK_RUNTIME_GETTY \
+                && (ADK_TARGET_WITH_VGA || ADK_TARGET_GENERIC)
 	default y if ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
 	default y if ADK_TARGET_QEMU_WITH_GRAPHIC
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
@@ -326,6 +327,7 @@ config ADK_RUNTIME_GETTY_SERIAL
 	bool "start getty on serial console"
 	depends on ADK_RUNTIME_GETTY && ( ADK_TARGET_WITH_SERIAL \
 		|| ADK_TARGET_QEMU \
+		|| ADK_TARGET_GENERIC \
 		|| ADK_TARGET_SIM )
 	default n if ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
 	default n if ADK_TARGET_QEMU_WITH_GRAPHIC
@@ -343,13 +345,14 @@ config ADK_RUNTIME_GETTY_SERIAL
 
 config ADK_RUNTIME_CONSOLE_VGA_DEVICE
 	string "VGA console device"
-	depends on ADK_TARGET_WITH_VGA
+	depends on ADK_TARGET_WITH_VGA || ADK_TARGET_GENERIC
 	default "tty0"
 
 config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
 	string "serial console device"
 	depends on ADK_TARGET_WITH_SERIAL \
 		|| ADK_TARGET_QEMU \
+		|| ADK_TARGET_GENERIC \
 		|| ADK_TARGET_SIM
 	default "hvc0" if ADK_TARGET_SYSTEM_QEMU_PPC64
 	default "ttyBF0" if ADK_TARGET_ARCH_BFIN
@@ -384,6 +387,7 @@ config ADK_RUNTIME_CONSOLE_SERIAL_SPEED
 	string "serial console speed"
 	depends on ADK_TARGET_WITH_SERIAL \
 		|| ADK_TARGET_QEMU \
+		|| ADK_TARGET_GENERIC \
 		|| ADK_TARGET_SIM
 	default "9600" if ADK_TARGET_SYSTEM_FON_FON2100
 	default "9600" if ADK_TARGET_SYSTEM_SGI_INDY
-- 
cgit v1.2.3