[U-Boot] [GIT PULL] u-boot-mips/master
The following changes since commit b149c4c399b111cec1ff7505ca9fabbeeb4fe394:
ARM:tegra20: Remove aes debug prints (2014-04-18 16:14:17 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-mips.git master
for you to fetch changes up to ed638b6af2e9089bc998500db7e9c655c02c2493:
MAKEALL: remove hard-coded MIPS boards (2014-04-20 13:16:43 +0200)
---------------------------------------------------------------- Daniel Schwierzeck (3): MIPS: always keep all sections in u-boot ELF binary. MIPS: drop incaip board MAKEALL: remove hard-coded MIPS boards
Masahiro Yamada (2): mips: xburst: remove remainders of dead board cosmetic: README: add some entries to Directory Hierarchy
Paul Burton (7): MIPS: stub interrupt_init function MIPS: move mips_io_port_base out of board.c MIPS: define __init_end in u-boot.lds board_f: call init_func_ram on MIPS board_f: call timer_init on MIPS MIPS: allow use of generic board MIPS: Malta: convert to generic board
MAKEALL | 44 +-- README | 6 +- arch/mips/config.mk | 5 +- arch/mips/cpu/mips32/incaip/Makefile | 9 - arch/mips/cpu/mips32/incaip/asc_serial.c | 300 ---------------- arch/mips/cpu/mips32/incaip/asc_serial.h | 177 ---------- arch/mips/cpu/mips32/incaip/config.mk | 8 - arch/mips/cpu/mips32/incaip/incaip_clock.c | 100 ------ arch/mips/cpu/mips32/incaip/incaip_wdt.S | 55 --- arch/mips/cpu/mips32/interrupts.c | 5 + arch/mips/cpu/mips64/interrupts.c | 5 + arch/mips/cpu/u-boot.lds | 57 ++-- arch/mips/cpu/xburst/Makefile | 9 - arch/mips/cpu/xburst/config.mk | 16 - arch/mips/cpu/xburst/cpu.c | 136 -------- arch/mips/cpu/xburst/jz4740.c | 235 ------------- arch/mips/cpu/xburst/jz_serial.c | 118 ------- arch/mips/cpu/xburst/start.S | 179 ---------- arch/mips/cpu/xburst/timer.c | 149 -------- arch/mips/include/asm/inca-ip.h | 2430 ---------------------------------------------------------------------------------------------------------------------------------- arch/mips/include/asm/u-boot-mips.h | 2 - arch/mips/include/asm/u-boot.h | 9 + arch/mips/lib/Makefile | 4 + arch/mips/lib/board.c | 9 - arch/mips/lib/io.c | 12 + board/incaip/Makefile | 9 - board/incaip/README | 57 ---- board/incaip/config.mk | 16 - board/incaip/flash.c | 655 ----------------------------------- board/incaip/incaip.c | 110 ------ board/incaip/lowlevel_init.S | 287 ---------------- boards.cfg | 4 - common/board_f.c | 6 +- doc/README.scrapyard | 1 + drivers/net/Makefile | 1 - drivers/net/inca-ip_sw.c | 793 ------------------------------------------- include/common.h | 3 - include/configs/incaip.h | 177 ---------- include/configs/malta.h | 3 + include/netdev.h | 1 - 40 files changed, 83 insertions(+), 6119 deletions(-) delete mode 100644 arch/mips/cpu/mips32/incaip/Makefile delete mode 100644 arch/mips/cpu/mips32/incaip/asc_serial.c delete mode 100644 arch/mips/cpu/mips32/incaip/asc_serial.h delete mode 100644 arch/mips/cpu/mips32/incaip/config.mk delete mode 100644 arch/mips/cpu/mips32/incaip/incaip_clock.c delete mode 100644 arch/mips/cpu/mips32/incaip/incaip_wdt.S delete mode 100644 arch/mips/cpu/xburst/Makefile delete mode 100644 arch/mips/cpu/xburst/config.mk delete mode 100644 arch/mips/cpu/xburst/cpu.c delete mode 100644 arch/mips/cpu/xburst/jz4740.c delete mode 100644 arch/mips/cpu/xburst/jz_serial.c delete mode 100644 arch/mips/cpu/xburst/start.S delete mode 100644 arch/mips/cpu/xburst/timer.c delete mode 100644 arch/mips/include/asm/inca-ip.h create mode 100644 arch/mips/lib/io.c delete mode 100644 board/incaip/Makefile delete mode 100644 board/incaip/README delete mode 100644 board/incaip/config.mk delete mode 100644 board/incaip/flash.c delete mode 100644 board/incaip/incaip.c delete mode 100644 board/incaip/lowlevel_init.S delete mode 100644 drivers/net/inca-ip_sw.c delete mode 100644 include/configs/incaip.h
Hi Tom,
On Sun, 20 Apr 2014 13:28:53 +0200 Daniel Schwierzeck daniel.schwierzeck@gmail.com wrote:
The following changes since commit b149c4c399b111cec1ff7505ca9fabbeeb4fe394:
ARM:tegra20: Remove aes debug prints (2014-04-18 16:14:17 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-mips.git master
for you to fetch changes up to ed638b6af2e9089bc998500db7e9c655c02c2493:
MAKEALL: remove hard-coded MIPS boards (2014-04-20 13:16:43 +0200)
Daniel Schwierzeck (3): MIPS: always keep all sections in u-boot ELF binary. MIPS: drop incaip board
Active mips mips64 - - qemu-mips qemu_mips64el qemu-mips64:SYS_LITTLE_ENDIAN - Active nds32 n1213 ag101 AndesTech adp-ag101 adp-ag101 - Andes uboot@andestech.com diff --git a/doc/README.scrapyard b/doc/README.scrapyard index 7d67033..32c85ad 100644 --- a/doc/README.scrapyard +++ b/doc/README.scrapyard @@ -114,3 +114,4 @@ PCIPPC2 powerpc MPC740/MPC750 7c9e89b 2013-02-07 Wolfgang Den PCIPPC6 powerpc MPC740/MPC750 - - Wolfgang Denk wd@denx.de omap2420h4 arm omap24xx - 2013-06-04 Richard Woodruff r-woodruff2@ti.com eNET x86 x86 7e8c53d 2013-02-14 Graeme Russ graeme.russ@gmail.com +incaip mips mips32 - 2014-04-17 Wolfgang Denk wd@denx.de
Commit bef67f1f32 sorted the list in reverse chronological order but the patch "MIPS: drop incaip board" broke the rule so soon. :-(
Tom, a conflict will happen anyway when pulling u-boot-mips/master. When you fix the merge conflict, could you move "incaip" to the top of the list of README.scrapyard?
Best Regard Masahiro Yamada
2014-04-21 10:37 GMT+02:00 Masahiro Yamada yamada.m@jp.panasonic.com:
diff --git a/doc/README.scrapyard b/doc/README.scrapyard index 7d67033..32c85ad 100644 --- a/doc/README.scrapyard +++ b/doc/README.scrapyard @@ -114,3 +114,4 @@ PCIPPC2 powerpc MPC740/MPC750 7c9e89b 2013-02-07 Wolfgang Den PCIPPC6 powerpc MPC740/MPC750 - - Wolfgang Denk wd@denx.de omap2420h4 arm omap24xx - 2013-06-04 Richard Woodruff r-woodruff2@ti.com eNET x86 x86 7e8c53d 2013-02-14 Graeme Russ graeme.russ@gmail.com +incaip mips mips32 - 2014-04-17 Wolfgang Denk wd@denx.de
Commit bef67f1f32 sorted the list in reverse chronological order but the patch "MIPS: drop incaip board" broke the rule so soon. :-(
I saw that the list has been sorted but I didn't know in which order. If there is a new rule it should be documented in README.scrapyard.
Tom, a conflict will happen anyway when pulling u-boot-mips/master.
why? The branch is rebased to current master so it would be a fast-forward merge.
When you fix the merge conflict, could you move "incaip" to the top of the list of README.scrapyard?
I can send a follow-up patch which fixes that and also add the commit id of the removal commit.
Hi Daniel,
Tom, a conflict will happen anyway when pulling u-boot-mips/master.
why? The branch is rebased to current master so it would be a fast-forward merge.
Sorry, my misunderstanding.
I was seeing your patch file: http://lists.denx.de/pipermail/u-boot/2014-April/177675.html
You had already rebased it.
Best Regards Masahiro Yamada
On Sun, Apr 20, 2014 at 01:28:53PM +0200, Daniel Schwierzeck wrote:
The following changes since commit b149c4c399b111cec1ff7505ca9fabbeeb4fe394:
ARM:tegra20: Remove aes debug prints (2014-04-18 16:14:17 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-mips.git master
for you to fetch changes up to ed638b6af2e9089bc998500db7e9c655c02c2493:
MAKEALL: remove hard-coded MIPS boards (2014-04-20 13:16:43 +0200)
Daniel Schwierzeck (3): MIPS: always keep all sections in u-boot ELF binary. MIPS: drop incaip board MAKEALL: remove hard-coded MIPS boards
Masahiro Yamada (2): mips: xburst: remove remainders of dead board cosmetic: README: add some entries to Directory Hierarchy
Paul Burton (7): MIPS: stub interrupt_init function MIPS: move mips_io_port_base out of board.c MIPS: define __init_end in u-boot.lds board_f: call init_func_ram on MIPS board_f: call timer_init on MIPS MIPS: allow use of generic board MIPS: Malta: convert to generic board
Applied to u-boot/master, thanks!
participants (3)
-
Daniel Schwierzeck -
Masahiro Yamada -
Tom Rini