projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SPDX: Convert all of our single license tags to Linux Kernel style
[platform/kernel/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
ece761f
..
9dff3f1
100644
(file)
--- a/
arch/arm/mach-uniphier/board_late_init.c
+++ b/
arch/arm/mach-uniphier/board_late_init.c
@@
-1,19
+1,20
@@
+// 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 <../drivers/mtd/nand/denali.h>
-#include "
boot-mode/boot-device
.h"
+#include "
init
.h"
static void nand_denali_wp_disable(void)
{
static void nand_denali_wp_disable(void)
{
@@
-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,38
+56,44
@@
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)
{
puts("MODE: ");
}
int board_late_init(void)
{
puts("MODE: ");
- switch (
spl
_boot_device_raw()) {
+ switch (
uniphier
_boot_device_raw()) {
case BOOT_DEVICE_MMC1:
case BOOT_DEVICE_MMC1:
- printf("eMMC Boot
\n
");
-
setenv
("bootmode", "emmcboot");
+ printf("eMMC Boot");
+
env_set
("bootmode", "emmcboot");
break;
case BOOT_DEVICE_NAND:
break;
case BOOT_DEVICE_NAND:
- printf("NAND Boot
\n
");
-
setenv
("bootmode", "nandboot");
+ printf("NAND Boot");
+
env_set
("bootmode", "nandboot");
nand_denali_wp_disable();
break;
case BOOT_DEVICE_NOR:
nand_denali_wp_disable();
break;
case BOOT_DEVICE_NOR:
- printf("NOR Boot
\n
");
-
setenv
("bootmode", "norboot");
+ printf("NOR Boot");
+
env_set
("bootmode", "norboot");
break;
case BOOT_DEVICE_USB:
break;
case BOOT_DEVICE_USB:
- printf("USB Boot
\n
");
-
setenv
("bootmode", "usbboot");
+ printf("USB Boot");
+
env_set
("bootmode", "usbboot");
break;
default:
break;
default:
- printf("Unknown
\n
");
+ printf("Unknown");
break;
}
break;
}
+ if (uniphier_have_internal_stm())
+ printf(" (STM: %s)",
+ uniphier_boot_from_backend() ? "OFF" : "ON");
+
+ printf("\n");
+
if (uniphier_set_fdt_file())
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;
}