summaryrefslogtreecommitdiff
path: root/cleopatre
diff options
context:
space:
mode:
authorCeline Buret2010-12-08 17:00:10 +0100
committerCeline Buret2010-12-09 15:36:33 +0100
commit4fb58628861fefa870bfa3d1f00a65317cdccfc2 (patch)
treebbf063112e4b38cb90be914eb53609284593070d /cleopatre
parent879c5d0937bbfc176170ae51c571245e32016183 (diff)
cleo/{buildroot,devkit,linux}: add flash large 1 image mapping, closes #2151
Diffstat (limited to 'cleopatre')
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/scr310/linux26.config7
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/spk300/linux26.config8
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/spk300g/linux26.config7
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/spk310/linux26.config7
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/spr300/linux26.config7
-rw-r--r--cleopatre/devkit/doc/cleopatre_bundle_archi.odtbin145364 -> 149423 bytes
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/Kconfig16
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk300.c27
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk300g.c27
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk310.c27
10 files changed, 104 insertions, 29 deletions
diff --git a/cleopatre/buildroot/target/device/Spidcom/scr310/linux26.config b/cleopatre/buildroot/target/device/Spidcom/scr310/linux26.config
index 27427017a1..2100385a87 100644
--- a/cleopatre/buildroot/target/device/Spidcom/scr310/linux26.config
+++ b/cleopatre/buildroot/target/device/Spidcom/scr310/linux26.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.25.10
-# Mon Jan 18 17:25:08 2010
+# Wed Dec 8 11:48:36 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -59,8 +59,6 @@ CONFIG_NAMESPACES=y
# CONFIG_PID_NS is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_ROOT_GID=0
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
# CONFIG_EMBEDDED is not set
@@ -184,7 +182,8 @@ CONFIG_MACH_SCR310=y
# CONFIG_MTD_SPC300_MAP_SMALL is not set
CONFIG_MTD_SPC300_MAP_MEDIUM1=y
# CONFIG_MTD_SPC300_MAP_MEDIUM2 is not set
-# CONFIG_MTD_SPC300_MAP_LARGE is not set
+# CONFIG_MTD_SPC300_MAP_LARGE1 is not set
+# CONFIG_MTD_SPC300_MAP_LARGE2 is not set
#
# Processor Type
diff --git a/cleopatre/buildroot/target/device/Spidcom/spk300/linux26.config b/cleopatre/buildroot/target/device/Spidcom/spk300/linux26.config
index 65815e96e0..9b3f2d77ad 100644
--- a/cleopatre/buildroot/target/device/Spidcom/spk300/linux26.config
+++ b/cleopatre/buildroot/target/device/Spidcom/spk300/linux26.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.25.10
-# Mon Jan 18 14:55:58 2010
+# Wed Dec 8 16:57:40 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -59,8 +59,6 @@ CONFIG_NAMESPACES=y
# CONFIG_PID_NS is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_ROOT_GID=0
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
# CONFIG_EMBEDDED is not set
@@ -181,11 +179,11 @@ CONFIG_MACH_SPK300=y
# CONFIG_MACH_SCR310 is not set
# CONFIG_MACH_SPR300 is not set
# CONFIG_MACH_ARIZONA is not set
-# CONFIG_SPK300G_ON_FCM3 is not set
# CONFIG_MTD_SPC300_MAP_SMALL is not set
# CONFIG_MTD_SPC300_MAP_MEDIUM1 is not set
# CONFIG_MTD_SPC300_MAP_MEDIUM2 is not set
-CONFIG_MTD_SPC300_MAP_LARGE=y
+# CONFIG_MTD_SPC300_MAP_LARGE1 is not set
+CONFIG_MTD_SPC300_MAP_LARGE2=y
#
# Processor Type
diff --git a/cleopatre/buildroot/target/device/Spidcom/spk300g/linux26.config b/cleopatre/buildroot/target/device/Spidcom/spk300g/linux26.config
index 752d19099d..220061578a 100644
--- a/cleopatre/buildroot/target/device/Spidcom/spk300g/linux26.config
+++ b/cleopatre/buildroot/target/device/Spidcom/spk300g/linux26.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.25.10
-# Mon Jan 18 14:55:58 2010
+# Wed Dec 8 11:50:20 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -59,8 +59,6 @@ CONFIG_NAMESPACES=y
# CONFIG_PID_NS is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_ROOT_GID=0
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
# CONFIG_EMBEDDED is not set
@@ -185,7 +183,8 @@ CONFIG_MACH_SPK300G=y
# CONFIG_MTD_SPC300_MAP_SMALL is not set
# CONFIG_MTD_SPC300_MAP_MEDIUM1 is not set
# CONFIG_MTD_SPC300_MAP_MEDIUM2 is not set
-CONFIG_MTD_SPC300_MAP_LARGE=y
+# CONFIG_MTD_SPC300_MAP_LARGE1 is not set
+CONFIG_MTD_SPC300_MAP_LARGE2=y
#
# Processor Type
diff --git a/cleopatre/buildroot/target/device/Spidcom/spk310/linux26.config b/cleopatre/buildroot/target/device/Spidcom/spk310/linux26.config
index 27d647d8e3..b730258182 100644
--- a/cleopatre/buildroot/target/device/Spidcom/spk310/linux26.config
+++ b/cleopatre/buildroot/target/device/Spidcom/spk310/linux26.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.25.10
-# Mon Jan 18 17:21:46 2010
+# Wed Dec 8 11:50:56 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -59,8 +59,6 @@ CONFIG_NAMESPACES=y
# CONFIG_PID_NS is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_ROOT_GID=0
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
# CONFIG_EMBEDDED is not set
@@ -184,7 +182,8 @@ CONFIG_MACH_SPK310=y
# CONFIG_MTD_SPC300_MAP_SMALL is not set
# CONFIG_MTD_SPC300_MAP_MEDIUM1 is not set
# CONFIG_MTD_SPC300_MAP_MEDIUM2 is not set
-CONFIG_MTD_SPC300_MAP_LARGE=y
+# CONFIG_MTD_SPC300_MAP_LARGE1 is not set
+CONFIG_MTD_SPC300_MAP_LARGE2=y
#
# Processor Type
diff --git a/cleopatre/buildroot/target/device/Spidcom/spr300/linux26.config b/cleopatre/buildroot/target/device/Spidcom/spr300/linux26.config
index e5b126e0b8..11719313ba 100644
--- a/cleopatre/buildroot/target/device/Spidcom/spr300/linux26.config
+++ b/cleopatre/buildroot/target/device/Spidcom/spr300/linux26.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.25.10
-# Mon Jan 18 17:25:08 2010
+# Wed Dec 8 11:51:30 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -59,8 +59,6 @@ CONFIG_NAMESPACES=y
# CONFIG_PID_NS is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_ROOT_GID=0
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
# CONFIG_EMBEDDED is not set
@@ -184,7 +182,8 @@ CONFIG_MACH_SPR300=y
# CONFIG_MTD_SPC300_MAP_SMALL is not set
CONFIG_MTD_SPC300_MAP_MEDIUM1=y
# CONFIG_MTD_SPC300_MAP_MEDIUM2 is not set
-# CONFIG_MTD_SPC300_MAP_LARGE is not set
+# CONFIG_MTD_SPC300_MAP_LARGE1 is not set
+# CONFIG_MTD_SPC300_MAP_LARGE2 is not set
#
# Processor Type
diff --git a/cleopatre/devkit/doc/cleopatre_bundle_archi.odt b/cleopatre/devkit/doc/cleopatre_bundle_archi.odt
index 0dc9951164..27e6636f95 100644
--- a/cleopatre/devkit/doc/cleopatre_bundle_archi.odt
+++ b/cleopatre/devkit/doc/cleopatre_bundle_archi.odt
Binary files differ
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/Kconfig b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/Kconfig
index 7cf9b831ee..0a120fe4ef 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/Kconfig
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/Kconfig
@@ -51,8 +51,9 @@ config SPK300G_ON_FCM3
choice
prompt "SPC300 flash mapping"
- default MTD_SPC300_MAP_LARGE if MACH_SPK300G
- default MTD_SPC300_MAP_LARGE if MACH_SPK310
+ default MTD_SPC300_MAP_LARGE2 if MACH_SPK300G
+ default MTD_SPC300_MAP_LARGE2 if MACH_SPK310
+ default MTD_SPC300_MAP_LARGE2 if MACH_SPK300
default MTD_SPC300_MAP_MEDIUM1
config MTD_SPC300_MAP_SMALL
@@ -70,10 +71,15 @@ config MTD_SPC300_MAP_MEDIUM2
help
Medium 2
-config MTD_SPC300_MAP_LARGE
- bool "Large flash mapping (8MB - 2 images)"
+config MTD_SPC300_MAP_LARGE1
+ bool "Large 1 flash mapping (8MB - 1 image)"
help
- Large
+ Large 1
+
+config MTD_SPC300_MAP_LARGE2
+ bool "Large 2 flash mapping (8MB - 2 images)"
+ help
+ Large 2
endchoice
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk300.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk300.c
index ac219a6201..d35a5556c2 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk300.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk300.c
@@ -111,7 +111,32 @@ static struct mtd_partition spc300_flash_partitions[] = {
}
};
-#elif defined CONFIG_MTD_SPC300_MAP_LARGE
+#elif defined CONFIG_MTD_SPC300_MAP_LARGE1
+static struct mtd_partition spc300_flash_partitions[] = {
+ {
+ .name = "u-boot",
+ .size = 0x00030000,
+ .offset = 0,
+ .mask_flags = 0,
+ }, {
+ .name = "nvram",
+ .size = 0x00010000,
+ .offset = MTDPART_OFS_APPEND,
+ .mask_flags = 0,
+ }, {
+ .name = "user-fs",
+ .size = 0x00100000,
+ .offset = MTDPART_OFS_APPEND,
+ .mask_flags = 0,
+ }, {
+ .name = "image 0",
+ .size = MTDPART_SIZ_FULL,
+ .offset = MTDPART_OFS_APPEND,
+ .mask_flags = 0,
+ }
+};
+
+#elif defined CONFIG_MTD_SPC300_MAP_LARGE2
static struct mtd_partition spc300_flash_partitions[] = {
{
.name = "u-boot",
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk300g.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk300g.c
index ed65f17c4d..9dc976f6de 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk300g.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk300g.c
@@ -111,7 +111,32 @@ static struct mtd_partition spc300_flash_partitions[] = {
}
};
-#elif defined CONFIG_MTD_SPC300_MAP_LARGE
+#elif defined CONFIG_MTD_SPC300_MAP_LARGE1
+static struct mtd_partition spc300_flash_partitions[] = {
+ {
+ .name = "u-boot",
+ .size = 0x00030000,
+ .offset = 0,
+ .mask_flags = 0,
+ }, {
+ .name = "nvram",
+ .size = 0x00010000,
+ .offset = MTDPART_OFS_APPEND,
+ .mask_flags = 0,
+ }, {
+ .name = "user-fs",
+ .size = 0x00100000,
+ .offset = MTDPART_OFS_APPEND,
+ .mask_flags = 0,
+ }, {
+ .name = "image 0",
+ .size = MTDPART_SIZ_FULL,
+ .offset = MTDPART_OFS_APPEND,
+ .mask_flags = 0,
+ }
+};
+
+#elif defined CONFIG_MTD_SPC300_MAP_LARGE2
static struct mtd_partition spc300_flash_partitions[] = {
{
.name = "u-boot",
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk310.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk310.c
index 29570128d6..80c7c43098 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk310.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spk310.c
@@ -111,7 +111,32 @@ static struct mtd_partition spc300_flash_partitions[] = {
}
};
-#elif defined CONFIG_MTD_SPC300_MAP_LARGE
+#elif defined CONFIG_MTD_SPC300_MAP_LARGE1
+static struct mtd_partition spc300_flash_partitions[] = {
+ {
+ .name = "u-boot",
+ .size = 0x00030000,
+ .offset = 0,
+ .mask_flags = 0,
+ }, {
+ .name = "nvram",
+ .size = 0x00010000,
+ .offset = MTDPART_OFS_APPEND,
+ .mask_flags = 0,
+ }, {
+ .name = "user-fs",
+ .size = 0x00100000,
+ .offset = MTDPART_OFS_APPEND,
+ .mask_flags = 0,
+ }, {
+ .name = "image 0",
+ .size = MTDPART_SIZ_FULL,
+ .offset = MTDPART_OFS_APPEND,
+ .mask_flags = 0,
+ }
+};
+
+#elif defined CONFIG_MTD_SPC300_MAP_LARGE2
static struct mtd_partition spc300_flash_partitions[] = {
{
.name = "u-boot",