diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-31 11:29:04 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-31 11:29:04 +0100 |
| commit | 0d9e15f4338505fa10d67aa995a00b2a45d201ce (patch) | |
| tree | c9c932516e855a8763dc83f634d63ef0c3801153 /target | |
| parent | 026459174c428d1262fc210df6a9a0dc2e1a0e77 (diff) | |
reworking startup using devtmpfs
After this change it is not needed to create
console, tty and null device nodes for nfsroot boot.
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/patches/2.6.32/startup.patch | 18 | ||||
| -rw-r--r-- | target/rb532/Makefile | 1 | ||||
| -rw-r--r-- | target/rb532/kernel.config | 8 |
3 files changed, 12 insertions, 15 deletions
diff --git a/target/linux/patches/2.6.32/startup.patch b/target/linux/patches/2.6.32/startup.patch index 25302f8d9..1e50e6312 100644 --- a/target/linux/patches/2.6.32/startup.patch +++ b/target/linux/patches/2.6.32/startup.patch @@ -1,16 +1,16 @@ -diff -Nur linux-2.6.30.5.orig/init/main.c linux-2.6.30.5/init/main.c ---- linux-2.6.30.5.orig/init/main.c 2009-08-16 23:19:38.000000000 +0200 -+++ linux-2.6.30.5/init/main.c 2009-08-22 20:26:39.000000000 +0200 -@@ -811,7 +811,7 @@ - numa_default_policy(); - +diff -Nur linux-2.6.32.orig/init/main.c linux-2.6.32/init/main.c +--- linux-2.6.32.orig/init/main.c 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/init/main.c 2010-01-31 11:01:41.154334301 +0100 +@@ -814,6 +814,8 @@ if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) -- printk(KERN_WARNING "Warning: unable to open an initial console.\n"); -+ printk(KERN_WARNING "Starting Linux (build with OpenADK).\n"); + printk(KERN_WARNING "Warning: unable to open an initial console.\n"); ++ printk(KERN_WARNING "Starting Linux (build with OpenADK).\n"); ++ (void) sys_dup(0); (void) sys_dup(0); -@@ -835,6 +835,7 @@ + +@@ -836,6 +838,7 @@ printk(KERN_WARNING "Failed to execute %s. Attempting " "defaults...\n", execute_command); } diff --git a/target/rb532/Makefile b/target/rb532/Makefile index 77a204a11..27a070c31 100644 --- a/target/rb532/Makefile +++ b/target/rb532/Makefile @@ -26,7 +26,6 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' - @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/rb532/kernel.config b/target/rb532/kernel.config index aac515061..f9ce20f75 100644 --- a/target/rb532/kernel.config +++ b/target/rb532/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Sat Jan 30 21:07:56 2010 +# Sat Jan 30 22:33:23 2010 # CONFIG_MIPS=y @@ -378,7 +378,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # Generic Driver Options # CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_DEVTMPFS is not set +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set # CONFIG_FW_LOADER is not set @@ -412,9 +413,6 @@ CONFIG_MTD_BLOCK=y # # CONFIG_MTD_CFI is not set # CONFIG_MTD_JEDECPROBE is not set -# CONFIG_MTD_CFI_NOSWAP is not set -# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set -# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set CONFIG_MTD_MAP_BANK_WIDTH_1=y CONFIG_MTD_MAP_BANK_WIDTH_2=y CONFIG_MTD_MAP_BANK_WIDTH_4=y |