From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Thu, 21 Jan 2021 14:52:05 +0000 (+0100)
Subject: samsung: tizen_rpi: add support for the MBR command
X-Git-Tag: accepted/tizen/unified/20221108.163909~96
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e1a5582aa58b22e05049f9fac9390f9e9413d20a;p=platform%2Fkernel%2Fu-boot.git

samsung: tizen_rpi: add support for the MBR command

Enable recently added 'mbr' command and define MBR partition table layout
based on the values from the current sd_fusing_rpi3.sh script.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I25e44f10365f95624cf6b85e09962671cf0c12c0
---

diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
index aba605c04f..f6f1b6b3f7 100644
--- a/configs/rpi_3_32b_defconfig
+++ b/configs/rpi_3_32b_defconfig
@@ -20,6 +20,7 @@ CONFIG_MISC_INIT_R=y
 CONFIG_FDT_SIMPLEFB=y
 CONFIG_SYS_PBSIZE=1049
 CONFIG_CMD_GPIO=y
+CONFIG_CMD_MBR=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_NFS_DOWNLOAD=y
diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
index 8b2e0e0b96..91b0b84222 100644
--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
@@ -19,6 +19,7 @@ CONFIG_MISC_INIT_R=y
 CONFIG_FDT_SIMPLEFB=y
 CONFIG_SYS_PBSIZE=1049
 CONFIG_CMD_GPIO=y
+CONFIG_CMD_MBR=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_FS_UUID=y
diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig
index 3700fe4d3f..6368739bc6 100644
--- a/configs/rpi_4_32b_defconfig
+++ b/configs/rpi_4_32b_defconfig
@@ -22,6 +22,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_CMD_THOR_DOWNLOAD=y
 CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
+CONFIG_CMD_MBR=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig
index 565266374c..67934853d6 100644
--- a/configs/rpi_4_defconfig
+++ b/configs/rpi_4_defconfig
@@ -22,6 +22,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_CMD_THOR_DOWNLOAD=y
 CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
+CONFIG_CMD_MBR=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
diff --git a/include/samsung/tizen_rpi.h b/include/samsung/tizen_rpi.h
index 8df939b60c..96aaf85c53 100644
--- a/include/samsung/tizen_rpi.h
+++ b/include/samsung/tizen_rpi.h
@@ -45,6 +45,20 @@
 #define CONFIG_SET_DFU_ALT_INFO
 #define CONFIG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
 
+#define PARTS_DEFAULT \
+	"name=boot,start=4M,size=64M,bootable,id=0x0e;"		\
+	"name=rootfs,size=3072M,id=0x83;"			\
+	"name=system-data,size=1344M,id=0x83;"			\
+	"name=[ext],size=-,id=0x05;"				\
+	"name=user,size=-,id=0x83;"				\
+	"name=modules,size=32M,id=0x83;"			\
+	"name=ramdisk,size=8M,id=0x83;"				\
+	"name=ramdisk-recovery,size=32M,id=0x83;"		\
+	"name=inform,size=8M,id=0x83;"				\
+	"name=hal,size=64M,id=0x83;"				\
+	"name=reserved2,size=125M,id=0x83;"			\
+	""
+
 #ifdef CONFIG_TARGET_RPI_4_32B
 #define TIZEN_VC_MEM "vc_mem.mem_base=0x3ec00000 vc_mem.mem_size=0x40000000 swiotlb=8192 "
 #else
@@ -91,6 +105,8 @@
 	"opts=loglevel=4\0"			\
 	"dfu_usb_con=0\0"			\
 	"dfu_interface=mmc\0"			\
-	"dfu_device=" __stringify(CONFIG_MMC_DEFAULT_DEV) "\0"
+	"dfu_device=" __stringify(CONFIG_MMC_DEFAULT_DEV) "\0" \
+	"mbr_parts=" PARTS_DEFAULT "\0"		\
+	""
 
 #endif /* __CONFIG_TIZEN_RPI_H */