diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-11-03 01:02:39 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-11-03 01:02:39 +0000 |
| commit | e49c2d769162c261a035db1a979f639b20effd47 (patch) | |
| tree | 4286407f29abcbd533e439ccccd20e8d4a184cb5 /target/linux/x86/olpc/base-files/etc | |
| parent | a4db9ed4529ba632d80f4d55eafc89c9c23851d2 (diff) | |
| download | master-31e0f0ae-e49c2d769162c261a035db1a979f639b20effd47.tar.gz master-31e0f0ae-e49c2d769162c261a035db1a979f639b20effd47.tar.bz2 master-31e0f0ae-e49c2d769162c261a035db1a979f639b20effd47.zip | |
merge the olpc target with the x86 target, both tested and running
SVN-Revision: 18279
Diffstat (limited to 'target/linux/x86/olpc/base-files/etc')
| -rw-r--r-- | target/linux/x86/olpc/base-files/etc/X11/xorg.conf | 71 | ||||
| -rw-r--r-- | target/linux/x86/olpc/base-files/etc/config/network | 11 | ||||
| -rw-r--r-- | target/linux/x86/olpc/base-files/etc/preinit.arch | 2 |
3 files changed, 84 insertions, 0 deletions
diff --git a/target/linux/x86/olpc/base-files/etc/X11/xorg.conf b/target/linux/x86/olpc/base-files/etc/X11/xorg.conf new file mode 100644 index 0000000000..d98a8f87a5 --- /dev/null +++ b/target/linux/x86/olpc/base-files/etc/X11/xorg.conf @@ -0,0 +1,71 @@ +# xorg configuration + +Section "ServerLayout" + Identifier "Default Layout" + Screen 0 "Screen0" 0 0 + InputDevice "Mouse0" "CorePointer" + InputDevice "Keyboard0" "CoreKeyboard" +EndSection + +Section "Files" + FontPath "/usr/lib/X11/fonts/misc" +EndSection + +Section "Module" + Load "dbe" + Load "extmod" + Load "fbdevhw" +# Load "glx" + Load "record" + Load "freetype" + Load "type1" +EndSection + +Section "InputDevice" + Identifier "Keyboard0" + Driver "keyboard" + Option "XkbModel" "pc105" + Option "XkbLayout" "us" +EndSection + +Section "InputDevice" + Identifier "Mouse0" + Driver "mouse" + Option "Protocol" "PS/2" + Option "Device" "/dev/psaux" + Option "ZAxisMapping" "4 5" + Option "Emulate3Buttons" "yes" +EndSection + +Section "Monitor" + Identifier "Monitor0" + VendorName "Monitor Vendor" + ModelName "OWRT" + Option "dpms" +EndSection + +Section "Device" + Identifier "FBDev" + Driver "fbdev" + #Option "shadowfb" "off" + VideoRam 4096 +EndSection + +Section "Screen" + Identifier "Screen0" + Device "FBDev" + Monitor "Monitor0" + DefaultDepth 16 + + SubSection "Display" + Depth 16 + Modes "1200x900-75" + EndSubsection + +EndSection + +Section "DRI" + Group 0 + Mode 0666 +EndSection + diff --git a/target/linux/x86/olpc/base-files/etc/config/network b/target/linux/x86/olpc/base-files/etc/config/network new file mode 100644 index 0000000000..faa8f0e782 --- /dev/null +++ b/target/linux/x86/olpc/base-files/etc/config/network @@ -0,0 +1,11 @@ +# Copyright (C) 2006 OpenWrt.org + +config interface loopback + option ifname lo + option proto static + option ipaddr 127.0.0.1 + option netmask 255.0.0.0 + +config interface wlan + option ifname eth0 + option proto dhcp diff --git a/target/linux/x86/olpc/base-files/etc/preinit.arch b/target/linux/x86/olpc/base-files/etc/preinit.arch new file mode 100644 index 0000000000..f29f0d448b --- /dev/null +++ b/target/linux/x86/olpc/base-files/etc/preinit.arch @@ -0,0 +1,2 @@ +mount -t proc none /proc +grep 'failsafe=' /proc/cmdline && export FAILSAFE=true |