| Message ID | 20140831084835.0AE04220D@darkstar.wytron.com.tw |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Sun, Aug 31, 2014 at 04:48:35PM +0800, Thomas Chou wrote: > Hi Tom, > > Please pull > > The following changes since commit 6defdc0b5552ab1af4a66a8abac8196cbb6b9e15: > > Merge branch 'master' of git://git.denx.de/u-boot-ti (2014-08-29 13:47:42 -0400) > > are available in the git repository at: > > git://git.denx.de/u-boot-nios.git master > > Thomas Chou (6): > nios2: remove epled driver > nios2: divide nios2-io.h into each specific drivers and remove it > nios2: move nios2.h to arch asm directory > serial: move nios2-yanu.h into opencores_yanu driver > nios2: link to CONFIG_SYS_MONITOR_BASE and remove text_base hook > nios2: rebase nios2-generic board to 3c120 reference design > > arch/nios2/cpu/cpu.c | 3 +- > arch/nios2/cpu/interrupts.c | 22 ++++- > arch/nios2/cpu/sysid.c | 8 +- > arch/nios2/cpu/u-boot.lds | 2 + > {include => arch/nios2/include/asm}/nios2.h | 6 +- > board/altera/common/epled.c | 46 -------- > board/altera/nios2-generic/Makefile | 2 - > board/altera/nios2-generic/custom_fpga.h | 127 ++++++++++++---------- > board/altera/nios2-generic/nios2-generic.c | 3 - > board/altera/nios2-generic/text_base.S | 21 ---- > board/altera/nios2-generic/u-boot.lds | 118 --------------------- > drivers/serial/altera_jtag_uart.c | 20 ++++- > drivers/serial/altera_uart.c | 39 +++++++- > drivers/serial/opencores_yanu.c | 87 +++++++++++++++- > include/configs/nios2-generic.h | 11 ++- > include/nios2-io.h | 153 --------------------------- > include/nios2-yanu.h | 99 ----------------- > 17 files changed, 253 insertions(+), 514 deletions(-) > rename {include => arch/nios2/include/asm}/nios2.h (95%) > delete mode 100644 board/altera/common/epled.c > delete mode 100644 board/altera/nios2-generic/text_base.S > delete mode 100644 board/altera/nios2-generic/u-boot.lds > delete mode 100644 include/nios2-io.h > delete mode 100644 include/nios2-yanu.h Applied to u-boot/master, thanks!
Hi Tom, Please pull The following changes since commit 6defdc0b5552ab1af4a66a8abac8196cbb6b9e15: Merge branch 'master' of git://git.denx.de/u-boot-ti (2014-08-29 13:47:42 -0400) are available in the git repository at: git://git.denx.de/u-boot-nios.git master Thomas Chou (6): nios2: remove epled driver nios2: divide nios2-io.h into each specific drivers and remove it nios2: move nios2.h to arch asm directory serial: move nios2-yanu.h into opencores_yanu driver nios2: link to CONFIG_SYS_MONITOR_BASE and remove text_base hook nios2: rebase nios2-generic board to 3c120 reference design arch/nios2/cpu/cpu.c | 3 +- arch/nios2/cpu/interrupts.c | 22 ++++- arch/nios2/cpu/sysid.c | 8 +- arch/nios2/cpu/u-boot.lds | 2 + {include => arch/nios2/include/asm}/nios2.h | 6 +- board/altera/common/epled.c | 46 -------- board/altera/nios2-generic/Makefile | 2 - board/altera/nios2-generic/custom_fpga.h | 127 ++++++++++++---------- board/altera/nios2-generic/nios2-generic.c | 3 - board/altera/nios2-generic/text_base.S | 21 ---- board/altera/nios2-generic/u-boot.lds | 118 --------------------- drivers/serial/altera_jtag_uart.c | 20 ++++- drivers/serial/altera_uart.c | 39 +++++++- drivers/serial/opencores_yanu.c | 87 +++++++++++++++- include/configs/nios2-generic.h | 11 ++- include/nios2-io.h | 153 --------------------------- include/nios2-yanu.h | 99 ----------------- 17 files changed, 253 insertions(+), 514 deletions(-) rename {include => arch/nios2/include/asm}/nios2.h (95%) delete mode 100644 board/altera/common/epled.c delete mode 100644 board/altera/nios2-generic/text_base.S delete mode 100644 board/altera/nios2-generic/u-boot.lds delete mode 100644 include/nios2-io.h delete mode 100644 include/nios2-yanu.h