diff options
| author | Daniel Drake <dsd@laptop.org> | 2012-09-13 16:49:55 (GMT) |
|---|---|---|
| committer | Daniel Drake <dsd@laptop.org> | 2012-09-13 16:49:55 (GMT) |
| commit | 5c9a93a5730c2c30d61eb8066a9155fb10f94749 (patch) | |
| tree | 8d05adffc5f285b7514091e29e4c9fd34c966ea2 | |
| parent | f1f90e21918e75fdc5094f356b55204b40e7854a (diff) | |
xo1_75: restore dove X driver (#12054)
| -rw-r--r-- | modules/xo1_75/kspkglist.50.xo1_75.inc | 3 | ||||
| -rw-r--r-- | modules/xo1_75/kspost.50.xo1_75-tweaks.inc | 55 |
2 files changed, 1 insertions, 57 deletions
diff --git a/modules/xo1_75/kspkglist.50.xo1_75.inc b/modules/xo1_75/kspkglist.50.xo1_75.inc index 06f63d3..87f4ea4 100644 --- a/modules/xo1_75/kspkglist.50.xo1_75.inc +++ b/modules/xo1_75/kspkglist.50.xo1_75.inc @@ -1,6 +1,5 @@ olpc-firmware-q4 - -# xorg-x11-drv-dove FIXME F18 +xorg-x11-drv-dove # currently XO-1.5 / XO-1.75 only olpc-runin-tests diff --git a/modules/xo1_75/kspost.50.xo1_75-tweaks.inc b/modules/xo1_75/kspost.50.xo1_75-tweaks.inc index fbf1987..6d435c9 100644 --- a/modules/xo1_75/kspost.50.xo1_75-tweaks.inc +++ b/modules/xo1_75/kspost.50.xo1_75-tweaks.inc @@ -6,58 +6,3 @@ ln -sf /lib/systemd/system/serial-getty@.service \ mkdir -p /etc/systemd/system/runin.target.wants ln -sf /lib/systemd/system/serial-getty@.service \ /etc/systemd/system/runin.target.wants/serial-getty@ttyS2.service - -# FIXME fix dove driver for F18 -cat > /usr/share/olpc-utils/xorg.conf.d/xo1.75.conf <<EOF -# This Monitor section is (partially?) unused (#10742) -# as no Screen section is provided, X creates a default monitor. -# but some of these options do seem to be picked up later? -Section "Monitor" - Identifier "Monitor0" - Option "PanelSize" "1200x900" - - # FIXME: http://dev.laptop.org/ticket/9331 - DisplaySize 152 114 -EndSection - -Section "Device" - Identifier "Videocard0" - Option "UseFBDev" "true" - # ShadowFB triggers some segfaults - Option "ShadowFB" "false" - Option "fbdev" "/dev/fb0" - Driver "fbdev" -EndSection - -Section "Module" - Disable "glx" -EndSection - -Section "Extensions" - Option "Composite" "False" -EndSection - -Section "Screen" - Identifier "Screen0" - Device "Videocard0" - Monitor "Monitor0" -EndSection - -Section "ServerLayout" - Identifier "Layout0" - Screen "Screen0" - Option "Damage" "False" -EndSection - -# Keep these in sync across models -Section "Extensions" - Option "DPMS" "off" -EndSection -Section "ServerFlags" - Option "SuspendTime" "0" - Option "OffTime" "0" - Option "BlankTime" "0" - Option "StandbyTime" "0" - Option "DontZap" "true" -EndSection -EOF |