projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: kirkwood: Add device-tree for keymile
[oweals/u-boot.git]
/
arch
/
arm
/
mach-uniphier
/
board_late_init.c
diff --git
a/arch/arm/mach-uniphier/board_late_init.c
b/arch/arm/mach-uniphier/board_late_init.c
index 4bfa10b374ad8b2306f052d1ee75fb5f8e4dfe1a..6a995728d4bc3d66d31e4e950a0639ee838d3df0 100644
(file)
--- a/
arch/arm/mach-uniphier/board_late_init.c
+++ b/
arch/arm/mach-uniphier/board_late_init.c
@@
-1,16
+1,17
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2014 Panasonic Corporation
* Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
/*
* Copyright (C) 2014 Panasonic Corporation
* Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <spl.h>
*/
#include <common.h>
#include <spl.h>
-#include <libfdt.h>
+#include <li
nux/li
bfdt.h>
#include <nand.h>
#include <nand.h>
+#include <stdio.h>
#include <linux/io.h>
#include <linux/io.h>
+#include <linux/printk.h>
#include <../drivers/mtd/nand/denali.h>
#include "init.h"
#include <../drivers/mtd/nand/denali.h>
#include "init.h"
@@
-37,7
+38,7
@@
static int uniphier_set_fdt_file(void)
char dtb_name[256];
int buf_len = sizeof(dtb_name);
char dtb_name[256];
int buf_len = sizeof(dtb_name);
- if (
getenv("fdt_
file"))
+ if (
env_get("fdt
file"))
return 0; /* do nothing if it is already set */
compat = fdt_stringlist_get(gd->fdt_blob, 0, "compatible", 0, NULL);
return 0; /* do nothing if it is already set */
compat = fdt_stringlist_get(gd->fdt_blob, 0, "compatible", 0, NULL);
@@
-55,7
+56,7
@@
static int uniphier_set_fdt_file(void)
strncat(dtb_name, ".dtb", buf_len);
strncat(dtb_name, ".dtb", buf_len);
- return
setenv("fdt_
file", dtb_name);
+ return
env_set("fdt
file", dtb_name);
}
int board_late_init(void)
}
int board_late_init(void)
@@
-65,20
+66,20
@@
int board_late_init(void)
switch (uniphier_boot_device_raw()) {
case BOOT_DEVICE_MMC1:
printf("eMMC Boot");
switch (uniphier_boot_device_raw()) {
case BOOT_DEVICE_MMC1:
printf("eMMC Boot");
-
setenv
("bootmode", "emmcboot");
+
env_set
("bootmode", "emmcboot");
break;
case BOOT_DEVICE_NAND:
printf("NAND Boot");
break;
case BOOT_DEVICE_NAND:
printf("NAND Boot");
-
setenv
("bootmode", "nandboot");
+
env_set
("bootmode", "nandboot");
nand_denali_wp_disable();
break;
case BOOT_DEVICE_NOR:
printf("NOR Boot");
nand_denali_wp_disable();
break;
case BOOT_DEVICE_NOR:
printf("NOR Boot");
-
setenv
("bootmode", "norboot");
+
env_set
("bootmode", "norboot");
break;
case BOOT_DEVICE_USB:
printf("USB Boot");
break;
case BOOT_DEVICE_USB:
printf("USB Boot");
-
setenv
("bootmode", "usbboot");
+
env_set
("bootmode", "usbboot");
break;
default:
printf("Unknown");
break;
default:
printf("Unknown");
@@
-92,7
+93,7
@@
int board_late_init(void)
printf("\n");
if (uniphier_set_fdt_file())
printf("\n");
if (uniphier_set_fdt_file())
- pr
intf
("fdt_file environment was not set correctly\n");
+ pr
_warn
("fdt_file environment was not set correctly\n");
return 0;
}
return 0;
}