diff --git a/cmd/mmc.c b/cmd/mmc.c index 6f3cb85cc04..78452abfde6 100644 --- a/cmd/mmc.c +++ b/cmd/mmc.c @@ -500,18 +500,19 @@ static int do_mmc_dev(cmd_tbl_t *cmdtp, int flag, return CMD_RET_FAILURE; ret = blk_select_hwpart_devnum(IF_TYPE_MMC, dev, part); - printf("switch to partitions #%d, %s\n", - part, (!ret) ? "OK" : "ERROR"); + //printf("switch to partitions #%d, %s\n", + //part, (!ret) ? "OK" : "ERROR"); if (ret) return 1; curr_device = dev; + /* if (mmc->part_config == MMCPART_NOAVAILABLE) printf("mmc%d is current device\n", curr_device); else printf("mmc%d(part %d) is current device\n", curr_device, mmc_get_blk_desc(mmc)->hwpart); - + */ return CMD_RET_SUCCESS; } static int do_mmc_list(cmd_tbl_t *cmdtp, int flag, diff --git a/common/image-fdt.c b/common/image-fdt.c index eb552ca207c..e20ff2ae4dd 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -40,7 +40,7 @@ static const image_header_t *image_get_fdt(ulong fdt_addr) image_print_contents(fdt_hdr); - puts(" Verifying Checksum ... "); + //puts(" Verifying Checksum ... "); if (!image_check_hcrc(fdt_hdr)) { fdt_error("fdt header checksum invalid"); return NULL; @@ -50,7 +50,7 @@ static const image_header_t *image_get_fdt(ulong fdt_addr) fdt_error("fdt checksum invalid"); return NULL; } - puts("OK\n"); + //puts("OK\n"); if (!image_check_type(fdt_hdr, IH_TYPE_FLATDT)) { fdt_error("uImage is not a fdt"); @@ -216,15 +216,15 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size) debug("## device tree at %p ... %p (len=%ld [0x%lX])\n", fdt_blob, fdt_blob + *of_size - 1, of_len, of_len); - printf(" Loading Device Tree to %p, end %p ... ", - of_start, of_start + of_len - 1); + //printf(" Loading Device Tree to %p, end %p ... ", + //of_start, of_start + of_len - 1); err = fdt_open_into(fdt_blob, of_start, of_len); if (err != 0) { fdt_error("fdt move failed"); goto error; } - puts("OK\n"); + //puts("OK\n"); } *of_flat_tree = of_start; @@ -423,7 +423,7 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch, goto no_fdt; } - printf(" Booting using the fdt blob at %#08lx\n", fdt_addr); + //printf(" Booting using the fdt blob at %#08lx\n", fdt_addr); fdt_blob = map_sysmem(fdt_addr, 0); } else if (images->legacy_hdr_valid && image_check_type(&images->legacy_hdr_os_copy, diff --git a/common/image.c b/common/image.c index 75b84d50091..d2aae77bf35 100644 --- a/common/image.c +++ b/common/image.c @@ -411,16 +411,16 @@ static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch, } bootstage_mark(BOOTSTAGE_ID_RD_MAGIC); - image_print_contents(rd_hdr); + //image_print_contents(rd_hdr); if (verify) { - puts(" Verifying Checksum ... "); + //puts(" Verifying Checksum ... "); if (!image_check_dcrc(rd_hdr)) { puts("Bad Data CRC\n"); bootstage_error(BOOTSTAGE_ID_RD_CHECKSUM); return NULL; } - puts("OK\n"); + //puts("OK\n"); } bootstage_mark(BOOTSTAGE_ID_RD_HDR_CHECKSUM); @@ -1181,8 +1181,8 @@ int boot_ramdisk_high(struct lmb *lmb, ulong rd_data, ulong rd_len, bootstage_mark(BOOTSTAGE_ID_COPY_RAMDISK); *initrd_end = *initrd_start + rd_len; - printf(" Loading Ramdisk to %08lx, end %08lx ... ", - *initrd_start, *initrd_end); + //printf(" Loading Ramdisk to %08lx, end %08lx ... ", + //*initrd_start, *initrd_end); memmove_wd((void *)*initrd_start, (void *)rd_data, rd_len, CHUNKSZ); @@ -1196,7 +1196,7 @@ int boot_ramdisk_high(struct lmb *lmb, ulong rd_data, ulong rd_len, flush_cache((unsigned long)*initrd_start, ALIGN(rd_len, ARCH_DMA_MINALIGN)); #endif - puts("OK\n"); + //puts("OK\n"); } } else { *initrd_start = 0; diff --git a/configs/orangepi_3_defconfig b/configs/orangepi_3_defconfig index 950573904bf..6677fdec414 100644 --- a/configs/orangepi_3_defconfig +++ b/configs/orangepi_3_defconfig @@ -27,3 +27,4 @@ CONFIG_CMD_PART=y CONFIG_HUSH_PARSER=y CONFIG_BOOTDELAY=1 CONFIG_ISO_PARTITION=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y diff --git a/configs/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig index ef5cdcc0470..b75a338187e 100644 --- a/configs/orangepi_pc2_defconfig +++ b/configs/orangepi_pc2_defconfig @@ -35,3 +35,4 @@ CONFIG_CMD_PART=y CONFIG_HUSH_PARSER=y CONFIG_BOOTDELAY=1 CONFIG_ISO_PARTITION=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig index 780739259d7..3acc7b54899 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -35,3 +35,4 @@ CONFIG_BOOTDELAY=1 CONFIG_ISO_PARTITION=y CONFIG_SY8106A_VOUT1_VOLT=1320 CONFIG_SYS_CLK_FREQ=1296000000 +CONFIG_SYS_CONSOLE_INFO_QUIET=y diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index 26e61ef1969..1be7c24f38e 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -431,16 +431,12 @@ "if test -e ${devtype} " \ "${devnum}:${distro_bootpart} " \ "${prefix}${script}; then " \ - "echo Found U-Boot script " \ - "${prefix}${script}; " \ "run boot_a_script; " \ "echo SCRIPT FAILED: continuing...; " \ "fi; " \ "done\0" \ \ "scan_dev_for_boot=" \ - "echo Scanning ${devtype} " \ - "${devnum}:${distro_bootpart}...; " \ "for prefix in ${boot_prefixes}; do " \ "run scan_dev_for_extlinux; " \ "run scan_dev_for_scripts; " \