projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
[oweals/u-boot.git]
/
board
/
socrates
/
socrates.c
diff --git
a/board/socrates/socrates.c
b/board/socrates/socrates.c
index 2caefbbe5844a217b4380160b00044c60b609826..da9ae5bebb7e01cad5d5c4cb9f27c11af7408e47 100644
(file)
--- a/
board/socrates/socrates.c
+++ b/
board/socrates/socrates.c
@@
-1,3
+1,4
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2008
* Sergei Poselenov, Emcraft Systems, sposelenov@emcraft.com.
/*
* (C) Copyright 2008
* Sergei Poselenov, Emcraft Systems, sposelenov@emcraft.com.
@@
-7,17
+8,16
@@
* Xianghua Xiao, (X.Xiao@motorola.com)
*
* (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com>
* Xianghua Xiao, (X.Xiao@motorola.com)
*
* (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
+#include <env.h>
#include <pci.h>
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <ioports.h>
#include <flash.h>
#include <pci.h>
#include <asm/processor.h>
#include <asm/immap_85xx.h>
#include <ioports.h>
#include <flash.h>
-#include <libfdt.h>
+#include <li
nux/li
bfdt.h>
#include <fdt_support.h>
#include <asm/io.h>
#include <i2c.h>
#include <fdt_support.h>
#include <asm/io.h>
#include <i2c.h>
@@
-38,7
+38,7
@@
int checkboard (void)
volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
char buf[64];
int f;
volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
char buf[64];
int f;
- int i =
getenv
_f("serial#", buf, sizeof(buf));
+ int i =
env_get
_f("serial#", buf, sizeof(buf));
#ifdef CONFIG_PCI
char *src;
#endif
#ifdef CONFIG_PCI
char *src;
#endif
@@
-217,9
+217,8
@@
int board_early_init_r (void)
}
#endif /* CONFIG_BOARD_EARLY_INIT_R */
}
#endif /* CONFIG_BOARD_EARLY_INIT_R */
-#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
-void
-ft_board_setup(void *blob, bd_t *bd)
+#ifdef CONFIG_OF_BOARD_SETUP
+int ft_board_setup(void *blob, bd_t *bd)
{
u32 val[12];
int rc, i = 0;
{
u32 val[12];
int rc, i = 0;
@@
-251,8
+250,10
@@
ft_board_setup(void *blob, bd_t *bd)
if (rc)
printf("Unable to update localbus ranges, err=%s\n",
fdt_strerror(rc));
if (rc)
printf("Unable to update localbus ranges, err=%s\n",
fdt_strerror(rc));
+
+ return 0;
}
}
-#endif /*
defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
*/
+#endif /*
CONFIG_OF_BOARD_SETUP
*/
#define DEFAULT_BRIGHTNESS 25
#define BACKLIGHT_ENABLE (1 << 31)
#define DEFAULT_BRIGHTNESS 25
#define BACKLIGHT_ENABLE (1 << 31)
@@
-377,7
+378,7
@@
static void board_backlight_brightness(int br)
/* LEDs on */
reg = in_be32((void *)(CONFIG_SYS_FPGA_BASE + 0x0c));
/* LEDs on */
reg = in_be32((void *)(CONFIG_SYS_FPGA_BASE + 0x0c));
- if (!(reg & BACKLIGHT_ENABLE))
;
+ if (!(reg & BACKLIGHT_ENABLE))
out_be32((void *)(CONFIG_SYS_FPGA_BASE + 0x0c),
reg | BACKLIGHT_ENABLE);
} else {
out_be32((void *)(CONFIG_SYS_FPGA_BASE + 0x0c),
reg | BACKLIGHT_ENABLE);
} else {
@@
-408,7
+409,7
@@
void board_backlight_switch (int flag)
printf ("hwmon IC init failed\n");
if (flag) {
printf ("hwmon IC init failed\n");
if (flag) {
- param =
getenv
("brightness");
+ param =
env_get
("brightness");
rc = param ? simple_strtol(param, NULL, 10) : -1;
if (rc < 0)
rc = DEFAULT_BRIGHTNESS;
rc = param ? simple_strtol(param, NULL, 10) : -1;
if (rc < 0)
rc = DEFAULT_BRIGHTNESS;