[U-Boot-Users] [GIT PULL] MIPS updates
Dear Wolfgang,
please pull MIPS updates. nand_init and spi_init will be added.
---
The following changes since commit 2c8d41969b47eb0b973912830c58689b2ba0e50a: Wolfgang Denk (1): Merge branch 'master' of git://git.denx.de/u-boot-testing
are available in the git repository at:
git://git.denx.de/u-boot-mips.git master
Jason McMullan (2): [MIPS] lib_mips/board.c: Add nand_init mips: If CONFIG_CMD_SPI is defined, call spi_init()
lib_mips/board.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/lib_mips/board.c b/lib_mips/board.c index 1645f2c..532550b 100644 --- a/lib_mips/board.c +++ b/lib_mips/board.c @@ -28,6 +28,8 @@ #include <version.h> #include <net.h> #include <environment.h> +#include <nand.h> +#include <spi.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -416,6 +418,17 @@ void board_init_r (gd_t *id, ulong dest_addr) } #endif
+#ifdef CONFIG_CMD_NAND + puts ("NAND: "); + nand_init (); /* go init the NAND */ +#endif + +#ifdef CONFIG_CMD_SPI + puts ("SPI: "); + spi_init (); /* go init the SPI */ + puts ("ready\n"); +#endif + #if defined(CONFIG_MISC_INIT_R) /* miscellaneous platform dependent initialisations */ misc_init_r ();
Dear Wolfgang,
please pull MIPS updates. This pull request also contains the previous MIPS updates (requested on 2008-05-23) as it's not merged into master.
The following changes since commit 1f1554841a4c8e069d331176f0c3059fb2bb8280: Wolfgang Denk (1): Merge branch 'master' of /home/wd/git/u-boot/custodians
are available in the git repository at:
git://git.denx.de/u-boot-mips.git master
Jason McMullan (3): [MIPS] lib_mips/board.c: Add nand_init mips: If CONFIG_CMD_SPI is defined, call spi_init() mips: Add an 'include/asm/errno.h', like all other architectures
Shinya Kuribayashi (11): [MIPS] <asm/mipsregs.h>: CodinygStyle cleanups [MIPS] <asm/mipsregs.h>: Update register / bit field definitions [MIPS] <asm/mipsregs.h>: Update coprocessor register access macros [MIPS] lib_mips/time.c: Replace CP0 access functions with existing macros [MIPS] lib_mips/time.c: Fix udelay [MIPS] lib_mips/time.c: Fix CP0 count register usage and timer routines [MIPS] Kill unused <version.h> inclusions [MIPS] mips_config.mk: Misc fixes [MIPS] Update <asm/addrspace.h> header [MIPS] Rename Alchemy processor configs into CONFIGO_SOC_* [MIPS] cpu/mips/Makefile: Split [CS]OBJS onto separate lines
board/dbau1x00/dbau1x00.c | 2 +- board/dbau1x00/lowlevel_init.S | 1 - board/gth2/gth2.c | 4 +- board/gth2/lowlevel_init.S | 1 - board/incaip/incaip.c | 2 +- board/incaip/lowlevel_init.S | 1 - board/pb1x00/lowlevel_init.S | 1 - board/pb1x00/pb1x00.c | 2 +- board/purple/lowlevel_init.S | 1 - board/purple/purple.c | 14 +- board/qemu-mips/lowlevel_init.S | 1 - board/qemu-mips/qemu-mips.c | 6 +- board/tb0229/lowlevel_init.S | 1 - board/tb0229/vr4131-pci.c | 56 +- cpu/mips/Makefile | 15 +- cpu/mips/asc_serial.c | 3 - cpu/mips/au1x00_eth.c | 12 +- cpu/mips/au1x00_serial.c | 4 - cpu/mips/au1x00_usb_ohci.c | 2 +- cpu/mips/cache.S | 7 +- cpu/mips/cpu.c | 10 +- cpu/mips/incaip_wdt.S | 1 - cpu/mips/start.S | 1 - drivers/net/inca-ip_sw.c | 28 +- include/asm-mips/addrspace.h | 173 ++++-- include/asm-mips/au1x00.h | 6 +- include/asm-mips/errno.h | 143 ++++ include/asm-mips/io.h | 4 +- include/asm-mips/mipsregs.h | 1405 +++++++++++++++++++++++++++++++-------- include/configs/dbau1x00.h | 14 +- include/configs/gth2.h | 8 +- include/configs/incaip.h | 4 +- include/configs/pb1x00.h | 12 +- include/configs/purple.h | 3 +- include/configs/qemu-mips.h | 4 +- include/configs/tb0229.h | 4 +- lib_mips/board.c | 13 + lib_mips/time.c | 57 +- mips_config.mk | 7 +- 39 files changed, 1541 insertions(+), 492 deletions(-) create mode 100644 include/asm-mips/errno.h
In message 48416920.7080305@ruby.dti.ne.jp you wrote:
Dear Wolfgang,
please pull MIPS updates. This pull request also contains the previous MIPS updates (requested on 2008-05-23) as it's not merged into master.
The following changes since commit 1f1554841a4c8e069d331176f0c3059fb2bb8280: Wolfgang Denk (1): Merge branch 'master' of /home/wd/git/u-boot/custodians
are available in the git repository at:
git://git.denx.de/u-boot-mips.git master
Jason McMullan (3): [MIPS] lib_mips/board.c: Add nand_init mips: If CONFIG_CMD_SPI is defined, call spi_init() mips: Add an 'include/asm/errno.h', like all other architectures
Shinya Kuribayashi (11): [MIPS] <asm/mipsregs.h>: CodinygStyle cleanups [MIPS] <asm/mipsregs.h>: Update register / bit field definitions [MIPS] <asm/mipsregs.h>: Update coprocessor register access macros [MIPS] lib_mips/time.c: Replace CP0 access functions with existing macros [MIPS] lib_mips/time.c: Fix udelay [MIPS] lib_mips/time.c: Fix CP0 count register usage and timer routines [MIPS] Kill unused <version.h> inclusions [MIPS] mips_config.mk: Misc fixes [MIPS] Update <asm/addrspace.h> header [MIPS] Rename Alchemy processor configs into CONFIGO_SOC_* [MIPS] cpu/mips/Makefile: Split [CS]OBJS onto separate lines
board/dbau1x00/dbau1x00.c | 2 +- board/dbau1x00/lowlevel_init.S | 1 - board/gth2/gth2.c | 4 +- board/gth2/lowlevel_init.S | 1 - board/incaip/incaip.c | 2 +- board/incaip/lowlevel_init.S | 1 - board/pb1x00/lowlevel_init.S | 1 - board/pb1x00/pb1x00.c | 2 +- board/purple/lowlevel_init.S | 1 - board/purple/purple.c | 14 +- board/qemu-mips/lowlevel_init.S | 1 - board/qemu-mips/qemu-mips.c | 6 +- board/tb0229/lowlevel_init.S | 1 - board/tb0229/vr4131-pci.c | 56 +- cpu/mips/Makefile | 15 +- cpu/mips/asc_serial.c | 3 - cpu/mips/au1x00_eth.c | 12 +- cpu/mips/au1x00_serial.c | 4 - cpu/mips/au1x00_usb_ohci.c | 2 +- cpu/mips/cache.S | 7 +- cpu/mips/cpu.c | 10 +- cpu/mips/incaip_wdt.S | 1 - cpu/mips/start.S | 1 - drivers/net/inca-ip_sw.c | 28 +- include/asm-mips/addrspace.h | 173 ++++-- include/asm-mips/au1x00.h | 6 +- include/asm-mips/errno.h | 143 ++++ include/asm-mips/io.h | 4 +- include/asm-mips/mipsregs.h | 1405 +++++++++++++++++++++++++++++++-------- include/configs/dbau1x00.h | 14 +- include/configs/gth2.h | 8 +- include/configs/incaip.h | 4 +- include/configs/pb1x00.h | 12 +- include/configs/purple.h | 3 +- include/configs/qemu-mips.h | 4 +- include/configs/tb0229.h | 4 +- lib_mips/board.c | 13 + lib_mips/time.c | 57 +- mips_config.mk | 7 +- 39 files changed, 1541 insertions(+), 492 deletions(-) create mode 100644 include/asm-mips/errno.h
Done, thanks.
Best regards,
Wolfgang Denk
participants (2)
-
Shinya Kuribayashi -
Wolfgang Denk