projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rockchip: rk3328: add rock-pi-e dts file
[oweals/u-boot.git]
/
post
/
post.c
diff --git
a/post/post.c
b/post/post.c
index 4af5355fa5a20f9c2e763f37b269bea38d43e8ea..6687e0b75cac897decf160dc41309dd773dc45a6 100644
(file)
--- a/
post/post.c
+++ b/
post/post.c
@@
-1,12
+1,16
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2002
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
/*
* (C) Copyright 2002
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
+#include <bootstage.h>
+#include <env.h>
+#include <log.h>
+#include <malloc.h>
#include <stdio_dev.h>
#include <stdio_dev.h>
+#include <time.h>
#include <watchdog.h>
#include <div64.h>
#include <post.h>
#include <watchdog.h>
#include <div64.h>
#include <post.h>
@@
-15,10
+19,6
@@
#include <asm/gpio.h>
#endif
#include <asm/gpio.h>
#endif
-#ifdef CONFIG_LOGBUFFER
-#include <logbuff.h>
-#endif
-
DECLARE_GLOBAL_DATA_PTR;
#define POST_MAX_NUMBER 32
DECLARE_GLOBAL_DATA_PTR;
#define POST_MAX_NUMBER 32
@@
-52,7
+52,7
@@
int post_init_f(void)
* Boards with hotkey support can override this weak default function
* by defining one in their board specific code.
*/
* Boards with hotkey support can override this weak default function
* by defining one in their board specific code.
*/
-
int __
post_hotkeys_pressed(void)
+
__weak int
post_hotkeys_pressed(void)
{
#ifdef CONFIG_SYS_POST_HOTKEYS_GPIO
int ret;
{
#ifdef CONFIG_SYS_POST_HOTKEYS_GPIO
int ret;
@@
-73,9
+73,6
@@
int __post_hotkeys_pressed(void)
return 0; /* No hotkeys supported */
}
return 0; /* No hotkeys supported */
}
-int post_hotkeys_pressed(void)
- __attribute__((weak, alias("__post_hotkeys_pressed")));
-
void post_bootmode_init(void)
{
void post_bootmode_init(void)
{
@@
-183,7
+180,7
@@
static void post_get_env_flags(int *test_flags)
int i, j;
for (i = 0; i < varnum; i++) {
int i, j;
for (i = 0; i < varnum; i++) {
- if (
getenv
_f(var[i], list, sizeof(list)) <= 0)
+ if (
env_get
_f(var[i], list, sizeof(list)) <= 0)
continue;
for (j = 0; j < post_list_size; j++)
continue;
for (j = 0; j < post_list_size; j++)
@@
-236,11
+233,9
@@
static void post_get_flags(int *test_flags)
test_flags[j] |= POST_SLOWTEST;
}
test_flags[j] |= POST_SLOWTEST;
}
-
void __
show_post_progress(unsigned int test_num, int before, int result)
+
__weak void
show_post_progress(unsigned int test_num, int before, int result)
{
}
{
}
-void show_post_progress(unsigned int, int, int)
- __attribute__((weak, alias("__show_post_progress")));
static int post_run_single(struct post_test *test,
int test_flags, int flags, unsigned int i)
static int post_run_single(struct post_test *test,
int test_flags, int flags, unsigned int i)
@@
-412,13
+407,8
@@
int post_log(char *format, ...)
vsprintf(printbuffer, format, args);
va_end(args);
vsprintf(printbuffer, format, args);
va_end(args);
-#ifdef CONFIG_LOGBUFFER
- /* Send to the logbuffer */
- logbuff_log(printbuffer);
-#else
/* Send to the stdout file */
puts(printbuffer);
/* Send to the stdout file */
puts(printbuffer);
-#endif
return 0;
}
return 0;
}
@@
-479,7
+469,7
@@
void post_reloc(void)
*/
unsigned long post_time_ms(unsigned long base)
{
*/
unsigned long post_time_ms(unsigned long base)
{
-#if defined(CONFIG_PPC) || defined(CONFIG_
BLACKFIN) || defined(CONFIG_
ARM)
+#if defined(CONFIG_PPC) || defined(CONFIG_ARM)
return (unsigned long)lldiv(get_ticks(), get_tbclk() / CONFIG_SYS_HZ)
- base;
#else
return (unsigned long)lldiv(get_ticks(), get_tbclk() / CONFIG_SYS_HZ)
- base;
#else