X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=common%2Fcmd_nand.c;h=a84f7dc2d1fd301adff83aae7d8a41ad1b8acdf7;hb=ed32522fe048f9edcb3269c8d5af79c6e8c6daea;hp=04ab0f19be05d911541567e09b12279984715a2a;hpb=4eef93da262048eb1118e726b3ec5b8ebd3c6c91;p=u-boot diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 04ab0f19be..a84f7dc2d1 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -605,22 +605,16 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) opts.spread = spread; if (scrub) { - if (!scrub_yes) - puts(scrub_warn); - - if (scrub_yes) + if (scrub_yes) { opts.scrub = 1; - else if (getc() == 'y') { - puts("y"); - if (getc() == '\r') + } else { + puts(scrub_warn); + if (confirm_yesno()) { opts.scrub = 1; - else { + } else { puts("scrub aborted\n"); return 1; } - } else { - puts("scrub aborted\n"); - return 1; } } ret = nand_erase_opts(nand, &opts);