GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge git://git.denx.de/u-boot-mips

Browse source
This commit is contained in:
Tom Rini 2017-11-28 16:54:30 -05:00
commit fcc8250c2f
14 changed files with 59 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.mailmap
View file

@ -20,6 +20,7 @@ Jagan Teki <jaganna@xilinx.com>
Jagan Teki <jagannadh.teki@gmail.com> Jagan Teki <jagannadh.teki@gmail.com>
Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com> Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com>
Markus Klotzbuecher <mk@denx.de> Markus Klotzbuecher <mk@denx.de>
Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
Prabhakar Kushwaha <prabhakar@freescale.com> Prabhakar Kushwaha <prabhakar@freescale.com>
Rajeshwari Shinde <rajeshwari.s@samsung.com> Rajeshwari Shinde <rajeshwari.s@samsung.com>
Ricardo Ribalda <ricardo.ribalda@uam.es> Ricardo Ribalda <ricardo.ribalda@uam.es>

6
arch/mips/cpu/u-boot.lds
View file

@ -5,12 +5,6 @@
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
#if defined(CONFIG_64BIT)
#define PTR_COUNT_SHIFT 3
#else
#define PTR_COUNT_SHIFT 2
#endif
OUTPUT_ARCH(mips) OUTPUT_ARCH(mips)
ENTRY(_start) ENTRY(_start)
SECTIONS SECTIONS

13
arch/mips/include/asm/system.h
View file

@ -14,8 +14,10 @@
#ifndef _ASM_SYSTEM_H #ifndef _ASM_SYSTEM_H
#define _ASM_SYSTEM_H #define _ASM_SYSTEM_H
#include <asm/asm.h>
#include <asm/sgidefs.h> #include <asm/sgidefs.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <linux/stringify.h>
#if 0 #if 0
#include <linux/kernel.h> #include <linux/kernel.h>
#endif #endif
@ -270,4 +272,15 @@ static inline void execution_hazard_barrier(void)
".set reorder"); ".set reorder");
} }
static inline void instruction_hazard_barrier(void)
{
unsigned long tmp;
asm volatile(
__stringify(PTR_LA) "\t%0, 1f\n"
" jr.hb %0\n"
"1: .insn"
: "=&r"(tmp));
}
#endif /* _ASM_SYSTEM_H */ #endif /* _ASM_SYSTEM_H */

30
arch/mips/lib/cache.c
View file

@ -10,7 +10,9 @@
#ifdef CONFIG_MIPS_L2_CACHE #ifdef CONFIG_MIPS_L2_CACHE
#include <asm/cm.h> #include <asm/cm.h>
#endif #endif
#include <asm/io.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
#include <asm/system.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -96,6 +98,9 @@ static inline unsigned long scache_line_size(void)
const unsigned int cache_ops[] = { ops }; \ const unsigned int cache_ops[] = { ops }; \
unsigned int i; \ unsigned int i; \
\ \
if (!lsize) \
break; \
\
for (; addr <= aend; addr += lsize) { \ for (; addr <= aend; addr += lsize) { \
for (i = 0; i < ARRAY_SIZE(cache_ops); i++) \ for (i = 0; i < ARRAY_SIZE(cache_ops); i++) \
mips_cache(cache_ops[i], addr); \ mips_cache(cache_ops[i], addr); \
@ -116,19 +121,24 @@ void flush_cache(ulong start_addr, ulong size)
/* flush I-cache & D-cache simultaneously */ /* flush I-cache & D-cache simultaneously */
cache_loop(start_addr, start_addr + size, ilsize, cache_loop(start_addr, start_addr + size, ilsize,
HIT_WRITEBACK_INV_D, HIT_INVALIDATE_I); HIT_WRITEBACK_INV_D, HIT_INVALIDATE_I);
return; goto ops_done;
} }
/* flush D-cache */ /* flush D-cache */
cache_loop(start_addr, start_addr + size, dlsize, HIT_WRITEBACK_INV_D); cache_loop(start_addr, start_addr + size, dlsize, HIT_WRITEBACK_INV_D);
/* flush L2 cache */ /* flush L2 cache */
if (slsize) cache_loop(start_addr, start_addr + size, slsize, HIT_WRITEBACK_INV_SD);
cache_loop(start_addr, start_addr + size, slsize,
HIT_WRITEBACK_INV_SD);
/* flush I-cache */ /* flush I-cache */
cache_loop(start_addr, start_addr + size, ilsize, HIT_INVALIDATE_I); cache_loop(start_addr, start_addr + size, ilsize, HIT_INVALIDATE_I);
ops_done:
/* ensure cache ops complete before any further memory accesses */
sync();
/* ensure the pipeline doesn't contain now-invalid instructions */
instruction_hazard_barrier();
} }
void flush_dcache_range(ulong start_addr, ulong stop) void flush_dcache_range(ulong start_addr, ulong stop)
@ -143,8 +153,10 @@ void flush_dcache_range(ulong start_addr, ulong stop)
cache_loop(start_addr, stop, lsize, HIT_WRITEBACK_INV_D); cache_loop(start_addr, stop, lsize, HIT_WRITEBACK_INV_D);
/* flush L2 cache */ /* flush L2 cache */
if (slsize) cache_loop(start_addr, stop, slsize, HIT_WRITEBACK_INV_SD);
cache_loop(start_addr, stop, slsize, HIT_WRITEBACK_INV_SD);
/* ensure cache ops complete before any further memory accesses */
sync();
} }
void invalidate_dcache_range(ulong start_addr, ulong stop) void invalidate_dcache_range(ulong start_addr, ulong stop)
@ -157,8 +169,10 @@ void invalidate_dcache_range(ulong start_addr, ulong stop)
return; return;
/* invalidate L2 cache */ /* invalidate L2 cache */
if (slsize) cache_loop(start_addr, stop, slsize, HIT_INVALIDATE_SD);
cache_loop(start_addr, stop, slsize, HIT_INVALIDATE_SD);
cache_loop(start_addr, stop, lsize, HIT_INVALIDATE_D); cache_loop(start_addr, stop, lsize, HIT_INVALIDATE_D);
/* ensure cache ops complete before any further memory accesses */
sync();
} }

2
board/imgtec/boston/MAINTAINERS
View file

@ -1,5 +1,5 @@
BOSTON BOARD BOSTON BOARD
M: Paul Burton <paul.burton@imgtec.com> M: Paul Burton <paul.burton@mips.com>
S: Maintained S: Maintained
F: board/imgtec/boston/ F: board/imgtec/boston/
F: include/configs/boston.h F: include/configs/boston.h

14
board/imgtec/boston/config.mk Normal file
View file

@ -0,0 +1,14 @@
#
# SPDX-License-Identifier: GPL-2.0+
#
quiet_cmd_srec_cat = SRECCAT $@
cmd_srec_cat = srec_cat -output $@ -$2 $< -binary -offset $3
u-boot.mcs: u-boot.bin
$(call cmd,srec_cat,intel,0x7c00000)
# if srec_cat is present build u-boot.mcs by default
has_srec_cat = $(call try-run,srec_cat -VERSion,y,n)
ALL-$(has_srec_cat) += u-boot.mcs
CLEAN_FILES += u-boot.mcs

3
board/imgtec/boston/lowlevel_init.S
View file

@ -34,7 +34,6 @@ LEAF(lowlevel_init)
PTR_LA a0, msg_ddr_ok PTR_LA a0, msg_ddr_ok
bal lowlevel_display bal lowlevel_display
move v0, zero
jr s0 jr s0
END(lowlevel_init) END(lowlevel_init)
@ -52,5 +51,5 @@ LEAF(lowlevel_display)
sw k1, 4(AT) sw k1, 4(AT)
#endif #endif
.set pop .set pop
1: jr ra jr ra
END(lowlevel_display) END(lowlevel_display)

2
board/imgtec/malta/MAINTAINERS
View file

@ -1,5 +1,5 @@
MALTA BOARD MALTA BOARD
M: Paul Burton <paul.burton@imgtec.com> M: Paul Burton <paul.burton@mips.com>
S: Maintained S: Maintained
F: board/imgtec/malta/ F: board/imgtec/malta/
F: include/configs/malta.h F: include/configs/malta.h

2
board/imgtec/malta/superio.c
View file

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2013 Imagination Technologies * Copyright (C) 2013 Imagination Technologies
* Author: Paul Burton <paul.burton@imgtec.com> * Author: Paul Burton <paul.burton@mips.com>
* *
* Setup code for the FDC37M817 super I/O controller * Setup code for the FDC37M817 super I/O controller
* *

2
board/imgtec/malta/superio.h
View file

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2013 Imagination Technologies * Copyright (C) 2013 Imagination Technologies
* Author: Paul Burton <paul.burton@imgtec.com> * Author: Paul Burton <paul.burton@mips.com>
* *
* Setup code for the FDC37M817 super I/O controller * Setup code for the FDC37M817 super I/O controller
* *

2
drivers/pci/pci_msc01.c
View file

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2013 Imagination Technologies * Copyright (C) 2013 Imagination Technologies
* Author: Paul Burton <paul.burton@imgtec.com> * Author: Paul Burton <paul.burton@mips.com>
* *
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */

2
include/configs/boston.h
View file

@ -34,7 +34,7 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x100000) #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x08000000)
#define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE + 0) #define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE + 0)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x10000000) #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x10000000)

2
include/msc01.h
View file

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2013 Imagination Technologies * Copyright (C) 2013 Imagination Technologies
* Author: Paul Burton <paul.burton@imgtec.com> * Author: Paul Burton <paul.burton@mips.com>
* *
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */

2
include/pci_msc01.h
View file

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2013 Imagination Technologies * Copyright (C) 2013 Imagination Technologies
* Author: Paul Burton <paul.burton@imgtec.com> * Author: Paul Burton <paul.burton@mips.com>
* *
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */