Merge branch 'master' of git+ssh://openadk.org/git/openadk

5 files changed, 16 insertions, 7 deletions

diff --git a/target/Makefile b/target/Makefile
index ddb395b55..4f63a3fb1 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -37,8 +37,12 @@ config-prepare: $(ADK_TOPDIR)/.config
 		exit 1; \
 	fi
 ifneq ($(ADK_TARGET_NO_CMDLINE),y)
+ifeq ($(ADK_APPLIANCE_KODI),y)
+	$(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 consoleblank=0 vt.global_cursor_default=0"#' \
+		$(BUILD_DIR)/.kernelconfig.board
+endif
 ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_VGA_ONLY),y)
-	$(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE) consoleblank=0"#' \
+	$(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE)"#' \
 		$(BUILD_DIR)/.kernelconfig.board
 endif
 ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_ONLY),y)
@@ -46,11 +50,11 @@ ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_ONLY),y)
 		$(BUILD_DIR)/.kernelconfig.board
 endif
 ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_VGA_SERIAL),y)
-	$(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE) consoleblank=0 console=$(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE),$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)"#' \
+	$(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE) console=$(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE),$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)"#' \
 		$(BUILD_DIR)/.kernelconfig.board
 endif
 ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_VGA),y)
-	$(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE),$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED) console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE) consoleblank=0"#' \
+	$(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE),$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED) console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE)"#' \
 		$(BUILD_DIR)/.kernelconfig.board
 endif
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_M68K),y)
diff --git a/target/appliances/kodi.appliance b/target/appliances/kodi.appliance
index 4982a6f77..20c3acb0a 100644
--- a/target/appliances/kodi.appliance
+++ b/target/appliances/kodi.appliance
@@ -13,11 +13,14 @@ config ADK_APPLIANCE_KODI
 	select ADK_RUNTIME_START_DROPBEAR
 	select ADK_RUNTIME_START_BUSYBOX_NTPD
 	select ADK_RUNTIME_START_BUSYBOX_SYSLOGD
+	select ADK_RUNTIME_START_BUSYBOX_WATCHDOG
 	select ADK_RUNTIME_START_KODI
 	select ADK_KERNEL_INPUT_EVDEV m
 	select ADK_KERNEL_USB_HID m
 	select ADK_TARGET_USB_KEYBOARD
 	select ADK_TARGET_USB_MOUSE
+	select ADK_RUNTIME_VERBOSE_KERNEL_VGA_SERIAL
+	select ADK_RUNTIME_VERBOSE_INIT_SERIAL
 	select ADK_RUNTIME_HOSTNAME kodibox
 	select ADK_PACKAGE_BCM28XX_BOOTLOADER_EXTRA if ADK_TARGET_BOARD_BCM28XX
 	select ADK_PACKAGE_BCM28XX_VC_LIBS if ADK_TARGET_BOARD_BCM28XX
diff --git a/target/arm/kernel/solidrun-imx6 b/target/arm/kernel/solidrun-imx6
index 1d8e6ec7f..c861a5678 100644
--- a/target/arm/kernel/solidrun-imx6
+++ b/target/arm/kernel/solidrun-imx6
@@ -12,4 +12,4 @@ CONFIG_PCI_IMX6=y
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
 CONFIG_ATAGS=y
-CONFIG_CMDLINE_EXTEND=y
+CONFIG_CMDLINE_FORCE=y
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu
index 2ae815e11..35e7f1e2f 100644
--- a/target/config/Config.in.cpu
+++ b/target/config/Config.in.cpu
@@ -56,6 +56,7 @@ config ADK_CPU_ATOM
 config ADK_CPU_AVR32
 	bool
 	select ADK_TARGET_WITH_LT
+	select ADK_TARGET_WITH_MMU
 
 config ADK_CPU_BFIN
 	bool
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 6c7676254..7ac4c92f8 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -122,7 +122,8 @@ endchoice
 
 choice
 prompt "bootup messages from initscripts"
-default ADK_RUNTIME_VERBOSE_INIT_VGA if ADK_TARGET_WITH_VGA
+default ADK_RUNTIME_VERBOSE_INIT_VGA if ADK_TARGET_WITH_VGA \
+	&& !ADK_APPLIANCE_KODI
 default ADK_RUNTIME_VERBOSE_INIT_SERIAL
 
 config ADK_RUNTIME_VERBOSE_INIT_VGA
@@ -167,7 +168,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_APPLIANCE_KODI
 	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
@@ -188,7 +190,6 @@ config ADK_RUNTIME_GETTY_SERIAL
 	default n if ADK_TARGET_QEMU_WITH_GRAPHIC
 	default n if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n if ADK_TARGET_SYSTEM_RASPBERRY_PI2
-	default n if ADK_TARGET_SYSTEM_HUMMINGBOARD
 	default n if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n if ADK_TARGET_SYSTEM_IBM_X40
 	default n if ADK_TARGET_SYSTEM_ARANYM_M68K