minnowboard-max: Start X on boot and run a few demos

Now that we've merged nodm, the autologin display manager, we can
get rid of xinit, and startx hack and use nodm to start X on boot.
While here, let's start xterm and glmark2, just as demos.

Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/board/minnowboard/fs-overlay-graphical/etc/X11/Xsession b/board/minnowboard/fs-overlay-graphical/etc/X11/Xsession
new file mode 100755 (executable)
index 0000000..d8862f1
--- /dev/null
+++ b/board/minnowboard/fs-overlay-graphical/etc/X11/Xsession
@@ -0,0 +1,7 @@
+# Start a terminal on the top left corner
+xterm -geom 80x30+0+0 &
+
+# OpenGL demo
+glmark2 &
+
+exec /usr/bin/openbox-session

diff --git a/board/minnowboard/fs-overlay-graphical/root/.xinitrc b/board/minnowboard/fs-overlay-graphical/root/.xinitrc
deleted file mode 100644 (file)
index 4274b24..0000000
--- a/board/minnowboard/fs-overlay-graphical/root/.xinitrc
+++ /dev/null
@@ -1 +0,0 @@
-exec /usr/bin/openbox-session

diff --git a/board/minnowboard/fs-overlay-graphical/usr/bin/startx b/board/minnowboard/fs-overlay-graphical/usr/bin/startx
deleted file mode 100755 (executable)
index 6f2c949..0000000
--- a/board/minnowboard/fs-overlay-graphical/usr/bin/startx
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Simplified custom startx script, which starts
-# the X server on vt7.
-
-xinit -- vt7

diff --git a/configs/minnowboard_max-graphical_defconfig b/configs/minnowboard_max-graphical_defconfig
index d84544be86c58efaa08ca5af0836d88eed62087e..de803f023920ae96e8a6ba14c327004835d767af 100644 (file)
--- a/configs/minnowboard_max-graphical_defconfig
+++ b/configs/minnowboard_max-graphical_defconfig
@@ -48,12 +48,12 @@ BR2_PACKAGE_FB_TEST_APP=y
 BR2_PACKAGE_XORG7=y
 BR2_PACKAGE_XSERVER_XORG_SERVER=y
 BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX=y
-BR2_PACKAGE_XAPP_XINIT=y
 BR2_PACKAGE_XAPP_XRANDR=y
 BR2_PACKAGE_XDRIVER_XF86_INPUT_EVDEV=y
 BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD=y
 BR2_PACKAGE_XDRIVER_XF86_INPUT_MOUSE=y
 BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL=y
+BR2_PACKAGE_NODM=y
 BR2_PACKAGE_XTERM=y
 BR2_PACKAGE_OPENBOX=y