[U-Boot] Pull request: u-boot-mips/master

Hi Tom,
The following changes since commit e66443fdb5355e68cfdbbdd37248c4b7eb4968f5:
Makefile: fix HAVE_VENDOR_COMMON_LIB (2012-08-17 18:07:12 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-mips.git master
for you to fetch changes up to b1418d90e7adf236433b1e2bf88ee05e7ad73d9d:
MIPS: add board qemu-mips64 support (2012-09-13 00:50:06 +0200)
---------------------------------------------------------------- Daniel Schwierzeck (3): MIPS: factor out endianess flag handling to arch config.mk MIPS: move CONFIG_STANDALONE_LOAD_ADDR to CPU config makefiles MIPS: add support for qemu for little endian MIPS32 CPUs
Marek Vasut (4): dm: mips: Fix lb60 WDT control dm: mips: Fix lb60 timer code dm: mips: Fix warnings in lb60 board dm: mips: Import libgcc components from Linux
Zhi-zhou Zhang (4): MIPS: don't use camel-case style MIPS: add support for 64 bit addressing MIPS: qemu_mips: move CONFIG_SYS_TEXT_BASE to qemu-mips.h MIPS: add board qemu-mips64 support
arch/mips/config.mk | 20 ++- arch/mips/cpu/mips32/cache.S | 10 +- arch/mips/cpu/mips32/config.mk | 19 +-- arch/mips/cpu/mips32/cpu.c | 8 +- arch/mips/cpu/mips64/Makefile | 45 +++++++ arch/mips/cpu/mips64/cache.S | 229 ++++++++++++++++++++++++++++++++ arch/mips/cpu/mips64/config.mk | 40 ++++++ arch/mips/cpu/mips64/cpu.c | 111 ++++++++++++++++ arch/mips/cpu/mips64/interrupts.c | 34 +++++ arch/mips/cpu/mips64/start.S | 256 ++++++++++++++++++++++++++++++++++++ arch/mips/cpu/mips64/time.c | 87 ++++++++++++ arch/mips/cpu/xburst/config.mk | 5 +- arch/mips/cpu/xburst/cpu.c | 14 +- arch/mips/cpu/xburst/start.S | 4 +- arch/mips/cpu/xburst/timer.c | 12 +- arch/mips/include/asm/addrspace.h | 2 +- arch/mips/include/asm/asm.h | 2 +- arch/mips/include/asm/cacheops.h | 82 ++++++------ arch/mips/include/asm/io.h | 16 +++ arch/mips/include/asm/posix_types.h | 6 + arch/mips/lib/Makefile | 20 +++ arch/mips/lib/ashldi3.c | 25 ++++ arch/mips/lib/ashrdi3.c | 27 ++++ arch/mips/lib/libgcc.h | 25 ++++ arch/mips/lib/lshrdi3.c | 25 ++++ board/qemu-mips/config.mk | 10 -- board/qemu-mips/u-boot.lds | 8 ++ board/qi/qi_lb60/qi_lb60.c | 4 +- boards.cfg | 5 +- examples/standalone/mips64.lds | 59 +++++++++ include/configs/qemu-mips.h | 8 +- include/configs/qemu-mips64.h | 175 ++++++++++++++++++++++++ include/configs/qi_lb60.h | 1 + 33 files changed, 1291 insertions(+), 103 deletions(-) create mode 100644 arch/mips/cpu/mips64/Makefile create mode 100644 arch/mips/cpu/mips64/cache.S create mode 100644 arch/mips/cpu/mips64/config.mk create mode 100644 arch/mips/cpu/mips64/cpu.c create mode 100644 arch/mips/cpu/mips64/interrupts.c create mode 100644 arch/mips/cpu/mips64/start.S create mode 100644 arch/mips/cpu/mips64/time.c create mode 100644 arch/mips/lib/ashldi3.c create mode 100644 arch/mips/lib/ashrdi3.c create mode 100644 arch/mips/lib/libgcc.h create mode 100644 arch/mips/lib/lshrdi3.c delete mode 100644 board/qemu-mips/config.mk create mode 100644 examples/standalone/mips64.lds create mode 100644 include/configs/qemu-mips64.h

On Thu, Sep 13, 2012 at 01:17:03AM +0200, Daniel Schwierzeck wrote:
Hi Tom,
The following changes since commit e66443fdb5355e68cfdbbdd37248c4b7eb4968f5:
Makefile: fix HAVE_VENDOR_COMMON_LIB (2012-08-17 18:07:12 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-mips.git master
for you to fetch changes up to b1418d90e7adf236433b1e2bf88ee05e7ad73d9d:
MIPS: add board qemu-mips64 support (2012-09-13 00:50:06 +0200)
Daniel Schwierzeck (3): MIPS: factor out endianess flag handling to arch config.mk MIPS: move CONFIG_STANDALONE_LOAD_ADDR to CPU config makefiles MIPS: add support for qemu for little endian MIPS32 CPUs
Marek Vasut (4): dm: mips: Fix lb60 WDT control dm: mips: Fix lb60 timer code dm: mips: Fix warnings in lb60 board dm: mips: Import libgcc components from Linux
Zhi-zhou Zhang (4): MIPS: don't use camel-case style MIPS: add support for 64 bit addressing MIPS: qemu_mips: move CONFIG_SYS_TEXT_BASE to qemu-mips.h MIPS: add board qemu-mips64 support
arch/mips/config.mk | 20 ++- arch/mips/cpu/mips32/cache.S | 10 +- arch/mips/cpu/mips32/config.mk | 19 +-- arch/mips/cpu/mips32/cpu.c | 8 +- arch/mips/cpu/mips64/Makefile | 45 +++++++ arch/mips/cpu/mips64/cache.S | 229 ++++++++++++++++++++++++++++++++ arch/mips/cpu/mips64/config.mk | 40 ++++++ arch/mips/cpu/mips64/cpu.c | 111 ++++++++++++++++ arch/mips/cpu/mips64/interrupts.c | 34 +++++ arch/mips/cpu/mips64/start.S | 256 ++++++++++++++++++++++++++++++++++++ arch/mips/cpu/mips64/time.c | 87 ++++++++++++ arch/mips/cpu/xburst/config.mk | 5 +- arch/mips/cpu/xburst/cpu.c | 14 +- arch/mips/cpu/xburst/start.S | 4 +- arch/mips/cpu/xburst/timer.c | 12 +- arch/mips/include/asm/addrspace.h | 2 +- arch/mips/include/asm/asm.h | 2 +- arch/mips/include/asm/cacheops.h | 82 ++++++------ arch/mips/include/asm/io.h | 16 +++ arch/mips/include/asm/posix_types.h | 6 + arch/mips/lib/Makefile | 20 +++ arch/mips/lib/ashldi3.c | 25 ++++ arch/mips/lib/ashrdi3.c | 27 ++++ arch/mips/lib/libgcc.h | 25 ++++ arch/mips/lib/lshrdi3.c | 25 ++++ board/qemu-mips/config.mk | 10 -- board/qemu-mips/u-boot.lds | 8 ++ board/qi/qi_lb60/qi_lb60.c | 4 +- boards.cfg | 5 +- examples/standalone/mips64.lds | 59 +++++++++ include/configs/qemu-mips.h | 8 +- include/configs/qemu-mips64.h | 175 ++++++++++++++++++++++++ include/configs/qi_lb60.h | 1 + 33 files changed, 1291 insertions(+), 103 deletions(-) create mode 100644 arch/mips/cpu/mips64/Makefile create mode 100644 arch/mips/cpu/mips64/cache.S create mode 100644 arch/mips/cpu/mips64/config.mk create mode 100644 arch/mips/cpu/mips64/cpu.c create mode 100644 arch/mips/cpu/mips64/interrupts.c create mode 100644 arch/mips/cpu/mips64/start.S create mode 100644 arch/mips/cpu/mips64/time.c create mode 100644 arch/mips/lib/ashldi3.c create mode 100644 arch/mips/lib/ashrdi3.c create mode 100644 arch/mips/lib/libgcc.h create mode 100644 arch/mips/lib/lshrdi3.c delete mode 100644 board/qemu-mips/config.mk create mode 100644 examples/standalone/mips64.lds create mode 100644 include/configs/qemu-mips64.h
With eldk-5.2.1 I see a number of warnings on qemu_mips64, of the form "oh, this is 64bit and some assumption is wrong now about types". Can you please fix these problems as well? And this is really past the merge window but since it's isolated I'm willing to go with your discretion on pulling it now, once the warnings are dealt with. Thanks!

Hi Tom,
2012/9/13 Tom Rini trini@ti.com:
On Thu, Sep 13, 2012 at 01:17:03AM +0200, Daniel Schwierzeck wrote:
[...]
With eldk-5.2.1 I see a number of warnings on qemu_mips64, of the form "oh, this is 64bit and some assumption is wrong now about types". Can you please fix these problems as well?
yes, but all warnings are not MIPS specific. Most likely there are many more locations in common U-Boot code which make false assumptions and need to be fixed for 64 bit.
And this is really past the merge window but since it's isolated I'm willing to go with your discretion on pulling it now, once the warnings are dealt with. Thanks!
the qemu_mips64 patches were submitted at the end of the merge window, but the review took me four weeks. I can reschedule the qemu_mips64 support to the next merge window if you are more comfortable with that. But the remaining patches are bugfixes and cleanups and should be merged for the upcoming release.
Shall I send a new pull request without qemu_mips64?

On 09/13/2012 06:38 AM, Daniel Schwierzeck wrote:
Hi Tom,
2012/9/13 Tom Rini trini@ti.com:
On Thu, Sep 13, 2012 at 01:17:03AM +0200, Daniel Schwierzeck wrote:
[...]
With eldk-5.2.1 I see a number of warnings on qemu_mips64, of the form "oh, this is 64bit and some assumption is wrong now about types". Can you please fix these problems as well?
yes, but all warnings are not MIPS specific. Most likely there are many more locations in common U-Boot code which make false assumptions and need to be fixed for 64 bit.
Exactly. Since you guys are the first to hit it, can you please try and fix them?
And this is really past the merge window but since it's isolated I'm willing to go with your discretion on pulling it now, once the warnings are dealt with. Thanks!
the qemu_mips64 patches were submitted at the end of the merge window, but the review took me four weeks. I can reschedule the qemu_mips64 support to the next merge window if you are more comfortable with that. But the remaining patches are bugfixes and cleanups and should be merged for the upcoming release.
Shall I send a new pull request without qemu_mips64?
OK, I didn't recall seeing them in time. I'm OK with pulling it in so long as someone is going to address all of the warnings this shows.

2012/9/13 Tom Rini trini@ti.com:
On 09/13/2012 06:38 AM, Daniel Schwierzeck wrote:
Hi Tom,
2012/9/13 Tom Rini trini@ti.com:
On Thu, Sep 13, 2012 at 01:17:03AM +0200, Daniel Schwierzeck wrote:
[...]
With eldk-5.2.1 I see a number of warnings on qemu_mips64, of the form "oh, this is 64bit and some assumption is wrong now about types". Can you please fix these problems as well?
yes, but all warnings are not MIPS specific. Most likely there are many more locations in common U-Boot code which make false assumptions and need to be fixed for 64 bit.
Exactly. Since you guys are the first to hit it, can you please try and fix them?
yes I'll look into it
And this is really past the merge window but since it's isolated I'm willing to go with your discretion on pulling it now, once the warnings are dealt with. Thanks!
the qemu_mips64 patches were submitted at the end of the merge window, but the review took me four weeks. I can reschedule the qemu_mips64 support to the next merge window if you are more comfortable with that. But the remaining patches are bugfixes and cleanups and should be merged for the upcoming release.
Shall I send a new pull request without qemu_mips64?
OK, I didn't recall seeing them in time. I'm OK with pulling it in so long as someone is going to address all of the warnings this shows.
I have to think about a correct and clean solution for the printf format specifiers. So I'll shift the qemu_mips64 support to the next merge window. I've sent you another pull request.
Thanks, Daniel

Hi Tom,
this one is without qemu_mips64 support and without any warnings.
The following changes since commit e66443fdb5355e68cfdbbdd37248c4b7eb4968f5:
Makefile: fix HAVE_VENDOR_COMMON_LIB (2012-08-17 18:07:12 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-mips.git master
for you to fetch changes up to 748fd4a621a870d378e4e4f54df76a38fd5d3cba:
MIPS: add support for qemu for little endian MIPS32 CPUs (2012-08-24 00:34:47 +0200)
---------------------------------------------------------------- Daniel Schwierzeck (3): MIPS: factor out endianess flag handling to arch config.mk MIPS: move CONFIG_STANDALONE_LOAD_ADDR to CPU config makefiles MIPS: add support for qemu for little endian MIPS32 CPUs
Marek Vasut (4): dm: mips: Fix lb60 WDT control dm: mips: Fix lb60 timer code dm: mips: Fix warnings in lb60 board dm: mips: Import libgcc components from Linux
arch/mips/config.mk | 20 +++++++++++++++++--- arch/mips/cpu/mips32/config.mk | 19 ++----------------- arch/mips/cpu/xburst/config.mk | 5 +++-- arch/mips/cpu/xburst/cpu.c | 2 +- arch/mips/cpu/xburst/timer.c | 12 ++++++------ arch/mips/lib/Makefile | 20 ++++++++++++++++++++ arch/mips/lib/ashldi3.c | 25 +++++++++++++++++++++++++ arch/mips/lib/ashrdi3.c | 27 +++++++++++++++++++++++++++ arch/mips/lib/libgcc.h | 25 +++++++++++++++++++++++++ arch/mips/lib/lshrdi3.c | 25 +++++++++++++++++++++++++ board/qi/qi_lb60/qi_lb60.c | 4 ++-- boards.cfg | 3 ++- include/configs/qemu-mips.h | 7 ++++++- include/configs/qi_lb60.h | 1 + 14 files changed, 162 insertions(+), 33 deletions(-) create mode 100644 arch/mips/lib/ashldi3.c create mode 100644 arch/mips/lib/ashrdi3.c create mode 100644 arch/mips/lib/libgcc.h create mode 100644 arch/mips/lib/lshrdi3.c

On Fri, Sep 14, 2012 at 04:04:36AM +0200, Daniel Schwierzeck wrote:
Hi Tom,
this one is without qemu_mips64 support and without any warnings.
The following changes since commit e66443fdb5355e68cfdbbdd37248c4b7eb4968f5:
Makefile: fix HAVE_VENDOR_COMMON_LIB (2012-08-17 18:07:12 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-mips.git master
for you to fetch changes up to 748fd4a621a870d378e4e4f54df76a38fd5d3cba:
MIPS: add support for qemu for little endian MIPS32 CPUs (2012-08-24 00:34:47 +0200)
Daniel Schwierzeck (3): MIPS: factor out endianess flag handling to arch config.mk MIPS: move CONFIG_STANDALONE_LOAD_ADDR to CPU config makefiles MIPS: add support for qemu for little endian MIPS32 CPUs
Marek Vasut (4): dm: mips: Fix lb60 WDT control dm: mips: Fix lb60 timer code dm: mips: Fix warnings in lb60 board dm: mips: Import libgcc components from Linux
arch/mips/config.mk | 20 +++++++++++++++++--- arch/mips/cpu/mips32/config.mk | 19 ++----------------- arch/mips/cpu/xburst/config.mk | 5 +++-- arch/mips/cpu/xburst/cpu.c | 2 +- arch/mips/cpu/xburst/timer.c | 12 ++++++------ arch/mips/lib/Makefile | 20 ++++++++++++++++++++ arch/mips/lib/ashldi3.c | 25 +++++++++++++++++++++++++ arch/mips/lib/ashrdi3.c | 27 +++++++++++++++++++++++++++ arch/mips/lib/libgcc.h | 25 +++++++++++++++++++++++++ arch/mips/lib/lshrdi3.c | 25 +++++++++++++++++++++++++ board/qi/qi_lb60/qi_lb60.c | 4 ++-- boards.cfg | 3 ++- include/configs/qemu-mips.h | 7 ++++++- include/configs/qi_lb60.h | 1 + 14 files changed, 162 insertions(+), 33 deletions(-) create mode 100644 arch/mips/lib/ashldi3.c create mode 100644 arch/mips/lib/ashrdi3.c create mode 100644 arch/mips/lib/libgcc.h create mode 100644 arch/mips/lib/lshrdi3.c
Applied to u-boot/master, thanks!
participants (2)
-
Daniel Schwierzeck
-
Tom Rini