[U-Boot] [GIT PULL] u-boot-mips/master
Hi Tom,
The following changes since commit 15c5cdf5aa6b292145e5e3e220ec1f42b11eff6f:
Merge branch 'master' of git://www.denx.de/git/u-boot-usb (2013-11-08 15:25:29 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-mips.git master
for you to fetch changes up to ab41305d3b7c1afa29c0b7fafce854c24445423a:
malta: define CONFIG_MEMSIZE_IN_BYTES (2013-11-09 17:21:02 +0100)
---------------------------------------------------------------- Gabor Juhos (1): malta: define CONFIG_MEMSIZE_IN_BYTES
Paul Burton (18): mips32: detect L1 cache sizes if they're not defined pcnet: code style cleanup pcnet: s/le16_to_cpu/cpu_to_le16/ in pcnet_send pcnet: add cache flushing & invalidation pcnet: enable the NOUFLO feature pci.h: allow inclusion in assembly source qemu-malta: rename to just "malta" malta: setup super I/O UARTs malta: support for coreFPGA6 boards malta: display "U-boot" on the LCD screen malta: enable CONFIG_PCNET_79C973, PCNET_HAS_PROM, CONFIG_CMD_DHCP malta: remove cache size definitions malta: disable L2 caches malta: enable RTC support malta: store environment in flash malta: setup PIIX4 interrupt route malta: add script & instructions to flash U-boot malta: add myself to maintainers
arch/mips/cpu/mips32/cache.S | 90 +++++++++++++++++++++++++++++++++++++------- arch/mips/cpu/mips32/cpu.c | 73 +++++++++++++++++++++++++++++++++--- arch/mips/cpu/mips32/start.S | 2 +- arch/mips/include/asm/malta.h | 50 ++++++++++++++++++++++--- arch/mips/include/asm/mipsregs.h | 6 +++ arch/mips/lib/bootm.c | 12 +++--- board/{qemu-malta => imgtec/malta}/Makefile | 3 +- board/imgtec/malta/flash-malta-boot.tcl | 40 ++++++++++++++++++++ board/imgtec/malta/lowlevel_init.S | 238 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/imgtec/malta/malta.c | 208 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/imgtec/malta/superio.c | 63 +++++++++++++++++++++++++++++++ board/imgtec/malta/superio.h | 15 ++++++++ board/qemu-malta/lowlevel_init.S | 69 ---------------------------------- board/qemu-malta/qemu-malta.c | 47 ----------------------- boards.cfg | 4 +- doc/README.malta | 16 ++++++++ drivers/net/pcnet.c | 279 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------- drivers/pci/Makefile | 1 + drivers/pci/pci_msc01.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/rtc/mc146818.c | 2 +- include/configs/{qemu-malta.h => malta.h} | 45 +++++++++++++--------- include/msc01.h | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/pci.h | 6 ++- include/pci_ids.h | 3 ++ include/pci_msc01.h | 17 +++++++++ 25 files changed, 1254 insertions(+), 295 deletions(-) rename board/{qemu-malta => imgtec/malta}/Makefile (81%) create mode 100644 board/imgtec/malta/flash-malta-boot.tcl create mode 100644 board/imgtec/malta/lowlevel_init.S create mode 100644 board/imgtec/malta/malta.c create mode 100644 board/imgtec/malta/superio.c create mode 100644 board/imgtec/malta/superio.h delete mode 100644 board/qemu-malta/lowlevel_init.S delete mode 100644 board/qemu-malta/qemu-malta.c create mode 100644 doc/README.malta create mode 100644 drivers/pci/pci_msc01.c rename include/configs/{qemu-malta.h => malta.h} (72%) create mode 100644 include/msc01.h create mode 100644 include/pci_msc01.h
On Sat, Nov 09, 2013 at 09:53:23PM +0100, Daniel Schwierzeck wrote:
Hi Tom,
The following changes since commit 15c5cdf5aa6b292145e5e3e220ec1f42b11eff6f:
Merge branch 'master' of git://www.denx.de/git/u-boot-usb (2013-11-08 15:25:29 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-mips.git master
[snip]
Paul Burton (18): mips32: detect L1 cache sizes if they're not defined pcnet: code style cleanup pcnet: s/le16_to_cpu/cpu_to_le16/ in pcnet_send pcnet: add cache flushing & invalidation
So, adding cache flushing and invalidation breaks the PN62 because mpc824x doesn't have cache flushing support. I'm inclined to take this PR now and then remove PN62 support if it's not fixed.
2013/11/11 Tom Rini trini@ti.com:
On Sat, Nov 09, 2013 at 09:53:23PM +0100, Daniel Schwierzeck wrote:
Hi Tom,
The following changes since commit 15c5cdf5aa6b292145e5e3e220ec1f42b11eff6f:
Merge branch 'master' of git://www.denx.de/git/u-boot-usb (2013-11-08 15:25:29 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-mips.git master
[snip]
Paul Burton (18): mips32: detect L1 cache sizes if they're not defined pcnet: code style cleanup pcnet: s/le16_to_cpu/cpu_to_le16/ in pcnet_send pcnet: add cache flushing & invalidation
So, adding cache flushing and invalidation breaks the PN62 because mpc824x doesn't have cache flushing support. I'm inclined to take this PR now and then remove PN62 support if it's not fixed.
-- Tom
hm, I thought qemu-malta was the sole user of pcnet.
To fix pn62, we could add a stub implementation like it is done in arch/powerpc/cpu/mpc83xx/cache.c.
On Mon, Nov 11, 2013 at 08:00:01PM +0100, Daniel Schwierzeck wrote:
2013/11/11 Tom Rini trini@ti.com:
On Sat, Nov 09, 2013 at 09:53:23PM +0100, Daniel Schwierzeck wrote:
Hi Tom,
The following changes since commit 15c5cdf5aa6b292145e5e3e220ec1f42b11eff6f:
Merge branch 'master' of git://www.denx.de/git/u-boot-usb (2013-11-08 15:25:29 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-mips.git master
[snip]
Paul Burton (18): mips32: detect L1 cache sizes if they're not defined pcnet: code style cleanup pcnet: s/le16_to_cpu/cpu_to_le16/ in pcnet_send pcnet: add cache flushing & invalidation
So, adding cache flushing and invalidation breaks the PN62 because mpc824x doesn't have cache flushing support. I'm inclined to take this PR now and then remove PN62 support if it's not fixed.
hm, I thought qemu-malta was the sole user of pcnet.
To fix pn62, we could add a stub implementation like it is done in arch/powerpc/cpu/mpc83xx/cache.c.
After talking with Wolfgang on IRC, he's just going to delete the platform (and more mpc824x) as mpc824x is just dead. I'll be pushing the MIPS PR shortly.
On Sat, Nov 09, 2013 at 09:53:23PM +0100, Daniel Schwierzeck wrote:
Hi Tom,
The following changes since commit 15c5cdf5aa6b292145e5e3e220ec1f42b11eff6f:
Merge branch 'master' of git://www.denx.de/git/u-boot-usb (2013-11-08 15:25:29 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-mips.git master
for you to fetch changes up to ab41305d3b7c1afa29c0b7fafce854c24445423a:
malta: define CONFIG_MEMSIZE_IN_BYTES (2013-11-09 17:21:02 +0100)
Gabor Juhos (1): malta: define CONFIG_MEMSIZE_IN_BYTES
Paul Burton (18): mips32: detect L1 cache sizes if they're not defined pcnet: code style cleanup pcnet: s/le16_to_cpu/cpu_to_le16/ in pcnet_send pcnet: add cache flushing & invalidation pcnet: enable the NOUFLO feature pci.h: allow inclusion in assembly source qemu-malta: rename to just "malta" malta: setup super I/O UARTs malta: support for coreFPGA6 boards malta: display "U-boot" on the LCD screen malta: enable CONFIG_PCNET_79C973, PCNET_HAS_PROM, CONFIG_CMD_DHCP malta: remove cache size definitions malta: disable L2 caches malta: enable RTC support malta: store environment in flash malta: setup PIIX4 interrupt route malta: add script & instructions to flash U-boot malta: add myself to maintainers
arch/mips/cpu/mips32/cache.S | 90 +++++++++++++++++++++++++++++++++++++------- arch/mips/cpu/mips32/cpu.c | 73 +++++++++++++++++++++++++++++++++--- arch/mips/cpu/mips32/start.S | 2 +- arch/mips/include/asm/malta.h | 50 ++++++++++++++++++++++--- arch/mips/include/asm/mipsregs.h | 6 +++ arch/mips/lib/bootm.c | 12 +++--- board/{qemu-malta => imgtec/malta}/Makefile | 3 +- board/imgtec/malta/flash-malta-boot.tcl | 40 ++++++++++++++++++++ board/imgtec/malta/lowlevel_init.S | 238 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/imgtec/malta/malta.c | 208 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/imgtec/malta/superio.c | 63 +++++++++++++++++++++++++++++++ board/imgtec/malta/superio.h | 15 ++++++++ board/qemu-malta/lowlevel_init.S | 69
board/qemu-malta/qemu-malta.c | 47 ----------------------- boards.cfg | 4 +- doc/README.malta | 16 ++++++++ drivers/net/pcnet.c | 279 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------- drivers/pci/Makefile | 1 + drivers/pci/pci_msc01.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/rtc/mc146818.c | 2 +- include/configs/{qemu-malta.h => malta.h} | 45 +++++++++++++--------- include/msc01.h | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/pci.h | 6 ++- include/pci_ids.h | 3 ++ include/pci_msc01.h | 17 +++++++++ 25 files changed, 1254 insertions(+), 295 deletions(-) rename board/{qemu-malta => imgtec/malta}/Makefile (81%) create mode 100644 board/imgtec/malta/flash-malta-boot.tcl create mode 100644 board/imgtec/malta/lowlevel_init.S create mode 100644 board/imgtec/malta/malta.c create mode 100644 board/imgtec/malta/superio.c create mode 100644 board/imgtec/malta/superio.h delete mode 100644 board/qemu-malta/lowlevel_init.S delete mode 100644 board/qemu-malta/qemu-malta.c create mode 100644 doc/README.malta create mode 100644 drivers/pci/pci_msc01.c rename include/configs/{qemu-malta.h => malta.h} (72%) create mode 100644 include/msc01.h create mode 100644 include/pci_msc01.h
Applied to u-boot/master, thanks!
participants (2)
-
Daniel Schwierzeck -
Tom Rini