From 7208396bbf1df1c7a85d263b7ff054e6b45d8240 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 24 Jul 2020 08:42:06 -0400 Subject: Revert "Merge tag 'dm-pull-20jul20' of git://git.denx.de/u-boot-dm" This reverts commit 5d3a21df6694ebd66d5c34c9d62a26edc7456fc7, reversing changes made to 56d37f1c564107e27d873181d838571b7d7860e7. Unfortunately this is causing CI failures: https://travis-ci.org/github/trini/u-boot/jobs/711313649 Signed-off-by: Tom Rini --- arch/nios2/cpu/cpu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'arch/nios2/cpu/cpu.c') diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c index e7ca9882fc..7f5e731a0f 100644 --- a/arch/nios2/cpu/cpu.c +++ b/arch/nios2/cpu/cpu.c @@ -79,8 +79,7 @@ int arch_cpu_init_dm(void) return 0; } -static int altera_nios2_get_desc(const struct udevice *dev, char *buf, - int size) +static int altera_nios2_get_desc(struct udevice *dev, char *buf, int size) { const char *cpu_name = "Nios-II"; @@ -91,8 +90,7 @@ static int altera_nios2_get_desc(const struct udevice *dev, char *buf, return 0; } -static int altera_nios2_get_info(const struct udevice *dev, - struct cpu_info *info) +static int altera_nios2_get_info(struct udevice *dev, struct cpu_info *info) { info->cpu_freq = gd->cpu_clk; info->features = (1 << CPU_FEAT_L1_CACHE) | @@ -101,7 +99,7 @@ static int altera_nios2_get_info(const struct udevice *dev, return 0; } -static int altera_nios2_get_count(const struct udevice *dev) +static int altera_nios2_get_count(struct udevice *dev) { return 1; } -- cgit v1.2.1