From: Przemyslaw Marczak <p.marczak@samsung.com>
Date: Fri, 21 Feb 2014 15:36:27 +0000 (+0100)
Subject: Trats/Trats2: Update Tizen partitions layout
X-Git-Tag: submit/tizen_common/20141030.153846~56
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bf272eb6e891234ba48f892ad0d3f7a53254129f;p=platform%2Fkernel%2Fu-boot.git

Trats/Trats2: Update Tizen partitions layout

Change-Id: Ia229bdd6a04762e6c1b71509933d5d7723b9ebcb
Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
---

diff --git a/include/configs/trats.h b/include/configs/trats.h
index b21ea2d..47c6463 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -84,7 +84,7 @@
 #define PARTS_DATA		"data"
 #define PARTS_UMS		"ums"
 
-#define PARTS_DEFAULT \
+#define TIZEN_PARTITIONS_V8 \
 	"uuid_disk=${uuid_gpt_disk};" \
 	"name="PARTS_CSA",start=5MiB,size=8MiB,uuid=${uuid_gpt_"PARTS_CSA"};" \
 	"name="PARTS_BOOT",size=60MiB,uuid=${uuid_gpt_"PARTS_BOOT"};" \
@@ -94,11 +94,15 @@
 	"name="PARTS_DATA",size=3000MiB,uuid=${uuid_gpt_"PARTS_DATA"};" \
 	"name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
 
-#define CONFIG_DFU_ALT \
-	"u-boot raw 0x80 0x400;" \
+#define TIZEN_DFU_ALT_VERSION   "08\0"
+
+#define TIZEN_DFU_ALT_INFO_V8 \
+	"s-boot-mmc.bin raw 0x0 0x400 mmcpart 1;" \
+	"u-boot-mmc.bin raw 0x80 0x800;" \
 	"/uImage ext4 0 2;" \
+	"/modules.img ext4 0 2;" \
 	"/modem.bin ext4 0 2;" \
-	"/exynos4210-trats.dtb ext4 0 2;" \
+	"exynos4210-trats2.dtb ext4 0 2;" \
 	""PARTS_CSA" part 0 1;" \
 	""PARTS_BOOT" part 0 2;" \
 	""PARTS_QBOOT" part 0 3;" \
@@ -151,8 +155,9 @@
 	"mmcbootpart=2\0" \
 	"mmcrootpart=5\0" \
 	"opts=always_resume=1\0" \
-	"partitions=" PARTS_DEFAULT \
-	"dfu_alt_info=" CONFIG_DFU_ALT \
+	"partitions=" TIZEN_PARTITIONS_V8 \
+	"dfu_alt_info=" TIZEN_DFU_ALT_INFO_V8 \
+	"dfu_alt_pit_compatible=" TIZEN_DFU_ALT_VERSION \
 	"spladdr=0x40000100\0" \
 	"splsize=0x200\0" \
 	"splfile=falcon.bin\0" \
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 42481ab..d0bba46 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -74,7 +74,7 @@
 #define PARTS_DATA		"data"
 #define PARTS_UMS		"ums"
 
-#define PARTS_DEFAULT \
+#define TIZEN_PARTITIONS_V8 \
 	"uuid_disk=${uuid_gpt_disk};" \
 	"name="PARTS_CSA",start=5MiB,size=8MiB,uuid=${uuid_gpt_"PARTS_CSA"};" \
 	"name="PARTS_BOOT",size=60MiB,uuid=${uuid_gpt_"PARTS_BOOT"};" \
@@ -84,8 +84,11 @@
 	"name="PARTS_DATA",size=3000MiB,uuid=${uuid_gpt_"PARTS_DATA"};" \
 	"name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
 
-#define CONFIG_DFU_ALT \
-	"u-boot raw 0x80 0x800;" \
+#define TIZEN_DFU_ALT_VERSION	"08\0"
+
+#define TIZEN_DFU_ALT_INFO_V8 \
+	"s-boot-mmc.bin raw 0x0 0x400 mmcpart 1;" \
+	"u-boot-mmc.bin raw 0x80 0x800;" \
 	"/uImage ext4 0 2;" \
 	"/modem.bin ext4 0 2;" \
 	"/exynos4412-trats2.dtb ext4 0 2;" \
@@ -96,7 +99,8 @@
 	""PARTS_ROOT" part 0 5;" \
 	""PARTS_DATA" part 0 6;" \
 	""PARTS_UMS" part 0 7;" \
-	"params.bin raw 0x38 0x8\0"
+	"params.bin raw 0x38 0x8;" \
+	"/modules.img ext4 0 2\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"bootk=" \
@@ -128,8 +132,9 @@
 	"mmcbootpart=2\0" \
 	"mmcrootpart=5\0" \
 	"opts=always_resume=1\0" \
-	"partitions=" PARTS_DEFAULT \
-	"dfu_alt_info=" CONFIG_DFU_ALT \
+	"partitions=" TIZEN_PARTITIONS_V8 \
+	"dfu_alt_info=" TIZEN_DFU_ALT_INFO_V8 \
+	"dfu_alt_pit_compatible=" TIZEN_DFU_ALT_VERSION \
 	"uartpath=ap\0" \
 	"usbpath=ap\0" \
 	"consoleon=set console console=ttySAC2,115200n8; save; reset\0" \