From 243f97e9f5262c1ef3bcaeba202b81d8e9403817 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 9 Jul 2013 16:28:09 +0300 Subject: Disable cursor blinking on VT with kernel arguments Change-Id: I5ff46bba20c574d4d3650de50a1dd696614c02e3 Reviewed-by: Samuli Piippo --- recipes/base-files/base-files/profile | 36 ---------- recipes/base-files/base-files_3.0.14.bbappend | 3 - .../0001-beagle-change-default-kernel-args.patch | 77 ++++++++++++++++++++++ ...ge-default-resolution-and-increase-VRAM-f.patch | 58 ---------------- recipes/u-boot/u-boot-beagleboard_2011.09.bbappend | 2 +- ...itrogen6x-disable-console-cursor-blinking.patch | 24 +++++++ recipes/u-boot/u-boot-script-boundary_git.bbappend | 10 ++- 7 files changed, 106 insertions(+), 104 deletions(-) delete mode 100644 recipes/base-files/base-files/profile create mode 100644 recipes/u-boot/u-boot-beagleboard/0001-beagle-change-default-kernel-args.patch delete mode 100644 recipes/u-boot/u-boot-beagleboard/0001-beagle-change-default-resolution-and-increase-VRAM-f.patch create mode 100644 recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch diff --git a/recipes/base-files/base-files/profile b/recipes/base-files/base-files/profile deleted file mode 100644 index 7d4c4d7..0000000 --- a/recipes/base-files/base-files/profile +++ /dev/null @@ -1,36 +0,0 @@ -# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) -# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). - -PATH="/usr/local/bin:/usr/bin:/bin" -EDITOR="/bin/vi" # needed for packages like cron -test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. - -if [ ! -e /etc/localtime ]; then - TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html - # for an explanation of how to set this to your local timezone. - export TZ -fi - -if [ "$HOME" = "ROOTHOME" ]; then - PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin -fi -if [ "$PS1" ]; then -# works for bash and ash (no other shells known to be in use here) - PS1='\u@\h:\w\$ ' -fi - -if [ -d /etc/profile.d ]; then - for i in /etc/profile.d/* ; do - . $i - done - unset i -fi - -LANG="en_US" - -export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM LANG - -umask 022 - -# disable cursor blinking on VT -echo 0 > /sys/class/graphics/fbcon/cursor_blink diff --git a/recipes/base-files/base-files_3.0.14.bbappend b/recipes/base-files/base-files_3.0.14.bbappend index b7e2d68..81c758c 100644 --- a/recipes/base-files/base-files_3.0.14.bbappend +++ b/recipes/base-files/base-files_3.0.14.bbappend @@ -1,7 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - do_install_append() { ln -s /home/root ${D}/root echo ${MACHINE_HOSTNAME} > ${D}${sysconfdir}/hostname } - diff --git a/recipes/u-boot/u-boot-beagleboard/0001-beagle-change-default-kernel-args.patch b/recipes/u-boot/u-boot-beagleboard/0001-beagle-change-default-kernel-args.patch new file mode 100644 index 0000000..1dea7f5 --- /dev/null +++ b/recipes/u-boot/u-boot-beagleboard/0001-beagle-change-default-kernel-args.patch @@ -0,0 +1,77 @@ +From 9ac6875931f5f9d073ca31cd6e1fb7636afb76bc Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Thu, 23 May 2013 14:37:10 +0300 +Subject: [PATCH] beagle: change default kernel args + +- default resolution to 800x600 +- increase VRAM for fb0 +- disable console blank +- disable console cursor blinking +- use extrabootargs +--- + include/configs/omap3_beagle.h | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h +index 1cc46dc..945e15e 100644 +--- a/include/configs/omap3_beagle.h ++++ b/include/configs/omap3_beagle.h +@@ -224,7 +224,7 @@ + "optargs=\0" \ + "camera=none\0" \ + "vram=12M\0" \ +- "dvimode=640x480MR-16@60\0" \ ++ "dvimode=800x600MR-16@60\0" \ + "defaultdisplay=dvi\0" \ + "mmcdev=0\0" \ + "mmcroot=/dev/mmcblk0p2 ro\0" \ +@@ -240,20 +240,28 @@ + "buddy2=${buddy2} "\ + "camera=${camera} "\ + "vram=${vram} " \ ++ "omapfb.vram=0:${vram} " \ + "omapfb.mode=dvi:${dvimode} " \ + "omapdss.def_disp=${defaultdisplay} " \ + "root=${mmcroot} " \ +- "rootfstype=${mmcrootfstype}\0" \ ++ "rootfstype=${mmcrootfstype} " \ ++ "consoleblank=0 " \ ++ "vt.global_cursor_default=0 " \ ++ "${extrabootargs}\0" \ + "nandargs=setenv bootargs console=${console} " \ + "${optargs} " \ + "mpurate=${mpurate} " \ + "buddy=${buddy} "\ + "camera=${camera} "\ + "vram=${vram} " \ ++ "omapfb.vram=0:${vram} " \ + "omapfb.mode=dvi:${dvimode} " \ + "omapdss.def_disp=${defaultdisplay} " \ + "root=${nandroot} " \ +- "rootfstype=${nandrootfstype}\0" \ ++ "rootfstype=${nandrootfstype} " \ ++ "consoleblank=0 " \ ++ "vt.global_cursor_default=0 " \ ++ "${extrabootargs}\0" \ + "bootenv=uEnv.txt\0" \ + "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ + "importbootenv=echo Importing environment from mmc ...; " \ +@@ -263,10 +271,14 @@ + "mpurate=${mpurate} " \ + "buddy=${buddy} "\ + "vram=${vram} " \ ++ "omapfb.vram=0:${vram} " \ + "omapfb.mode=dvi:${dvimode} " \ + "omapdss.def_disp=${defaultdisplay} " \ + "root=${ramroot} " \ +- "rootfstype=${ramrootfstype}\0" \ ++ "rootfstype=${ramrootfstype} " \ ++ "consoleblank=0 " \ ++ "vt.global_cursor_default=0 " \ ++ "${extrabootargs}\0" \ + "loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ + "loaduimagefat=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ + "loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} /boot/uImage\0" \ +-- +1.7.10.4 + diff --git a/recipes/u-boot/u-boot-beagleboard/0001-beagle-change-default-resolution-and-increase-VRAM-f.patch b/recipes/u-boot/u-boot-beagleboard/0001-beagle-change-default-resolution-and-increase-VRAM-f.patch deleted file mode 100644 index fbae3f3..0000000 --- a/recipes/u-boot/u-boot-beagleboard/0001-beagle-change-default-resolution-and-increase-VRAM-f.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 4fe2e7b7b9a83f36b409892e854aed68dbd45a0a Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Thu, 23 May 2013 14:37:10 +0300 -Subject: [PATCH] beagle: change default resolution and increase VRAM for fb0 - ---- - include/configs/omap3_beagle.h | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h -index 1cc46dc..04862d1 100644 ---- a/include/configs/omap3_beagle.h -+++ b/include/configs/omap3_beagle.h -@@ -224,7 +224,7 @@ - "optargs=\0" \ - "camera=none\0" \ - "vram=12M\0" \ -- "dvimode=640x480MR-16@60\0" \ -+ "dvimode=800x600MR-16@60\0" \ - "defaultdisplay=dvi\0" \ - "mmcdev=0\0" \ - "mmcroot=/dev/mmcblk0p2 ro\0" \ -@@ -240,8 +240,10 @@ - "buddy2=${buddy2} "\ - "camera=${camera} "\ - "vram=${vram} " \ -+ "omapfb.vram=0:${vram} " \ - "omapfb.mode=dvi:${dvimode} " \ - "omapdss.def_disp=${defaultdisplay} " \ -+ "consoleblank=0 " \ - "root=${mmcroot} " \ - "rootfstype=${mmcrootfstype}\0" \ - "nandargs=setenv bootargs console=${console} " \ -@@ -250,8 +252,10 @@ - "buddy=${buddy} "\ - "camera=${camera} "\ - "vram=${vram} " \ -+ "omapfb.vram=0:${vram} " \ - "omapfb.mode=dvi:${dvimode} " \ - "omapdss.def_disp=${defaultdisplay} " \ -+ "consoleblank=0 " \ - "root=${nandroot} " \ - "rootfstype=${nandrootfstype}\0" \ - "bootenv=uEnv.txt\0" \ -@@ -263,8 +267,10 @@ - "mpurate=${mpurate} " \ - "buddy=${buddy} "\ - "vram=${vram} " \ -+ "omapfb.vram=0:${vram} " \ - "omapfb.mode=dvi:${dvimode} " \ - "omapdss.def_disp=${defaultdisplay} " \ -+ "consoleblank=0 " \ - "root=${ramroot} " \ - "rootfstype=${ramrootfstype}\0" \ - "loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ --- -1.7.10.4 - diff --git a/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend b/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend index 28c08bc..787ac42 100644 --- a/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend +++ b/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend @@ -1,4 +1,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += " \ - file://0001-beagle-change-default-resolution-and-increase-VRAM-f.patch \ + file://0001-beagle-change-default-kernel-args.patch \ " diff --git a/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch b/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch new file mode 100644 index 0000000..3c65a20 --- /dev/null +++ b/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch @@ -0,0 +1,24 @@ +From 6b894707404a1aeb3072d4b3bfc486ff9ad37ac4 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Tue, 9 Jul 2013 15:31:30 +0300 +Subject: [PATCH] nitrogen6x: disable console cursor blinking + +--- + board/boundary/nitrogen6x/6x_bootscript.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/board/boundary/nitrogen6x/6x_bootscript.txt b/board/boundary/nitrogen6x/6x_bootscript.txt +index 1d766ca..80b91ea 100644 +--- a/board/boundary/nitrogen6x/6x_bootscript.txt ++++ b/board/boundary/nitrogen6x/6x_bootscript.txt +@@ -53,6 +53,6 @@ done + + setenv bootargs $bootargs $fbmem + +-setenv bootargs $bootargs console=ttymxc1,115200 vmalloc=400M root=/dev/mmcblk0p2 rootwait consoleblank=0 ; ++setenv bootargs $bootargs console=ttymxc1,115200 vmalloc=400M root=/dev/mmcblk0p2 rootwait consoleblank=0 vt.global_cursor_default=0 ; + ${fs}load mmc ${disk}:1 10800000 uImage && bootm 10800000 ; echo "Error loading kernel image" + +-- +1.7.10.4 + diff --git a/recipes/u-boot/u-boot-script-boundary_git.bbappend b/recipes/u-boot/u-boot-script-boundary_git.bbappend index 8db57e0..c845717 100644 --- a/recipes/u-boot/u-boot-script-boundary_git.bbappend +++ b/recipes/u-boot/u-boot-script-boundary_git.bbappend @@ -1,6 +1,4 @@ - -do_mkimage_prepend () { - if [ ! -e board/boundary/${MACHINE} ]; then - cp -r board/boundary/nitrogen6x board/boundary/${MACHINE} - fi -} +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +SRC_URI += " \ + file://0001-nitrogen6x-disable-console-cursor-blinking.patch \ + " -- cgit v1.2.3-54-g00ecf