Skip to content

Commit 68c0142

Browse files
EvgeniiDidinEvgeniiDidin
committed
Add more patches for u-boot
Add some update and cleanup patches for u-boot. Signed-off-by: Evgeniy Didin <[email protected]>
1 parent ad52687 commit 68c0142

7 files changed

+304
-0
lines changed

‎board/synopsys/hsdk/uboot-patches/0053-ARC-HSDK-CLK-fix-using-plat-data-instead-of-priv-dat.patch‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 2e8569f95d23e16f9f17e74764def3dbae03edba Mon Sep 17 00:00:00 2001
2+
From: Eugeniy Paltsev <[email protected]>
3+
Date: Mon, 8 Jan 2018 17:42:29 +0300
4+
Subject: [PATCH 53/59] ARC: HSDK: CLK: fix using plat data instead of priv
5+
data
6+
7+
Signed-off-by: Eugeniy Paltsev <[email protected]>
8+
---
9+
drivers/clk/clk-hsdk-cgu.c | 2 +-
10+
1 file changed, 1 insertion(+), 1 deletion(-)
11+
12+
diff --git a/drivers/clk/clk-hsdk-cgu.c b/drivers/clk/clk-hsdk-cgu.c
13+
index 61926656d9..fb2295f257 100644
14+
--- a/drivers/clk/clk-hsdk-cgu.c
15+
+++ b/drivers/clk/clk-hsdk-cgu.c
16+
@@ -720,6 +720,6 @@ U_BOOT_DRIVER(hsdk_cgu_clk) = {
17+
.id = UCLASS_CLK,
18+
.of_match = hsdk_cgu_clk_id,
19+
.probe = hsdk_cgu_clk_probe,
20+
- .platdata_auto_alloc_size = sizeof(struct hsdk_cgu_clk),
21+
+ .priv_auto_alloc_size = sizeof(struct hsdk_cgu_clk),
22+
.ops = &hsdk_cgu_ops,
23+
};
24+
--
25+
2.11.0
26+

‎board/synopsys/hsdk/uboot-patches/0054-ARC-HSDK-CLK-rename-system-clocks.patch‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
From 69c639d947684c2abaff849ddd09663dfbfb2e7d Mon Sep 17 00:00:00 2001
2+
From: Eugeniy Paltsev <[email protected]>
3+
Date: Tue, 9 Jan 2018 20:17:03 +0300
4+
Subject: [PATCH 54/59] ARC: HSDK: CLK: rename system clocks
5+
6+
Signed-off-by: Eugeniy Paltsev <[email protected]>
7+
---
8+
arch/arc/dts/hsdk.dts | 8 ++++----
9+
board/synopsys/hsdk/hsdk-cmd.c | 38 +++++++++++++++++++-------------------
10+
2 files changed, 23 insertions(+), 23 deletions(-)
11+
12+
diff --git a/arch/arc/dts/hsdk.dts b/arch/arc/dts/hsdk.dts
13+
index 3c7f36da94..28c9eb0c97 100644
14+
--- a/arch/arc/dts/hsdk.dts
15+
+++ b/arch/arc/dts/hsdk.dts
16+
@@ -35,10 +35,10 @@
17+
<&cgu_clk 24>, <&cgu_clk 25>;
18+
clock-names = "cpu-pll", "sys-pll", "tun-pll", "ddr-clk",
19+
"cpu-clk", "hdmi-pll", "tun-clk", "hdmi-clk",
20+
- "sys-apb", "sys-axi", "sys-eth", "sys-usb",
21+
- "sys-sdio", "sys-hdmi", "sys-gfx-core", "sys-gfx-dma",
22+
- "sys-gfx-cfg", "sys-dmac-core", "sys-dmac-cfg", "sys-sdio-ref",
23+
- "sys-spi", "sys-i2c", "sys-uart", "sys-ebi",
24+
+ "apb-clk", "axi-clk", "eth-clk", "usb-clk",
25+
+ "sdio-clk", "hdmi-sys-clk", "gfx-core-clk", "gfx-dma-clk",
26+
+ "gfx-cfg-clk", "dmac-core-clk", "dmac-cfg-clk", "sdio-ref-clk",
27+
+ "spi-clk", "i2c-clk", "uart-clk", "ebi-clk",
28+
"rom-clk", "pwm-clk";
29+
};
30+
31+
diff --git a/board/synopsys/hsdk/hsdk-cmd.c b/board/synopsys/hsdk/hsdk-cmd.c
32+
index 8f25033b23..2a619ee126 100644
33+
--- a/board/synopsys/hsdk/hsdk-cmd.c
34+
+++ b/board/synopsys/hsdk/hsdk-cmd.c
35+
@@ -852,7 +852,7 @@ static void setup_clocks(void)
36+
37+
if (env_common.axi_freq.set) {
38+
rate = env_common.axi_freq.val * HZ_IN_MHZ;
39+
- soc_clk_ctl("sys-axi", &rate, CLK_SET | CLK_ON);
40+
+ soc_clk_ctl("axi-clk", &rate, CLK_SET | CLK_ON);
41+
}
42+
}
43+
44+
@@ -1208,7 +1208,7 @@ static int do_hsdk_clock_get(cmd_tbl_t *cmdtp, int flag, int argc, char * const
45+
if (ret)
46+
return CMD_RET_FAILURE;
47+
48+
- ret = soc_clk_ctl("sys-axi", &rate, CLK_GET);
49+
+ ret = soc_clk_ctl("axi-clk", &rate, CLK_GET);
50+
if (ret)
51+
return CMD_RET_FAILURE;
52+
53+
@@ -1226,7 +1226,7 @@ static int do_hsdk_clock_print(cmd_tbl_t *cmdtp, int flag, int argc, char * cons
54+
/* Main clocks */
55+
soc_clk_ctl("cpu-clk", NULL, CLK_PRINT);
56+
soc_clk_ctl("tun-clk", NULL, CLK_PRINT);
57+
- soc_clk_ctl("sys-axi", NULL, CLK_PRINT);
58+
+ soc_clk_ctl("axi-clk", NULL, CLK_PRINT);
59+
soc_clk_ctl("ddr-clk", NULL, CLK_PRINT);
60+
61+
return CMD_RET_SUCCESS;
62+
@@ -1241,22 +1241,22 @@ static int do_hsdk_clock_print_all(cmd_tbl_t *cmdtp, int flag, int argc, char *
63+
64+
/* SYS clock domain */
65+
soc_clk_ctl("sys-pll", NULL, CLK_PRINT);
66+
- soc_clk_ctl("sys-apb", NULL, CLK_PRINT);
67+
- soc_clk_ctl("sys-axi", NULL, CLK_PRINT);
68+
- soc_clk_ctl("sys-eth", NULL, CLK_PRINT);
69+
- soc_clk_ctl("sys-usb", NULL, CLK_PRINT);
70+
- soc_clk_ctl("sys-sdio", NULL, CLK_PRINT);
71+
-/* soc_clk_ctl("sys-hdmi", NULL, CLK_PRINT); */
72+
- soc_clk_ctl("sys-gfx-core", NULL, CLK_PRINT);
73+
- soc_clk_ctl("sys-gfx-dma", NULL, CLK_PRINT);
74+
- soc_clk_ctl("sys-gfx-cfg", NULL, CLK_PRINT);
75+
- soc_clk_ctl("sys-dmac-core", NULL, CLK_PRINT);
76+
- soc_clk_ctl("sys-dmac-cfg", NULL, CLK_PRINT);
77+
- soc_clk_ctl("sys-sdio-ref", NULL, CLK_PRINT);
78+
- soc_clk_ctl("sys-spi", NULL, CLK_PRINT);
79+
- soc_clk_ctl("sys-i2c", NULL, CLK_PRINT);
80+
-/* soc_clk_ctl("sys-ebi", NULL, CLK_PRINT); */
81+
- soc_clk_ctl("sys-uart", NULL, CLK_PRINT);
82+
+ soc_clk_ctl("apb-clk", NULL, CLK_PRINT);
83+
+ soc_clk_ctl("axi-clk", NULL, CLK_PRINT);
84+
+ soc_clk_ctl("eth-clk", NULL, CLK_PRINT);
85+
+ soc_clk_ctl("usb-clk", NULL, CLK_PRINT);
86+
+ soc_clk_ctl("sdio-clk", NULL, CLK_PRINT);
87+
+/* soc_clk_ctl("hdmi-sys-clk", NULL, CLK_PRINT); */
88+
+ soc_clk_ctl("gfx-core-clk", NULL, CLK_PRINT);
89+
+ soc_clk_ctl("gfx-dma-clk", NULL, CLK_PRINT);
90+
+ soc_clk_ctl("gfx-cfg-clk", NULL, CLK_PRINT);
91+
+ soc_clk_ctl("dmac-core-clk", NULL, CLK_PRINT);
92+
+ soc_clk_ctl("dmac-cfg-clk", NULL, CLK_PRINT);
93+
+ soc_clk_ctl("sdio-ref-clk", NULL, CLK_PRINT);
94+
+ soc_clk_ctl("spi-clk", NULL, CLK_PRINT);
95+
+ soc_clk_ctl("i2c-clk", NULL, CLK_PRINT);
96+
+/* soc_clk_ctl("ebi-clk", NULL, CLK_PRINT); */
97+
+ soc_clk_ctl("uart-clk", NULL, CLK_PRINT);
98+
printf("\n");
99+
100+
/* DDR clock domain */
101+
--
102+
2.11.0
103+

‎board/synopsys/hsdk/uboot-patches/0055-ARC-HSDK-hsdk-cmd-fix-error-message.patch‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
From a716e1bb8a63cfb99139389ea9cb07802c3bf37a Mon Sep 17 00:00:00 2001
2+
From: Eugeniy Paltsev <[email protected]>
3+
Date: Tue, 9 Jan 2018 20:18:37 +0300
4+
Subject: [PATCH 55/59] ARC: HSDK: hsdk cmd: fix error message
5+
6+
Signed-off-by: Eugeniy Paltsev <[email protected]>
7+
---
8+
board/synopsys/hsdk/hsdk-cmd.c | 16 ++++++++++++----
9+
1 file changed, 12 insertions(+), 4 deletions(-)
10+
11+
diff --git a/board/synopsys/hsdk/hsdk-cmd.c b/board/synopsys/hsdk/hsdk-cmd.c
12+
index 2a619ee126..94c0c8d146 100644
13+
--- a/board/synopsys/hsdk/hsdk-cmd.c
14+
+++ b/board/synopsys/hsdk/hsdk-cmd.c
15+
@@ -260,8 +260,12 @@ static int env_validate_common(u32 index, const struct hsdk_env_map_common *map)
16+
17+
/* Check environment boundary */
18+
if (set && (value < min || value > max)) {
19+
- pr_err("Variable \'%s\' must be between %#x and %#x\n",
20+
- map[index].env_name, min, max);
21+
+ if (map[index].type == ENV_HEX)
22+
+ pr_err("Variable \'%s\' must be between %#x and %#x\n",
23+
+ map[index].env_name, min, max);
24+
+ else
25+
+ pr_err("Variable \'%s\' must be between %u and %u\n",
26+
+ map[index].env_name, min, max);
27+
28+
return -EINVAL;
29+
}
30+
@@ -294,8 +298,12 @@ static int env_validate_core(u32 index, const struct hsdk_env_map_core *map)
31+
32+
/* Check environment boundary */
33+
if (set && (value < min || value > max)) {
34+
- pr_err("Variable \'%s_%u\' must be between %#x and %#x\n",
35+
- map[index].env_name, i, min, max);
36+
+ if (map[index].type == ENV_HEX)
37+
+ pr_err("Variable \'%s_%u\' must be between %#x and %#x\n",
38+
+ map[index].env_name, i, min, max);
39+
+ else
40+
+ pr_err("Variable \'%s_%u\' must be between %d and %d\n",
41+
+ map[index].env_name, i, min, max);
42+
43+
return -EINVAL;
44+
}
45+
--
46+
2.11.0
47+

‎board/synopsys/hsdk/uboot-patches/0056-ARC-HSDK-hsdk_init-fix-error-mesage.patch‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From 9f63bb0fcb5a727ba46ccff6356d01821fa090ba Mon Sep 17 00:00:00 2001
2+
From: Eugeniy Paltsev <[email protected]>
3+
Date: Tue, 9 Jan 2018 20:20:29 +0300
4+
Subject: [PATCH 56/59] ARC: HSDK: hsdk_init: fix error mesage
5+
6+
Be more verbose about launching hsdk_init second time
7+
8+
Signed-off-by: Eugeniy Paltsev <[email protected]>
9+
---
10+
board/synopsys/hsdk/hsdk-cmd.c | 2 +-
11+
1 file changed, 1 insertion(+), 1 deletion(-)
12+
13+
diff --git a/board/synopsys/hsdk/hsdk-cmd.c b/board/synopsys/hsdk/hsdk-cmd.c
14+
index 94c0c8d146..eaea34f812 100644
15+
--- a/board/synopsys/hsdk/hsdk-cmd.c
16+
+++ b/board/synopsys/hsdk/hsdk-cmd.c
17+
@@ -1070,7 +1070,7 @@ static int do_hsdk_init(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
18+
19+
/* hsdk_init can be run only once */
20+
if (done) {
21+
- printf("HSDK HW is already initialized!\n");
22+
+ printf("HSDK HW is already initialized! Please reset the board if you want to change the configuration.\n");
23+
return CMD_RET_FAILURE;
24+
}
25+
26+
--
27+
2.11.0
28+

‎board/synopsys/hsdk/uboot-patches/0057-ARC-HSDK-hsdk-cmd-remove-unused-variables-to-avoid-w.patch‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
From 7b6a6451a1ee1552a8becb27e47f375708c8004f Mon Sep 17 00:00:00 2001
2+
From: Eugeniy Paltsev <[email protected]>
3+
Date: Tue, 9 Jan 2018 20:22:07 +0300
4+
Subject: [PATCH 57/59] ARC: HSDK: hsdk cmd: remove unused variables to avoid
5+
warnings
6+
7+
Signed-off-by: Eugeniy Paltsev <[email protected]>
8+
---
9+
board/synopsys/hsdk/hsdk-cmd.c | 5 ++---
10+
1 file changed, 2 insertions(+), 3 deletions(-)
11+
12+
diff --git a/board/synopsys/hsdk/hsdk-cmd.c b/board/synopsys/hsdk/hsdk-cmd.c
13+
index eaea34f812..6000d9b624 100644
14+
--- a/board/synopsys/hsdk/hsdk-cmd.c
15+
+++ b/board/synopsys/hsdk/hsdk-cmd.c
16+
@@ -508,9 +508,9 @@ static void init_claster_nvlim(void)
17+
18+
static void init_master_icache(void)
19+
{
20+
+#ifdef CONFIG_SYS_ICACHE_OFF
21+
unsigned int r;
22+
23+
-#ifdef CONFIG_SYS_ICACHE_OFF
24+
/* enable if required, else - nothing to do */
25+
if (env_common.icache.val) {
26+
r = ARC_AUX_IC_CTRL;
27+
@@ -536,9 +536,9 @@ static void init_master_icache(void)
28+
29+
static void init_master_dcache(void)
30+
{
31+
+#ifdef CONFIG_SYS_ICACHE_OFF
32+
unsigned int r;
33+
34+
-#ifdef CONFIG_SYS_ICACHE_OFF
35+
/* enable if required, else - nothing to do */
36+
if (env_common.dcache.val) {
37+
r = ARC_AUX_DC_CTRL;
38+
@@ -887,7 +887,6 @@ static int check_master_cpu_id(void)
39+
40+
static int prepare_cpus(void)
41+
{
42+
- u32 i;
43+
int ret;
44+
45+
ret = check_master_cpu_id();
46+
--
47+
2.11.0
48+

‎board/synopsys/hsdk/uboot-patches/0058-ARC-HSDK-hsdk-cmd-bump-version-to-0.9.patch‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 29f7064bbb2152ee4b48607f7eab24ac5566c0b9 Mon Sep 17 00:00:00 2001
2+
From: Eugeniy Paltsev <[email protected]>
3+
Date: Wed, 10 Jan 2018 20:51:44 +0300
4+
Subject: [PATCH 58/59] ARC: HSDK: hsdk-cmd: bump version to 0.9
5+
6+
Signed-off-by: Eugeniy Paltsev <[email protected]>
7+
---
8+
board/synopsys/hsdk/hsdk-cmd.c | 2 +-
9+
1 file changed, 1 insertion(+), 1 deletion(-)
10+
11+
diff --git a/board/synopsys/hsdk/hsdk-cmd.c b/board/synopsys/hsdk/hsdk-cmd.c
12+
index 6000d9b624..970a43a0c9 100644
13+
--- a/board/synopsys/hsdk/hsdk-cmd.c
14+
+++ b/board/synopsys/hsdk/hsdk-cmd.c
15+
@@ -15,7 +15,7 @@
16+
#error "hsdk_go will not work with BIG endian CPU"
17+
#endif
18+
19+
-#define HSDKGO_VERSION "0.8"
20+
+#define HSDKGO_VERSION "0.9"
21+
22+
#define ceil(x, y) ({ ulong __x = (x), __y = (y); (__x + __y - 1) / __y; })
23+
24+
--
25+
2.11.0
26+

‎board/synopsys/hsdk/uboot-patches/0059-Print-relocation-offset-every-time.patch‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 1d71736f094505e473d7518daf64327b60deacc9 Mon Sep 17 00:00:00 2001
2+
From: Eugeniy Paltsev <[email protected]>
3+
Date: Wed, 10 Jan 2018 20:56:15 +0300
4+
Subject: [PATCH 59/59] Print relocation offset every time
5+
6+
Signed-off-by: Eugeniy Paltsev <[email protected]>
7+
---
8+
common/board_f.c | 2 +-
9+
1 file changed, 1 insertion(+), 1 deletion(-)
10+
11+
diff --git a/common/board_f.c b/common/board_f.c
12+
index 9220815441..f6231549cf 100644
13+
--- a/common/board_f.c
14+
+++ b/common/board_f.c
15+
@@ -643,7 +643,7 @@ static int setup_reloc(void)
16+
#endif
17+
memcpy(gd->new_gd, (char *)gd, sizeof(gd_t));
18+
19+
- debug("Relocation Offset is: %08lx\n", gd->reloc_off);
20+
+ printf("Relocation Offset is: %08lx\n", gd->reloc_off);
21+
debug("Relocating to %08lx, new gd at %08lx, sp at %08lx\n",
22+
gd->relocaddr, (ulong)map_to_sysmem(gd->new_gd),
23+
gd->start_addr_sp);
24+
--
25+
2.11.0
26+

0 commit comments

Comments
 (0)