diff options
| author | g2@giantshoulder.com <g2@giantshoulder.com> | 2005-02-21 00:27:47 +0000 |
|---|---|---|
| committer | g2@giantshoulder.com <g2@giantshoulder.com> | 2005-02-21 00:27:47 +0000 |
| commit | 473d45a56ea484dd66ac0700a917e304e994d6e5 (patch) | |
| tree | 0882c812f5ef771013dce6ff6825c14339975f68 | |
| parent | 851c22ddf3182974555c69e2a4fd5b7c9ca3425d (diff) | |
Switch to hotplug-ng and tweak sysconfsetup for /etc/networks/interfaces and ehci-hcd, boot directly to /dev/mtdblock4 until we add /initrd and fix switchbox
BKrev: 42192b03wZVN4cRgtqs0xPX31y3Klg
| -rw-r--r-- | conf/distro/openslug.conf | 6 | ||||
| -rw-r--r-- | packages/linux/openslug-kernel_2.6.9.bb | 4 | ||||
| -rw-r--r-- | packages/openslug-init/openslug-init-0.10/sysconfsetup | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 73860298d7..e1c8c7d741 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -26,8 +26,10 @@ OPENSLUG_EXTRA_INSTALL += "${OPENSLUG_EXTRA_RDEPENDS}" # Whether to use the old shell hotplug or the new C hotplug is a # distribution decision. -OPENSLUG_EXTRA_DEPENDS += "linux-hotplug" -OPENSLUG_EXTRA_RDEPENDS += "linux-hotplug" +#OPENSLUG_EXTRA_DEPENDS += "linux-hotplug" +#OPENSLUG_EXTRA_RDEPENDS += "linux-hotplug" +OPENSLUG_EXTRA_DEPENDS += "hotplug-ng" +OPENSLUG_EXTRA_RDEPENDS += "hotplug-ng" BOOTSTRAP_EXTRA_DEPENDS += "${OPENSLUG_EXTRA_DEPENDS}" BOOTSTRAP_EXTRA_RDEPENDS += "${OPENSLUG_EXTRA_RDEPENDS}" diff --git a/packages/linux/openslug-kernel_2.6.9.bb b/packages/linux/openslug-kernel_2.6.9.bb index d1a59d85ce..a4ee115f92 100644 --- a/packages/linux/openslug-kernel_2.6.9.bb +++ b/packages/linux/openslug-kernel_2.6.9.bb @@ -27,7 +27,9 @@ inherit kernel ARCH = "arm" KERNEL_IMAGETYPE = "zImage" CMDLINE_CONSOLE ?= "ttyS0,115200n8" -CMDLINE_ROOT = "root=/dev/slug rootfstype=ext2,jffs2 initrd=0x01000000,10M mem=32M@0x00000000" +#CMDLINE_ROOT = "root=/dev/slug rootfstype=ext2,jffs2 initrd=0x01000000,10M mem=32M@0x00000000" +CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000" +#CMDLINE_ROOT = "root=/dev/ram0 rootfstype=ext2,jffs2 initrd=0x01000000,10M /init=/linuxrc mem=32M@0x00000000" CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}" do_configure_prepend() { diff --git a/packages/openslug-init/openslug-init-0.10/sysconfsetup b/packages/openslug-init/openslug-init-0.10/sysconfsetup index 1b5b901708..533354b71f 100644 --- a/packages/openslug-init/openslug-init-0.10/sysconfsetup +++ b/packages/openslug-init/openslug-init-0.10/sysconfsetup @@ -15,6 +15,7 @@ then auto lo iface lo inet loopback +auto eth0 iface eth0 inet static EOF @@ -32,3 +33,5 @@ EOF fi modprobe ixp425_eth +modprobe ehci-hcd + |