From 33f8cbbaca8b67e999dce43a4fe33a028887535d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Wed, 11 Dec 2013 09:54:37 +0100 Subject: [PATCH] karo: tx6: various cleanups --- board/karo/tx6/tx6qdl.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/board/karo/tx6/tx6qdl.c b/board/karo/tx6/tx6qdl.c index 2b59efb0e7..387908a656 100644 --- a/board/karo/tx6/tx6qdl.c +++ b/board/karo/tx6/tx6qdl.c @@ -336,7 +336,7 @@ static int tx6_rev_2(void) struct fuse_bank5_regs *fuse = (void *)ocotp->bank[5].fuse_regs; u32 pad_settings = readl(&fuse->pad_settings); - debug("Fuse pad_settings @ %p = %08x\n", + debug("Fuse pad_settings @ %p = %02x\n", &fuse->pad_settings, pad_settings); return pad_settings & 1; } @@ -425,15 +425,13 @@ int board_init(void) /* Address of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x1000; -#ifdef CONFIG_OF_LIBFDT gd->bd->bi_arch_number = -1; -#else - gd->bd->bi_arch_number = 4429; -#endif + if (ctrlc()) { printf("CTRL-C detected; Skipping PMIC setup\n"); return 1; } + ret = setup_pmic_voltages(); if (ret) { printf("Failed to setup PMIC voltages\n"); @@ -1188,7 +1186,7 @@ static void tx6qdl_set_cpu_clock(void) printf("CPU clock set to %lu.%03lu MHz\n", cpu_clk / 1000000, cpu_clk / 1000 % 1000); } else { - printf("Failed to set CPU clock to %lu MHz\n", cpu_clk); + printf("Error: Failed to set CPU clock to %lu MHz\n", cpu_clk); } } @@ -1202,8 +1200,8 @@ static void tx6_init_mac(void) return; } - eth_setenv_enetaddr("ethaddr", mac); printf("MAC addr from fuse: %pM\n", mac); + eth_setenv_enetaddr("ethaddr", mac); } int board_late_init(void) -- 2.39.2