diff options
author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-03-30 02:13:29 +0000 |
---|---|---|
committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-03-30 02:13:29 +0000 |
commit | df072e35c156fcedce2e7488efd9651f2fe6773c (patch) | |
tree | c1e00f7392d09a019c54d3aec7112ff050be7a78 /packages/arm-kernel-shim | |
parent | 8fc5afd475c8c2a1fd4de81937cd736c5931bb7c (diff) | |
parent | a5ab4c711b23d99dd9d252d5c08fa60dd76c493d (diff) |
merge of '338ea31d4809a6db514f8ee9dbd35db2c426e83f'
and '33ef958347850ae3830b2326a4476282484717bd'
Diffstat (limited to 'packages/arm-kernel-shim')
-rw-r--r-- | packages/arm-kernel-shim/arm-kernel-shim_1.3.bb | 2 | ||||
-rw-r--r-- | packages/arm-kernel-shim/files/config-dsmg600.h | 2 | ||||
-rw-r--r-- | packages/arm-kernel-shim/files/config-nas100d.h | 2 | ||||
-rw-r--r-- | packages/arm-kernel-shim/files/config-nslu2.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb index 4014d9e866..339f663e25 100644 --- a/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb +++ b/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb @@ -3,7 +3,7 @@ SECTION = "" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" -PR = "r4" +PR = "r5" COMPATIBLE_MACHINE = "(ixp4xx|nslu2)" diff --git a/packages/arm-kernel-shim/files/config-dsmg600.h b/packages/arm-kernel-shim/files/config-dsmg600.h index 3203052d51..f8caccecd4 100644 --- a/packages/arm-kernel-shim/files/config-dsmg600.h +++ b/packages/arm-kernel-shim/files/config-dsmg600.h @@ -23,7 +23,7 @@ //#define RAM_BANK1_LENGTH 0x10000000 #define COMMANDLINE \ - "init=/linuxrc root=/dev/mtdblock2 rootfstype=jffs2 rw noirqdebug console=ttyS0,115200n8" + "console=ttyS0,115200n8 root=/dev/mtdblock2 rootfstype=jffs2 init=/linuxrc rw noirqdebug" #define MACH_TYPE 964 diff --git a/packages/arm-kernel-shim/files/config-nas100d.h b/packages/arm-kernel-shim/files/config-nas100d.h index 846161d016..62c5556999 100644 --- a/packages/arm-kernel-shim/files/config-nas100d.h +++ b/packages/arm-kernel-shim/files/config-nas100d.h @@ -23,7 +23,7 @@ //#define RAM_BANK1_LENGTH 0x10000000 #define COMMANDLINE\ - "init=/linuxrc root=/dev/mtdblock2 rootfstype=jffs2 rw noirqdebug console=ttyS0,115200n8" + "console=ttyS0,115200n8 root=/dev/mtdblock2 rootfstype=jffs2 init=/linuxrc rw noirqdebug" #define MACH_TYPE 865 diff --git a/packages/arm-kernel-shim/files/config-nslu2.h b/packages/arm-kernel-shim/files/config-nslu2.h index d641523841..2b597c2b7f 100644 --- a/packages/arm-kernel-shim/files/config-nslu2.h +++ b/packages/arm-kernel-shim/files/config-nslu2.h @@ -23,7 +23,7 @@ //#define RAM_BANK1_LENGTH 0x10000000 #define COMMANDLINE\ - "init=/linuxrc root=/dev/mtdblock4 rootfstype=jffs2 rw noirqdebug console=ttyS0,115200n8" + "console=ttyS0,115200n8 root=/dev/mtdblock4 rootfstype=jffs2 init=/linuxrc rw noirqdebug" #define MACH_TYPE 597 |