arm/km: checkpatch cleanup

[karo-tx-uboot.git] / board / keymile / km_arm / km_arm.c

diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index 5da856fabc4fd9e32eb90abe565315c52ee69287..9e9940c51f0bbd584780ec8376fec13481680045 100644 (file)
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -34,6 +34,7 @@
 #include <netdev.h>
 #include <miiphy.h>
 #include <asm/io.h>
+#include <asm/arch/cpu.h>
 #include <asm/arch/kirkwood.h>
 #include <asm/arch/mpp.h>
 
@@ -206,8 +207,14 @@ int misc_init_r(void)
        if (wait_for_ne != NULL) {
                if (strcmp(wait_for_ne, "true") == 0) {
                        int cnt = 0;
+                       int abort = 0;
                        puts("NE go: ");
                        while (startup_allowed() == 0) {
+                               if (tstc()) {
+                                       (void) getc(); /* consume input */
+                                       abort = 1;
+                                       break;
+                               }
                                udelay(200000);
                                cnt++;
                                if (cnt == 5)
@@ -217,7 +224,10 @@ int misc_init_r(void)
                                        puts("    \b\b\b\b");
                                }
                        }
-                       puts("OK\n");
+                       if (abort == 1)
+                               printf("\nAbort waiting for ne\n");
+                       else
+                               puts("OK\n");
                }
        }
 #endif
@@ -257,17 +267,17 @@ int board_early_init_f(void)
        kw_gpio_set_valid(KM_KIRKWOOD_ENV_WP, 38);
        kw_gpio_direction_output(KM_KIRKWOOD_ENV_WP, 1);
 #endif
-
+#if defined(CONFIG_KM_RECONFIG_XLX)
+       /* trigger the reconfiguration of the xilinx fpga */
+       kw_gpio_set_valid(KM_XLX_PROGRAM_B_PIN, 1);
+       kw_gpio_direction_output(KM_XLX_PROGRAM_B_PIN, 0);
+       kw_gpio_direction_input(KM_XLX_PROGRAM_B_PIN);
+#endif
        return 0;
 }
 
 int board_init(void)
 {
-       /*
-        * arch number of board
-        */
-       gd->bd->bi_arch_number = MACH_TYPE_KM_KIRKWOOD;
-
        /* address of boot parameters */
        gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100;
 
@@ -321,7 +331,7 @@ int dram_init(void)
 {
        /* dram_init must store complete ramsize in gd->ram_size */
        /* Fix this */
-       gd->ram_size = get_ram_size((volatile void *)kw_sdram_bar(0),
+       gd->ram_size = get_ram_size((void *)kw_sdram_bar(0),
                                kw_sdram_bs(0));
        return 0;
 }
@@ -395,32 +405,53 @@ int hush_init_var(void)
 #endif
 
 #if defined(CONFIG_BOOTCOUNT_LIMIT)
+const ulong patterns[]      = {        0x00000000,
+                               0xFFFFFFFF,
+                               0xFF00FF00,
+                               0x0F0F0F0F,
+                               0xF0F0F0F0};
+const ulong NBR_OF_PATTERNS = sizeof(patterns)/sizeof(*patterns);
+const ulong OFFS_PATTERN    = 3;
+const ulong REPEAT_PATTERN  = 1000;
+
 void bootcount_store(ulong a)
 {
-       volatile ulong *save_addr;
-       volatile ulong size = 0;
+       ulong *save_addr;
+       ulong size = 0;
        int i;
-       for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
+
+       for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++)
                size += gd->bd->bi_dram[i].size;
-       }
-       save_addr = (ulong*)(size - BOOTCOUNT_ADDR);
+       save_addr = (ulong *)(size - BOOTCOUNT_ADDR);
        writel(a, save_addr);
        writel(BOOTCOUNT_MAGIC, &save_addr[1]);
+
+       for (i = 0; i < REPEAT_PATTERN; i++)
+               writel(patterns[i % NBR_OF_PATTERNS],
+                       &save_addr[i+OFFS_PATTERN]);
+
 }
 
 ulong bootcount_load(void)
 {
-       volatile ulong *save_addr;
-       volatile ulong size = 0;
-       int i;
-       for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
+       ulong *save_addr;
+       ulong size = 0;
+       ulong counter = 0;
+       int i, tmp;
+
+       for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++)
                size += gd->bd->bi_dram[i].size;
+       save_addr = (ulong *)(size - BOOTCOUNT_ADDR);
+
+       counter = readl(&save_addr[0]);
+
+       /* Is the counter reliable, check in the big pattern for bit errors */
+       for (i = 0; (i < REPEAT_PATTERN) && (counter != 0); i++) {
+               tmp = readl(&save_addr[i+OFFS_PATTERN]);
+               if (tmp != patterns[i % NBR_OF_PATTERNS])
+                       counter = 0;
        }
-       save_addr = (ulong*)(size - BOOTCOUNT_ADDR);
-       if (readl(&save_addr[1]) != BOOTCOUNT_MAGIC)
-               return 0;
-       else
-               return readl(save_addr);
+       return counter;
 }
 #endif
 
@@ -448,6 +479,39 @@ int get_scl(void)
 }
 #endif
 
+#if defined(CONFIG_POST)
+
+#define KM_POST_EN_L   44
+#define POST_WORD_OFF  8
+
+int post_hotkeys_pressed(void)
+{
+       return !kw_gpio_get_value(KM_POST_EN_L);
+}
+
+ulong post_word_load(void)
+{
+       void* addr = (void *) (gd->ram_size - BOOTCOUNT_ADDR + POST_WORD_OFF);
+       return in_le32(addr);
+
+}
+void post_word_store(ulong value)
+{
+       void* addr = (void *) (gd->ram_size - BOOTCOUNT_ADDR + POST_WORD_OFF);
+       out_le32(addr, value);
+}
+
+int arch_memory_test_prepare(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
+{
+       *vstart = CONFIG_SYS_SDRAM_BASE;
+
+       /* we go up to relocation plus a 1 MB margin */
+       *size = CONFIG_SYS_TEXT_BASE - (1<<20);
+
+       return 0;
+}
+#endif
+
 #if defined(CONFIG_SYS_EEPROM_WREN)
 int eeprom_write_enable(unsigned dev_addr, int state)
 {