From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Fri, 26 Apr 2024 08:58:33 +0000 (+0200)
Subject: tizen: rpi4: drop outdated MBR support
X-Git-Tag: accepted/tizen/unified/20240603.161029~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f91b849342db49f5ca85501089336b200ef459f;p=platform%2Fkernel%2Fu-boot.git

tizen: rpi4: drop outdated MBR support

Tizen use GPT partition layout, so there is no point keeping MBR support.

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

diff --git a/configs/tizen_rpi_4_32b_defconfig b/configs/tizen_rpi_4_32b_defconfig
index 220b589e00..0a107f458f 100644
--- a/configs/tizen_rpi_4_32b_defconfig
+++ b/configs/tizen_rpi_4_32b_defconfig
@@ -29,7 +29,6 @@ CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_GPT_RENAME=y
-CONFIG_CMD_MBR=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
diff --git a/configs/tizen_rpi_4_defconfig b/configs/tizen_rpi_4_defconfig
index 0416359fc7..1ca0e66b8e 100644
--- a/configs/tizen_rpi_4_defconfig
+++ b/configs/tizen_rpi_4_defconfig
@@ -29,7 +29,6 @@ CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_GPT_RENAME=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 3d87e5fdef..88497eeb0e 100644
--- a/include/samsung/tizen_rpi.h
+++ b/include/samsung/tizen_rpi.h
@@ -41,29 +41,6 @@
 
 #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=256M,id=0x83;"				\
-	"name=reserved2,size=125M,id=0x83;"			\
-	""
-
-#define MBR_CHECK	\
-	"env default mbr_parts; "					\
-	"if mbr verify ${dfu_interface} ${dfu_device}; "		\
-	"then true; else "						\
-	"echo \"MBR partition layout does not match flashed bootloader!\"; " \
-	"echo \"Please format SD card with recent sd_fusing_rpi3.sh script or Ctrl-C to continue.\"; " \
-	"while sleep 2; do echo .\\\\\\\\c; done; echo; "		\
-	"fi"
-
 #define GPT_PARTS_DEFAULT \
 	"uuid_disk=${uuid_gpt_disk};"				\
 	"name=boot_a,start=4MiB,uuid=${uuid_gpt_boot_a},size=64MiB,type=C12A7328-F81F-11D2-BA4B-00A0C93EC93B;"	\
@@ -161,8 +138,6 @@
 	"dfu_usb_con=0\0"			\
 	"dfu_interface=mmc\0"			\
 	"dfu_device=" __stringify(CONFIG_MMC_DEFAULT_DEV) "\0" \
-	"mbr_parts=" PARTS_DEFAULT "\0"		\
-	"mbr_check=" MBR_CHECK "\0"		\
 	"set_to_part_a=" SET_TO_PARTITION_A "\0"		\
 	"set_to_part_b=" SET_TO_PARTITION_B "\0"		\
 	"gpt_parts=" GPT_PARTS_DEFAULT "\0"		\