summaryrefslogtreecommitdiffstats
path: root/target/linux/x86/olpc
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/x86/olpc')
-rw-r--r--target/linux/x86/olpc/base-files/etc/config/network5
-rw-r--r--target/linux/x86/olpc/base-files/lib/preinit/15_essential_fs_x864
-rw-r--r--target/linux/x86/olpc/base-files/lib/preinit/45_failsafe_x8614
-rw-r--r--target/linux/x86/olpc/config-3.32
4 files changed, 8 insertions, 17 deletions
diff --git a/target/linux/x86/olpc/base-files/etc/config/network b/target/linux/x86/olpc/base-files/etc/config/network
index faa8f0e78..dc0bee1ee 100644
--- a/target/linux/x86/olpc/base-files/etc/config/network
+++ b/target/linux/x86/olpc/base-files/etc/config/network
@@ -9,3 +9,8 @@ config interface loopback
config interface wlan
option ifname eth0
option proto dhcp
+
+config interface wlan6
+ option ifname @wlan
+ option proto dhcpv6
+ option reqprefix no
diff --git a/target/linux/x86/olpc/base-files/lib/preinit/15_essential_fs_x86 b/target/linux/x86/olpc/base-files/lib/preinit/15_essential_fs_x86
index be342433d..e4a380fd5 100644
--- a/target/linux/x86/olpc/base-files/lib/preinit/15_essential_fs_x86
+++ b/target/linux/x86/olpc/base-files/lib/preinit/15_essential_fs_x86
@@ -3,7 +3,5 @@
# Copyright (C) 2010 Vertical Communications
do_mount_procfs() {
- mount -t proc none /proc
+ mount -o noatime -t proc none /proc
}
-
-
diff --git a/target/linux/x86/olpc/base-files/lib/preinit/45_failsafe_x86 b/target/linux/x86/olpc/base-files/lib/preinit/45_failsafe_x86
deleted file mode 100644
index dd7330d5d..000000000
--- a/target/linux/x86/olpc/base-files/lib/preinit/45_failsafe_x86
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2006-2010 OpenWrt.org
-# Copyright (C) 2010 Vertical Communications
-
-failsafe_wait() {
- FAILSAFE=
- grep -q 'failsafe=' /proc/cmdline && FAILSAFE=true && export FAILSAFE
- if [ "$FAILSAFE" != "true" ]; then
- preinit_net_echo "Please press button now to enter failsafe"
- echo -n "Press "
- fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true && export FAILSAFE
- fi
-}
-
diff --git a/target/linux/x86/olpc/config-3.3 b/target/linux/x86/olpc/config-3.3
index 41357e109..184b8398a 100644
--- a/target/linux/x86/olpc/config-3.3
+++ b/target/linux/x86/olpc/config-3.3
@@ -101,10 +101,12 @@ CONFIG_TIMER_STATS=y
CONFIG_USB=y
CONFIG_USB_COMMON=y
CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
CONFIG_USB_EHCI_TT_NEWSCHED=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
CONFIG_USB_STORAGE=y
CONFIG_USB_UHCI_HCD=y
CONFIG_VGA_ARB=y