aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2005-02-25 13:09:03 +0000
committerRod Whitby <rod@whitby.id.au>2005-02-25 13:09:03 +0000
commitbddbd0ea7629c6cfeb5ff0cda97a4cc8ef4f166d (patch)
tree67ad835562b84e502e1418105807e2bb603f5105
parent6c35ecd0ad296efd892ba58f9c85e02b3a21fd08 (diff)
downloadopenembedded-bddbd0ea7629c6cfeb5ff0cda97a4cc8ef4f166d.tar.gz
openembedded-bddbd0ea7629c6cfeb5ff0cda97a4cc8ef4f166d.tar.bz2
openembedded-bddbd0ea7629c6cfeb5ff0cda97a4cc8ef4f166d.zip
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/slug/openembedded 2005/02/25 23:38:24+10:30 (none)!rwhitby Added PPP and NetConsole support to Openslug BKrev: 421f236fSsf6lPPevs6gMLwuUZ9wcQ
-rw-r--r--conf/distro/openslug.conf2
-rw-r--r--files/device_table-nslu2.txt40
-rw-r--r--files/device_table-openslug.txt0
-rw-r--r--packages/linux/openslug-kernel-2.6.9/defconfig8
4 files changed, 7 insertions, 43 deletions
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index ed90c33fe0..db12ea6ab3 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -11,7 +11,7 @@ INHERIT += " package_ipk debian nslu2_flashimg"
IMAGE_FSTYPES = "jffs2"
-OPENSLUG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-nslu2.txt')}"
+OPENSLUG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-openslug.txt')}"
EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${OPENSLUG_DEVICE_TABLE}"
OPENSLUG_EXTRA_DEPENDS += "virtual/kernel module-init-tools mtd-utils modutils-initscripts"
diff --git a/files/device_table-nslu2.txt b/files/device_table-nslu2.txt
deleted file mode 100644
index 4a4ef25d8a..0000000000
--- a/files/device_table-nslu2.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-# <path> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
-# /dev/mem c 640 0 0 1 1 0 0 -
-# f A regular file
-# d Directory
-# c Character special device file
-# b Block special device file
-# p Fifo (named pipe)
-/dev d 755 0 0 - - - - -
-/dev/console c 622 0 0 5 1 - - -
-/dev/cua c 622 0 0 5 64 0 1 2
-/dev/flash d 755 0 0 - - - - -
-/dev/flash/config c 644 0 0 90 6 - - -
-/dev/ipsec c 644 0 0 36 10 - - -
-/dev/kmem c 640 0 0 1 2 - - -
-/dev/ledman c 644 0 0 126 0 - - -
-/dev/mem c 640 0 0 1 1 - - -
-/dev/mtd c 664 0 0 90 0 0 2 4
-/dev/mtdblock b 644 0 0 31 0 0 1 4
-/dev/mtdr c 664 0 0 90 0 1 2 4
-/dev/null c 666 0 0 1 3 - - -
-/dev/pbuttons c 664 0 0 60 0 - - -
-/dev/ppp c 644 0 0 108 0 - - -
-/dev/ptyp c 644 0 0 2 0 0 1 10
-/dev/ram b 644 0 0 1 0 0 1 4
-/dev/random c 644 0 0 1 8 - - -
-/dev/rbuttons c 644 0 0 61 0 - - -
-/dev/rtc c 644 0 0 10 135 - - -
-/dev/sda b 664 0 0 8 0 - - -
-/dev/sda b 664 0 0 8 1 1 1 5
-/dev/sdb b 664 0 0 8 16 - - -
-/dev/sdb b 664 0 0 8 17 1 1 5
-/dev/sdc b 664 0 0 8 32 - - -
-/dev/sdc b 664 0 0 8 33 1 1 5
-/dev/tty c 666 0 0 5 0 - - -
-/dev/tty c 644 0 0 4 0 0 1 10
-/dev/ttyS c 644 0 0 4 64 0 1 2
-/dev/ttyp c 644 0 0 3 0 0 1 10
-/dev/urandom c 644 0 0 1 9 - - -
-/dev/zero c 666 0 0 1 5 - - -
-/bin/tinylogin f 6755 0 0 - - - - -
diff --git a/files/device_table-openslug.txt b/files/device_table-openslug.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/files/device_table-openslug.txt
diff --git a/packages/linux/openslug-kernel-2.6.9/defconfig b/packages/linux/openslug-kernel-2.6.9/defconfig
index bbd9f9e542..a7c811d544 100644
--- a/packages/linux/openslug-kernel-2.6.9/defconfig
+++ b/packages/linux/openslug-kernel-2.6.9/defconfig
@@ -506,11 +506,15 @@ CONFIG_NET_WIRELESS=y
# CONFIG_WAN is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
-# CONFIG_PPP is not set
+CONFIG_PPP=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
# CONFIG_SLIP is not set
# CONFIG_NET_FC is not set
# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
+CONFIG_NETCONSOLE=m
#
# ATA/ATAPI/MFM/RLL support