diff options
| author | Tom Rini <trini@konsulko.com> | 2016-08-20 11:35:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-08-20 16:40:34 -0400 |
| commit | c98b171e1098f94b2ff7720c45a25a602882f876 (patch) | |
| tree | e89e772841c83c5600a5288216b78b05840d903d /board/renesas/alt | |
| parent | f835706c2957a4c77fc0c6fece9f38a6587b4cad (diff) | |
| parent | 798dc6be7feabce33676877f85d307f571a9ec15 (diff) | |
Merge branch 'rmobile' of git://git.denx.de/u-boot-sh
[trini: Drop CMD_BOOTI as it's now on by default on ARM64]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board/renesas/alt')
| -rw-r--r-- | board/renesas/alt/Makefile | 2 | ||||
| -rw-r--r-- | board/renesas/alt/alt.c | 2 | ||||
| -rw-r--r-- | board/renesas/alt/qos.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/board/renesas/alt/Makefile b/board/renesas/alt/Makefile index 6904e39b128..22ab1f43d96 100644 --- a/board/renesas/alt/Makefile +++ b/board/renesas/alt/Makefile @@ -6,4 +6,4 @@ # SPDX-License-Identifier: GPL-2.0 # -obj-y := alt.o qos.o ../rcar-gen2-common/common.o +obj-y := alt.o qos.o ../rcar-common/common.o diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c index 3501a170442..a1a26a6d821 100644 --- a/board/renesas/alt/alt.c +++ b/board/renesas/alt/alt.c @@ -217,7 +217,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_RMOBILE_BOARD_STRING + CONFIG_ARCH_RMOBILE_BOARD_STRING }; void reset_cpu(ulong addr) diff --git a/board/renesas/alt/qos.c b/board/renesas/alt/qos.c index b6324c8fd7c..3323c3aee15 100644 --- a/board/renesas/alt/qos.c +++ b/board/renesas/alt/qos.c @@ -13,7 +13,7 @@ #include <asm/io.h> #include <asm/arch/rmobile.h> -#if defined(CONFIG_RMOBILE_EXTRAM_BOOT) +#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) /* QoS version 0.311 for ES1 and version 0.321 for ES2 */ enum { @@ -993,8 +993,8 @@ void qos_init(void) writel(0x00000001, &axi_qos->qosthres2); writel(0x00000001, &axi_qos->qosqon); } -#else /* CONFIG_RMOBILE_EXTRAM_BOOT */ +#else /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */ void qos_init(void) { } -#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */ +#endif /* CONFIG_ARCH_RMOBILE_EXTRAM_BOOT */ |