]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
prevent evaluation of cpu_clk in case of watchdog reset or key pressed during boot
authorLothar Waßmann <LW@KARO-electronics.de>
Thu, 23 Aug 2012 07:23:32 +0000 (09:23 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Thu, 23 Aug 2012 07:23:32 +0000 (09:23 +0200)
board/karo/tx53/tx53.c

index 2231785f311cffc0af8f47b67c9943f06ebfadcf..0b2c8c133598b58b0c384077536059a14515a997 100644 (file)
@@ -828,6 +828,9 @@ static void tx53_set_cpu_clock(void)
        unsigned long cpu_clk = getenv_ulong("cpu_clk", 10, 0);
        int ret;
 
+       if (tstc() || (wrsr & WRSR_TOUT))
+               return;
+
        if (cpu_clk == 0 || cpu_clk == mxc_get_clock(MXC_ARM_CLK) / 1000000)
                return;