summaryrefslogtreecommitdiff
path: root/arch/blackfin
diff options
context:
space:
mode:
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/cpu/serial.c40
-rw-r--r--arch/blackfin/include/asm/config.h18
-rw-r--r--arch/blackfin/lib/Makefile2
-rw-r--r--arch/blackfin/lib/post.c85
-rw-r--r--arch/blackfin/lib/tests.c250
5 files changed, 144 insertions, 251 deletions
diff --git a/arch/blackfin/cpu/serial.c b/arch/blackfin/cpu/serial.c
index 030160f..6603dc0 100644
--- a/arch/blackfin/cpu/serial.c
+++ b/arch/blackfin/cpu/serial.c
@@ -38,6 +38,7 @@
*/
#include <common.h>
+#include <post.h>
#include <watchdog.h>
#include <serial.h>
#include <linux/compiler.h>
@@ -153,6 +154,30 @@ static int uart_getc(uint32_t uart_base)
return uart_rbr_val;
}
+#if CONFIG_POST & CONFIG_SYS_POST_UART
+# define LOOP(x) x
+#else
+# define LOOP(x)
+#endif
+
+LOOP(
+static void uart_loop(uint32_t uart_base, int state)
+{
+ u16 mcr;
+
+ /* Drain the TX fifo first so bytes don't come back */
+ while (!(uart_lsr_read(uart_base) & TEMT))
+ continue;
+
+ mcr = bfin_read(&pUART->mcr);
+ if (state)
+ mcr |= LOOP_ENA | MRTS;
+ else
+ mcr &= ~(LOOP_ENA | MRTS);
+ bfin_write(&pUART->mcr, mcr);
+}
+)
+
#ifdef CONFIG_SYS_BFIN_UART
static void uart_puts(uint32_t uart_base, const char *s)
@@ -202,6 +227,13 @@ static void uart##n##_puts(const char *s) \
uart_puts(MMR_UART(n), s); \
} \
\
+LOOP( \
+static void uart##n##_loop(int state) \
+{ \
+ uart_loop(MMR_UART(n), state); \
+} \
+) \
+\
struct serial_device bfin_serial##n##_device = { \
.name = "bfin_uart"#n, \
.init = uart##n##_init, \
@@ -211,6 +243,7 @@ struct serial_device bfin_serial##n##_device = { \
.tstc = uart##n##_tstc, \
.putc = uart##n##_putc, \
.puts = uart##n##_puts, \
+ LOOP(.loop = uart##n##_loop) \
};
#ifdef UART0_DLL
@@ -307,6 +340,13 @@ void serial_puts(const char *s)
serial_putc(*s++);
}
+LOOP(
+void serial_loop(int state)
+{
+ uart_loop(UART_DLL, state);
+}
+)
+
#endif
#endif
diff --git a/arch/blackfin/include/asm/config.h b/arch/blackfin/include/asm/config.h
index bc3c252..53af310 100644
--- a/arch/blackfin/include/asm/config.h
+++ b/arch/blackfin/include/asm/config.h
@@ -169,4 +169,22 @@
# define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
#endif
+/* Blackfin POST tests */
+#ifdef CONFIG_POST_BSPEC1_GPIO_LEDS
+# define CONFIG_POST_BSPEC1 \
+ { \
+ "LED test", "led", "This test verifies LEDs on the board.", \
+ POST_MEM | POST_ALWAYS, &led_post_test, NULL, NULL, \
+ CONFIG_SYS_POST_BSPEC1, \
+ }
+#endif
+#ifdef CONFIG_POST_BSPEC2_GPIO_BUTTONS
+# define CONFIG_POST_BSPEC2 \
+ { \
+ "Button test", "button", "This test verifies buttons on the board.", \
+ POST_MEM | POST_ALWAYS, &button_post_test, NULL, NULL, \
+ CONFIG_SYS_POST_BSPEC2, \
+ }
+#endif
+
#endif
diff --git a/arch/blackfin/lib/Makefile b/arch/blackfin/lib/Makefile
index 4a22766..37e0663 100644
--- a/arch/blackfin/lib/Makefile
+++ b/arch/blackfin/lib/Makefile
@@ -46,7 +46,7 @@ COBJS-y += clocks.o
COBJS-$(CONFIG_CMD_CACHE_DUMP) += cmd_cache_dump.o
COBJS-$(CONFIG_CMD_KGDB) += kgdb.o
COBJS-y += muldi3.o
-COBJS-$(CONFIG_POST_ALT_LIST) += tests.o
+COBJS-$(CONFIG_HAS_POST) += post.o
COBJS-y += string.o
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
diff --git a/arch/blackfin/lib/post.c b/arch/blackfin/lib/post.c
new file mode 100644
index 0000000..b3c5fab
--- /dev/null
+++ b/arch/blackfin/lib/post.c
@@ -0,0 +1,85 @@
+/*
+ * Blackfin POST code
+ *
+ * Copyright (c) 2005-2011 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <common.h>
+#include <config.h>
+#include <post.h>
+
+#include <asm/gpio.h>
+
+#if CONFIG_POST & CONFIG_SYS_POST_BSPEC1
+int led_post_test(int flags)
+{
+ unsigned leds[] = { CONFIG_POST_BSPEC1_GPIO_LEDS };
+ int i;
+
+ /* First turn them all off */
+ for (i = 0; i < ARRAY_SIZE(leds); ++i) {
+ if (gpio_request(leds[i], "post")) {
+ printf("could not request gpio %u\n", leds[i]);
+ continue;
+ }
+ gpio_direction_output(leds[i], 0);
+ }
+
+ /* Now turn them on one by one */
+ for (i = 0; i < ARRAY_SIZE(leds); ++i) {
+ printf("LED%i on", i + 1);
+ gpio_set_value(leds[i], 1);
+ udelay(1000000);
+ printf("\b\b\b\b\b\b\b");
+ gpio_free(leds[i]);
+ }
+
+ return 0;
+}
+#endif
+
+#if CONFIG_POST & CONFIG_SYS_POST_BSPEC2
+int button_post_test(int flags)
+{
+ unsigned buttons[] = { CONFIG_POST_BSPEC2_GPIO_BUTTONS };
+ unsigned int sws[] = { CONFIG_POST_BSPEC2_GPIO_NAMES };
+ int i, delay = 5;
+ unsigned short value = 0;
+ int result = 0;
+
+ for (i = 0; i < ARRAY_SIZE(buttons); ++i) {
+ if (gpio_request(buttons[i], "post")) {
+ printf("could not request gpio %u\n", buttons[i]);
+ continue;
+ }
+ gpio_direction_input(buttons[i]);
+
+ delay = 5;
+ printf("\n--------Press SW%i: %2d ", sws[i], delay);
+ while (delay--) {
+ int j;
+ for (j = 0; j < 100; j++) {
+ value = gpio_get_value(buttons[i]);
+ if (value != 0)
+ break;
+ udelay(10000);
+ }
+ printf("\b\b\b%2d ", delay);
+ }
+ if (value != 0)
+ puts("\b\bOK");
+ else {
+ result = -1;
+ puts("\b\bfailed");
+ }
+
+ gpio_free(buttons[i]);
+ }
+
+ puts("\n");
+
+ return result;
+}
+#endif
diff --git a/arch/blackfin/lib/tests.c b/arch/blackfin/lib/tests.c
deleted file mode 100644
index bf7fba0..0000000
--- a/arch/blackfin/lib/tests.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * (C) Copyright 2002
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- * Be sure to mark tests to be run before relocation as such with the
- * CONFIG_SYS_POST_PREREL flag so that logging is done correctly if the
- * logbuffer support is enabled.
- */
-
-#include <common.h>
-#include <config.h>
-
-#include <post.h>
-#define CONFIG_SYS_POST_FLASH 0x00004000
-#define CONFIG_SYS_POST_LED 0x00008000
-#define CONFIG_SYS_POST_BUTTON 0x00010000
-
-extern int cache_post_test(int flags);
-extern int watchdog_post_test(int flags);
-extern int i2c_post_test(int flags);
-extern int rtc_post_test(int flags);
-extern int memory_post_test(int flags);
-extern int cpu_post_test(int flags);
-extern int uart_post_test(int flags);
-extern int ether_post_test(int flags);
-extern int spi_post_test(int flags);
-extern int usb_post_test(int flags);
-extern int spr_post_test(int flags);
-extern int sysmon_post_test(int flags);
-extern int dsp_post_test(int flags);
-extern int codec_post_test(int flags);
-
-extern int sysmon_init_f(void);
-
-extern void sysmon_reloc(void);
-
-extern int flash_post_test(int flags);
-extern int led_post_test(int flags);
-extern int button_post_test(int flags);
-
-struct post_test post_list[] = {
-#if CONFIG_POST & CONFIG_SYS_POST_CACHE
- {
- "Cache test",
- "cache",
- "This test verifies the CPU cache operation.",
- POST_RAM | POST_ALWAYS,
- &cache_post_test,
- NULL,
- NULL,
- CONFIG_SYS_POST_CACHE},
-#endif
-#if CONFIG_POST & CONFIG_SYS_POST_WATCHDOG
- {
- "Watchdog timer test",
- "watchdog",
- "This test checks the watchdog timer.",
- POST_RAM | POST_POWERON | POST_SLOWTEST | POST_MANUAL | POST_REBOOT,
- &watchdog_post_test,
- NULL,
- NULL,
- CONFIG_SYS_POST_WATCHDOG},
-#endif
-#if CONFIG_POST & CONFIG_SYS_POST_I2C
- {
- "I2C test",
- "i2c",
- "This test verifies the I2C operation.",
- POST_RAM | POST_ALWAYS,
- &i2c_post_test,
- NULL,
- NULL,
- CONFIG_SYS_POST_I2C},
-#endif
-#if CONFIG_POST & CONFIG_SYS_POST_RTC
- {
- "RTC test",
- "rtc",
- "This test verifies the RTC operation.",
- POST_RAM | POST_SLOWTEST | POST_MANUAL,
- &rtc_post_test,
- NULL,
- NULL,
- CONFIG_SYS_POST_RTC},
-#endif
-#if CONFIG_POST & CONFIG_SYS_POST_MEMORY
- {
- "Memory test",
- "memory",
- "This test checks RAM.",
- POST_ROM | POST_POWERON | POST_SLOWTEST | POST_PREREL,
- &memory_post_test,
- NULL,
- NULL,
- CONFIG_SYS_POST_MEMORY},
-#endif
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
- {
- "CPU test",
- "cpu",
- "This test verifies the arithmetic logic unit of" " CPU.",
- POST_RAM | POST_ALWAYS,
- &cpu_post_test,
- NULL,
- NULL,
- CONFIG_SYS_POST_CPU},
-#endif
-#if CONFIG_POST & CONFIG_SYS_POST_UART
- {
- "UART test",
- "uart",
- "This test verifies the UART operation.",
- POST_RAM | POST_SLOWTEST | POST_MANUAL,
- &uart_post_test,
- NULL,
- NULL,
- CONFIG_SYS_POST_UART},
-#endif
-#if CONFIG_POST & CONFIG_SYS_POST_ETHER
- {
- "ETHERNET test",
- "ethernet",
- "This test verifies the ETHERNET operation.",
- POST_RAM | POST_ALWAYS | POST_MANUAL,
- &ether_post_test,
- NULL,
- NULL,
- CONFIG_SYS_POST_ETHER},
-#endif
-#if CONFIG_POST & CONFIG_SYS_POST_SPI
- {
- "SPI test",
- "spi",
- "This test verifies the SPI operation.",
- POST_RAM | POST_ALWAYS | POST_MANUAL,
- &spi_post_test,
- NULL,
- NULL,
- CONFIG_SYS_POST_SPI},
-#endif
-#if CONFIG_POST & CONFIG_SYS_POST_USB
- {
- "USB test",
- "usb",
- "This test verifies the USB operation.",
- POST_RAM | POST_ALWAYS | POST_MANUAL,
- &usb_post_test,
- NULL,
- NULL,
- CONFIG_SYS_POST_USB},
-#endif
-#if CONFIG_POST & CONFIG_SYS_POST_SPR
- {
- "SPR test",
- "spr",
- "This test checks SPR contents.",
- POST_ROM | POST_ALWAYS | POST_PREREL,
- &spr_post_test,
- NULL,
- NULL,
- CONFIG_SYS_POST_SPR},
-#endif
-#if CONFIG_POST & CONFIG_SYS_POST_SYSMON
- {
- "SYSMON test",
- "sysmon",
- "This test monitors system hardware.",
- POST_RAM | POST_ALWAYS,
- &sysmon_post_test,
- &sysmon_init_f,
- &sysmon_reloc,
- CONFIG_SYS_POST_SYSMON},
-#endif
-#if CONFIG_POST & CONFIG_SYS_POST_DSP
- {
- "DSP test",
- "dsp",
- "This test checks any connected DSP(s).",
- POST_RAM | POST_MANUAL,
- &dsp_post_test,
- NULL,
- NULL,
- CONFIG_SYS_POST_DSP},
-#endif
-#if CONFIG_POST & CONFIG_SYS_POST_CODEC
- {
- "CODEC test",
- "codec",
- "This test checks any connected codec(s).",
- POST_RAM | POST_MANUAL,
- &codec_post_test,
- NULL,
- NULL,
- CONFIG_SYS_POST_CODEC},
-#endif
-#if CONFIG_POST & CONFIG_SYS_POST_FLASH
- {
- "FLASH test",
- "flash",
- "This test checks flash.",
- POST_RAM | POST_ALWAYS | POST_MANUAL,
- &flash_post_test,
- NULL,
- NULL,
- CONFIG_SYS_POST_FLASH},
-#endif
-#if CONFIG_POST & CONFIG_SYS_POST_LED
- {
- "LED test",
- "LED",
- "This test checks LED ",
- POST_RAM | POST_ALWAYS | POST_MANUAL,
- &led_post_test,
- NULL,
- NULL,
- CONFIG_SYS_POST_LED},
-#endif
-#if CONFIG_POST & CONFIG_SYS_POST_BUTTON
- {
- "Button test",
- "button",
- "This test checks Button ",
- POST_RAM | POST_ALWAYS | POST_MANUAL,
- &button_post_test,
- NULL,
- NULL,
- CONFIG_SYS_POST_BUTTON},
-#endif
-
-};
-
-unsigned int post_list_size = sizeof(post_list) / sizeof(struct post_test);
generated by cgit v1.1 at 2024-12-25 20:11:09 +0000