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 845f047b027da675425f70f1d7bf548b28e2e549..6a995728d4bc3d66d31e4e950a0639ee838d3df0 100644
(file)
--- a/
arch/arm/mach-uniphier/board_late_init.c
+++ b/
arch/arm/mach-uniphier/board_late_init.c
@@
-1,17
+1,20
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
/*
- * Copyright (C) 2014
-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- *
SPDX-License-Identifier: GPL-2.0+
+ * Copyright (C) 2014
Panasonic Corporation
+ *
Copyright (C) 2015-2016 Socionext Inc.
+ *
Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
#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)
{
@@
-28,68
+31,69
@@
static void nand_denali_wp_disable(void)
#endif
}
#endif
}
-#define VENDOR_PREFIX "socionext,"
-#define DTB_FILE_PREFIX "uniphier-"
-
static int uniphier_set_fdt_file(void)
{
DECLARE_GLOBAL_DATA_PTR;
const char *compat;
char dtb_name[256];
static int uniphier_set_fdt_file(void)
{
DECLARE_GLOBAL_DATA_PTR;
const char *compat;
char dtb_name[256];
- int buf_len = 256;
- int ret;
+ int buf_len = sizeof(dtb_name);
- ret = fdt_get_string(gd->fdt_blob, 0, "compatible", &compat);
- if (ret)
- return -EINVAL;
+ if (env_get("fdtfile"))
+ return 0; /* do nothing if it is already set */
- if (strncmp(compat, VENDOR_PREFIX, strlen(VENDOR_PREFIX)))
+ compat = fdt_stringlist_get(gd->fdt_blob, 0, "compatible", 0, NULL);
+ if (!compat)
return -EINVAL;
return -EINVAL;
- compat += strlen(VENDOR_PREFIX);
-
- strncat(dtb_name, DTB_FILE_PREFIX, buf_len);
- buf_len -= strlen(DTB_FILE_PREFIX);
+ /* rip off the vendor prefix "socionext," */
+ compat = strchr(compat, ',');
+ if (!compat)
+ return -EINVAL;
+ compat++;
- strnc
at
(dtb_name, compat, buf_len);
+ strnc
py
(dtb_name, compat, buf_len);
buf_len -= strlen(compat);
strncat(dtb_name, ".dtb", buf_len);
buf_len -= strlen(compat);
strncat(dtb_name, ".dtb", buf_len);
- setenv("fdt_file", dtb_name);
-
- return 0;
+ return env_set("fdtfile", 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;
}