diff options
| author | Tom Rini <trini@konsulko.com> | 2017-11-28 16:54:30 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-11-28 16:54:30 -0500 |
| commit | fcc8250c2f7c982f3593a8eecf737f8e2c95f222 (patch) | |
| tree | 13752b14c2e60b4dce2124fa34b79d2b3aa3c7c8 /board/imgtec | |
| parent | 74a4818415852560b43ee990ce47c68582bef4ca (diff) | |
| parent | caead80a66271d2de809acf410f8648c31ed5805 (diff) | |
Merge git://git.denx.de/u-boot-mips
Diffstat (limited to 'board/imgtec')
| -rw-r--r-- | board/imgtec/boston/MAINTAINERS | 2 | ||||
| -rw-r--r-- | board/imgtec/boston/config.mk | 14 | ||||
| -rw-r--r-- | board/imgtec/boston/lowlevel_init.S | 3 | ||||
| -rw-r--r-- | board/imgtec/malta/MAINTAINERS | 2 | ||||
| -rw-r--r-- | board/imgtec/malta/superio.c | 2 | ||||
| -rw-r--r-- | board/imgtec/malta/superio.h | 2 |
6 files changed, 19 insertions, 6 deletions
diff --git a/board/imgtec/boston/MAINTAINERS b/board/imgtec/boston/MAINTAINERS index ec850d2f91..81f067d690 100644 --- a/board/imgtec/boston/MAINTAINERS +++ b/board/imgtec/boston/MAINTAINERS @@ -1,5 +1,5 @@ BOSTON BOARD -M: Paul Burton <paul.burton@imgtec.com> +M: Paul Burton <paul.burton@mips.com> S: Maintained F: board/imgtec/boston/ F: include/configs/boston.h diff --git a/board/imgtec/boston/config.mk b/board/imgtec/boston/config.mk new file mode 100644 index 0000000000..2775727744 --- /dev/null +++ b/board/imgtec/boston/config.mk @@ -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 diff --git a/board/imgtec/boston/lowlevel_init.S b/board/imgtec/boston/lowlevel_init.S index 0c01aa981d..02a75a8ee7 100644 --- a/board/imgtec/boston/lowlevel_init.S +++ b/board/imgtec/boston/lowlevel_init.S @@ -34,7 +34,6 @@ LEAF(lowlevel_init) PTR_LA a0, msg_ddr_ok bal lowlevel_display - move v0, zero jr s0 END(lowlevel_init) @@ -52,5 +51,5 @@ LEAF(lowlevel_display) sw k1, 4(AT) #endif .set pop -1: jr ra + jr ra END(lowlevel_display) diff --git a/board/imgtec/malta/MAINTAINERS b/board/imgtec/malta/MAINTAINERS index 052ec67b14..b1cf297f4f 100644 --- a/board/imgtec/malta/MAINTAINERS +++ b/board/imgtec/malta/MAINTAINERS @@ -1,5 +1,5 @@ MALTA BOARD -M: Paul Burton <paul.burton@imgtec.com> +M: Paul Burton <paul.burton@mips.com> S: Maintained F: board/imgtec/malta/ F: include/configs/malta.h diff --git a/board/imgtec/malta/superio.c b/board/imgtec/malta/superio.c index 7865ae2b70..d6ada4f87d 100644 --- a/board/imgtec/malta/superio.c +++ b/board/imgtec/malta/superio.c @@ -1,6 +1,6 @@ /* * 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 * diff --git a/board/imgtec/malta/superio.h b/board/imgtec/malta/superio.h index 271c462eac..f0ae1422b8 100644 --- a/board/imgtec/malta/superio.h +++ b/board/imgtec/malta/superio.h @@ -1,6 +1,6 @@ /* * 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 * |