minnowboard-max: Enable serial and HDMI consoles

Following what's done in Raspberry Pi's defconfigs, let's
unify the consoles in Minnowboard Max defconfigs, providing
consoles on HDMI and serial port.

[Peter: use tty1 like on rpi]
Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/board/minnowboard/post-build.sh b/board/minnowboard/post-build.sh
index f3a11e99f0f5d1a0642f06152fcfc47c2ec76c50..1406a509c1d9c39510ea0193185c10242edb0698 100755 (executable)
--- a/board/minnowboard/post-build.sh
+++ b/board/minnowboard/post-build.sh
@@ -3,3 +3,8 @@
 # $2    board name
 
 cp -v board/minnowboard/grub-${2}.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg
+
+# Add a console on tty1
+grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \
+sed -i '/GENERIC_SERIAL/a\
+tty1::respawn:/sbin/getty -L  tty1 0 vt100 # HDMI console' ${TARGET_DIR}/etc/inittab

diff --git a/board/minnowboard/readme.txt b/board/minnowboard/readme.txt
index 8cf35b79c562c678d08fce83f7bdab73dff3e363..f76cd77c3403c2ad596d2003a21e22c6a0dad2bd 100644 (file)
--- a/board/minnowboard/readme.txt
+++ b/board/minnowboard/readme.txt
@@ -23,6 +23,9 @@ How to get started with the MinnowBoard (MAX)
 
   $ dd if=output/images/sdcard.img of=/dev/mmcblk0; sync
 
+  The system starts two consoles: one on the serial port
+  and one on HDMI.
+
 3. Enjoy
 
 Additional information about this board can be found at

diff --git a/configs/minnowboard_max-graphical_defconfig b/configs/minnowboard_max-graphical_defconfig
index a5f60a7e3c6843e51b952d68a4f73499693705cc..d84544be86c58efaa08ca5af0836d88eed62087e 100644 (file)
--- a/configs/minnowboard_max-graphical_defconfig
+++ b/configs/minnowboard_max-graphical_defconfig
@@ -9,7 +9,6 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 # System configuration
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
-BR2_TARGET_GENERIC_GETTY_PORT="tty0"
 BR2_ROOTFS_OVERLAY="board/minnowboard/fs-overlay-graphical"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/minnowboard/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/minnowboard/post-image.sh"

diff --git a/configs/minnowboard_max_defconfig b/configs/minnowboard_max_defconfig
index 1bb22f9ec1321e6f45eecfce7aaadf259d6711c5..0adb382f0c4b0feaee6d75e05f1f34479f07bfa3 100644 (file)
--- a/configs/minnowboard_max_defconfig
+++ b/configs/minnowboard_max_defconfig
@@ -3,7 +3,6 @@ BR2_x86_64=y
 BR2_x86_atom=y
 
 # Misc
-BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 BR2_SYSTEM_DHCP="eth0"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/minnowboard/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/minnowboard/post-image.sh"