Looks good to me.
Acked-by: Jaehoon Chung jh80.chung@samsung.com
Best Regards, Jaehoon Chung
On 01/31/2014 06:32 AM, Tom Rini wrote:
The open and close mmc sub-commands implement a hard-coded set of values specific to the SMDK5250 platform. Remove these commands as what they did can be done instead with a series of mmc dev / bootpart / bootbus commands instead now.
Cc: Amar amarendra.xt@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com Cc: Jaehoon Chung jh80.chung@samsung.com Signed-off-by: Tom Rini trini@ti.com
common/cmd_mmc.c | 72 ----------------------------------------------------- drivers/mmc/mmc.c | 65 ----------------------------------------------- include/mmc.h | 2 -- 3 files changed, 139 deletions(-)
diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index a028149..2d51927 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -131,36 +131,6 @@ U_BOOT_CMD( "- display info of the current MMC device" );
-#ifdef CONFIG_SUPPORT_EMMC_BOOT -static int boot_part_access(struct mmc *mmc, u8 ack, u8 part_num, u8 access) -{
- int err;
- err = mmc_boot_part_access(mmc, ack, part_num, access);
- if ((err == 0) && (access != 0)) {
printf("\t\t\t!!!Notice!!!\n");printf("!You must close EMMC boot Partition");printf("after all images are written\n");printf("!EMMC boot partition has continuity");printf("at image writing time.\n");printf("!So, do not close the boot partition");printf("before all images are written.\n");return 0;- } else if ((err == 0) && (access == 0))
return 0;- else if ((err != 0) && (access != 0)) {
printf("EMMC boot partition-%d OPEN Failed.\n", part_num);return 1;- } else {
printf("EMMC boot partition-%d CLOSE Failed.\n", part_num);return 1;- }
-} -#endif
static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { enum mmc_state state; @@ -273,44 +243,6 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return 0;#ifdef CONFIG_SUPPORT_EMMC_BOOT
- } else if ((strcmp(argv[1], "open") == 0) ||
(strcmp(argv[1], "close") == 0)) {int dev;struct mmc *mmc;u8 part_num, access = 0;if (argc == 4) {dev = simple_strtoul(argv[2], NULL, 10);part_num = simple_strtoul(argv[3], NULL, 10);} else {return CMD_RET_USAGE;}mmc = find_mmc_device(dev);if (!mmc) {printf("no mmc device at slot %x\n", dev);return 1;}if (IS_SD(mmc)) {printf("SD device cannot be opened/closed\n");return 1;}if ((part_num <= 0) || (part_num > MMC_NUM_BOOT_PARTITION)) {printf("Invalid boot partition number:\n");printf("Boot partition number cannot be <= 0\n");printf("EMMC44 supports only 2 boot partitions\n");return 1;}if (strcmp(argv[1], "open") == 0)access = part_num; /* enable R/W access to boot part*/elseaccess = 0; /* No access to boot partition *//* acknowledge to be sent during boot operation */return boot_part_access(mmc, 1, part_num, access);@@ -498,10 +430,6 @@ U_BOOT_CMD( "mmc dev [dev] [part] - show or set current mmc device [partition]\n" "mmc list - lists available devices\n" #ifdef CONFIG_SUPPORT_EMMC_BOOT
- "mmc open <dev> <boot_partition>\n"
- " - Enable boot_part for booting and enable R/W access of boot_part\n"
- "mmc close <dev> <boot_partition>\n"
- " - Enable boot_part for booting and disable access to boot_part\n" "mmc bootbus dev boot_bus_width reset_boot_bus_width boot_mode\n" " - Set the BOOT_BUS_WIDTH field of the specified device\n" "mmc bootpart-resize <dev> <boot part size MB> <RPMB part size MB>\n"
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index fc1c1dc..3a57ab8 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1442,71 +1442,6 @@ int mmc_boot_partition_size_change(struct mmc *mmc, unsigned long bootsize, }
/*
- This function shall form and send the commands to open / close the
- boot partition specified by user.
- Input Parameters:
- ack: 0x0 - No boot acknowledge sent (default)
- 0x1 - Boot acknowledge sent during boot operation
- part_num: User selects boot data that will be sent to master
- 0x0 - Device not boot enabled (default)
- 0x1 - Boot partition 1 enabled for boot
- 0x2 - Boot partition 2 enabled for boot
- access: User selects partitions to access
- 0x0 : No access to boot partition (default)
- 0x1 : R/W boot partition 1
- 0x2 : R/W boot partition 2
- 0x3 : R/W Replay Protected Memory Block (RPMB)
- Returns 0 on success.
- */
-int mmc_boot_part_access(struct mmc *mmc, u8 ack, u8 part_num, u8 access) -{
- int err;
- struct mmc_cmd cmd;
- /* Boot ack enable, boot partition enable , boot partition access */
- cmd.cmdidx = MMC_CMD_SWITCH;
- cmd.resp_type = MMC_RSP_R1b;
- cmd.cmdarg = (MMC_SWITCH_MODE_WRITE_BYTE << 24) |
(EXT_CSD_PART_CONF << 16) |((EXT_CSD_BOOT_ACK(ack) |EXT_CSD_BOOT_PART_NUM(part_num) |EXT_CSD_PARTITION_ACCESS(access)) << 8);- err = mmc_send_cmd(mmc, &cmd, NULL);
- if (err) {
if (access) {debug("mmc boot partition#%d open fail:Error1 = %d\n",part_num, err);} else {debug("mmc boot partition#%d close fail:Error = %d\n",part_num, err);}return err;- }
- if (access) {
/* 4bit transfer mode at booting time. */cmd.cmdidx = MMC_CMD_SWITCH;cmd.resp_type = MMC_RSP_R1b;cmd.cmdarg = (MMC_SWITCH_MODE_WRITE_BYTE << 24) |(EXT_CSD_BOOT_BUS_WIDTH << 16) |((1 << 0) << 8);err = mmc_send_cmd(mmc, &cmd, NULL);if (err) {debug("mmc boot partition#%d open fail:Error2 = %d\n",part_num, err);return err;}- }
- return 0;
-}
-/*
- Modify EXT_CSD[177] which is BOOT_BUS_WIDTH
- based on the passed in values for BOOT_BUS_WIDTH, RESET_BOOT_BUS_WIDTH
- and BOOT_MODE.
diff --git a/include/mmc.h b/include/mmc.h index 3594286..e95a237 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -313,8 +313,6 @@ int mmc_set_dsr(struct mmc *mmc, u16 val); /* Function to change the size of boot partition and rpmb partitions */ int mmc_boot_partition_size_change(struct mmc *mmc, unsigned long bootsize, unsigned long rpmbsize); -/* Function to send commands to open/close the specified boot partition */ -int mmc_boot_part_access(struct mmc *mmc, u8 ack, u8 part_num, u8 access); /* Function to modify the PARTITION_CONFIG field of EXT_CSD */ int mmc_set_part_conf(struct mmc *mmc, u8 ack, u8 part_num, u8 access); /* Function to modify the BOOT_BUS_WIDTH field of EXT_CSD */