V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge branch 'post' of git://git.denx.de/u-boot-blackfin 

* 'post' of git://git.denx.de/u-boot-blackfin:
  Blackfin: uart: implement loop callback for post
  Blackfin: bf537-stamp/bf548-ezkit: update POST flash block range
  Blackfin: post: generalize led/button tests with GPIOs
  Blackfin: bf537-stamp: drop uart/flash post tests
  Blackfin: post: drop custom test list
  Blackfin: bf537-stamp: convert to gpio post hotkey
This commit is contained in:
Wolfgang Denk 2011-10-01 21:42:21 +02:00
parent af708cbaae 90a75b050b
commit 97d7ab8a8e
12 changed files with 165 additions and 493 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
arch/blackfin/cpu/serial.c
View File

@ -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

18
arch/blackfin/include/asm/config.h
View File

@ -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

2
arch/blackfin/lib/Makefile
View File

@ -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)

85
arch/blackfin/lib/post.c Normal file
View File

@ -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

250
arch/blackfin/lib/tests.c
View File

@ -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);

2
board/bf537-stamp/Makefile
View File

@ -31,7 +31,7 @@ LIB = $(obj)lib$(BOARD).o
COBJS-y := $(BOARD).o
COBJS-$(CONFIG_BFIN_IDE) += ide-cf.o
COBJS-$(CONFIG_HAS_POST) += post.o post-memory.o
COBJS-$(CONFIG_HAS_POST) += post-memory.o
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS-y))

63
board/bf537-stamp/post-memory.c
View File

@ -13,7 +13,6 @@
#define SCLK_NUM 3
void post_out_buff(char *buff);
int post_key_pressed(void);
void post_init_pll(int mult, int div);
int post_init_sdram(int sclk);
void post_init_uart(int sclk);
@ -52,7 +51,7 @@ int memory_post_test(int flags)
sclk_temp -= CONFIG_SCLK_DIV;
sclk = sclk * 1000000;
post_init_uart(sclk);
if (post_key_pressed() == 0)
if (post_hotkeys_pressed() == 0)
return 0;
for (m = 0; m < CCLK_NUM; m++) {
@ -130,66 +129,6 @@ void post_out_buff(char *buff)
;
}
/* Using sw10-PF5 as the hotkey */
#define KEY_LOOP 0x80000
#define KEY_DELAY 0x80
int post_key_pressed(void)
{
int i, n;
unsigned short value;
bfin_write_PORTF_FER(bfin_read_PORTF_FER() & ~PF5);
bfin_write_PORTFIO_DIR(bfin_read_PORTFIO_DIR() & ~PF5);
bfin_write_PORTFIO_INEN(bfin_read_PORTFIO_INEN() | PF5);
SSYNC();
post_out_buff("########Press SW10 to enter Memory POST########: 3\0");
for (i = 0; i < KEY_LOOP; i++) {
value = bfin_read_PORTFIO() & PF5;
if (bfin_read_UART0_RBR() == 0x0D) {
value = 0;
goto key_pressed;
}
if (value != 0)
goto key_pressed;
for (n = 0; n < KEY_DELAY; n++)
asm("nop");
}
post_out_buff("\b2\0");
for (i = 0; i < KEY_LOOP; i++) {
value = bfin_read_PORTFIO() & PF5;
if (bfin_read_UART0_RBR() == 0x0D) {
value = 0;
goto key_pressed;
}
if (value != 0)
goto key_pressed;
for (n = 0; n < KEY_DELAY; n++)
asm("nop");
}
post_out_buff("\b1\0");
for (i = 0; i < KEY_LOOP; i++) {
value = bfin_read_PORTFIO() & PF5;
if (bfin_read_UART0_RBR() == 0x0D) {
value = 0;
goto key_pressed;
}
if (value != 0)
goto key_pressed;
for (n = 0; n < KEY_DELAY; n++)
asm("nop");
}
key_pressed:
post_out_buff("\b0");
post_out_buff("\n\r\0");
if (value == 0)
return 0;
post_out_buff("Hotkey has been pressed, Enter POST . . . . . .\n\r\0");
return 1;
}
void post_init_pll(int mult, int div)
{

174
board/bf537-stamp/post.c
View File

@ -1,174 +0,0 @@
/*
* BF537-STAMP POST code
*
* Enter bugs at http://blackfin.uclinux.org/
*
* Copyright (c) 2005-2009 Analog Devices Inc.
*
* Licensed under the GPL-2 or later.
*/
#include <common.h>
#include <config.h>
#include <command.h>
#include <asm/blackfin.h>
#include <asm/gpio.h>
/* Using sw10-PF5 as the hotkey */
int post_hotkeys_pressed(void)
{
int delay = 3;
int i;
unsigned short value;
gpio_request(GPIO_PF5, "post");
gpio_direction_input(GPIO_PF5);
printf("########Press SW10 to enter Memory POST########: %2d ", delay);
while (delay--) {
for (i = 0; i < 100; i++) {
value = gpio_get_value(GPIO_PF5);
if (value != 0) {
break;
}
udelay(10000);
}
printf("\b\b\b%2d ", delay);
}
printf("\b\b\b 0");
printf("\n");
if (value == 0)
return 0;
else {
printf("Hotkey has been pressed, Enter POST . . . . . .\n");
return 1;
}
gpio_free(GPIO_PF5);
}
int uart_post_test(int flags)
{
return 0;
}
#define BLOCK_SIZE 0x10000
#define VERIFY_ADDR 0x2000000
extern int erase_block_flash(int);
extern int write_data(long lStart, long lCount, uchar * pnData);
int flash_post_test(int flags)
{
unsigned short *pbuf, *temp;
int offset, n, i;
int value = 0;
int result = 0;
printf("\n");
pbuf = (unsigned short *)VERIFY_ADDR;
temp = pbuf;
for (n = FLASH_START_POST_BLOCK; n < FLASH_END_POST_BLOCK; n++) {
offset = (n - 7) * BLOCK_SIZE;
printf("--------Erase block:%2d..", n);
erase_block_flash(n);
printf("OK\r");
printf("--------Program block:%2d...", n);
write_data(CONFIG_SYS_FLASH_BASE + offset, BLOCK_SIZE, pbuf);
printf("OK\r");
printf("--------Verify block:%2d...", n);
for (i = 0; i < BLOCK_SIZE; i += 2) {
if (*(unsigned short *)(CONFIG_SYS_FLASH_BASE + offset + i) !=
*temp++) {
value = 1;
result = 1;
}
}
if (value)
printf("failed\n");
else
printf("OK %3d%%\r",
(int)(
(n + 1 -
FLASH_START_POST_BLOCK) *
100 / (FLASH_END_POST_BLOCK -
FLASH_START_POST_BLOCK)));
temp = pbuf;
value = 0;
}
printf("\n");
if (result)
return -1;
else
return 0;
}
/****************************************************
* LED1 ---- PF6 LED2 ---- PF7 *
* LED3 ---- PF8 LED4 ---- PF9 *
* LED5 ---- PF10 LED6 ---- PF11 *
****************************************************/
int led_post_test(int flags)
{
unsigned int leds[] = {
GPIO_PF6, GPIO_PF7, GPIO_PF8,
GPIO_PF9, GPIO_PF10, GPIO_PF11,
};
int i;
for (i = 0; i < ARRAY_SIZE(leds); ++i) {
gpio_request(leds[i], "post");
gpio_direction_output(leds[i], 0);
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;
}
/************************************************
* SW10 ---- PF5 SW11 ---- PF4 *
* SW12 ---- PF3 SW13 ---- PF2 *
************************************************/
int button_post_test(int flags)
{
unsigned int buttons[] = {
GPIO_PF2, GPIO_PF3, GPIO_PF4, GPIO_PF5,
};
unsigned int sws[] = { 13, 12, 11, 10, };
int i, delay = 5;
unsigned short value = 0;
int result = 0;
for (i = 0; i < ARRAY_SIZE(buttons); ++i) {
gpio_request(buttons[i], "post");
gpio_direction_input(buttons[i]);
delay = 5;
printf("\n--------Press SW%i: %2d ", sws[i], delay);
while (delay--) {
for (i = 0; i < 100; i++) {
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;
}

11
include/configs/bf537-stamp.h
View File

@ -257,8 +257,15 @@
/* Define if want to do post memory test */
#undef CONFIG_POST
#ifdef CONFIG_POST
#define FLASH_START_POST_BLOCK 11 /* Should > = 11 */
#define FLASH_END_POST_BLOCK 71 /* Should < = 71 */
#define CONFIG_SYS_POST_HOTKEYS_GPIO GPIO_PF5
#define CONFIG_POST_BSPEC1_GPIO_LEDS \
GPIO_PF6, GPIO_PF7, GPIO_PF8, GPIO_PF9, GPIO_PF10, GPIO_PF11,
#define CONFIG_POST_BSPEC2_GPIO_BUTTONS \
GPIO_PF5, GPIO_PF4, GPIO_PF3, GPIO_PF2,
#define CONFIG_POST_BSPEC2_GPIO_NAMES \
10, 11, 12, 13,
#define CONFIG_SYS_POST_FLASH_START 11
#define CONFIG_SYS_POST_FLASH_END 71
#endif
/* These are for board tests */

10
include/configs/bf548-ezkit.h
View File

@ -197,8 +197,14 @@
/* Define if want to do post memory test */
#undef CONFIG_POST
#ifdef CONFIG_POST
#define FLASH_START_POST_BLOCK 11 /* Should > = 11 */
#define FLASH_END_POST_BLOCK 71 /* Should < = 71 */
#define CONFIG_POST_BSPEC1_GPIO_LEDS \
GPIO_PG6, GPIO_PG7, GPIO_PG8, GPIO_PG9, GPIO_PG10, GPIO_PG11,
#define CONFIG_POST_BSPEC2_GPIO_BUTTONS \
GPIO_PB8, GPIO_PB9, GPIO_PB10, GPIO_PB11
#define CONFIG_POST_BSPEC2_GPIO_NAMES \
13, 12, 11, 10,
#define CONFIG_SYS_POST_FLASH_START 10
#define CONFIG_SYS_POST_FLASH_END 127
#endif

1
include/configs/bfin_adi_common.h
View File

@ -55,7 +55,6 @@
# endif
# ifdef CONFIG_POST
# define CONFIG_CMD_DIAG
# define CONFIG_POST_ALT_LIST
# endif
# ifdef CONFIG_RTC_BFIN
# define CONFIG_CMD_DATE

2
post/tests.c
View File

@ -55,6 +55,8 @@ extern int fpga_post_test (int flags);
extern int lwmon5_watchdog_post_test(int flags);
extern int sysmon1_post_test(int flags);
extern int coprocessor_post_test(int flags);
extern int led_post_test(int flags);
extern int button_post_test(int flags);
extern int sysmon_init_f (void);