Author: richard
Date: Fri Jan 30 02:34:01 2009
New Revision: 3991
URL: http://svn.slimdevices.com?rev=3991&root=Jive&view=rev
Log:
Bug: N/A
Description:
Include a read-only flash partition for the bootloader.
Modified:
7.3/trunk/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/mach-s3c2412/mach-jive.c
Modified:
7.3/trunk/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/mach-s3c2412/mach-jive.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/mach-s3c2412/mach-jive.c?rev=3991&root=Jive&r1=3990&r2=3991&view=diff
==============================================================================
---
7.3/trunk/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/mach-s3c2412/mach-jive.c
(original)
+++
7.3/trunk/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/mach-s3c2412/mach-jive.c
Fri Jan 30 02:34:01 2009
@@ -104,28 +104,68 @@
* 0x02c00000-0x04000000 : jffs2
*/
static struct mtd_partition jive_imageA_nand_part[] = {
-
-#if 0
- /* Don't allow access to the bootloader from linux */
+ /* booted images */
+ {
+ .name = "kernel (ro)",
+ .offset = (192*SZ_1K),
+ .size = (2*SZ_1M) - (192*SZ_1K),
+ .mask_flags = MTD_WRITEABLE, /* force read-only */
+ },
+
+ {
+ .name = "root (ro)",
+ .offset = (2*SZ_1M),
+ .size = (20*SZ_1M),
+ .mask_flags = MTD_WRITEABLE, /* force read-only */
+ },
+
+ /* jffs2 */
+ {
+ .name = "jffs2",
+ .offset = (44*SZ_1M),
+ .size = (20*SZ_1M),
+ },
+
+ /* bootloader environment */
+ {
+ .name = "env",
+ .offset = (160*SZ_1K),
+ .size = 2 * (16*SZ_1K),
+ },
+
+ /* upgrade images */
+ {
+ .name = "zimage",
+ .offset = (22*SZ_1M),
+ .size = (2*SZ_1M) - (192*SZ_1K),
+ },
+
+ {
+ .name = "cramfs",
+ .offset = (24*SZ_1M) - (192*SZ_1K),
+ .size = (20*SZ_1M),
+ },
+ /* allow R/O access to the bootloader from linux */
{
.name = "uboot",
.offset = 0,
.size = (160*SZ_1K),
.mask_flags = MTD_WRITEABLE, /* force read-only */
},
-#endif
-
+};
+
+static struct mtd_partition jive_imageB_nand_part[] = {
/* booted images */
{
.name = "kernel (ro)",
- .offset = (192*SZ_1K),
+ .offset = (22*SZ_1M),
.size = (2*SZ_1M) - (192*SZ_1K),
.mask_flags = MTD_WRITEABLE, /* force read-only */
},
{
.name = "root (ro)",
- .offset = (2*SZ_1M),
+ .offset = (24*SZ_1M) - (192*SZ_1K),
.size = (20*SZ_1M),
.mask_flags = MTD_WRITEABLE, /* force read-only */
},
@@ -147,70 +187,22 @@
/* upgrade images */
{
.name = "zimage",
- .offset = (22*SZ_1M),
+ .offset = (192*SZ_1K),
.size = (2*SZ_1M) - (192*SZ_1K),
},
{
.name = "cramfs",
- .offset = (24*SZ_1M) - (192*SZ_1K),
+ .offset = (2*SZ_1M),
.size = (20*SZ_1M),
},
-};
-
-static struct mtd_partition jive_imageB_nand_part[] = {
-
-#if 0
- /* Don't allow access to the bootloader from linux */
+ /* allow read-only access to the bootloader from linux */
{
.name = "uboot",
.offset = 0,
.size = (160*SZ_1K),
.mask_flags = MTD_WRITEABLE, /* force read-only */
},
-#endif
-
- /* booted images */
- {
- .name = "kernel (ro)",
- .offset = (22*SZ_1M),
- .size = (2*SZ_1M) - (192*SZ_1K),
- .mask_flags = MTD_WRITEABLE, /* force read-only */
- },
-
- {
- .name = "root (ro)",
- .offset = (24*SZ_1M) - (192*SZ_1K),
- .size = (20*SZ_1M),
- .mask_flags = MTD_WRITEABLE, /* force read-only */
- },
-
- /* jffs2 */
- {
- .name = "jffs2",
- .offset = (44*SZ_1M),
- .size = (20*SZ_1M),
- },
-
- /* bootloader environment */
- {
- .name = "env",
- .offset = (160*SZ_1K),
- .size = 2 * (16*SZ_1K),
- },
-
- /* upgrade images */
- {
- .name = "zimage",
- .offset = (192*SZ_1K),
- .size = (2*SZ_1M) - (192*SZ_1K),
- },
-
- {
- .name = "cramfs",
- .offset = (2*SZ_1M),
- .size = (20*SZ_1M),
- },
};
static struct nand_ecclayout jive_nand_oob = {
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
