MAINLINE 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 c00d60a..13f88ce 100644 (file)
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -122,33 +122,40 @@
 
 /* Tizen - partitions definitions */
 #define PARTS_CSA              "csa-mmc"
-#define PARTS_BOOTLOADER       "u-boot"
 #define PARTS_BOOT             "boot"
+#define PARTS_QBOOT            "qboot"
+#define PARTS_CSC              "csc"
 #define PARTS_ROOT             "platform"
 #define PARTS_DATA             "data"
-#define PARTS_CSC              "csc"
 #define PARTS_UMS              "ums"
 
-#define PARTS_DEFAULT \
-       "uuid_disk=${uuid_gpt_disk};" \
-       "name="PARTS_CSA",size=8MiB,uuid=${uuid_gpt_"PARTS_CSA"};" \
-       "name="PARTS_BOOTLOADER",size=60MiB," \
-               "uuid=${uuid_gpt_"PARTS_BOOTLOADER"};" \
-       "name="PARTS_BOOT",size=100MiB,uuid=${uuid_gpt_"PARTS_BOOT"};" \
-       "name="PARTS_ROOT",size=1GiB,uuid=${uuid_gpt_"PARTS_ROOT"};" \
-       "name="PARTS_DATA",size=3GiB,uuid=${uuid_gpt_"PARTS_DATA"};" \
-       "name="PARTS_CSC",size=150MiB,uuid=${uuid_gpt_"PARTS_CSC"};" \
-       "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
-
-#define CONFIG_DFU_ALT \
-       "u-boot mmc 80 400;" \
-       "uImage ext4 0 2;" \
-       "exynos4210-trats.dtb ext4 0 2;" \
-       ""PARTS_BOOT" part 0 2;" \
-       ""PARTS_ROOT" part 0 5;" \
-       ""PARTS_DATA" part 0 6;" \
-       ""PARTS_UMS" part 0 7;" \
-       "params.bin mmc 0x38 0x8\0"
+#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"};" \
+        "name="PARTS_QBOOT",size=100MiB,uuid=${uuid_gpt_"PARTS_QBOOT"};" \
+        "name="PARTS_CSC",size=150MiB,uuid=${uuid_gpt_"PARTS_CSC"};" \
+        "name="PARTS_ROOT",size=1536MiB,uuid=${uuid_gpt_"PARTS_ROOT"};" \
+        "name="PARTS_DATA",size=3000MiB,uuid=${uuid_gpt_"PARTS_DATA"};" \
+        "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
+
+#define TIZEN_DFU_ALT_VERSION   "08\0"
+
+#define TIZEN_DFU_ALT_INFO_V8 \
+        "s-boot-mmc.bin mmc 0 400 mmcpart 1;" \
+        "u-boot-mmc.bin mmc 80 800;" \
+        "uImage ext4 0 2;" \
+        "modules.img ext4 0 2;" \
+        "modem.bin ext4 0 2;" \
+        "exynos4412-trats2.dtb ext4 0 2;" \
+        ""PARTS_CSA" part 0 1;" \
+        ""PARTS_BOOT" part 0 2;" \
+        ""PARTS_QBOOT" part 0 3;" \
+        ""PARTS_CSC" part 0 4;" \
+        ""PARTS_ROOT" part 0 5;" \
+        ""PARTS_DATA" part 0 6;" \
+        ""PARTS_UMS" part 0 7;" \
+        "params.bin mmc 0x38 0x8\0"
 
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
@@ -203,8 +210,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 59896b1..2afb893 100644 (file)
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -156,29 +156,37 @@
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
 /* Tizen - partitions definitions */
-#define PARTS_CSA              "csa"
+#define PARTS_CSA              "csa-mmc"
 #define PARTS_BOOT             "boot"
-#define PARTS_MODEM            "modem"
+#define PARTS_QBOOT            "qboot"
 #define PARTS_CSC              "csc"
 #define PARTS_ROOT             "platform"
 #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=64MiB,uuid=${uuid_gpt_"PARTS_BOOT"};" \
-       "name="PARTS_MODEM",size=100MiB,uuid=${uuid_gpt_"PARTS_MODEM"};" \
+       "name="PARTS_BOOT",size=60MiB,uuid=${uuid_gpt_"PARTS_BOOT"};" \
+       "name="PARTS_QBOOT",size=100MiB,uuid=${uuid_gpt_"PARTS_QBOOT"};" \
        "name="PARTS_CSC",size=150MiB,uuid=${uuid_gpt_"PARTS_CSC"};" \
        "name="PARTS_ROOT",size=1536MiB,uuid=${uuid_gpt_"PARTS_ROOT"};" \
-       "name="PARTS_DATA",size=512MiB,uuid=${uuid_gpt_"PARTS_DATA"};" \
+       "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 mmc 80 800;" \
+#define TIZEN_DFU_ALT_VERSION  "08\0"
+
+#define TIZEN_DFU_ALT_INFO_V8 \
+       "s-boot-mmc.bin mmc 0 400 mmcpart 1;" \
+       "u-boot-mmc.bin mmc 80 800;" \
        "uImage ext4 0 2;" \
+       "modules.img ext4 0 2;" \
+       "modem.bin ext4 0 2;" \
        "exynos4412-trats2.dtb ext4 0 2;" \
+       ""PARTS_CSA" part 0 1;" \
        ""PARTS_BOOT" part 0 2;" \
+       ""PARTS_QBOOT" part 0 3;" \
+       ""PARTS_CSC" part 0 4;" \
        ""PARTS_ROOT" part 0 5;" \
        ""PARTS_DATA" part 0 6;" \
        ""PARTS_UMS" part 0 7;" \
@@ -219,8 +227,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" \