diff options
| author | Tom Rini <trini@konsulko.com> | 2016-04-11 14:05:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-04-11 20:48:28 -0400 |
| commit | 5fee9489f6e361219790c92dfaa9f27aaf8bf5a9 (patch) | |
| tree | 19e4b194030f78b48cd2fde278465b919670dcbf /arch | |
| parent | 811906aebcb81c14c1a836a5ae97f49f1cc9b7ec (diff) | |
| parent | 53637c911b7a2397b50690cd67b7d59145bcae9c (diff) | |
| download | u-boot-imx-5fee9489f6e361219790c92dfaa9f27aaf8bf5a9.zip u-boot-imx-5fee9489f6e361219790c92dfaa9f27aaf8bf5a9.tar.gz u-boot-imx-5fee9489f6e361219790c92dfaa9f27aaf8bf5a9.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arc
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arc/include/asm/global_data.h | 1 | ||||
| -rw-r--r-- | arch/arc/include/asm/io.h | 5 | ||||
| -rw-r--r-- | arch/arc/lib/cpu.c | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/arch/arc/include/asm/global_data.h b/arch/arc/include/asm/global_data.h index d644e80..e25b966 100644 --- a/arch/arc/include/asm/global_data.h +++ b/arch/arc/include/asm/global_data.h @@ -9,7 +9,6 @@ /* Architecture-specific global data */ struct arch_global_data { - int running_on_hw; }; #include <asm-generic/global_data.h> diff --git a/arch/arc/include/asm/io.h b/arch/arc/include/asm/io.h index 281682c..b6f7724 100644 --- a/arch/arc/include/asm/io.h +++ b/arch/arc/include/asm/io.h @@ -239,4 +239,9 @@ static inline int __raw_writesl(unsigned int addr, void *data, int longlen) #define setbits_8(addr, set) setbits(8, addr, set) #define clrsetbits_8(addr, clear, set) clrsetbits(8, addr, clear, set) +static inline phys_addr_t virt_to_phys(void *vaddr) +{ + return (phys_addr_t)((unsigned long)vaddr); +} + #endif /* __ASM_ARC_IO_H */ diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c index 4e4dd74..d1f10ab 100644 --- a/arch/arc/lib/cpu.c +++ b/arch/arc/lib/cpu.c @@ -14,12 +14,6 @@ int arch_cpu_init(void) { timer_init(); -/* In simulation (ISS) "CHIPID" and "ARCNUM" are all "ff" */ - if ((read_aux_reg(ARC_AUX_IDENTITY) & 0xffffff00) == 0xffffff00) - gd->arch.running_on_hw = 0; - else - gd->arch.running_on_hw = 1; - gd->cpu_clk = CONFIG_SYS_CLK_FREQ; gd->ram_size = CONFIG_SYS_SDRAM_SIZE; |