aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/olpc
diff options
context:
space:
mode:
authorJens Muecke <jens@nons.de>2007-12-15 19:59:21 +0000
committerJens Muecke <jens@nons.de>2007-12-15 19:59:21 +0000
commit7eeb4e6f7f10c17c889abe4b905a909bb9f58af0 (patch)
treed2cd4d28e2b5c18464c71f4a9492a4eccc85b842 /target/linux/olpc
parentb03f211098f218b9e09d93a0056aec27a7a1e452 (diff)
downloadupstream-7eeb4e6f7f10c17c889abe4b905a909bb9f58af0.tar.gz
upstream-7eeb4e6f7f10c17c889abe4b905a909bb9f58af0.tar.bz2
upstream-7eeb4e6f7f10c17c889abe4b905a909bb9f58af0.zip
* adding network config for olpc * adding libertas * config issue * quiet mode for bootloader
SVN-Revision: 9768
Diffstat (limited to 'target/linux/olpc')
-rw-r--r--target/linux/olpc/base-files/etc/config/network11
-rw-r--r--target/linux/olpc/config-2.6.2316
-rw-r--r--target/linux/olpc/image/olpc.fth2
3 files changed, 17 insertions, 12 deletions
diff --git a/target/linux/olpc/base-files/etc/config/network b/target/linux/olpc/base-files/etc/config/network
new file mode 100644
index 0000000000..faa8f0e782
--- /dev/null
+++ b/target/linux/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/olpc/config-2.6.23 b/target/linux/olpc/config-2.6.23
index 99fe878ffc..5d8353135d 100644
--- a/target/linux/olpc/config-2.6.23
+++ b/target/linux/olpc/config-2.6.23
@@ -25,19 +25,14 @@ CONFIG_BATTERY_OLPC=y
# CONFIG_BINFMT_AOUT is not set
CONFIG_BINFMT_MISC=y
CONFIG_BITREVERSE=y
-CONFIG_BLK_DEV_CRYPTOLOOP=y
CONFIG_BLK_DEV_GENERIC=m
CONFIG_BLK_DEV_IDE=m
CONFIG_BLK_DEV_IDEDISK=m
CONFIG_BLK_DEV_IDEDMA=y
CONFIG_BLK_DEV_IDEDMA_PCI=y
CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_LOOP is not set
# CONFIG_BLK_DEV_NBD is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
CONFIG_BLK_DEV_SC1200=m
CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SR=y
@@ -57,22 +52,21 @@ CONFIG_COMPAT_VDSO=y
# CONFIG_CRC_ITU_T is not set
# CONFIG_CRYPTO_AES is not set
# CONFIG_CRYPTO_AES_586 is not set
-CONFIG_CRYPTO_ALGAPI=y
# CONFIG_CRYPTO_ANUBIS is not set
# CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_BLKCIPHER=y
# CONFIG_CRYPTO_BLOWFISH is not set
# CONFIG_CRYPTO_CAMELLIA is not set
# CONFIG_CRYPTO_CAST5 is not set
# CONFIG_CRYPTO_CAST6 is not set
-CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CBC is not set
# CONFIG_CRYPTO_CRC32C is not set
# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_DES is not set
# CONFIG_CRYPTO_ECB is not set
# CONFIG_CRYPTO_HMAC is not set
# CONFIG_CRYPTO_HW is not set
# CONFIG_CRYPTO_KHAZAD is not set
-CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_MANAGER is not set
# CONFIG_CRYPTO_MD4 is not set
# CONFIG_CRYPTO_MD5 is not set
# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -82,6 +76,7 @@ CONFIG_CRYPTO_MANAGER=y
# CONFIG_CRYPTO_SHA256 is not set
# CONFIG_CRYPTO_SHA512 is not set
# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TEST is not set
# CONFIG_CRYPTO_TGR192 is not set
# CONFIG_CRYPTO_TWOFISH is not set
# CONFIG_CRYPTO_TWOFISH_586 is not set
@@ -242,7 +237,6 @@ CONFIG_INSTRUMENTATION=y
# CONFIG_IP_NF_MATCH_AH is not set
# CONFIG_IP_NF_MATCH_ECN is not set
# CONFIG_IP_NF_MATCH_IPP2P is not set
-# CONFIG_IP_NF_MATCH_LAYER7 is not set
# CONFIG_IP_NF_MATCH_OWNER is not set
# CONFIG_IP_NF_MATCH_RECENT is not set
# CONFIG_IP_NF_MATCH_TIME is not set
diff --git a/target/linux/olpc/image/olpc.fth b/target/linux/olpc/image/olpc.fth
index 048ab88964..a23cdd4fdf 100644
--- a/target/linux/olpc/image/olpc.fth
+++ b/target/linux/olpc/image/olpc.fth
@@ -1,4 +1,4 @@
\ Boot script
" u:\boot\vmlinuz" to boot-device
-" block2mtd.block2mtd=/dev/sda2,65536,rootfs root=/dev/mtdblock1 rootfstype=squashfs init=/etc/preinit rootdelay=5 noinitrd console=tty0" to boot-file
+" block2mtd.block2mtd=/dev/sda2,65536,rootfs root=/dev/mtdblock1 rootfstype=squashfs init=/etc/preinit rootdelay=5 noinitrd console=tty0 quiet" to boot-file
boot