1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
From 86cc911aaa958fedf2ea9cb04b4af17f5357815d Mon Sep 17 00:00:00 2001
From: Anton Gerasimov <anton.gerasimov@here.com>
Date: Fri, 1 Feb 2019 14:39:48 +0100
Subject: [PATCH] board: raspberrypi: add serial and revision to the device
tree
Raspberry Pi bootloader adds this node to fdt, but if u-boot script
doesn't reuse the tree provided by it, this information is lost.
Revision and serial are displayed in /proc/cpuinfo after boot.
Signed-off-by: Anton Gerasimov <anton.gerasimov@here.com>
---
board/raspberrypi/rpi/rpi.c | 31 +++++++++++++++++++++++++++++--
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 35f5939552..114178397e 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -241,6 +241,8 @@ static uint32_t rev_scheme;
static uint32_t rev_type;
static const struct rpi_model *model;
+uint64_t serial;
+
#ifdef CONFIG_ARM64
static struct mm_region bcm2837_mem_map[] = {
{
@@ -384,8 +386,8 @@ static void set_serial_number(void)
return;
}
- snprintf(serial_string, sizeof(serial_string), "%016llx",
- msg->get_board_serial.body.resp.serial);
+ serial = msg->get_board_serial.body.resp.serial;
+ snprintf(serial_string, sizeof(serial_string), "%016llx", serial);
env_set("serial#", serial_string);
}
@@ -478,6 +480,29 @@ void *board_fdt_blob_setup(void)
return (void *)fw_dtb_pointer;
}
+static int ft_add_revision_info(void *blob) {
+ int off;
+ int ret;
+
+ off = fdt_subnode_offset(blob, 0, "system");
+
+ if (off < 0) {
+ off = fdt_add_subnode(blob, 0, "system");
+ if (off < 0)
+ return -1;
+ }
+
+ ret = fdt_setprop_u64(blob, off, "linux,serial", serial);
+ if (ret < 0)
+ return -1;
+
+ ret = fdt_setprop_u32(blob, off, "linux,revision", revision);
+ if (ret < 0)
+ return -1;
+
+ return 0;
+}
+
int ft_board_setup(void *blob, bd_t *bd)
{
/*
@@ -487,6 +512,8 @@ int ft_board_setup(void *blob, bd_t *bd)
*/
lcd_dt_simplefb_add_node(blob);
+ ft_add_revision_info(blob);
+
#ifdef CONFIG_EFI_LOADER
/* Reserve the spin table */
efi_add_memory_map(0, 1, EFI_RESERVED_MEMORY_TYPE, 0);
--
2.17.1
|
