[U-Boot] Pull request for u-boot-marvell.git
Dear Albert
Please kindly pull
The following changes since commit ca849aa4b86b282f837c58a0b129460ebfad2239: David Müller (ELSOFT AG) (1): ARM: activate DISPLAY_CPUINFO for VCMA9 + SMDK2410 board
are available in the git repository at:
u-boot-marvell.git master branch.
Albert ARIBAUD (5): edminiv2: add hush parser, cmdline editing and long help Rename ehci-kirkwood as ehci-marvell Remove kirkwood-specifics from marvell EHCI driver orion5x: add USB host ehci-marvell support edminiv2: add USB host support
Holger Brunck (2): arm/km: speed up i2c access for keymile boards arm/km: checkpatch cleanup
Ian Campbell (1): kirkwood_spi: correct access to irq_mask register
Michael Walle (1): arm, arm-kirkwood: disable l2c before linux boot
Prafulla Wadaskar (1): bugfix: all Marvell specific build fails due to undefined reference to `get_ticks'
Stefan (1): kirkwood: add support for D-Link DNS-325
MAINTAINERS | 4 + arch/arm/cpu/arm926ejs/armada100/timer.c | 18 ++ arch/arm/cpu/arm926ejs/cache.c | 9 + arch/arm/cpu/arm926ejs/cpu.c | 2 + arch/arm/cpu/arm926ejs/kirkwood/Makefile | 1 + arch/arm/cpu/arm926ejs/kirkwood/cache.c | 34 ++++ arch/arm/cpu/arm926ejs/kirkwood/timer.c | 18 ++ arch/arm/cpu/arm926ejs/orion5x/timer.c | 18 ++ arch/arm/cpu/arm926ejs/pantheon/timer.c | 18 ++ arch/arm/include/asm/arch-kirkwood/config.h | 2 +- arch/arm/include/asm/arch-kirkwood/kirkwood.h | 12 ++ arch/arm/include/asm/arch-orion5x/orion5x.h | 12 ++ board/d-link/dns325/Makefile | 49 +++++ board/d-link/dns325/dns325.c | 148 ++++++++++++++ board/d-link/dns325/dns325.h | 48 +++++ board/d-link/dns325/kwbimage.cfg | 208 ++++++++++++++++++++ board/keymile/km_arm/km_arm.c | 23 +-- boards.cfg | 1 + drivers/spi/kirkwood_spi.c | 2 +- drivers/usb/host/Makefile | 2 +- .../usb/host/{ehci-kirkwood.c => ehci-marvell.c} | 36 ++-- include/configs/dns325.h | 188 ++++++++++++++++++ include/configs/edminiv2.h | 24 +++ include/configs/km/km_arm.h | 2 +- 24 files changed, 849 insertions(+), 30 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/kirkwood/cache.c create mode 100644 board/d-link/dns325/Makefile create mode 100644 board/d-link/dns325/dns325.c create mode 100644 board/d-link/dns325/dns325.h create mode 100644 board/d-link/dns325/kwbimage.cfg rename drivers/usb/host/{ehci-kirkwood.c => ehci-marvell.c} (73%) create mode 100644 include/configs/dns325.h
Regards.. Prafulla . . .
Hi Prafulla,
Le 08/02/2012 10:57, Prafulla Wadaskar a écrit :
Dear Albert
Please kindly pull
The following changes since commit ca849aa4b86b282f837c58a0b129460ebfad2239: David Müller (ELSOFT AG) (1): ARM: activate DISPLAY_CPUINFO for VCMA9 + SMDK2410 board
are available in the git repository at:
u-boot-marvell.git master branch.
Albert ARIBAUD (5): edminiv2: add hush parser, cmdline editing and long help Rename ehci-kirkwood as ehci-marvell Remove kirkwood-specifics from marvell EHCI driver orion5x: add USB host ehci-marvell support edminiv2: add USB host support
Holger Brunck (2): arm/km: speed up i2c access for keymile boards arm/km: checkpatch cleanup
Ian Campbell (1): kirkwood_spi: correct access to irq_mask register
Michael Walle (1): arm, arm-kirkwood: disable l2c before linux boot
Prafulla Wadaskar (1): bugfix: all Marvell specific build fails due to undefined reference to `get_ticks'
Stefan (1): kirkwood: add support for D-Link DNS-325
MAINTAINERS | 4 + arch/arm/cpu/arm926ejs/armada100/timer.c | 18 ++ arch/arm/cpu/arm926ejs/cache.c | 9 + arch/arm/cpu/arm926ejs/cpu.c | 2 + arch/arm/cpu/arm926ejs/kirkwood/Makefile | 1 + arch/arm/cpu/arm926ejs/kirkwood/cache.c | 34 ++++ arch/arm/cpu/arm926ejs/kirkwood/timer.c | 18 ++ arch/arm/cpu/arm926ejs/orion5x/timer.c | 18 ++ arch/arm/cpu/arm926ejs/pantheon/timer.c | 18 ++ arch/arm/include/asm/arch-kirkwood/config.h | 2 +- arch/arm/include/asm/arch-kirkwood/kirkwood.h | 12 ++ arch/arm/include/asm/arch-orion5x/orion5x.h | 12 ++ board/d-link/dns325/Makefile | 49 +++++ board/d-link/dns325/dns325.c | 148 ++++++++++++++ board/d-link/dns325/dns325.h | 48 +++++ board/d-link/dns325/kwbimage.cfg | 208 ++++++++++++++++++++ board/keymile/km_arm/km_arm.c | 23 +-- boards.cfg | 1 + drivers/spi/kirkwood_spi.c | 2 +- drivers/usb/host/Makefile | 2 +- .../usb/host/{ehci-kirkwood.c => ehci-marvell.c} | 36 ++-- include/configs/dns325.h | 188 ++++++++++++++++++ include/configs/edminiv2.h | 24 +++ include/configs/km/km_arm.h | 2 +- 24 files changed, 849 insertions(+), 30 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/kirkwood/cache.c create mode 100644 board/d-link/dns325/Makefile create mode 100644 board/d-link/dns325/dns325.c create mode 100644 board/d-link/dns325/dns325.h create mode 100644 board/d-link/dns325/kwbimage.cfg rename drivers/usb/host/{ehci-kirkwood.c => ehci-marvell.c} (73%) create mode 100644 include/configs/dns325.h
Applied to u-boot-arm/master, thanks!
Regards.. Prafulla . . .
Amicalement,
Hi Albert
Please kindly pull
The following changes since commit 2271e7c6e8eef883b834fb7d07911848a54fde13: prabhakar.csengg@gmail.com (1): Ethernut 5: fix build error
are available in the git repository at:
u-boot-marvell.git on next branch.
Ajay Bhargav (4): USB: Armada100: Add UTMI PHY interface driver USB: Armada100: EHCI Driver for Armada100 SOCs Armada100: gplugD: Add USB command support Armada100: gplugD: Add FAT & EXT2 command support
Ian Campbell (1): ARM: dreamplug: Enable FDT support
arch/arm/include/asm/arch-armada100/armada100.h | 9 ++ .../include/asm/arch-armada100/utmi-armada100.h | 79 ++++++++++++++++ drivers/usb/host/Makefile | 1 + drivers/usb/host/ehci-armada100.c | 64 +++++++++++++ drivers/usb/host/utmi-armada100.c | 96 ++++++++++++++++++++ include/configs/dreamplug.h | 2 + include/configs/gplugd.h | 14 +++ 7 files changed, 265 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/arch-armada100/utmi-armada100.h create mode 100644 drivers/usb/host/ehci-armada100.c create mode 100644 drivers/usb/host/utmi-armada100.c
Regards.. Prafulla . . .
Hi Prafulla,
Le 02/03/2012 08:29, Prafulla Wadaskar a écrit :
Hi Albert
Please kindly pull
The following changes since commit 2271e7c6e8eef883b834fb7d07911848a54fde13: prabhakar.csengg@gmail.com (1): Ethernut 5: fix build error
are available in the git repository at:
u-boot-marvell.git on next branch.
Ajay Bhargav (4): USB: Armada100: Add UTMI PHY interface driver USB: Armada100: EHCI Driver for Armada100 SOCs Armada100: gplugD: Add USB command support Armada100: gplugD: Add FAT& EXT2 command support
Ian Campbell (1): ARM: dreamplug: Enable FDT support
arch/arm/include/asm/arch-armada100/armada100.h | 9 ++ .../include/asm/arch-armada100/utmi-armada100.h | 79 ++++++++++++++++ drivers/usb/host/Makefile | 1 + drivers/usb/host/ehci-armada100.c | 64 +++++++++++++ drivers/usb/host/utmi-armada100.c | 96 ++++++++++++++++++++ include/configs/dreamplug.h | 2 + include/configs/gplugd.h | 14 +++ 7 files changed, 265 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/arch-armada100/utmi-armada100.h create mode 100644 drivers/usb/host/ehci-armada100.c create mode 100644 drivers/usb/host/utmi-armada100.c
Regards.. Prafulla . . .
Applied to u-boot-arm/next, thanks.
I will move next to master and send out a pull request once 2012.03 is out.
Amicalement,
Dear Albert
Please kindly pull The following changes since commit fb14b6b2f680363678b4e6a75eb9f3f0d79111fa: Wolfgang Denk (1): Prepare v2012.04-rc3
are available in the git repository at:
u-boot-marvell.git master branch.
David Purdy (1): kirkwood: add support for Cloud Engines Pogoplug E02
Luka Perkov (1): kirkwood: add NAS62x0 board support
MAINTAINERS | 8 ++ board/cloudengines/pogo_e02/Makefile | 43 ++++++++ board/cloudengines/pogo_e02/kwbimage.cfg | 169 ++++++++++++++++++++++++++++++ board/cloudengines/pogo_e02/pogo_e02.c | 118 +++++++++++++++++++++ board/cloudengines/pogo_e02/pogo_e02.h | 44 ++++++++ board/raidsonic/ib62x0/Makefile | 43 ++++++++ board/raidsonic/ib62x0/ib62x0.c | 79 ++++++++++++++ board/raidsonic/ib62x0/ib62x0.h | 40 +++++++ board/raidsonic/ib62x0/kwbimage.cfg | 169 ++++++++++++++++++++++++++++++ boards.cfg | 2 + include/configs/ib62x0.h | 152 +++++++++++++++++++++++++++ include/configs/pogo_e02.h | 119 +++++++++++++++++++++ 12 files changed, 986 insertions(+), 0 deletions(-) create mode 100644 board/cloudengines/pogo_e02/Makefile create mode 100644 board/cloudengines/pogo_e02/kwbimage.cfg create mode 100644 board/cloudengines/pogo_e02/pogo_e02.c create mode 100644 board/cloudengines/pogo_e02/pogo_e02.h create mode 100644 board/raidsonic/ib62x0/Makefile create mode 100644 board/raidsonic/ib62x0/ib62x0.c create mode 100644 board/raidsonic/ib62x0/ib62x0.h create mode 100644 board/raidsonic/ib62x0/kwbimage.cfg create mode 100644 include/configs/ib62x0.h create mode 100644 include/configs/pogo_e02.h
Regards.. Prafulla . . .
Hi Prafulla,
Le 20/04/2012 08:10, Prafulla Wadaskar a écrit :
Dear Albert
Please kindly pull The following changes since commit fb14b6b2f680363678b4e6a75eb9f3f0d79111fa: Wolfgang Denk (1): Prepare v2012.04-rc3
are available in the git repository at:
u-boot-marvell.git master branch.
David Purdy (1): kirkwood: add support for Cloud Engines Pogoplug E02
Luka Perkov (1): kirkwood: add NAS62x0 board support
MAINTAINERS | 8 ++ board/cloudengines/pogo_e02/Makefile | 43 ++++++++ board/cloudengines/pogo_e02/kwbimage.cfg | 169 ++++++++++++++++++++++++++++++ board/cloudengines/pogo_e02/pogo_e02.c | 118 +++++++++++++++++++++ board/cloudengines/pogo_e02/pogo_e02.h | 44 ++++++++ board/raidsonic/ib62x0/Makefile | 43 ++++++++ board/raidsonic/ib62x0/ib62x0.c | 79 ++++++++++++++ board/raidsonic/ib62x0/ib62x0.h | 40 +++++++ board/raidsonic/ib62x0/kwbimage.cfg | 169 ++++++++++++++++++++++++++++++ boards.cfg | 2 + include/configs/ib62x0.h | 152 +++++++++++++++++++++++++++ include/configs/pogo_e02.h | 119 +++++++++++++++++++++ 12 files changed, 986 insertions(+), 0 deletions(-) create mode 100644 board/cloudengines/pogo_e02/Makefile create mode 100644 board/cloudengines/pogo_e02/kwbimage.cfg create mode 100644 board/cloudengines/pogo_e02/pogo_e02.c create mode 100644 board/cloudengines/pogo_e02/pogo_e02.h create mode 100644 board/raidsonic/ib62x0/Makefile create mode 100644 board/raidsonic/ib62x0/ib62x0.c create mode 100644 board/raidsonic/ib62x0/ib62x0.h create mode 100644 board/raidsonic/ib62x0/kwbimage.cfg create mode 100644 include/configs/ib62x0.h create mode 100644 include/configs/pogo_e02.h
As we are on the verge of release:
Applied to u-boot-arm/next, thanks.
Regards.. Prafulla . . .
Amicalement,
Dear Albert
Please kindly pull The following changes since commit 3e0cac6b5158b22248f57cdf7769bf8d610fec5e: Rajeshwari Shinde (1): EXYNOS: SMDK5250: Enable the pinmux setup
are available in the git repository at:
u-boot-marvell.git ..BRANCH.NOT.VERIFIED..
Holger Brunck (7): arm/km: add board type to boards.cfg arm/km: add piggy mac adress offset for mgcoge3un arm/km: rename CONFIG option CONFIG_KM_DEF_ENV_UPDATE arm/km: use ARRAY_SIZE macro arm/km: fix wrong comment in SDRAM config for mgcoge3un arm/km: change maintainer for mgcoge3un arm/km: remove CONFIG_RESET_PHY_R
Luka Perkov (1): kwboot: boot kirkwood SoCs over a serial link
Michael Walle (4): lib: add rand() function net: use common rand()/srand() functions net: add helper to generate random mac address Kirkwood: add lschlv2 and lsxhl board support
Simon Guinot (3): lacie_kw: fix SDRAM banks number for net2big_v2 lacie_kw: fix CONFIG_SYS_KWD_CONFIG for inetspace_v2 ARM: don't probe PHY address for LaCie boards
Valentin Longchamp (9): arm/km: enable mii cmd km_arm: use filesize for erase in update command kirkwood: add save functionality kirkwood_mpp_conf function kirkwood: fix calls to kirkwood_mpp_conf kw_spi: backup and reset the MPP of the chosen CS pin kw_spi: support spi_claim/release_bus functions kw_spi: add weak functions board_spi_claim/release_bus arm/kirkwood: protect the ENV_SPI #defines arm/km: use spi claim bus to switch between SPI and NAND
MAINTAINERS | 7 +- arch/arm/cpu/arm926ejs/kirkwood/mpp.c | 10 +- arch/arm/include/asm/arch-kirkwood/config.h | 12 +- arch/arm/include/asm/arch-kirkwood/mpp.h | 2 +- arch/arm/include/asm/arch-kirkwood/spi.h | 11 + board/LaCie/common/common.c | 23 +- board/LaCie/common/common.h | 2 +- board/LaCie/edminiv2/edminiv2.c | 2 +- board/LaCie/net2big_v2/net2big_v2.c | 4 +- board/LaCie/netspace_v2/netspace_v2.c | 4 +- board/Marvell/dreamplug/dreamplug.c | 2 +- board/Marvell/guruplug/guruplug.c | 2 +- board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c | 2 +- board/Marvell/openrd/openrd.c | 2 +- board/Marvell/rd6281a/rd6281a.c | 2 +- board/Marvell/sheevaplug/sheevaplug.c | 2 +- board/Seagate/dockstar/dockstar.c | 2 +- board/buffalo/lsxl/Makefile | 44 ++ board/buffalo/lsxl/kwbimage-lschl.cfg | 229 +++++++ board/buffalo/lsxl/kwbimage-lsxhl.cfg | 229 +++++++ board/buffalo/lsxl/lsxl.c | 283 +++++++++ board/buffalo/lsxl/lsxl.h | 75 +++ board/cloudengines/pogo_e02/pogo_e02.c | 2 +- board/d-link/dns325/dns325.c | 2 +- board/keymile/km_arm/km_arm.c | 48 +-- board/keymile/km_arm/kwbimage-memphis.cfg | 2 +- board/raidsonic/ib62x0/ib62x0.c | 2 +- boards.cfg | 6 +- doc/kwboot.1 | 84 +++ drivers/spi/kirkwood_spi.c | 64 ++- include/common.h | 10 + include/configs/km/km_arm.h | 15 +- include/configs/km_kirkwood.h | 4 +- include/configs/lacie_kw.h | 6 +- include/configs/lsxl.h | 182 ++++++ include/configs/mgcoge3un.h | 1 + include/net.h | 17 + lib/Makefile | 5 +- lib/rand.c | 48 ++ net/Makefile | 2 - net/eth.c | 22 + net/link_local.c | 7 +- net/net_rand.c | 68 -- net/net_rand.h | 31 +- tools/Makefile | 6 + tools/kwboot.c | 742 +++++++++++++++++++++++ 46 files changed, 2143 insertions(+), 184 deletions(-) create mode 100644 board/buffalo/lsxl/Makefile create mode 100644 board/buffalo/lsxl/kwbimage-lschl.cfg create mode 100644 board/buffalo/lsxl/kwbimage-lsxhl.cfg create mode 100644 board/buffalo/lsxl/lsxl.c create mode 100644 board/buffalo/lsxl/lsxl.h create mode 100644 doc/kwboot.1 create mode 100644 include/configs/lsxl.h create mode 100644 lib/rand.c delete mode 100644 net/net_rand.c create mode 100644 tools/kwboot.c
Regards... Prafulla . . .
Hi Prafulla,
On Tue, 3 Jul 2012 04:59:21 -0700, Prafulla Wadaskar prafulla@marvell.com wrote:
Dear Albert
Please kindly pull The following changes since commit 3e0cac6b5158b22248f57cdf7769bf8d610fec5e: Rajeshwari Shinde (1): EXYNOS: SMDK5250: Enable the pinmux setup
are available in the git repository at:
u-boot-marvell.git ..BRANCH.NOT.VERIFIED..
Seems the branch was not pushed at time of pull request... And then current marvell master has one more commit than what's listed below. Can you re-issue a (rebased and) updated pull request? Thanks in advance.
Holger Brunck (7): arm/km: add board type to boards.cfg arm/km: add piggy mac adress offset for mgcoge3un arm/km: rename CONFIG option CONFIG_KM_DEF_ENV_UPDATE arm/km: use ARRAY_SIZE macro arm/km: fix wrong comment in SDRAM config for mgcoge3un arm/km: change maintainer for mgcoge3un arm/km: remove CONFIG_RESET_PHY_R
Luka Perkov (1): kwboot: boot kirkwood SoCs over a serial link
Michael Walle (4): lib: add rand() function net: use common rand()/srand() functions net: add helper to generate random mac address Kirkwood: add lschlv2 and lsxhl board support
Simon Guinot (3): lacie_kw: fix SDRAM banks number for net2big_v2 lacie_kw: fix CONFIG_SYS_KWD_CONFIG for inetspace_v2 ARM: don't probe PHY address for LaCie boards
Valentin Longchamp (9): arm/km: enable mii cmd km_arm: use filesize for erase in update command kirkwood: add save functionality kirkwood_mpp_conf function kirkwood: fix calls to kirkwood_mpp_conf kw_spi: backup and reset the MPP of the chosen CS pin kw_spi: support spi_claim/release_bus functions kw_spi: add weak functions board_spi_claim/release_bus arm/kirkwood: protect the ENV_SPI #defines arm/km: use spi claim bus to switch between SPI and NAND
MAINTAINERS | 7 +- arch/arm/cpu/arm926ejs/kirkwood/mpp.c | 10 +- arch/arm/include/asm/arch-kirkwood/config.h | 12 +- arch/arm/include/asm/arch-kirkwood/mpp.h | 2 +- arch/arm/include/asm/arch-kirkwood/spi.h | 11 + board/LaCie/common/common.c | 23 +- board/LaCie/common/common.h | 2 +- board/LaCie/edminiv2/edminiv2.c | 2 +- board/LaCie/net2big_v2/net2big_v2.c | 4 +- board/LaCie/netspace_v2/netspace_v2.c | 4 +- board/Marvell/dreamplug/dreamplug.c | 2 +- board/Marvell/guruplug/guruplug.c | 2 +- board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c | 2 +- board/Marvell/openrd/openrd.c | 2 +- board/Marvell/rd6281a/rd6281a.c | 2 +- board/Marvell/sheevaplug/sheevaplug.c | 2 +- board/Seagate/dockstar/dockstar.c | 2 +- board/buffalo/lsxl/Makefile | 44 ++ board/buffalo/lsxl/kwbimage-lschl.cfg | 229 +++++++ board/buffalo/lsxl/kwbimage-lsxhl.cfg | 229 +++++++ board/buffalo/lsxl/lsxl.c | 283 +++++++++ board/buffalo/lsxl/lsxl.h | 75 +++ board/cloudengines/pogo_e02/pogo_e02.c | 2 +- board/d-link/dns325/dns325.c | 2 +- board/keymile/km_arm/km_arm.c | 48 +-- board/keymile/km_arm/kwbimage-memphis.cfg | 2 +- board/raidsonic/ib62x0/ib62x0.c | 2 +- boards.cfg | 6 +- doc/kwboot.1 | 84 +++ drivers/spi/kirkwood_spi.c | 64 ++- include/common.h | 10 + include/configs/km/km_arm.h | 15 +- include/configs/km_kirkwood.h | 4 +- include/configs/lacie_kw.h | 6 +- include/configs/lsxl.h | 182 ++++++ include/configs/mgcoge3un.h | 1 + include/net.h | 17 + lib/Makefile | 5 +- lib/rand.c | 48 ++ net/Makefile | 2 - net/eth.c | 22 + net/link_local.c | 7 +- net/net_rand.c | 68 -- net/net_rand.h | 31 +- tools/Makefile | 6 + tools/kwboot.c | 742 +++++++++++++++++++++++ 46 files changed, 2143 insertions(+), 184 deletions(-) create mode 100644 board/buffalo/lsxl/Makefile create mode 100644 board/buffalo/lsxl/kwbimage-lschl.cfg create mode 100644 board/buffalo/lsxl/kwbimage-lsxhl.cfg create mode 100644 board/buffalo/lsxl/lsxl.c create mode 100644 board/buffalo/lsxl/lsxl.h create mode 100644 doc/kwboot.1 create mode 100644 include/configs/lsxl.h create mode 100644 lib/rand.c delete mode 100644 net/net_rand.c create mode 100644 tools/kwboot.c
Regards... Prafulla . . .
Amicalement,
Hi Albert,
On Thu, 5 Jul 2012 10:40:47 +0200, Albert ARIBAUD albert.u.boot@aribaud.net wrote:
Hi Prafulla,
On Tue, 3 Jul 2012 04:59:21 -0700, Prafulla Wadaskar prafulla@marvell.com wrote:
Dear Albert
Please kindly pull The following changes since commit 3e0cac6b5158b22248f57cdf7769bf8d610fec5e: Rajeshwari Shinde (1): EXYNOS: SMDK5250: Enable the pinmux setup
are available in the git repository at:
u-boot-marvell.git ..BRANCH.NOT.VERIFIED..
Seems the branch was not pushed at time of pull request... And then current marvell master has one more commit than what's listed below. Can you re-issue a (rebased and) updated pull request? Thanks in advance.
Please hold on: I had a misconfigured e-mail in my new git setup, so my current u-boot-arm tree is not ueasble. I'll send out a notice when the tree is fixed.
Amicalement,
Hi Albert,
On Thu, 5 Jul 2012 11:37:25 +0200, Albert ARIBAUD albert.u.boot@aribaud.net wrote:
Hi Albert,
On Thu, 5 Jul 2012 10:40:47 +0200, Albert ARIBAUD albert.u.boot@aribaud.net wrote:
Hi Prafulla,
On Tue, 3 Jul 2012 04:59:21 -0700, Prafulla Wadaskar prafulla@marvell.com wrote:
Dear Albert
Please kindly pull The following changes since commit 3e0cac6b5158b22248f57cdf7769bf8d610fec5e: Rajeshwari Shinde (1): EXYNOS: SMDK5250: Enable the pinmux setup
are available in the git repository at:
u-boot-marvell.git ..BRANCH.NOT.VERIFIED..
Seems the branch was not pushed at time of pull request... And then current marvell master has one more commit than what's listed below. Can you re-issue a (rebased and) updated pull request? Thanks in advance.
Please hold on: I had a misconfigured e-mail in my new git setup, so my current u-boot-arm tree is not ueasble. I'll send out a notice when the tree is fixed.
Luckily, I had not pushed any change with the wrong e-mail address on the official ARM tree, so all is fine. Please proceed with fixing and rebasing.
Amicalement,
Dear Albert,
Please pull The following changes since commit c45272e25bdf241fbb27638465f16ce2342ed1b6: Michael Langer (1): i.MX6 USDHC: Use the ESDHC clock
are available in the git repository at:
u-boot-marvell.git master branch.
Holger Brunck (7): arm/km: add board type to boards.cfg arm/km: add piggy mac adress offset for mgcoge3un arm/km: rename CONFIG option CONFIG_KM_DEF_ENV_UPDATE arm/km: use ARRAY_SIZE macro arm/km: fix wrong comment in SDRAM config for mgcoge3un arm/km: change maintainer for mgcoge3un arm/km: remove CONFIG_RESET_PHY_R
Luka Perkov (1): kwboot: boot kirkwood SoCs over a serial link
Marek Vasut (1): Kirkwood: Add support for Ka-Ro TK71
Michael Walle (4): lib: add rand() function net: use common rand()/srand() functions net: add helper to generate random mac address Kirkwood: add lschlv2 and lsxhl board support
Simon Guinot (3): lacie_kw: fix SDRAM banks number for net2big_v2 lacie_kw: fix CONFIG_SYS_KWD_CONFIG for inetspace_v2 ARM: don't probe PHY address for LaCie boards
Valentin Longchamp (9): arm/km: enable mii cmd km_arm: use filesize for erase in update command kirkwood: add save functionality kirkwood_mpp_conf function kirkwood: fix calls to kirkwood_mpp_conf kw_spi: backup and reset the MPP of the chosen CS pin kw_spi: support spi_claim/release_bus functions kw_spi: add weak functions board_spi_claim/release_bus arm/kirkwood: protect the ENV_SPI #defines arm/km: use spi claim bus to switch between SPI and NAND
MAINTAINERS | 7 +- arch/arm/cpu/arm926ejs/kirkwood/mpp.c | 10 +- arch/arm/include/asm/arch-kirkwood/config.h | 12 +- arch/arm/include/asm/arch-kirkwood/mpp.h | 2 +- arch/arm/include/asm/arch-kirkwood/spi.h | 11 + board/LaCie/common/common.c | 23 +- board/LaCie/common/common.h | 2 +- board/LaCie/edminiv2/edminiv2.c | 2 +- board/LaCie/net2big_v2/net2big_v2.c | 4 +- board/LaCie/netspace_v2/netspace_v2.c | 4 +- board/Marvell/dreamplug/dreamplug.c | 2 +- board/Marvell/guruplug/guruplug.c | 2 +- board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c | 2 +- board/Marvell/openrd/openrd.c | 2 +- board/Marvell/rd6281a/rd6281a.c | 2 +- board/Marvell/sheevaplug/sheevaplug.c | 2 +- board/Seagate/dockstar/dockstar.c | 2 +- board/buffalo/lsxl/Makefile | 44 ++ board/buffalo/lsxl/kwbimage-lschl.cfg | 229 +++++++ board/buffalo/lsxl/kwbimage-lsxhl.cfg | 229 +++++++ board/buffalo/lsxl/lsxl.c | 283 +++++++++ board/buffalo/lsxl/lsxl.h | 75 +++ board/cloudengines/pogo_e02/pogo_e02.c | 2 +- board/d-link/dns325/dns325.c | 2 +- board/karo/tk71/Makefile | 45 ++ board/karo/tk71/kwbimage.cfg | 174 ++++++ board/karo/tk71/tk71.c | 166 +++++ board/keymile/km_arm/km_arm.c | 48 +-- board/keymile/km_arm/kwbimage-memphis.cfg | 2 +- board/raidsonic/ib62x0/ib62x0.c | 2 +- boards.cfg | 7 +- doc/kwboot.1 | 84 +++ drivers/spi/kirkwood_spi.c | 64 ++- include/common.h | 10 + include/configs/km/km_arm.h | 15 +- include/configs/km_kirkwood.h | 4 +- include/configs/lacie_kw.h | 6 +- include/configs/lsxl.h | 182 ++++++ include/configs/mgcoge3un.h | 1 + include/configs/tk71.h | 130 ++++ include/net.h | 17 + lib/Makefile | 5 +- lib/rand.c | 48 ++ net/Makefile | 2 - net/eth.c | 22 + net/link_local.c | 7 +- net/net_rand.c | 68 -- net/net_rand.h | 31 +- tools/Makefile | 6 + tools/kwboot.c | 742 +++++++++++++++++++++++ 50 files changed, 2659 insertions(+), 184 deletions(-) create mode 100644 board/buffalo/lsxl/Makefile create mode 100644 board/buffalo/lsxl/kwbimage-lschl.cfg create mode 100644 board/buffalo/lsxl/kwbimage-lsxhl.cfg create mode 100644 board/buffalo/lsxl/lsxl.c create mode 100644 board/buffalo/lsxl/lsxl.h create mode 100644 board/karo/tk71/Makefile create mode 100644 board/karo/tk71/kwbimage.cfg create mode 100644 board/karo/tk71/tk71.c create mode 100644 doc/kwboot.1 create mode 100644 include/configs/lsxl.h create mode 100644 include/configs/tk71.h create mode 100644 lib/rand.c delete mode 100644 net/net_rand.c create mode 100644 tools/kwboot.c
Regards... Prafulla . . .
Hi Prafulla,
On Thu, 5 Jul 2012 04:29:31 -0700, Prafulla Wadaskar prafulla@marvell.com wrote:
Dear Albert,
Please pull The following changes since commit c45272e25bdf241fbb27638465f16ce2342ed1b6: Michael Langer (1): i.MX6 USDHC: Use the ESDHC clock
are available in the git repository at:
u-boot-marvell.git master branch.
Applied to u-boot-arm/master, thanks.
Amicalement,
Dear Albert,
Please pull The following changes since commit 863ba81c70d8ca8dc49e0c5a28a1fd0fb23ca62d: Tetsuyuki Kobayashi (1): arm: bugfix: Move vector table before jumping relocated code
are available in the git repository at:
u-boot-marvell.git master branch.
Holger Brunck (6): arm/km: add kmnusa board support arm/km: add kmcoge5un board support arm/km: convert mgcoge3un target to km_kirkwood arm/km: remove portl2.h and use km_kirkwood instead arm/km: cleanup km_kirkwood boards arm/km: remove calls to kw_gpio_* in board_early_init_f
Thomas Herzmann (1): arm/km: add implementation for read_dip_switch
Valentin Longchamp (4): arm/km: enable BOCO2 FPGA download support arm/km: redefine piggy 4 reg names to avoid conflicts arm/km: skip FPGA config when already configured arm/km: support the 2 PCIe fpga resets
MAINTAINERS | 2 + board/keymile/common/common.h | 5 + board/keymile/km_arm/Makefile | 4 + board/keymile/km_arm/fpga_config.c | 256 ++++++++++++++++++++++++ board/keymile/km_arm/km_arm.c | 104 +++++++--- board/keymile/km_arm/kwbimage_128M16_1.cfg | 294 +++++++++++++++++++++++++++ board/keymile/km_arm/kwbimage_256M8_1.cfg | 296 ++++++++++++++++++++++++++++ boards.cfg | 10 +- include/configs/km/km_arm.h | 48 ++++- include/configs/km_kirkwood.h | 141 ++++++++++++-- include/configs/mgcoge3un.h | 87 -------- include/configs/portl2.h | 85 -------- 12 files changed, 1101 insertions(+), 231 deletions(-) create mode 100644 board/keymile/km_arm/fpga_config.c create mode 100644 board/keymile/km_arm/kwbimage_128M16_1.cfg create mode 100644 board/keymile/km_arm/kwbimage_256M8_1.cfg delete mode 100644 include/configs/mgcoge3un.h delete mode 100644 include/configs/portl2.h
Regards... Prafulla . . .
Hi Prafulla,
On Thu, 5 Jul 2012 10:38:32 -0700, Prafulla Wadaskar prafulla@marvell.com wrote:
Dear Albert,
Please pull The following changes since commit 863ba81c70d8ca8dc49e0c5a28a1fd0fb23ca62d: Tetsuyuki Kobayashi (1): arm: bugfix: Move vector table before jumping relocated code
are available in the git repository at:
u-boot-marvell.git master branch.
Holger Brunck (6): arm/km: add kmnusa board support arm/km: add kmcoge5un board support arm/km: convert mgcoge3un target to km_kirkwood arm/km: remove portl2.h and use km_kirkwood instead arm/km: cleanup km_kirkwood boards arm/km: remove calls to kw_gpio_* in board_early_init_f
Thomas Herzmann (1): arm/km: add implementation for read_dip_switch
Valentin Longchamp (4): arm/km: enable BOCO2 FPGA download support arm/km: redefine piggy 4 reg names to avoid conflicts arm/km: skip FPGA config when already configured arm/km: support the 2 PCIe fpga resets
MAINTAINERS | 2 + board/keymile/common/common.h | 5 + board/keymile/km_arm/Makefile | 4 + board/keymile/km_arm/fpga_config.c | 256 ++++++++++++++++++++++++ board/keymile/km_arm/km_arm.c | 104 +++++++--- board/keymile/km_arm/kwbimage_128M16_1.cfg | 294 +++++++++++++++++++++++++++ board/keymile/km_arm/kwbimage_256M8_1.cfg | 296 ++++++++++++++++++++++++++++ boards.cfg | 10 +- include/configs/km/km_arm.h | 48 ++++- include/configs/km_kirkwood.h | 141 ++++++++++++-- include/configs/mgcoge3un.h | 87 -------- include/configs/portl2.h | 85 -------- 12 files changed, 1101 insertions(+), 231 deletions(-) create mode 100644 board/keymile/km_arm/fpga_config.c create mode 100644 board/keymile/km_arm/kwbimage_128M16_1.cfg create mode 100644 board/keymile/km_arm/kwbimage_256M8_1.cfg delete mode 100644 include/configs/mgcoge3un.h delete mode 100644 include/configs/portl2.h
Applied to u-boot-arm/master, thanks.
Regards... Prafulla . . .
Amicalement,
Dear Albert,
Please pull The following changes since commit 6e2fbdea1b26d75314d87c380a36b0015bf824cf: Wolfgang Denk (1): Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
are available in the git repository at:
u-boot-marvell.git master branch.
Albert ARIBAUD (1): edminiv2: orion5x: fix GPIO inits and values
Holger Brunck (1): arm/km: remove unused code
Karl O. Pinc (2): Cosmetic doc typo fixes to the kwbimage feature docs cosmetic: Better explain how to use the kirkwood kwbimage.cfg file.
Michael Walle (1): lsxl: support power switch
Valentin Longchamp (4): km/arm: set SPI NOR Flash default parameters kw_spi: fix clock prescaler computation km/ivm: fix string len check to support 7 char board names arm/km: fix frequency of the SPI NOR Flash
arch/arm/cpu/arm926ejs/orion5x/cpu.c | 2 ++ arch/arm/include/asm/arch-kirkwood/spi.h | 1 + board/Marvell/sheevaplug/kwbimage.cfg | 4 ++-- board/buffalo/lsxl/lsxl.c | 22 +++++++++++++++++++++- board/keymile/common/ivm.c | 2 +- board/keymile/km_arm/km_arm.c | 20 -------------------- doc/README.kwbimage | 19 +++++++++++++++---- drivers/spi/kirkwood_spi.c | 5 +++-- include/configs/edminiv2.h | 13 +++++++++---- include/configs/km/keymile-common.h | 1 - include/configs/km/km_arm.h | 6 +++++- 11 files changed, 59 insertions(+), 36 deletions(-)
Regards... Prafulla . . .
Hi Prafulla,
On Mon, 3 Sep 2012 02:20:19 -0700, Prafulla Wadaskar prafulla@marvell.com wrote:
Dear Albert,
Please pull The following changes since commit 6e2fbdea1b26d75314d87c380a36b0015bf824cf: Wolfgang Denk (1): Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
are available in the git repository at:
u-boot-marvell.git master branch.
Albert ARIBAUD (1): edminiv2: orion5x: fix GPIO inits and values
Holger Brunck (1): arm/km: remove unused code
Karl O. Pinc (2): Cosmetic doc typo fixes to the kwbimage feature docs cosmetic: Better explain how to use the kirkwood kwbimage.cfg file.
Michael Walle (1): lsxl: support power switch
Valentin Longchamp (4): km/arm: set SPI NOR Flash default parameters kw_spi: fix clock prescaler computation km/ivm: fix string len check to support 7 char board names arm/km: fix frequency of the SPI NOR Flash
arch/arm/cpu/arm926ejs/orion5x/cpu.c | 2 ++ arch/arm/include/asm/arch-kirkwood/spi.h | 1 + board/Marvell/sheevaplug/kwbimage.cfg | 4 ++-- board/buffalo/lsxl/lsxl.c | 22 +++++++++++++++++++++- board/keymile/common/ivm.c | 2 +- board/keymile/km_arm/km_arm.c | 20 -------------------- doc/README.kwbimage | 19 +++++++++++++++---- drivers/spi/kirkwood_spi.c | 5 +++-- include/configs/edminiv2.h | 13 +++++++++---- include/configs/km/keymile-common.h | 1 - include/configs/km/km_arm.h | 6 +++++- 11 files changed, 59 insertions(+), 36 deletions(-)
Regards... Prafulla . . .
Applied to u-boot-arm/master, thanks!
Amicalement,
On Mon, Sep 03, 2012 at 02:20:19AM -0700, Prafulla Wadaskar wrote:
Dear Albert,
Please pull The following changes since commit 6e2fbdea1b26d75314d87c380a36b0015bf824cf: Wolfgang Denk (1): Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Hi Prafulla,
Do you have some news about the board patches I sent you in early June ?
Here are the patchwork urls: http://patchwork.ozlabs.org/patch/163192/ http://patchwork.ozlabs.org/patch/163193/ http://patchwork.ozlabs.org/patch/163195/ http://patchwork.ozlabs.org/patch/163194/
Thanks in advance.
Simon
-----Original Message----- From: Simon Guinot [mailto:simon.guinot@sequanux.org] Sent: 05 September 2012 12:57 To: Prafulla Wadaskar Cc: Albert ARIBAUD; 'u-boot@lists.denx.de'; 'Wolfgang@theia.denx.de; Ashish Karkare; Prabhanjan Sarnaik Subject: Re: [U-Boot] Pull request for u-boot-marvell.git
On Mon, Sep 03, 2012 at 02:20:19AM -0700, Prafulla Wadaskar wrote:
Dear Albert,
Please pull The following changes since commit
6e2fbdea1b26d75314d87c380a36b0015bf824cf:
Wolfgang Denk (1): Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-
staging
Hi Prafulla,
Do you have some news about the board patches I sent you in early June ?
Here are the patchwork urls: http://patchwork.ozlabs.org/patch/163192/
This looks Okay
This change should go differently, ARM Maintainer should pull mach_types, we cannot modify this file locally.
http://patchwork.ozlabs.org/patch/163194/
Thanks in advance.
Hi Simon Thanks for pointing this out, I will pull them, but I doubt they will be applicable on latest u-boot, may you please confirm?
Or it would be good if you can repost new patch series.
Regards... Prafulla . . .
Hi Prafulla, Simon,
On Wed, 5 Sep 2012 18:21:47 -0700, Prafulla Wadaskar prafulla@marvell.com wrote:
-----Original Message----- From: Simon Guinot [mailto:simon.guinot@sequanux.org] Sent: 05 September 2012 12:57 To: Prafulla Wadaskar Cc: Albert ARIBAUD; 'u-boot@lists.denx.de'; 'Wolfgang@theia.denx.de; Ashish Karkare; Prabhanjan Sarnaik Subject: Re: [U-Boot] Pull request for u-boot-marvell.git
On Mon, Sep 03, 2012 at 02:20:19AM -0700, Prafulla Wadaskar wrote:
Dear Albert,
Please pull The following changes since commit
6e2fbdea1b26d75314d87c380a36b0015bf824cf:
Wolfgang Denk (1): Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-
staging
Hi Prafulla,
Do you have some news about the board patches I sent you in early June ?
Here are the patchwork urls: http://patchwork.ozlabs.org/patch/163192/
This looks Okay
This change should go differently, ARM Maintainer should pull mach_types, we cannot modify this file locally.
I will do the Linux machine type pulling (including clean up of any board configs if their locally defined machine type is now part of the Linux list) and warn board maintainers about dropped machine types if any.
http://patchwork.ozlabs.org/patch/163194/
Thanks in advance.
Hi Simon Thanks for pointing this out, I will pull them, but I doubt they will be applicable on latest u-boot, may you please confirm?
Or it would be good if you can repost new patch series.
... rebased on u-boot-arm/master.
Regards... Prafulla . . .
Amicalement,
Changes for v3: - Rebased against u-boot-mv/master and u-boot-arm/master.
Changes for v2: - Move board support and feature into a separate patch set. - Move mach-types update into a separate patch.
Simon Guinot (4): lacie_kw: add support for EFI partitions ARM: add netspace_mini_v2 to mach-types.h ARM: add support for Network Space v2 Lite and Mini ARM: add support for d2 Network v2
arch/arm/include/asm/mach-types.h | 13 +++ board/LaCie/common/common.c | 36 ++++++- board/LaCie/common/common.h | 1 + board/LaCie/netspace_v2/kwbimage-ns2l.cfg | 162 +++++++++++++++++++++++++++++ board/LaCie/netspace_v2/netspace_v2.c | 4 + boards.cfg | 3 + include/configs/lacie_kw.h | 42 ++++++-- 7 files changed, 252 insertions(+), 9 deletions(-) create mode 100644 board/LaCie/netspace_v2/kwbimage-ns2l.cfg
Defines CONFIG_EFI_PARTITION for LaCie boards.
Additionally this patch defines CONFIG_DOS_PARTITION. Note that this definition is implicit in mv_common.h when CONFIG_CMD_USB is enabled.
Signed-off-by: Simon Guinot simon.guinot@sequanux.org --- No changes for v2 and v3.
include/configs/lacie_kw.h | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index c35c2db..08aec04 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -130,6 +130,12 @@ #endif /* CONFIG_CMD_I2C */
/* + * Partition support + */ +#define CONFIG_DOS_PARTITION +#define CONFIG_EFI_PARTITION + +/* * File systems support */ #define CONFIG_CMD_EXT2
This patch adds the Network Space Mini v2 machine to mach-types.h.
Signed-off-by: Simon Guinot simon.guinot@sequanux.org --- No changes for v3.
arch/arm/include/asm/mach-types.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)
diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h index 2d5c3bc..36c108d 100644 --- a/arch/arm/include/asm/mach-types.h +++ b/arch/arm/include/asm/mach-types.h @@ -471,6 +471,7 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_EUKREA_CPUIMX35SD 2821 #define MACH_TYPE_EUKREA_CPUIMX51SD 2822 #define MACH_TYPE_EUKREA_CPUIMX51 2823 +#define MACH_TYPE_NETSPACE_MINI_V2 2831 #define MACH_TYPE_SMDKC210 2838 #define MACH_TYPE_OMAP3_BRAILLO 2839 #define MACH_TYPE_SPYPLUG 2840 @@ -6614,6 +6615,18 @@ extern unsigned int __machine_arch_type; # define machine_is_eukrea_cpuimx51() (0) #endif
+#ifdef CONFIG_MACH_NETSPACE_MINI_V2 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_NETSPACE_MINI_V2 +# endif +# define machine_is_netspace_mini_v2() (machine_arch_type == MACH_TYPE_NETSPACE_MINI_V2) +#else +# define machine_is_netspace_mini_v2() (0) +#endif + #ifdef CONFIG_MACH_SMDKC210 # ifdef machine_arch_type # undef machine_arch_type
This patch adds support for the LaCie boards Network Space v2 (Lite and Mini). This two boards are derived from the Network Space v2 and a lot of hardware caracteristics are shared.
- CPU: Marvell 88F6192 800Mhz - SDRAM memory: 128MB DDR2 200Mhz - 1 SATA port: internal - Gigabit ethernet: PHY Marvell 88E1318 - Flash memory: SPI NOR 512KB (Macronix MX25L4005A) - i2c EEPROM: 512 bytes (24C04 type) - 2 USB2 ports (Lite only): host and host/device - 1 push button - 1 SATA LED (bi-color, blue and red)
Signed-off-by: Simon Guinot simon.guinot@sequanux.org --- No changes for v3.
Changes for v2: - Move mach-types update into a separate patch.
board/LaCie/common/common.c | 36 ++++++- board/LaCie/common/common.h | 1 + board/LaCie/netspace_v2/kwbimage-ns2l.cfg | 162 +++++++++++++++++++++++++++++ board/LaCie/netspace_v2/netspace_v2.c | 4 + boards.cfg | 2 + include/configs/lacie_kw.h | 26 ++++- 6 files changed, 224 insertions(+), 7 deletions(-) create mode 100644 board/LaCie/netspace_v2/kwbimage-ns2l.cfg
diff --git a/board/LaCie/common/common.c b/board/LaCie/common/common.c index 78d0edc..a62bf9f 100644 --- a/board/LaCie/common/common.c +++ b/board/LaCie/common/common.c @@ -13,10 +13,11 @@
#if defined(CONFIG_CMD_NET) && defined(CONFIG_RESET_PHY_R)
+#define MII_MARVELL_PHY_PAGE 22 + #define MV88E1116_LED_FCTRL_REG 10 #define MV88E1116_CPRSP_CR3_REG 21 #define MV88E1116_MAC_CTRL_REG 21 -#define MV88E1116_PGADR_REG 22 #define MV88E1116_RGMII_TXTM_CTRL (1 << 4) #define MV88E1116_RGMII_RXTM_CTRL (1 << 5)
@@ -31,15 +32,44 @@ void mv_phy_88e1116_init(const char *name, u16 phyaddr) * Enable RGMII delay on Tx and Rx for CPU port * Ref: sec 4.7.2 of chip datasheet */ - miiphy_write(name, phyaddr, MV88E1116_PGADR_REG, 2); + miiphy_write(name, phyaddr, MII_MARVELL_PHY_PAGE, 2); miiphy_read(name, phyaddr, MV88E1116_MAC_CTRL_REG, ®); reg |= (MV88E1116_RGMII_RXTM_CTRL | MV88E1116_RGMII_TXTM_CTRL); miiphy_write(name, phyaddr, MV88E1116_MAC_CTRL_REG, reg); - miiphy_write(name, phyaddr, MV88E1116_PGADR_REG, 0); + miiphy_write(name, phyaddr, MII_MARVELL_PHY_PAGE, 0);
if (miiphy_reset(name, phyaddr) == 0) printf("88E1116 Initialized on %s\n", name); } + +void mv_phy_88e1318_init(const char *name, u16 phyaddr) +{ + u16 reg; + + if (miiphy_set_current_dev(name)) + return; + + /* + * Set control mode 4 for LED[0]. + */ + miiphy_write(name, phyaddr, MII_MARVELL_PHY_PAGE, 3); + miiphy_read(name, phyaddr, 16, ®); + reg |= 0xf; + miiphy_write(name, phyaddr, 16, reg); + + /* + * Enable RGMII delay on Tx and Rx for CPU port + * Ref: sec 4.7.2 of chip datasheet + */ + miiphy_write(name, phyaddr, MII_MARVELL_PHY_PAGE, 2); + miiphy_read(name, phyaddr, MV88E1116_MAC_CTRL_REG, ®); + reg |= (MV88E1116_RGMII_TXTM_CTRL | MV88E1116_RGMII_RXTM_CTRL); + miiphy_write(name, phyaddr, MV88E1116_MAC_CTRL_REG, reg); + miiphy_write(name, phyaddr, MII_MARVELL_PHY_PAGE, 0); + + if (miiphy_reset(name, phyaddr) == 0) + printf("88E1318 Initialized on %s\n", name); +} #endif /* CONFIG_CMD_NET && CONFIG_RESET_PHY_R */
#if defined(CONFIG_CMD_I2C) && defined(CONFIG_SYS_I2C_EEPROM_ADDR) diff --git a/board/LaCie/common/common.h b/board/LaCie/common/common.h index 2edd5ab..85e433c 100644 --- a/board/LaCie/common/common.h +++ b/board/LaCie/common/common.h @@ -12,6 +12,7 @@
#if defined(CONFIG_CMD_NET) && defined(CONFIG_RESET_PHY_R) void mv_phy_88e1116_init(const char *name, u16 phyaddr); +void mv_phy_88e1318_init(const char *name, u16 phyaddr); #endif #if defined(CONFIG_CMD_I2C) && defined(CONFIG_SYS_I2C_EEPROM_ADDR) int lacie_read_mac_address(uchar *mac); diff --git a/board/LaCie/netspace_v2/kwbimage-ns2l.cfg b/board/LaCie/netspace_v2/kwbimage-ns2l.cfg new file mode 100644 index 0000000..d008eb0 --- /dev/null +++ b/board/LaCie/netspace_v2/kwbimage-ns2l.cfg @@ -0,0 +1,162 @@ +# +# Copyright (C) 2011 Simon Guinot sguinot@lacie.com +# +# Based on Kirkwood support: +# (C) Copyright 2009 +# Marvell Semiconductor <www.marvell.com> +# Written-by: Prafulla Wadaskar prafulla@marvell.com +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# Refer docs/README.kwimage for more details about how-to configure +# and create kirkwood boot image +# + +# Boot Media configurations +BOOT_FROM spi # Boot from SPI flash + +# SOC registers configuration using bootrom header extension +# Maximum KWBIMAGE_MAX_CONFIG configurations allowed + +# Configure RGMII-0 interface pad voltage to 1.8V +DATA 0xFFD100e0 0x1B1B1B9B + +#Dram initalization for SINGLE x16 CL=5 @ 400MHz +DATA 0xFFD01400 0x43000618 # DDR Configuration register +# bit13-0: 0xa00 (2560 DDR2 clks refresh rate) +# bit23-14: zero +# bit24: 1= enable exit self refresh mode on DDR access +# bit25: 1 required +# bit29-26: zero +# bit31-30: 01 + +DATA 0xFFD01404 0x34143000 # DDR Controller Control Low +# bit 4: 0=addr/cmd in smame cycle +# bit 5: 0=clk is driven during self refresh, we don't care for APX +# bit 6: 0=use recommended falling edge of clk for addr/cmd +# bit14: 0=input buffer always powered up +# bit18: 1=cpu lock transaction enabled +# bit23-20: 5=recommended value for CL=5 and STARTBURST_DEL disabled bit31=0 +# bit27-24: 8= CL+3, STARTBURST sample stages, for freqs 400MHz, unbuffered DIMM +# bit30-28: 3 required +# bit31: 0=no additional STARTBURST delay + +DATA 0xFFD01408 0x11012228 # DDR Timing (Low) (active cycles value +1) +# bit7-4: TRCD +# bit11- 8: TRP +# bit15-12: TWR +# bit19-16: TWTR +# bit20: TRAS msb +# bit23-21: 0x0 +# bit27-24: TRRD +# bit31-28: TRTP + +DATA 0xFFD0140C 0x00000A19 # DDR Timing (High) +# bit6-0: TRFC +# bit8-7: TR2R +# bit10-9: TR2W +# bit12-11: TW2W +# bit31-13: zero required + +DATA 0xFFD01410 0x0000DDDD # DDR Address Control +# bit1-0: 00, Cs0width=x8 +# bit3-2: 10, Cs0size=512Mb +# bit5-4: 00, Cs2width=nonexistent +# bit7-6: 00, Cs1size =nonexistent +# bit9-8: 00, Cs2width=nonexistent +# bit11-10: 00, Cs2size =nonexistent +# bit13-12: 00, Cs3width=nonexistent +# bit15-14: 00, Cs3size =nonexistent +# bit16: 0, Cs0AddrSel +# bit17: 0, Cs1AddrSel +# bit18: 0, Cs2AddrSel +# bit19: 0, Cs3AddrSel +# bit31-20: 0 required + +DATA 0xFFD01414 0x00000000 # DDR Open Pages Control +# bit0: 0, OpenPage enabled +# bit31-1: 0 required + +DATA 0xFFD01418 0x00000000 # DDR Operation +# bit3-0: 0x0, DDR cmd +# bit31-4: 0 required + +DATA 0xFFD0141C 0x00000632 # DDR Mode +# bit2-0: 2, BurstLen=2 required +# bit3: 0, BurstType=0 required +# bit6-4: 4, CL=5 +# bit7: 0, TestMode=0 normal +# bit8: 0, DLL reset=0 normal +# bit11-9: 6, auto-precharge write recovery ???????????? +# bit12: 0, PD must be zero +# bit31-13: 0 required + +DATA 0xFFD01420 0x00000004 # DDR Extended Mode +# bit0: 0, DDR DLL enabled +# bit1: 1, DDR drive strenght reduced +# bit2: 1, DDR ODT control lsd enabled +# bit5-3: 000, required +# bit6: 1, DDR ODT control msb, enabled +# bit9-7: 000, required +# bit10: 0, differential DQS enabled +# bit11: 0, required +# bit12: 0, DDR output buffer enabled +# bit31-13: 0 required + +DATA 0xFFD01424 0x0000F07F # DDR Controller Control High +# bit2-0: 111, required +# bit3 : 1 , MBUS Burst Chop disabled +# bit6-4: 111, required +# bit7 : 1 , D2P Latency enabled +# bit8 : 1 , add writepath sample stage, must be 1 for DDR freq >= 300MHz +# bit9 : 0 , no half clock cycle addition to dataout +# bit10 : 0 , 1/4 clock cycle skew enabled for addr/ctl signals +# bit11 : 0 , 1/4 clock cycle skew disabled for write mesh +# bit15-12: 1111 required +# bit31-16: 0 required + +DATA 0xFFD01428 0x00085520 # DDR2 ODT Read Timing (default values) +DATA 0xFFD0147C 0x00008552 # DDR2 ODT Write Timing (default values) + +DATA 0xFFD01500 0x00000000 # CS[0]n Base address to 0x0 +DATA 0xFFD01504 0x07FFFFF1 # CS[0]n Size +# bit0: 1, Window enabled +# bit1: 0, Write Protect disabled +# bit3-2: 00, CS0 hit selected +# bit23-4: ones, required +# bit31-24: 0x07, Size (i.e. 128MB) + +DATA 0xFFD0150C 0x00000000 # CS[1]n Size, window disabled +DATA 0xFFD01514 0x00000000 # CS[2]n Size, window disabled +DATA 0xFFD0151C 0x00000000 # CS[3]n Size, window disabled + +DATA 0xFFD01494 0x00010000 # DDR ODT Control (Low) +# bit3-0: 1, ODT0Rd, MODT[0] asserted during read from DRAM CS0 +# bit19-16:1, ODT0Wr, MODT[0] asserted during write to DRAM CS0 + +DATA 0xFFD01498 0x00000000 # DDR ODT Control (High) +# bit1-0: 00, ODT0 controlled by ODT Control (low) register above +# bit3-2: 01, ODT1 active NEVER! +# bit31-4: zero, required + +DATA 0xFFD0149C 0x0000E40F # CPU ODT Control +# bit3-0: 1, ODT0Rd, Internal ODT asserted during read from DRAM bank0 +# bit7-4: 1, ODT0Wr, Internal ODT asserted during write to DRAM bank0 +# bit11-10:1, DQ_ODTSel. ODT select turned on + +DATA 0xFFD01480 0x00000001 # DDR Initialization Control +#bit0=1, enable DDR init upon this register write + +# End of Header extension +DATA 0x0 0x0 diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c index 68e8a77..101a80a 100644 --- a/board/LaCie/netspace_v2/netspace_v2.c +++ b/board/LaCie/netspace_v2/netspace_v2.c @@ -107,7 +107,11 @@ int misc_init_r(void) /* Configure and initialize PHY */ void reset_phy(void) { +#if defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2) + mv_phy_88e1318_init("egiga0", 0); +#else mv_phy_88e1116_init("egiga0", 8); +#endif } #endif
diff --git a/boards.cfg b/boards.cfg index 613d6b2..e4613a9 100644 --- a/boards.cfg +++ b/boards.cfg @@ -162,7 +162,9 @@ kmcoge5un arm arm926ejs km_arm keymile portl2 arm arm926ejs km_arm keymile kirkwood km_kirkwood:KM_PORTL2 inetspace_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:INETSPACE_V2 net2big_v2 arm arm926ejs net2big_v2 LaCie kirkwood lacie_kw:NET2BIG_V2 +netspace_lite_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:NETSPACE_LITE_V2 netspace_max_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:NETSPACE_MAX_V2 +netspace_mini_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:NETSPACE_MINI_V2 netspace_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:NETSPACE_V2 dreamplug arm arm926ejs - Marvell kirkwood guruplug arm arm926ejs - Marvell kirkwood diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 08aec04..b00c352 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -27,6 +27,12 @@ #elif defined(CONFIG_NETSPACE_V2) #define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_V2 #define CONFIG_IDENT_STRING " NS v2" +#elif defined(CONFIG_NETSPACE_LITE_V2) +#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_LITE_V2 +#define CONFIG_IDENT_STRING " NS v2 Lite" +#elif defined(CONFIG_NETSPACE_MINI_V2) +#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MINI_V2 +#define CONFIG_IDENT_STRING " NS v2 Mini" #elif defined(CONFIG_NETSPACE_MAX_V2) #define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MAX_V2 #define CONFIG_IDENT_STRING " NS Max v2" @@ -41,8 +47,13 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ -#define CONFIG_KIRKWOOD /* SOC Family Name */ -#define CONFIG_KW88F6281 /* SOC Name */ +#define CONFIG_KIRKWOOD /* SoC Family Name */ +/* SoC name */ +#if defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2) +#define CONFIG_KW88F6192 +#else +#define CONFIG_KW88F6281 +#endif #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
/* @@ -56,7 +67,9 @@ #define CONFIG_CMD_SF #define CONFIG_CMD_I2C #define CONFIG_CMD_IDE +#ifndef CONFIG_NETSPACE_MINI_V2 /* No USB ports on Network Space v2 Mini */ #define CONFIG_CMD_USB +#endif
/* * Core clock definition @@ -68,9 +81,14 @@ */ #define CONFIG_NR_DRAM_BANKS 1
-#ifdef CONFIG_INETSPACE_V2 -/* Different SDRAM configuration and size for Internet Space v2 */ +/* + * Different SDRAM configuration and size for some of the boards derived + * from the Network Space v2 + */ +#if defined(CONFIG_INETSPACE_V2) #define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage-is2.cfg +#elif defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2) +#define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage-ns2l.cfg #endif
/*
This patch adds support for the LaCie board d2 Network v2 which share a lot of hardware caracteristics with the 2Big Network v2.
- CPU: Marvell 88F6281 1200Mhz - SDRAM memory: 256MB DDR2 400Mhz - 2 SATA ports: internal and eSATA - Gigabit ethernet: PHY Marvell 88E1116R - Flash memory: SPI NOR 512KB (Macronix MX25L4005A) - i2c EEPROM: 512 bytes (24C04 type) - 2 USB2 ports: host and host/device - 1 push button - 1 power switch - 1 SATA LED (bi-color, blue and red)
Signed-off-by: Simon Guinot simon.guinot@sequanux.org --- Changes for v3: - Rebased against u-boot-mv/master and u-boot-arm/master.
No changes for v2.
boards.cfg | 1 + include/configs/lacie_kw.h | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/boards.cfg b/boards.cfg index e4613a9..2c7d351 100644 --- a/boards.cfg +++ b/boards.cfg @@ -160,6 +160,7 @@ kmnusa arm arm926ejs km_arm keymile mgcoge3un arm arm926ejs km_arm keymile kirkwood km_kirkwood:KM_MGCOGE3UN kmcoge5un arm arm926ejs km_arm keymile kirkwood km_kirkwood:KM_COGE5UN portl2 arm arm926ejs km_arm keymile kirkwood km_kirkwood:KM_PORTL2 +d2net_v2 arm arm926ejs net2big_v2 LaCie kirkwood lacie_kw:D2NET_V2 inetspace_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:INETSPACE_V2 net2big_v2 arm arm926ejs net2big_v2 LaCie kirkwood lacie_kw:NET2BIG_V2 netspace_lite_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:NETSPACE_LITE_V2 diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index b00c352..3c0f838 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -36,6 +36,9 @@ #elif defined(CONFIG_NETSPACE_MAX_V2) #define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MAX_V2 #define CONFIG_IDENT_STRING " NS Max v2" +#elif defined(CONFIG_D2NET_V2) +#define CONFIG_MACH_TYPE MACH_TYPE_D2NET_V2 +#define CONFIG_IDENT_STRING " D2 v2" #elif defined(CONFIG_NET2BIG_V2) #define CONFIG_MACH_TYPE MACH_TYPE_NET2BIG_V2 #define CONFIG_IDENT_STRING " 2Big v2" @@ -106,7 +109,9 @@ #define CONFIG_ENV_SPI_MAX_HZ 20000000 /* 20Mhz */ #define CONFIG_SYS_IDE_MAXBUS 1 #define CONFIG_SYS_IDE_MAXDEVICE 1 -#if defined(CONFIG_NET2BIG_V2) +#if defined(CONFIG_D2NET_V2) +#define CONFIG_SYS_PROMPT "d2v2> " +#elif defined(CONFIG_NET2BIG_V2) #define CONFIG_SYS_PROMPT "2big2> " #else #define CONFIG_SYS_PROMPT "ns2> " @@ -126,7 +131,8 @@ */ #ifdef CONFIG_MVSATA_IDE #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET -#if defined(CONFIG_NETSPACE_MAX_V2) || defined(CONFIG_NET2BIG_V2) +#if defined(CONFIG_NETSPACE_MAX_V2) || defined(CONFIG_D2NET_V2) || \ + defined(CONFIG_NET2BIG_V2) #define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET #endif #endif /* CONFIG_MVSATA_IDE */
On Thu, Sep 06, 2012 at 11:25:23AM +0200, Simon Guinot wrote:
Changes for v3:
- Rebased against u-boot-mv/master and u-boot-arm/master.
Changes for v2:
- Move board support and feature into a separate patch set.
- Move mach-types update into a separate patch.
Simon Guinot (4): lacie_kw: add support for EFI partitions ARM: add netspace_mini_v2 to mach-types.h ARM: add support for Network Space v2 Lite and Mini ARM: add support for d2 Network v2
arch/arm/include/asm/mach-types.h | 13 +++ board/LaCie/common/common.c | 36 ++++++- board/LaCie/common/common.h | 1 + board/LaCie/netspace_v2/kwbimage-ns2l.cfg | 162 +++++++++++++++++++++++++++++ board/LaCie/netspace_v2/netspace_v2.c | 4 + boards.cfg | 3 + include/configs/lacie_kw.h | 42 ++++++-- 7 files changed, 252 insertions(+), 9 deletions(-) create mode 100644 board/LaCie/netspace_v2/kwbimage-ns2l.cfg
Hi Albert and Prafulla,
I thinks I miss the point with this v3 patch series. I understand now, I have to drop the patch: "ARM: add netspace_mini_v2 to mach-types.h"
The problem is that the boards netspace_mini_v2, and more recently netspace_lite_v2, have been removed from the Linux mach-types file. As a temporary solution, I could include the missing MACH_TYPE_ definitions to the header configs/lacie_kw.h.
Is that correct ? If yes, do you want me to resend the whole patch series or just an update for the patch "ARM: add support for Network Space v2 Lite and Mini" ?
Regards,
Simon
-- 1.7.10
Hi Simon,
On Thu, 6 Sep 2012 13:27:19 +0200, Simon Guinot simon.guinot@sequanux.org wrote:
On Thu, Sep 06, 2012 at 11:25:23AM +0200, Simon Guinot wrote:
Changes for v3:
- Rebased against u-boot-mv/master and u-boot-arm/master.
Changes for v2:
- Move board support and feature into a separate patch set.
- Move mach-types update into a separate patch.
Simon Guinot (4): lacie_kw: add support for EFI partitions ARM: add netspace_mini_v2 to mach-types.h ARM: add support for Network Space v2 Lite and Mini ARM: add support for d2 Network v2
arch/arm/include/asm/mach-types.h | 13 +++ board/LaCie/common/common.c | 36 ++++++- board/LaCie/common/common.h | 1 + board/LaCie/netspace_v2/kwbimage-ns2l.cfg | 162 +++++++++++++++++++++++++++++ board/LaCie/netspace_v2/netspace_v2.c | 4 + boards.cfg | 3 + include/configs/lacie_kw.h | 42 ++++++-- 7 files changed, 252 insertions(+), 9 deletions(-) create mode 100644 board/LaCie/netspace_v2/kwbimage-ns2l.cfg
Hi Albert and Prafulla,
I thinks I miss the point with this v3 patch series. I understand now, I have to drop the patch: "ARM: add netspace_mini_v2 to mach-types.h"
The problem is that the boards netspace_mini_v2, and more recently netspace_lite_v2, have been removed from the Linux mach-types file. As a temporary solution, I could include the missing MACH_TYPE_ definitions to the header configs/lacie_kw.h.
Is that correct ?
Correct. Boards which are being dropped from Linux mach-types have not necessarily died or stopped using (older) Linux or U-Boot, so we need to keep their mach-types around, in their board config headers.
I will pull the mach-types file myself and either remove redundant mach types from config header files or Cc: maintainers of boards the machine type of which have been dropped so that they fix their boards.
If yes, do you want me to resend the whole patch series or just an update for the patch "ARM: add support for Network Space v2 Lite and Mini" ?
Only updating that patch in the series is fine with me. Prafulla ?
Regards,
Simon
Amicalement,
-----Original Message----- From: Albert ARIBAUD [mailto:albert.u.boot@aribaud.net] Sent: 06 September 2012 08:07 To: U-Boot Cc: Simon Guinot; Prafulla Wadaskar Subject: Re: [PATCH v3 0/4] Board support and feature for LaCie devices
Hi Simon,
On Thu, 6 Sep 2012 13:27:19 +0200, Simon Guinot simon.guinot@sequanux.org wrote:
On Thu, Sep 06, 2012 at 11:25:23AM +0200, Simon Guinot wrote:
Changes for v3:
- Rebased against u-boot-mv/master and u-boot-arm/master.
Changes for v2:
- Move board support and feature into a separate patch set.
- Move mach-types update into a separate patch.
Simon Guinot (4): lacie_kw: add support for EFI partitions ARM: add netspace_mini_v2 to mach-types.h ARM: add support for Network Space v2 Lite and Mini ARM: add support for d2 Network v2
arch/arm/include/asm/mach-types.h | 13 +++ board/LaCie/common/common.c | 36 ++++++- board/LaCie/common/common.h | 1 + board/LaCie/netspace_v2/kwbimage-ns2l.cfg | 162 +++++++++++++++++++++++++++++ board/LaCie/netspace_v2/netspace_v2.c | 4 + boards.cfg | 3 + include/configs/lacie_kw.h | 42 ++++++-- 7 files changed, 252 insertions(+), 9 deletions(-) create mode 100644 board/LaCie/netspace_v2/kwbimage-ns2l.cfg
Hi Albert and Prafulla,
I thinks I miss the point with this v3 patch series. I understand
now,
I have to drop the patch: "ARM: add netspace_mini_v2 to mach-
types.h"
The problem is that the boards netspace_mini_v2, and more recently netspace_lite_v2, have been removed from the Linux mach-types file. As a temporary solution, I could include the missing MACH_TYPE_ definitions to the header configs/lacie_kw.h.
Is that correct ?
Correct. Boards which are being dropped from Linux mach-types have not necessarily died or stopped using (older) Linux or U-Boot, so we need to keep their mach-types around, in their board config headers.
I will pull the mach-types file myself and either remove redundant mach types from config header files or Cc: maintainers of boards the machine type of which have been dropped so that they fix their boards.
If yes, do you want me to resend the whole patch series or just an update for the patch "ARM: add support for Network Space v2 Lite and Mini" ?
Only updating that patch in the series is fine with me. Prafulla ?
If the MACHINE ID is not available in the mach_types.h, then we can define in the board specific file instead of updating mach_types.h?
Hi Simon, can you take care of this and post v4?
Regards... Prafulla . . .
Changes for v4: - Drop patch "ARM: add netspace_mini_v2 to mach-types.h". - Include missing MACH_TYPE_ in configs/lacie_kw.h.
Changes for v3: - Rebased against u-boot-mv/master and u-boot-arm/master.
Changes for v2: - Move board support and feature into a separate patch set. - Move mach-types update into a separate patch.
Simon Guinot (3): lacie_kw: add support for EFI partitions ARM: add support for Network Space v2 Lite and Mini ARM: add support for d2 Network v2
board/LaCie/common/common.c | 36 ++++++- board/LaCie/common/common.h | 1 + board/LaCie/netspace_v2/kwbimage-ns2l.cfg | 162 +++++++++++++++++++++++++++++ board/LaCie/netspace_v2/netspace_v2.c | 4 + boards.cfg | 3 + include/configs/lacie_kw.h | 44 ++++++-- 6 files changed, 241 insertions(+), 9 deletions(-) create mode 100644 board/LaCie/netspace_v2/kwbimage-ns2l.cfg
Defines CONFIG_EFI_PARTITION for LaCie boards.
Additionally this patch defines CONFIG_DOS_PARTITION. Note that this definition is implicit in mv_common.h when CONFIG_CMD_USB is enabled.
Signed-off-by: Simon Guinot simon.guinot@sequanux.org --- No changes for v2, v3 and v4.
include/configs/lacie_kw.h | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index c35c2db..08aec04 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -130,6 +130,12 @@ #endif /* CONFIG_CMD_I2C */
/* + * Partition support + */ +#define CONFIG_DOS_PARTITION +#define CONFIG_EFI_PARTITION + +/* * File systems support */ #define CONFIG_CMD_EXT2
This patch adds support for the LaCie boards Network Space v2 (Lite and Mini). This two boards are derived from the Network Space v2 and a lot of hardware caracteristics are shared.
- CPU: Marvell 88F6192 800Mhz - SDRAM memory: 128MB DDR2 200Mhz - 1 SATA port: internal - Gigabit ethernet: PHY Marvell 88E1318 - Flash memory: SPI NOR 512KB (Macronix MX25L4005A) - i2c EEPROM: 512 bytes (24C04 type) - 2 USB2 ports (Lite only): host and host/device - 1 push button - 1 SATA LED (bi-color, blue and red)
Signed-off-by: Simon Guinot simon.guinot@sequanux.org --- Changes for v4: - Include missing MACH_TYPE_ in configs/lacie_kw.h.
No changes for v3.
Changes for v2: - Move mach-types update into a separate patch.
board/LaCie/common/common.c | 36 ++++++- board/LaCie/common/common.h | 1 + board/LaCie/netspace_v2/kwbimage-ns2l.cfg | 162 +++++++++++++++++++++++++++++ board/LaCie/netspace_v2/netspace_v2.c | 4 + boards.cfg | 2 + include/configs/lacie_kw.h | 28 ++++- 6 files changed, 226 insertions(+), 7 deletions(-) create mode 100644 board/LaCie/netspace_v2/kwbimage-ns2l.cfg
diff --git a/board/LaCie/common/common.c b/board/LaCie/common/common.c index 78d0edc..a62bf9f 100644 --- a/board/LaCie/common/common.c +++ b/board/LaCie/common/common.c @@ -13,10 +13,11 @@
#if defined(CONFIG_CMD_NET) && defined(CONFIG_RESET_PHY_R)
+#define MII_MARVELL_PHY_PAGE 22 + #define MV88E1116_LED_FCTRL_REG 10 #define MV88E1116_CPRSP_CR3_REG 21 #define MV88E1116_MAC_CTRL_REG 21 -#define MV88E1116_PGADR_REG 22 #define MV88E1116_RGMII_TXTM_CTRL (1 << 4) #define MV88E1116_RGMII_RXTM_CTRL (1 << 5)
@@ -31,15 +32,44 @@ void mv_phy_88e1116_init(const char *name, u16 phyaddr) * Enable RGMII delay on Tx and Rx for CPU port * Ref: sec 4.7.2 of chip datasheet */ - miiphy_write(name, phyaddr, MV88E1116_PGADR_REG, 2); + miiphy_write(name, phyaddr, MII_MARVELL_PHY_PAGE, 2); miiphy_read(name, phyaddr, MV88E1116_MAC_CTRL_REG, ®); reg |= (MV88E1116_RGMII_RXTM_CTRL | MV88E1116_RGMII_TXTM_CTRL); miiphy_write(name, phyaddr, MV88E1116_MAC_CTRL_REG, reg); - miiphy_write(name, phyaddr, MV88E1116_PGADR_REG, 0); + miiphy_write(name, phyaddr, MII_MARVELL_PHY_PAGE, 0);
if (miiphy_reset(name, phyaddr) == 0) printf("88E1116 Initialized on %s\n", name); } + +void mv_phy_88e1318_init(const char *name, u16 phyaddr) +{ + u16 reg; + + if (miiphy_set_current_dev(name)) + return; + + /* + * Set control mode 4 for LED[0]. + */ + miiphy_write(name, phyaddr, MII_MARVELL_PHY_PAGE, 3); + miiphy_read(name, phyaddr, 16, ®); + reg |= 0xf; + miiphy_write(name, phyaddr, 16, reg); + + /* + * Enable RGMII delay on Tx and Rx for CPU port + * Ref: sec 4.7.2 of chip datasheet + */ + miiphy_write(name, phyaddr, MII_MARVELL_PHY_PAGE, 2); + miiphy_read(name, phyaddr, MV88E1116_MAC_CTRL_REG, ®); + reg |= (MV88E1116_RGMII_TXTM_CTRL | MV88E1116_RGMII_RXTM_CTRL); + miiphy_write(name, phyaddr, MV88E1116_MAC_CTRL_REG, reg); + miiphy_write(name, phyaddr, MII_MARVELL_PHY_PAGE, 0); + + if (miiphy_reset(name, phyaddr) == 0) + printf("88E1318 Initialized on %s\n", name); +} #endif /* CONFIG_CMD_NET && CONFIG_RESET_PHY_R */
#if defined(CONFIG_CMD_I2C) && defined(CONFIG_SYS_I2C_EEPROM_ADDR) diff --git a/board/LaCie/common/common.h b/board/LaCie/common/common.h index 2edd5ab..85e433c 100644 --- a/board/LaCie/common/common.h +++ b/board/LaCie/common/common.h @@ -12,6 +12,7 @@
#if defined(CONFIG_CMD_NET) && defined(CONFIG_RESET_PHY_R) void mv_phy_88e1116_init(const char *name, u16 phyaddr); +void mv_phy_88e1318_init(const char *name, u16 phyaddr); #endif #if defined(CONFIG_CMD_I2C) && defined(CONFIG_SYS_I2C_EEPROM_ADDR) int lacie_read_mac_address(uchar *mac); diff --git a/board/LaCie/netspace_v2/kwbimage-ns2l.cfg b/board/LaCie/netspace_v2/kwbimage-ns2l.cfg new file mode 100644 index 0000000..d008eb0 --- /dev/null +++ b/board/LaCie/netspace_v2/kwbimage-ns2l.cfg @@ -0,0 +1,162 @@ +# +# Copyright (C) 2011 Simon Guinot sguinot@lacie.com +# +# Based on Kirkwood support: +# (C) Copyright 2009 +# Marvell Semiconductor <www.marvell.com> +# Written-by: Prafulla Wadaskar prafulla@marvell.com +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# Refer docs/README.kwimage for more details about how-to configure +# and create kirkwood boot image +# + +# Boot Media configurations +BOOT_FROM spi # Boot from SPI flash + +# SOC registers configuration using bootrom header extension +# Maximum KWBIMAGE_MAX_CONFIG configurations allowed + +# Configure RGMII-0 interface pad voltage to 1.8V +DATA 0xFFD100e0 0x1B1B1B9B + +#Dram initalization for SINGLE x16 CL=5 @ 400MHz +DATA 0xFFD01400 0x43000618 # DDR Configuration register +# bit13-0: 0xa00 (2560 DDR2 clks refresh rate) +# bit23-14: zero +# bit24: 1= enable exit self refresh mode on DDR access +# bit25: 1 required +# bit29-26: zero +# bit31-30: 01 + +DATA 0xFFD01404 0x34143000 # DDR Controller Control Low +# bit 4: 0=addr/cmd in smame cycle +# bit 5: 0=clk is driven during self refresh, we don't care for APX +# bit 6: 0=use recommended falling edge of clk for addr/cmd +# bit14: 0=input buffer always powered up +# bit18: 1=cpu lock transaction enabled +# bit23-20: 5=recommended value for CL=5 and STARTBURST_DEL disabled bit31=0 +# bit27-24: 8= CL+3, STARTBURST sample stages, for freqs 400MHz, unbuffered DIMM +# bit30-28: 3 required +# bit31: 0=no additional STARTBURST delay + +DATA 0xFFD01408 0x11012228 # DDR Timing (Low) (active cycles value +1) +# bit7-4: TRCD +# bit11- 8: TRP +# bit15-12: TWR +# bit19-16: TWTR +# bit20: TRAS msb +# bit23-21: 0x0 +# bit27-24: TRRD +# bit31-28: TRTP + +DATA 0xFFD0140C 0x00000A19 # DDR Timing (High) +# bit6-0: TRFC +# bit8-7: TR2R +# bit10-9: TR2W +# bit12-11: TW2W +# bit31-13: zero required + +DATA 0xFFD01410 0x0000DDDD # DDR Address Control +# bit1-0: 00, Cs0width=x8 +# bit3-2: 10, Cs0size=512Mb +# bit5-4: 00, Cs2width=nonexistent +# bit7-6: 00, Cs1size =nonexistent +# bit9-8: 00, Cs2width=nonexistent +# bit11-10: 00, Cs2size =nonexistent +# bit13-12: 00, Cs3width=nonexistent +# bit15-14: 00, Cs3size =nonexistent +# bit16: 0, Cs0AddrSel +# bit17: 0, Cs1AddrSel +# bit18: 0, Cs2AddrSel +# bit19: 0, Cs3AddrSel +# bit31-20: 0 required + +DATA 0xFFD01414 0x00000000 # DDR Open Pages Control +# bit0: 0, OpenPage enabled +# bit31-1: 0 required + +DATA 0xFFD01418 0x00000000 # DDR Operation +# bit3-0: 0x0, DDR cmd +# bit31-4: 0 required + +DATA 0xFFD0141C 0x00000632 # DDR Mode +# bit2-0: 2, BurstLen=2 required +# bit3: 0, BurstType=0 required +# bit6-4: 4, CL=5 +# bit7: 0, TestMode=0 normal +# bit8: 0, DLL reset=0 normal +# bit11-9: 6, auto-precharge write recovery ???????????? +# bit12: 0, PD must be zero +# bit31-13: 0 required + +DATA 0xFFD01420 0x00000004 # DDR Extended Mode +# bit0: 0, DDR DLL enabled +# bit1: 1, DDR drive strenght reduced +# bit2: 1, DDR ODT control lsd enabled +# bit5-3: 000, required +# bit6: 1, DDR ODT control msb, enabled +# bit9-7: 000, required +# bit10: 0, differential DQS enabled +# bit11: 0, required +# bit12: 0, DDR output buffer enabled +# bit31-13: 0 required + +DATA 0xFFD01424 0x0000F07F # DDR Controller Control High +# bit2-0: 111, required +# bit3 : 1 , MBUS Burst Chop disabled +# bit6-4: 111, required +# bit7 : 1 , D2P Latency enabled +# bit8 : 1 , add writepath sample stage, must be 1 for DDR freq >= 300MHz +# bit9 : 0 , no half clock cycle addition to dataout +# bit10 : 0 , 1/4 clock cycle skew enabled for addr/ctl signals +# bit11 : 0 , 1/4 clock cycle skew disabled for write mesh +# bit15-12: 1111 required +# bit31-16: 0 required + +DATA 0xFFD01428 0x00085520 # DDR2 ODT Read Timing (default values) +DATA 0xFFD0147C 0x00008552 # DDR2 ODT Write Timing (default values) + +DATA 0xFFD01500 0x00000000 # CS[0]n Base address to 0x0 +DATA 0xFFD01504 0x07FFFFF1 # CS[0]n Size +# bit0: 1, Window enabled +# bit1: 0, Write Protect disabled +# bit3-2: 00, CS0 hit selected +# bit23-4: ones, required +# bit31-24: 0x07, Size (i.e. 128MB) + +DATA 0xFFD0150C 0x00000000 # CS[1]n Size, window disabled +DATA 0xFFD01514 0x00000000 # CS[2]n Size, window disabled +DATA 0xFFD0151C 0x00000000 # CS[3]n Size, window disabled + +DATA 0xFFD01494 0x00010000 # DDR ODT Control (Low) +# bit3-0: 1, ODT0Rd, MODT[0] asserted during read from DRAM CS0 +# bit19-16:1, ODT0Wr, MODT[0] asserted during write to DRAM CS0 + +DATA 0xFFD01498 0x00000000 # DDR ODT Control (High) +# bit1-0: 00, ODT0 controlled by ODT Control (low) register above +# bit3-2: 01, ODT1 active NEVER! +# bit31-4: zero, required + +DATA 0xFFD0149C 0x0000E40F # CPU ODT Control +# bit3-0: 1, ODT0Rd, Internal ODT asserted during read from DRAM bank0 +# bit7-4: 1, ODT0Wr, Internal ODT asserted during write to DRAM bank0 +# bit11-10:1, DQ_ODTSel. ODT select turned on + +DATA 0xFFD01480 0x00000001 # DDR Initialization Control +#bit0=1, enable DDR init upon this register write + +# End of Header extension +DATA 0x0 0x0 diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c index 68e8a77..101a80a 100644 --- a/board/LaCie/netspace_v2/netspace_v2.c +++ b/board/LaCie/netspace_v2/netspace_v2.c @@ -107,7 +107,11 @@ int misc_init_r(void) /* Configure and initialize PHY */ void reset_phy(void) { +#if defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2) + mv_phy_88e1318_init("egiga0", 0); +#else mv_phy_88e1116_init("egiga0", 8); +#endif } #endif
diff --git a/boards.cfg b/boards.cfg index 613d6b2..e4613a9 100644 --- a/boards.cfg +++ b/boards.cfg @@ -162,7 +162,9 @@ kmcoge5un arm arm926ejs km_arm keymile portl2 arm arm926ejs km_arm keymile kirkwood km_kirkwood:KM_PORTL2 inetspace_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:INETSPACE_V2 net2big_v2 arm arm926ejs net2big_v2 LaCie kirkwood lacie_kw:NET2BIG_V2 +netspace_lite_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:NETSPACE_LITE_V2 netspace_max_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:NETSPACE_MAX_V2 +netspace_mini_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:NETSPACE_MINI_V2 netspace_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:NETSPACE_V2 dreamplug arm arm926ejs - Marvell kirkwood guruplug arm arm926ejs - Marvell kirkwood diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 08aec04..878d2a3 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -27,6 +27,14 @@ #elif defined(CONFIG_NETSPACE_V2) #define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_V2 #define CONFIG_IDENT_STRING " NS v2" +#elif defined(CONFIG_NETSPACE_LITE_V2) +#define MACH_TYPE_NETSPACE_LITE_V2 2983 /* missing in mach-types.h */ +#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_LITE_V2 +#define CONFIG_IDENT_STRING " NS v2 Lite" +#elif defined(CONFIG_NETSPACE_MINI_V2) +#define MACH_TYPE_NETSPACE_MINI_V2 2831 /* missing in mach-types.h */ +#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MINI_V2 +#define CONFIG_IDENT_STRING " NS v2 Mini" #elif defined(CONFIG_NETSPACE_MAX_V2) #define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MAX_V2 #define CONFIG_IDENT_STRING " NS Max v2" @@ -41,8 +49,13 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ -#define CONFIG_KIRKWOOD /* SOC Family Name */ -#define CONFIG_KW88F6281 /* SOC Name */ +#define CONFIG_KIRKWOOD /* SoC Family Name */ +/* SoC name */ +#if defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2) +#define CONFIG_KW88F6192 +#else +#define CONFIG_KW88F6281 +#endif #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
/* @@ -56,7 +69,9 @@ #define CONFIG_CMD_SF #define CONFIG_CMD_I2C #define CONFIG_CMD_IDE +#ifndef CONFIG_NETSPACE_MINI_V2 /* No USB ports on Network Space v2 Mini */ #define CONFIG_CMD_USB +#endif
/* * Core clock definition @@ -68,9 +83,14 @@ */ #define CONFIG_NR_DRAM_BANKS 1
-#ifdef CONFIG_INETSPACE_V2 -/* Different SDRAM configuration and size for Internet Space v2 */ +/* + * Different SDRAM configuration and size for some of the boards derived + * from the Network Space v2 + */ +#if defined(CONFIG_INETSPACE_V2) #define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage-is2.cfg +#elif defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2) +#define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage-ns2l.cfg #endif
/*
-----Original Message----- From: Simon Guinot [mailto:simon.guinot@sequanux.org] Sent: 06 September 2012 13:52 To: Prafulla Wadaskar; Albert ARIBAUD Cc: u-boot@lists.denx.de; Simon Guinot Subject: [PATCH v4 2/3] ARM: add support for Network Space v2 Lite and Mini
This patch adds support for the LaCie boards Network Space v2 (Lite and Mini). This two boards are derived from the Network Space v2 and a lot of hardware caracteristics are shared.
- CPU: Marvell 88F6192 800Mhz
- SDRAM memory: 128MB DDR2 200Mhz
- 1 SATA port: internal
- Gigabit ethernet: PHY Marvell 88E1318
- Flash memory: SPI NOR 512KB (Macronix MX25L4005A)
- i2c EEPROM: 512 bytes (24C04 type)
- 2 USB2 ports (Lite only): host and host/device
- 1 push button
- 1 SATA LED (bi-color, blue and red)
Signed-off-by: Simon Guinot simon.guinot@sequanux.org
Changes for v4:
- Include missing MACH_TYPE_ in configs/lacie_kw.h.
No changes for v3.
Changes for v2:
- Move mach-types update into a separate patch.
board/LaCie/common/common.c | 36 ++++++- board/LaCie/common/common.h | 1 + board/LaCie/netspace_v2/kwbimage-ns2l.cfg | 162 +++++++++++++++++++++++++++++
Hi Simon,
You have added one more cfg file in this patch Now you have three cfg files in this folder that just diff from each other for DRAM configuration.
Whereas you can delete two of them, use maximum dram setting in cfg file, and then in board specific file you can tune the configuration for required size.
You may look for this optimization. FYI: pls see the captured log of diff
[prafulla@pe-dt061 u-boot-marvell.git (master)]$ diff board/LaCie/netspace_v2/kwbimage-ns2l.cfg board/LaCie/netspace_v2/kwbimage.cfg 44c44 < DATA 0xFFD01404 0x34143000 # DDR Controller Control Low ---
DATA 0xFFD01404 0x35143000 # DDR Controller Control Low
72c72 < DATA 0xFFD01410 0x0000DDDD # DDR Address Control ---
DATA 0xFFD01410 0x0000000C # DDR Address Control
74c74 < # bit3-2: 10, Cs0size=512Mb ---
# bit3-2: 11, Cs0size=1Gb
133c133 < DATA 0xFFD01504 0x07FFFFF1 # CS[0]n Size ---
DATA 0xFFD01504 0x0FFFFFF1 # CS[0]n Size
[prafulla@pe-dt061 u-boot-marvell.git (master)]$ diff board/LaCie/netspace_v2/kwbimage-ns2l.cfg board/LaCie/netspace_v2/kwbimage kwbimage.cfg kwbimage-is2.cfg kwbimage-ns2l.cfg [prafulla@pe-dt061 u-boot-marvell.git (master)]$ diff board/LaCie/netspace_v2/kwbimage-ns2l.cfg board/LaCie/netspace_v2/kwbimage-is2.cfg 44c44 < DATA 0xFFD01404 0x34143000 # DDR Controller Control Low ---
DATA 0xFFD01404 0x35143000 # DDR Controller Control Low
72c72 < DATA 0xFFD01410 0x0000DDDD # DDR Address Control ---
DATA 0xFFD01410 0x00000008 # DDR Address Control
[prafulla@pe-dt061 u-boot-marvell.git (master)]$ diff board/LaCie/netspace_v2/kwbimage-is2.cfg board/LaCie/netspace_v2/kwbimage.cfg 72c72 < DATA 0xFFD01410 0x00000008 # DDR Address Control ---
DATA 0xFFD01410 0x0000000C # DDR Address Control
74c74 < # bit3-2: 10, Cs0size=512Mb ---
# bit3-2: 11, Cs0size=1Gb
133c133 < DATA 0xFFD01504 0x07FFFFF1 # CS[0]n Size ---
DATA 0xFFD01504 0x0FFFFFF1 # CS[0]n Size
Regards... Prafulla . . .
On Thu, Sep 06, 2012 at 04:19:16PM -0700, Prafulla Wadaskar wrote:
-----Original Message----- From: Simon Guinot [mailto:simon.guinot@sequanux.org] Sent: 06 September 2012 13:52 To: Prafulla Wadaskar; Albert ARIBAUD Cc: u-boot@lists.denx.de; Simon Guinot Subject: [PATCH v4 2/3] ARM: add support for Network Space v2 Lite and Mini
This patch adds support for the LaCie boards Network Space v2 (Lite and Mini). This two boards are derived from the Network Space v2 and a lot of hardware caracteristics are shared.
- CPU: Marvell 88F6192 800Mhz
- SDRAM memory: 128MB DDR2 200Mhz
- 1 SATA port: internal
- Gigabit ethernet: PHY Marvell 88E1318
- Flash memory: SPI NOR 512KB (Macronix MX25L4005A)
- i2c EEPROM: 512 bytes (24C04 type)
- 2 USB2 ports (Lite only): host and host/device
- 1 push button
- 1 SATA LED (bi-color, blue and red)
Signed-off-by: Simon Guinot simon.guinot@sequanux.org
Changes for v4:
- Include missing MACH_TYPE_ in configs/lacie_kw.h.
No changes for v3.
Changes for v2:
- Move mach-types update into a separate patch.
board/LaCie/common/common.c | 36 ++++++- board/LaCie/common/common.h | 1 + board/LaCie/netspace_v2/kwbimage-ns2l.cfg | 162 +++++++++++++++++++++++++++++
Hi Simon,
You have added one more cfg file in this patch Now you have three cfg files in this folder that just diff from each other for DRAM configuration.
Whereas you can delete two of them, use maximum dram setting in cfg file, and then in board specific file you can tune the configuration for required size.
You may look for this optimization. FYI: pls see the captured log of diff
OK I will look at this but are you sure it is safe to update the DDR settings at run time (even only the size) ?
[prafulla@pe-dt061 u-boot-marvell.git (master)]$ diff board/LaCie/netspace_v2/kwbimage-ns2l.cfg board/LaCie/netspace_v2/kwbimage.cfg 44c44
< DATA 0xFFD01404 0x34143000 # DDR Controller Control Low
DATA 0xFFD01404 0x35143000 # DDR Controller Control Low
72c72
< DATA 0xFFD01410 0x0000DDDD # DDR Address Control
DATA 0xFFD01410 0x0000000C # DDR Address Control
74c74
For example, here we have a different SDRAM width configuration configuration for CS0: x8 against x16. It looks like it can't be merged.
< # bit3-2: 10, Cs0size=512Mb
# bit3-2: 11, Cs0size=1Gb
133c133
< DATA 0xFFD01504 0x07FFFFF1 # CS[0]n Size
DATA 0xFFD01504 0x0FFFFFF1 # CS[0]n Size
[prafulla@pe-dt061 u-boot-marvell.git (master)]$ diff board/LaCie/netspace_v2/kwbimage-ns2l.cfg board/LaCie/netspace_v2/kwbimage kwbimage.cfg kwbimage-is2.cfg kwbimage-ns2l.cfg [prafulla@pe-dt061 u-boot-marvell.git (master)]$ diff board/LaCie/netspace_v2/kwbimage-ns2l.cfg board/LaCie/netspace_v2/kwbimage-is2.cfg 44c44
< DATA 0xFFD01404 0x34143000 # DDR Controller Control Low
DATA 0xFFD01404 0x35143000 # DDR Controller Control Low
72c72
< DATA 0xFFD01410 0x0000DDDD # DDR Address Control
DATA 0xFFD01410 0x00000008 # DDR Address Control
Same comment as before.
[prafulla@pe-dt061 u-boot-marvell.git (master)]$ diff board/LaCie/netspace_v2/kwbimage-is2.cfg board/LaCie/netspace_v2/kwbimage.cfg 72c72
< DATA 0xFFD01410 0x00000008 # DDR Address Control
DATA 0xFFD01410 0x0000000C # DDR Address Control
74c74
< # bit3-2: 10, Cs0size=512Mb
# bit3-2: 11, Cs0size=1Gb
133c133
< DATA 0xFFD01504 0x07FFFFF1 # CS[0]n Size
DATA 0xFFD01504 0x0FFFFFF1 # CS[0]n Size
Ok. Here, the only difference is the size. So, this two configurations could probably be merged. Thanks for pointing this out.
Considering this merge is rather optimisation than fix, is that good enough for you if I schedule this task for the next U-Boot release ?
Regards,
Simon
-----Original Message----- From: Simon Guinot [mailto:simon.guinot@sequanux.org] Sent: 07 September 2012 02:28 To: Prafulla Wadaskar Cc: Albert ARIBAUD; u-boot@lists.denx.de Subject: Re: [PATCH v4 2/3] ARM: add support for Network Space v2 Lite and Mini
On Thu, Sep 06, 2012 at 04:19:16PM -0700, Prafulla Wadaskar wrote:
-----Original Message----- From: Simon Guinot [mailto:simon.guinot@sequanux.org] Sent: 06 September 2012 13:52 To: Prafulla Wadaskar; Albert ARIBAUD Cc: u-boot@lists.denx.de; Simon Guinot Subject: [PATCH v4 2/3] ARM: add support for Network Space v2 Lite
and
Mini
This patch adds support for the LaCie boards Network Space v2
(Lite
and Mini). This two boards are derived from the Network Space v2 and a
lot
of hardware caracteristics are shared.
- CPU: Marvell 88F6192 800Mhz
- SDRAM memory: 128MB DDR2 200Mhz
- 1 SATA port: internal
- Gigabit ethernet: PHY Marvell 88E1318
- Flash memory: SPI NOR 512KB (Macronix MX25L4005A)
- i2c EEPROM: 512 bytes (24C04 type)
- 2 USB2 ports (Lite only): host and host/device
- 1 push button
- 1 SATA LED (bi-color, blue and red)
Signed-off-by: Simon Guinot simon.guinot@sequanux.org
Changes for v4:
- Include missing MACH_TYPE_ in configs/lacie_kw.h.
No changes for v3.
Changes for v2:
- Move mach-types update into a separate patch.
board/LaCie/common/common.c | 36 ++++++- board/LaCie/common/common.h | 1 + board/LaCie/netspace_v2/kwbimage-ns2l.cfg | 162 +++++++++++++++++++++++++++++
Hi Simon,
You have added one more cfg file in this patch Now you have three cfg files in this folder that just diff from each
other for DRAM configuration.
Whereas you can delete two of them, use maximum dram setting in cfg
file, and then in board specific file you can tune the configuration for required size.
You may look for this optimization. FYI: pls see the captured log of diff
OK I will look at this but are you sure it is safe to update the DDR settings at run time (even only the size) ?
I think so, size should not have any issues
[prafulla@pe-dt061 u-boot-marvell.git (master)]$ diff
board/LaCie/netspace_v2/kwbimage-ns2l.cfg board/LaCie/netspace_v2/kwbimage.cfg
44c44
< DATA 0xFFD01404 0x34143000 # DDR Controller Control Low
DATA 0xFFD01404 0x35143000 # DDR Controller Control Low
72c72
< DATA 0xFFD01410 0x0000DDDD # DDR Address Control
DATA 0xFFD01410 0x0000000C # DDR Address Control
74c74
For example, here we have a different SDRAM width configuration configuration for CS0: x8 against x16. It looks like it can't be merged.
Okay
< # bit3-2: 10, Cs0size=512Mb
# bit3-2: 11, Cs0size=1Gb
133c133
< DATA 0xFFD01504 0x07FFFFF1 # CS[0]n Size
DATA 0xFFD01504 0x0FFFFFF1 # CS[0]n Size
[prafulla@pe-dt061 u-boot-marvell.git (master)]$ diff
board/LaCie/netspace_v2/kwbimage-ns2l.cfg board/LaCie/netspace_v2/kwbimage
kwbimage.cfg kwbimage-is2.cfg kwbimage-ns2l.cfg [prafulla@pe-dt061 u-boot-marvell.git (master)]$ diff
board/LaCie/netspace_v2/kwbimage-ns2l.cfg board/LaCie/netspace_v2/kwbimage-is2.cfg
44c44
< DATA 0xFFD01404 0x34143000 # DDR Controller Control Low
DATA 0xFFD01404 0x35143000 # DDR Controller Control Low
72c72
< DATA 0xFFD01410 0x0000DDDD # DDR Address Control
DATA 0xFFD01410 0x00000008 # DDR Address Control
Same comment as before.
[prafulla@pe-dt061 u-boot-marvell.git (master)]$ diff
board/LaCie/netspace_v2/kwbimage-is2.cfg board/LaCie/netspace_v2/kwbimage.cfg
72c72
< DATA 0xFFD01410 0x00000008 # DDR Address Control
DATA 0xFFD01410 0x0000000C # DDR Address Control
74c74
< # bit3-2: 10, Cs0size=512Mb
# bit3-2: 11, Cs0size=1Gb
133c133
< DATA 0xFFD01504 0x07FFFFF1 # CS[0]n Size
DATA 0xFFD01504 0x0FFFFFF1 # CS[0]n Size
Ok. Here, the only difference is the size. So, this two configurations could probably be merged. Thanks for pointing this out.
Considering this merge is rather optimisation than fix, is that good enough for you if I schedule this task for the next U-Boot release ?
Okay, you can take it for next release.
Regards... Prafulla . . .
This patch adds support for the LaCie board d2 Network v2 which share a lot of hardware caracteristics with the 2Big Network v2.
- CPU: Marvell 88F6281 1200Mhz - SDRAM memory: 256MB DDR2 400Mhz - 2 SATA ports: internal and eSATA - Gigabit ethernet: PHY Marvell 88E1116R - Flash memory: SPI NOR 512KB (Macronix MX25L4005A) - i2c EEPROM: 512 bytes (24C04 type) - 2 USB2 ports: host and host/device - 1 push button - 1 power switch - 1 SATA LED (bi-color, blue and red)
Signed-off-by: Simon Guinot simon.guinot@sequanux.org --- No changes for v4.
Changes for v3: - Rebased against u-boot-mv/master and u-boot-arm/master.
No changes for v2.
boards.cfg | 1 + include/configs/lacie_kw.h | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/boards.cfg b/boards.cfg index e4613a9..2c7d351 100644 --- a/boards.cfg +++ b/boards.cfg @@ -160,6 +160,7 @@ kmnusa arm arm926ejs km_arm keymile mgcoge3un arm arm926ejs km_arm keymile kirkwood km_kirkwood:KM_MGCOGE3UN kmcoge5un arm arm926ejs km_arm keymile kirkwood km_kirkwood:KM_COGE5UN portl2 arm arm926ejs km_arm keymile kirkwood km_kirkwood:KM_PORTL2 +d2net_v2 arm arm926ejs net2big_v2 LaCie kirkwood lacie_kw:D2NET_V2 inetspace_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:INETSPACE_V2 net2big_v2 arm arm926ejs net2big_v2 LaCie kirkwood lacie_kw:NET2BIG_V2 netspace_lite_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:NETSPACE_LITE_V2 diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 878d2a3..09b5798 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -38,6 +38,9 @@ #elif defined(CONFIG_NETSPACE_MAX_V2) #define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MAX_V2 #define CONFIG_IDENT_STRING " NS Max v2" +#elif defined(CONFIG_D2NET_V2) +#define CONFIG_MACH_TYPE MACH_TYPE_D2NET_V2 +#define CONFIG_IDENT_STRING " D2 v2" #elif defined(CONFIG_NET2BIG_V2) #define CONFIG_MACH_TYPE MACH_TYPE_NET2BIG_V2 #define CONFIG_IDENT_STRING " 2Big v2" @@ -108,7 +111,9 @@ #define CONFIG_ENV_SPI_MAX_HZ 20000000 /* 20Mhz */ #define CONFIG_SYS_IDE_MAXBUS 1 #define CONFIG_SYS_IDE_MAXDEVICE 1 -#if defined(CONFIG_NET2BIG_V2) +#if defined(CONFIG_D2NET_V2) +#define CONFIG_SYS_PROMPT "d2v2> " +#elif defined(CONFIG_NET2BIG_V2) #define CONFIG_SYS_PROMPT "2big2> " #else #define CONFIG_SYS_PROMPT "ns2> " @@ -128,7 +133,8 @@ */ #ifdef CONFIG_MVSATA_IDE #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET -#if defined(CONFIG_NETSPACE_MAX_V2) || defined(CONFIG_NET2BIG_V2) +#if defined(CONFIG_NETSPACE_MAX_V2) || defined(CONFIG_D2NET_V2) || \ + defined(CONFIG_NET2BIG_V2) #define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET #endif #endif /* CONFIG_MVSATA_IDE */
-----Original Message----- From: Simon Guinot [mailto:simon.guinot@sequanux.org] Sent: 06 September 2012 13:52 To: Prafulla Wadaskar; Albert ARIBAUD Cc: u-boot@lists.denx.de; Simon Guinot Subject: [PATCH v4 0/3] Board support and feature for LaCie devices
Changes for v4:
- Drop patch "ARM: add netspace_mini_v2 to mach-types.h".
- Include missing MACH_TYPE_ in configs/lacie_kw.h.
Changes for v3:
- Rebased against u-boot-mv/master and u-boot-arm/master.
Changes for v2:
- Move board support and feature into a separate patch set.
- Move mach-types update into a separate patch.
Simon Guinot (3): lacie_kw: add support for EFI partitions ARM: add support for Network Space v2 Lite and Mini ARM: add support for d2 Network v2
board/LaCie/common/common.c | 36 ++++++- board/LaCie/common/common.h | 1 + board/LaCie/netspace_v2/kwbimage-ns2l.cfg | 162 +++++++++++++++++++++++++++++ board/LaCie/netspace_v2/netspace_v2.c | 4 + boards.cfg | 3 + include/configs/lacie_kw.h | 44 ++++++-- 6 files changed, 241 insertions(+), 9 deletions(-) create mode 100644 board/LaCie/netspace_v2/kwbimage-ns2l.cfg
Applied this entire patch series to u-boot-marvell.git master branch
Regards... Prafulla . . .
Dear Albert,
Please pull The following changes since commit 35729c6cb310d8bdfcf32ec0c23f226c714efda3: Nobuhiro Iwamatsu (1): rmobile: Fix build timer driver with BUILD_DIR
are available in the git repository at:
u-boot-marvell.git master branch.
Albert ARIBAUD (1): edminiv2: increase malloc len to 256K
Dinh Nguyen (1): ARM: kirkwood/orion5x: Use reset_cpu definition in include/common.h
Gerlando Falauto (2): kirkwood: implement kw_sdram_bs_set() kirkwood: implement kw_sdram_size_adjust
Holger Brunck (2): kirkwood: use c-struct for access to SDRAM addr decode registers arm/km: use kw_sdram_size_adjust to adjust SDRAM size
Luka Perkov (2): kirkwood: fix mpp.h coding style kirkwood: add support for Iomega iConnect board
Michael Walle (1): lsxl: also turn off fan in power down mode
Simon Baatz (1): kirkwood: ib62x0: Invert SATA activity LEDs
Simon Guinot (3): lacie_kw: add support for EFI partitions ARM: add support for Network Space v2 Lite and Mini ARM: add support for d2 Network v2
Valentin Longchamp (2): arm/km: add mv88e6352 configuration for kmnusa km_kirkwood: enable MV88E6352_SWITCH support for kmnusa
MAINTAINERS | 1 + arch/arm/cpu/arm926ejs/kirkwood/dram.c | 58 +++++++++- arch/arm/include/asm/arch-kirkwood/cpu.h | 2 +- arch/arm/include/asm/arch-kirkwood/mpp.h | 2 +- arch/arm/include/asm/arch-orion5x/cpu.h | 1 - board/LaCie/common/common.c | 36 ++++++- board/LaCie/common/common.h | 1 + board/LaCie/netspace_v2/kwbimage-ns2l.cfg | 162 ++++++++++++++++++++++++++++ board/LaCie/netspace_v2/netspace_v2.c | 4 + board/buffalo/lsxl/lsxl.c | 6 +- board/iomega/iconnect/Makefile | 43 ++++++++ board/iomega/iconnect/iconnect.c | 107 +++++++++++++++++++ board/iomega/iconnect/iconnect.h | 39 +++++++ board/iomega/iconnect/kwbimage.cfg | 165 +++++++++++++++++++++++++++++ board/keymile/km_arm/km_arm.c | 68 ++++++++++++- board/raidsonic/ib62x0/ib62x0.c | 3 + board/raidsonic/ib62x0/ib62x0.h | 4 + boards.cfg | 4 + include/configs/edminiv2.h | 2 +- include/configs/iconnect.h | 129 ++++++++++++++++++++++ include/configs/km_kirkwood.h | 2 + include/configs/lacie_kw.h | 44 +++++++- 22 files changed, 862 insertions(+), 21 deletions(-) create mode 100644 board/LaCie/netspace_v2/kwbimage-ns2l.cfg create mode 100644 board/iomega/iconnect/Makefile create mode 100644 board/iomega/iconnect/iconnect.c create mode 100644 board/iomega/iconnect/iconnect.h create mode 100644 board/iomega/iconnect/kwbimage.cfg create mode 100644 include/configs/iconnect.h
Regards... Prafulla . . .
Hi Prafulla,
On Wed, 3 Oct 2012 02:01:14 -0700, Prafulla Wadaskar prafulla@marvell.com wrote:
Dear Albert,
Please pull The following changes since commit 35729c6cb310d8bdfcf32ec0c23f226c714efda3: Nobuhiro Iwamatsu (1): rmobile: Fix build timer driver with BUILD_DIR
are available in the git repository at:
u-boot-marvell.git master branch.
Albert ARIBAUD (1): edminiv2: increase malloc len to 256K
Dinh Nguyen (1): ARM: kirkwood/orion5x: Use reset_cpu definition in include/common.h
Gerlando Falauto (2): kirkwood: implement kw_sdram_bs_set() kirkwood: implement kw_sdram_size_adjust
Holger Brunck (2): kirkwood: use c-struct for access to SDRAM addr decode registers arm/km: use kw_sdram_size_adjust to adjust SDRAM size
Luka Perkov (2): kirkwood: fix mpp.h coding style kirkwood: add support for Iomega iConnect board
Michael Walle (1): lsxl: also turn off fan in power down mode
Simon Baatz (1): kirkwood: ib62x0: Invert SATA activity LEDs
Simon Guinot (3): lacie_kw: add support for EFI partitions ARM: add support for Network Space v2 Lite and Mini ARM: add support for d2 Network v2
Valentin Longchamp (2): arm/km: add mv88e6352 configuration for kmnusa km_kirkwood: enable MV88E6352_SWITCH support for kmnusa
MAINTAINERS | 1 + arch/arm/cpu/arm926ejs/kirkwood/dram.c | 58 +++++++++- arch/arm/include/asm/arch-kirkwood/cpu.h | 2 +- arch/arm/include/asm/arch-kirkwood/mpp.h | 2 +- arch/arm/include/asm/arch-orion5x/cpu.h | 1 - board/LaCie/common/common.c | 36 ++++++- board/LaCie/common/common.h | 1 + board/LaCie/netspace_v2/kwbimage-ns2l.cfg | 162 ++++++++++++++++++++++++++++ board/LaCie/netspace_v2/netspace_v2.c | 4 + board/buffalo/lsxl/lsxl.c | 6 +- board/iomega/iconnect/Makefile | 43 ++++++++ board/iomega/iconnect/iconnect.c | 107 +++++++++++++++++++ board/iomega/iconnect/iconnect.h | 39 +++++++ board/iomega/iconnect/kwbimage.cfg | 165 +++++++++++++++++++++++++++++ board/keymile/km_arm/km_arm.c | 68 ++++++++++++- board/raidsonic/ib62x0/ib62x0.c | 3 + board/raidsonic/ib62x0/ib62x0.h | 4 + boards.cfg | 4 + include/configs/edminiv2.h | 2 +- include/configs/iconnect.h | 129 ++++++++++++++++++++++ include/configs/km_kirkwood.h | 2 + include/configs/lacie_kw.h | 44 +++++++- 22 files changed, 862 insertions(+), 21 deletions(-) create mode 100644 board/LaCie/netspace_v2/kwbimage-ns2l.cfg create mode 100644 board/iomega/iconnect/Makefile create mode 100644 board/iomega/iconnect/iconnect.c create mode 100644 board/iomega/iconnect/iconnect.h create mode 100644 board/iomega/iconnect/kwbimage.cfg create mode 100644 include/configs/iconnect.h
Regards... Prafulla . . .
Applied to u-boot-arm/master, thanks!
Amicalement,
Dear Albert,
Please pull The following changes since commit b8a7c467960ffb4d5a5e1eef5f7783fb6f594542: Albert ARIBAUD (1): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
are available in the git repository at:
u-boot-marvell.git master branch.
Albert ARIBAUD (3): mv88e61xx: refactor PHY and SWITCH level-code kirkwood: make MPP arrays static const ARM: lacie_kw: add support for WIRELESS_SPACE
Holger Brunck (3): arm/km: fix memory settings km/common: drop unneeded std* environment variables km/common: cosmetic change reported from checkpatch
Valentin Longchamp (1): arm/km: remove duplicate code
arch/arm/cpu/arm926ejs/kirkwood/mpp.c | 2 +- arch/arm/include/asm/arch-kirkwood/mpp.h | 2 +- board/LaCie/net2big_v2/net2big_v2.c | 2 +- board/LaCie/netspace_v2/netspace_v2.c | 2 +- board/LaCie/wireless_space/Makefile | 46 +++ board/LaCie/wireless_space/kwbimage.cfg | 82 ++++ board/LaCie/wireless_space/wireless_space.c | 176 ++++++++ board/Marvell/dreamplug/dreamplug.c | 2 +- board/Marvell/guruplug/guruplug.c | 2 +- board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c | 2 +- board/Marvell/openrd/openrd.c | 2 +- board/Marvell/rd6281a/rd6281a.c | 2 +- board/Marvell/sheevaplug/sheevaplug.c | 2 +- board/Seagate/dockstar/dockstar.c | 2 +- board/buffalo/lsxl/lsxl.c | 2 +- board/cloudengines/pogo_e02/pogo_e02.c | 2 +- board/d-link/dns325/dns325.c | 2 +- board/iomega/iconnect/iconnect.c | 2 +- board/karo/tk71/tk71.c | 2 +- board/keymile/common/common.c | 2 +- board/keymile/km_arm/km_arm.c | 16 +- board/keymile/km_arm/kwbimage-memphis.cfg | 6 +- board/keymile/km_arm/kwbimage.cfg | 6 +- board/keymile/km_arm/kwbimage_128M16_1.cfg | 25 +- board/keymile/km_arm/kwbimage_256M8_1.cfg | 25 +- board/raidsonic/ib62x0/ib62x0.c | 2 +- boards.cfg | 1 + drivers/net/phy/mv88e61xx.c | 495 ++++++++++++++-------- drivers/net/phy/mv88e61xx.h | 39 ++- drivers/spi/kirkwood_spi.c | 12 +- include/configs/km/keymile-common.h | 3 - include/configs/wireless_space.h | 194 +++++++++ include/netdev.h | 21 +- 33 files changed, 891 insertions(+), 292 deletions(-) create mode 100644 board/LaCie/wireless_space/Makefile create mode 100644 board/LaCie/wireless_space/kwbimage.cfg create mode 100644 board/LaCie/wireless_space/wireless_space.c create mode 100644 include/configs/wireless_space.h
Regards... Prafulla . . .
Dear Albert Please discard my earlier pull request and please pull The following changes since commit b8a7c467960ffb4d5a5e1eef5f7783fb6f594542: Albert ARIBAUD (1): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
are available in the git repository at:
u-boot-marvell.git master branch.
Albert ARIBAUD (3): mv88e61xx: refactor PHY and SWITCH level-code kirkwood: make MPP arrays static const ARM: lacie_kw: add support for WIRELESS_SPACE
Holger Brunck (3): arm/km: fix memory settings km/common: drop unneeded std* environment variables km/common: cosmetic change reported from checkpatch
Luke Lowrey (1): arch-kirkwood: Ethernet port macro returning incorrect address
Michael Walle (1): lsxl: unset ncip for rescue mode
Valentin Longchamp (1): arm/km: remove duplicate code
andreas.devel@googlemail.com (1): mv-common.h: increase malloc arena to 4MiB
arch/arm/cpu/arm926ejs/kirkwood/mpp.c | 2 +- arch/arm/include/asm/arch-kirkwood/cpu.h | 2 +- arch/arm/include/asm/arch-kirkwood/mpp.h | 2 +- board/LaCie/net2big_v2/net2big_v2.c | 2 +- board/LaCie/netspace_v2/netspace_v2.c | 2 +- board/LaCie/wireless_space/Makefile | 46 +++ board/LaCie/wireless_space/kwbimage.cfg | 82 ++++ board/LaCie/wireless_space/wireless_space.c | 176 ++++++++ board/Marvell/dreamplug/dreamplug.c | 2 +- board/Marvell/guruplug/guruplug.c | 2 +- board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c | 2 +- board/Marvell/openrd/openrd.c | 2 +- board/Marvell/rd6281a/rd6281a.c | 2 +- board/Marvell/sheevaplug/sheevaplug.c | 2 +- board/Seagate/dockstar/dockstar.c | 2 +- board/buffalo/lsxl/lsxl.c | 7 +- board/cloudengines/pogo_e02/pogo_e02.c | 2 +- board/d-link/dns325/dns325.c | 2 +- board/iomega/iconnect/iconnect.c | 2 +- board/karo/tk71/tk71.c | 2 +- board/keymile/common/common.c | 2 +- board/keymile/km_arm/km_arm.c | 16 +- board/keymile/km_arm/kwbimage-memphis.cfg | 6 +- board/keymile/km_arm/kwbimage.cfg | 6 +- board/keymile/km_arm/kwbimage_128M16_1.cfg | 25 +- board/keymile/km_arm/kwbimage_256M8_1.cfg | 25 +- board/raidsonic/ib62x0/ib62x0.c | 2 +- boards.cfg | 1 + drivers/net/phy/mv88e61xx.c | 495 ++++++++++++++-------- drivers/net/phy/mv88e61xx.h | 39 ++- drivers/spi/kirkwood_spi.c | 12 +- include/configs/km/keymile-common.h | 3 - include/configs/lsxl.h | 2 +- include/configs/mv-common.h | 2 +- include/configs/wireless_space.h | 194 +++++++++ include/netdev.h | 21 +- 36 files changed, 896 insertions(+), 298 deletions(-) create mode 100644 board/LaCie/wireless_space/Makefile create mode 100644 board/LaCie/wireless_space/kwbimage.cfg create mode 100644 board/LaCie/wireless_space/wireless_space.c create mode 100644 include/configs/wireless_space.h
Regards... Prafulla . . .
-----Original Message----- From: Prafulla Wadaskar Sent: 20 December 2012 12:27 To: 'Albert ARIBAUD' Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik; 'Wolfgang Denk' Subject: Pull request for u-boot-marvell.git
Dear Albert,
Please pull The following changes since commit b8a7c467960ffb4d5a5e1eef5f7783fb6f594542: Albert ARIBAUD (1): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
are available in the git repository at:
u-boot-marvell.git master branch.
Albert ARIBAUD (3): mv88e61xx: refactor PHY and SWITCH level-code kirkwood: make MPP arrays static const ARM: lacie_kw: add support for WIRELESS_SPACE
Holger Brunck (3): arm/km: fix memory settings km/common: drop unneeded std* environment variables km/common: cosmetic change reported from checkpatch
Valentin Longchamp (1): arm/km: remove duplicate code
arch/arm/cpu/arm926ejs/kirkwood/mpp.c | 2 +- arch/arm/include/asm/arch-kirkwood/mpp.h | 2 +- board/LaCie/net2big_v2/net2big_v2.c | 2 +- board/LaCie/netspace_v2/netspace_v2.c | 2 +- board/LaCie/wireless_space/Makefile | 46 +++ board/LaCie/wireless_space/kwbimage.cfg | 82 ++++ board/LaCie/wireless_space/wireless_space.c | 176 ++++++++ board/Marvell/dreamplug/dreamplug.c | 2 +- board/Marvell/guruplug/guruplug.c | 2 +- board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c | 2 +- board/Marvell/openrd/openrd.c | 2 +- board/Marvell/rd6281a/rd6281a.c | 2 +- board/Marvell/sheevaplug/sheevaplug.c | 2 +- board/Seagate/dockstar/dockstar.c | 2 +- board/buffalo/lsxl/lsxl.c | 2 +- board/cloudengines/pogo_e02/pogo_e02.c | 2 +- board/d-link/dns325/dns325.c | 2 +- board/iomega/iconnect/iconnect.c | 2 +- board/karo/tk71/tk71.c | 2 +- board/keymile/common/common.c | 2 +- board/keymile/km_arm/km_arm.c | 16 +- board/keymile/km_arm/kwbimage-memphis.cfg | 6 +- board/keymile/km_arm/kwbimage.cfg | 6 +- board/keymile/km_arm/kwbimage_128M16_1.cfg | 25 +- board/keymile/km_arm/kwbimage_256M8_1.cfg | 25 +- board/raidsonic/ib62x0/ib62x0.c | 2 +- boards.cfg | 1 + drivers/net/phy/mv88e61xx.c | 495 ++++++++++++++-------- drivers/net/phy/mv88e61xx.h | 39 ++- drivers/spi/kirkwood_spi.c | 12 +- include/configs/km/keymile-common.h | 3 - include/configs/wireless_space.h | 194 +++++++++ include/netdev.h | 21 +- 33 files changed, 891 insertions(+), 292 deletions(-) create mode 100644 board/LaCie/wireless_space/Makefile create mode 100644 board/LaCie/wireless_space/kwbimage.cfg create mode 100644 board/LaCie/wireless_space/wireless_space.c create mode 100644 include/configs/wireless_space.h
Regards... Prafulla . . .
Hi Prafulla,
On Thu, 20 Dec 2012 02:05:36 -0800, Prafulla Wadaskar prafulla@marvell.com wrote:
Dear Albert Please discard my earlier pull request and please pull The following changes since commit b8a7c467960ffb4d5a5e1eef5f7783fb6f594542: Albert ARIBAUD (1): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
are available in the git repository at:
u-boot-marvell.git master branch.
Albert ARIBAUD (3): mv88e61xx: refactor PHY and SWITCH level-code kirkwood: make MPP arrays static const ARM: lacie_kw: add support for WIRELESS_SPACE
Holger Brunck (3): arm/km: fix memory settings km/common: drop unneeded std* environment variables km/common: cosmetic change reported from checkpatch
Luke Lowrey (1): arch-kirkwood: Ethernet port macro returning incorrect address
Michael Walle (1): lsxl: unset ncip for rescue mode
Valentin Longchamp (1): arm/km: remove duplicate code
andreas.devel@googlemail.com (1): mv-common.h: increase malloc arena to 4MiB
Is that last commit really supposed to be with Andreas Bießmann's e-mail only, without his name?
Amicalement,
-----Original Message----- From: Albert ARIBAUD [mailto:albert.u.boot@aribaud.net] Sent: 23 December 2012 20:40 To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik; 'Wolfgang Denk'; Andreas Bießmann Subject: Re: Pull request for u-boot-marvell.git
Hi Prafulla,
On Thu, 20 Dec 2012 02:05:36 -0800, Prafulla Wadaskar prafulla@marvell.com wrote:
Dear Albert Please discard my earlier pull request and please pull The following changes since commit
b8a7c467960ffb4d5a5e1eef5f7783fb6f594542:
Albert ARIBAUD (1): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
are available in the git repository at:
u-boot-marvell.git master branch.
Albert ARIBAUD (3): mv88e61xx: refactor PHY and SWITCH level-code kirkwood: make MPP arrays static const ARM: lacie_kw: add support for WIRELESS_SPACE
Holger Brunck (3): arm/km: fix memory settings km/common: drop unneeded std* environment variables km/common: cosmetic change reported from checkpatch
Luke Lowrey (1): arch-kirkwood: Ethernet port macro returning incorrect address
Michael Walle (1): lsxl: unset ncip for rescue mode
Valentin Longchamp (1): arm/km: remove duplicate code
andreas.devel@googlemail.com (1): mv-common.h: increase malloc arena to 4MiB
Is that last commit really supposed to be with Andreas Bießmann's e-mail only, without his name?
Hi Albert, Sorry for the late reply, Yes, it is with Andreas Bießmann' email only, I wonder how his name is removed from this commit. I will check and let you know.
Regards... Prafulla . . .
Dear Prafulla Wadaskar,
On 07.01.2013 13:26, Prafulla Wadaskar wrote:
-----Original Message----- From: Albert ARIBAUD [mailto:albert.u.boot@aribaud.net] Sent: 23 December 2012 20:40 To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik; 'Wolfgang Denk'; Andreas Bießmann Subject: Re: Pull request for u-boot-marvell.git
Hi Prafulla,
On Thu, 20 Dec 2012 02:05:36 -0800, Prafulla Wadaskar prafulla@marvell.com wrote:
Dear Albert Please discard my earlier pull request and please pull The following changes since commit
b8a7c467960ffb4d5a5e1eef5f7783fb6f594542:
<snip>
andreas.devel@googlemail.com (1): mv-common.h: increase malloc arena to 4MiB
Is that last commit really supposed to be with Andreas Bießmann's e-mail only, without his name?
Hi Albert, Sorry for the late reply, Yes, it is with Andreas Bießmann' email only, I wonder how his name is removed from this commit. I will check and let you know.
maybe this is again some encoding issue. The original 'From' is like that:
---8<--- From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= andreas.devel@googlemail.com --->8---
Maybe somehow your toolchain removed the coded string. Git however can work with this like a charm. So this is just an asumption, I do not know your toolchain.
Best regards
Andreas Bießmann
Hi Prafulla,
On Mon, 7 Jan 2013 04:26:09 -0800, Prafulla Wadaskar prafulla@marvell.com wrote:
-----Original Message----- From: Albert ARIBAUD [mailto:albert.u.boot@aribaud.net] Sent: 23 December 2012 20:40 To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik; 'Wolfgang Denk'; Andreas Bießmann Subject: Re: Pull request for u-boot-marvell.git
Hi Prafulla,
On Thu, 20 Dec 2012 02:05:36 -0800, Prafulla Wadaskar prafulla@marvell.com wrote:
Dear Albert Please discard my earlier pull request and please pull The following changes since commit
b8a7c467960ffb4d5a5e1eef5f7783fb6f594542:
Albert ARIBAUD (1): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
are available in the git repository at:
u-boot-marvell.git master branch.
Albert ARIBAUD (3): mv88e61xx: refactor PHY and SWITCH level-code kirkwood: make MPP arrays static const ARM: lacie_kw: add support for WIRELESS_SPACE
Holger Brunck (3): arm/km: fix memory settings km/common: drop unneeded std* environment variables km/common: cosmetic change reported from checkpatch
Luke Lowrey (1): arch-kirkwood: Ethernet port macro returning incorrect address
Michael Walle (1): lsxl: unset ncip for rescue mode
Valentin Longchamp (1): arm/km: remove duplicate code
andreas.devel@googlemail.com (1): mv-common.h: increase malloc arena to 4MiB
Is that last commit really supposed to be with Andreas Bießmann's e-mail only, without his name?
Hi Albert, Sorry for the late reply, Yes, it is with Andreas Bießmann' email only, I wonder how his name is removed from this commit. I will check and let you know.
Ok - note that meanwhile, I have merged in TI and IMX.
Regards... Prafulla . . .
Amicalement,
Dear Albert Please pull
The following changes since commit 7528cf5f016b5b8b8b12b373f6f31a10bf89233d:
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' (2013-01-08 14:59:37 +0100)
are available in the git repository at:
u-boot-marvell.git master branch.
Albert ARIBAUD (3): mv88e61xx: refactor PHY and SWITCH level-code kirkwood: make MPP arrays static const ARM: lacie_kw: add support for WIRELESS_SPACE
Andreas Bießmann (1): mv-common.h: increase malloc arena to 4MiB
Holger Brunck (3): arm/km: fix memory settings km/common: drop unneeded std* environment variables km/common: cosmetic change reported from checkpatch
Luke Lowrey (1): arch-kirkwood: Ethernet port macro returning incorrect address
Michael Walle (1): lsxl: unset ncip for rescue mode
Valentin Longchamp (1): arm/km: remove duplicate code
arch/arm/cpu/arm926ejs/kirkwood/mpp.c | 2 +- arch/arm/include/asm/arch-kirkwood/cpu.h | 2 +- arch/arm/include/asm/arch-kirkwood/mpp.h | 2 +- board/LaCie/net2big_v2/net2big_v2.c | 2 +- board/LaCie/netspace_v2/netspace_v2.c | 2 +- board/LaCie/wireless_space/Makefile | 46 +++ board/LaCie/wireless_space/kwbimage.cfg | 82 ++++ board/LaCie/wireless_space/wireless_space.c | 176 ++++++++ board/Marvell/dreamplug/dreamplug.c | 2 +- board/Marvell/guruplug/guruplug.c | 2 +- board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c | 2 +- board/Marvell/openrd/openrd.c | 2 +- board/Marvell/rd6281a/rd6281a.c | 2 +- board/Marvell/sheevaplug/sheevaplug.c | 2 +- board/Seagate/dockstar/dockstar.c | 2 +- board/buffalo/lsxl/lsxl.c | 7 +- board/cloudengines/pogo_e02/pogo_e02.c | 2 +- board/d-link/dns325/dns325.c | 2 +- board/iomega/iconnect/iconnect.c | 2 +- board/karo/tk71/tk71.c | 2 +- board/keymile/common/common.c | 2 +- board/keymile/km_arm/km_arm.c | 16 +- board/keymile/km_arm/kwbimage-memphis.cfg | 6 +- board/keymile/km_arm/kwbimage.cfg | 6 +- board/keymile/km_arm/kwbimage_128M16_1.cfg | 25 +- board/keymile/km_arm/kwbimage_256M8_1.cfg | 25 +- board/raidsonic/ib62x0/ib62x0.c | 2 +- boards.cfg | 1 + drivers/net/phy/mv88e61xx.c | 495 ++++++++++++++-------- drivers/net/phy/mv88e61xx.h | 39 ++- drivers/spi/kirkwood_spi.c | 12 +- include/configs/km/keymile-common.h | 3 - include/configs/lsxl.h | 2 +- include/configs/mv-common.h | 2 +- include/configs/wireless_space.h | 194 +++++++++ include/netdev.h | 21 +- 36 files changed, 896 insertions(+), 298 deletions(-) create mode 100644 board/LaCie/wireless_space/Makefile create mode 100644 board/LaCie/wireless_space/kwbimage.cfg create mode 100644 board/LaCie/wireless_space/wireless_space.c create mode 100644 include/configs/wireless_space.h
Regards... Prafulla . . .
________________________________________ From: Albert ARIBAUD [albert.u.boot@aribaud.net] Sent: Tuesday, January 08, 2013 8:33 PM To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik; 'Wolfgang Denk'; Andreas Bießmann Subject: Re: Pull request for u-boot-marvell.git
Hi Prafulla,
On Mon, 7 Jan 2013 04:26:09 -0800, Prafulla Wadaskar prafulla@marvell.com wrote:
-----Original Message----- From: Albert ARIBAUD [mailto:albert.u.boot@aribaud.net] Sent: 23 December 2012 20:40 To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik; 'Wolfgang Denk'; Andreas Bießmann Subject: Re: Pull request for u-boot-marvell.git
Hi Prafulla,
On Thu, 20 Dec 2012 02:05:36 -0800, Prafulla Wadaskar prafulla@marvell.com wrote:
Dear Albert Please discard my earlier pull request and please pull The following changes since commit
b8a7c467960ffb4d5a5e1eef5f7783fb6f594542:
Albert ARIBAUD (1): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
are available in the git repository at:
u-boot-marvell.git master branch.
Albert ARIBAUD (3): mv88e61xx: refactor PHY and SWITCH level-code kirkwood: make MPP arrays static const ARM: lacie_kw: add support for WIRELESS_SPACE
Holger Brunck (3): arm/km: fix memory settings km/common: drop unneeded std* environment variables km/common: cosmetic change reported from checkpatch
Luke Lowrey (1): arch-kirkwood: Ethernet port macro returning incorrect address
Michael Walle (1): lsxl: unset ncip for rescue mode
Valentin Longchamp (1): arm/km: remove duplicate code
andreas.devel@googlemail.com (1): mv-common.h: increase malloc arena to 4MiB
Is that last commit really supposed to be with Andreas Bießmann's e-mail only, without his name?
Hi Albert, Sorry for the late reply, Yes, it is with Andreas Bießmann' email only, I wonder how his name is removed from this commit. I will check and let you know.
Ok - note that meanwhile, I have merged in TI and IMX.
Regards... Prafulla . . .
Amicalement, -- Albert.
Hi Prafulla,
On Tue, 8 Jan 2013 09:21:40 -0800, Prafulla Wadaskar prafulla@marvell.com wrote:
Dear Albert Please pull
The following changes since commit 7528cf5f016b5b8b8b12b373f6f31a10bf89233d:
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' (2013-01-08 14:59:37 +0100)
are available in the git repository at:
u-boot-marvell.git master branch.
Albert ARIBAUD (3): mv88e61xx: refactor PHY and SWITCH level-code kirkwood: make MPP arrays static const ARM: lacie_kw: add support for WIRELESS_SPACE
Andreas Bießmann (1): mv-common.h: increase malloc arena to 4MiB
Holger Brunck (3): arm/km: fix memory settings km/common: drop unneeded std* environment variables km/common: cosmetic change reported from checkpatch
Luke Lowrey (1): arch-kirkwood: Ethernet port macro returning incorrect address
Michael Walle (1): lsxl: unset ncip for rescue mode
Valentin Longchamp (1): arm/km: remove duplicate code
arch/arm/cpu/arm926ejs/kirkwood/mpp.c | 2 +- arch/arm/include/asm/arch-kirkwood/cpu.h | 2 +- arch/arm/include/asm/arch-kirkwood/mpp.h | 2 +- board/LaCie/net2big_v2/net2big_v2.c | 2 +- board/LaCie/netspace_v2/netspace_v2.c | 2 +- board/LaCie/wireless_space/Makefile | 46 +++ board/LaCie/wireless_space/kwbimage.cfg | 82 ++++ board/LaCie/wireless_space/wireless_space.c | 176 ++++++++ board/Marvell/dreamplug/dreamplug.c | 2 +- board/Marvell/guruplug/guruplug.c | 2 +- board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c | 2 +- board/Marvell/openrd/openrd.c | 2 +- board/Marvell/rd6281a/rd6281a.c | 2 +- board/Marvell/sheevaplug/sheevaplug.c | 2 +- board/Seagate/dockstar/dockstar.c | 2 +- board/buffalo/lsxl/lsxl.c | 7 +- board/cloudengines/pogo_e02/pogo_e02.c | 2 +- board/d-link/dns325/dns325.c | 2 +- board/iomega/iconnect/iconnect.c | 2 +- board/karo/tk71/tk71.c | 2 +- board/keymile/common/common.c | 2 +- board/keymile/km_arm/km_arm.c | 16 +- board/keymile/km_arm/kwbimage-memphis.cfg | 6 +- board/keymile/km_arm/kwbimage.cfg | 6 +- board/keymile/km_arm/kwbimage_128M16_1.cfg | 25 +- board/keymile/km_arm/kwbimage_256M8_1.cfg | 25 +- board/raidsonic/ib62x0/ib62x0.c | 2 +- boards.cfg | 1 + drivers/net/phy/mv88e61xx.c | 495 ++++++++++++++-------- drivers/net/phy/mv88e61xx.h | 39 ++- drivers/spi/kirkwood_spi.c | 12 +- include/configs/km/keymile-common.h | 3 - include/configs/lsxl.h | 2 +- include/configs/mv-common.h | 2 +- include/configs/wireless_space.h | 194 +++++++++ include/netdev.h | 21 +- 36 files changed, 896 insertions(+), 298 deletions(-) create mode 100644 board/LaCie/wireless_space/Makefile create mode 100644 board/LaCie/wireless_space/kwbimage.cfg create mode 100644 board/LaCie/wireless_space/wireless_space.c create mode 100644 include/configs/wireless_space.h
Regards... Prafulla . . .
From: Albert ARIBAUD [albert.u.boot@aribaud.net] Sent: Tuesday, January 08, 2013 8:33 PM To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik; 'Wolfgang Denk'; Andreas Bießmann Subject: Re: Pull request for u-boot-marvell.git
Hi Prafulla,
On Mon, 7 Jan 2013 04:26:09 -0800, Prafulla Wadaskar prafulla@marvell.com wrote:
-----Original Message----- From: Albert ARIBAUD [mailto:albert.u.boot@aribaud.net] Sent: 23 December 2012 20:40 To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik; 'Wolfgang Denk'; Andreas Bießmann Subject: Re: Pull request for u-boot-marvell.git
Hi Prafulla,
On Thu, 20 Dec 2012 02:05:36 -0800, Prafulla Wadaskar prafulla@marvell.com wrote:
Dear Albert Please discard my earlier pull request and please pull The following changes since commit
b8a7c467960ffb4d5a5e1eef5f7783fb6f594542:
Albert ARIBAUD (1): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
are available in the git repository at:
u-boot-marvell.git master branch.
Albert ARIBAUD (3): mv88e61xx: refactor PHY and SWITCH level-code kirkwood: make MPP arrays static const ARM: lacie_kw: add support for WIRELESS_SPACE
Holger Brunck (3): arm/km: fix memory settings km/common: drop unneeded std* environment variables km/common: cosmetic change reported from checkpatch
Luke Lowrey (1): arch-kirkwood: Ethernet port macro returning incorrect address
Michael Walle (1): lsxl: unset ncip for rescue mode
Valentin Longchamp (1): arm/km: remove duplicate code
andreas.devel@googlemail.com (1): mv-common.h: increase malloc arena to 4MiB
Is that last commit really supposed to be with Andreas Bießmann's e-mail only, without his name?
Hi Albert, Sorry for the late reply, Yes, it is with Andreas Bießmann' email only, I wonder how his name is removed from this commit. I will check and let you know.
Ok - note that meanwhile, I have merged in TI and IMX.
Regards... Prafulla . . .
Amicalement,
Albert.
Applied to u-boot-arm/master, thanks!
Amicalement,
On Tue, 8 Jan 2013 20:14:44 +0100, Albert ARIBAUD albert.u.boot@aribaud.net wrote:
Hi Prafulla,
On Tue, 8 Jan 2013 09:21:40 -0800, Prafulla Wadaskar prafulla@marvell.com wrote:
Dear Albert Please pull
The following changes since commit 7528cf5f016b5b8b8b12b373f6f31a10bf89233d:
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' (2013-01-08 14:59:37 +0100)
are available in the git repository at:
u-boot-marvell.git master branch.
Albert ARIBAUD (3): mv88e61xx: refactor PHY and SWITCH level-code kirkwood: make MPP arrays static const ARM: lacie_kw: add support for WIRELESS_SPACE
Andreas Bießmann (1): mv-common.h: increase malloc arena to 4MiB
Holger Brunck (3): arm/km: fix memory settings km/common: drop unneeded std* environment variables km/common: cosmetic change reported from checkpatch
Luke Lowrey (1): arch-kirkwood: Ethernet port macro returning incorrect address
Michael Walle (1): lsxl: unset ncip for rescue mode
Valentin Longchamp (1): arm/km: remove duplicate code
arch/arm/cpu/arm926ejs/kirkwood/mpp.c | 2 +- arch/arm/include/asm/arch-kirkwood/cpu.h | 2 +- arch/arm/include/asm/arch-kirkwood/mpp.h | 2 +- board/LaCie/net2big_v2/net2big_v2.c | 2 +- board/LaCie/netspace_v2/netspace_v2.c | 2 +- board/LaCie/wireless_space/Makefile | 46 +++ board/LaCie/wireless_space/kwbimage.cfg | 82 ++++ board/LaCie/wireless_space/wireless_space.c | 176 ++++++++ board/Marvell/dreamplug/dreamplug.c | 2 +- board/Marvell/guruplug/guruplug.c | 2 +- board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c | 2 +- board/Marvell/openrd/openrd.c | 2 +- board/Marvell/rd6281a/rd6281a.c | 2 +- board/Marvell/sheevaplug/sheevaplug.c | 2 +- board/Seagate/dockstar/dockstar.c | 2 +- board/buffalo/lsxl/lsxl.c | 7 +- board/cloudengines/pogo_e02/pogo_e02.c | 2 +- board/d-link/dns325/dns325.c | 2 +- board/iomega/iconnect/iconnect.c | 2 +- board/karo/tk71/tk71.c | 2 +- board/keymile/common/common.c | 2 +- board/keymile/km_arm/km_arm.c | 16 +- board/keymile/km_arm/kwbimage-memphis.cfg | 6 +- board/keymile/km_arm/kwbimage.cfg | 6 +- board/keymile/km_arm/kwbimage_128M16_1.cfg | 25 +- board/keymile/km_arm/kwbimage_256M8_1.cfg | 25 +- board/raidsonic/ib62x0/ib62x0.c | 2 +- boards.cfg | 1 + drivers/net/phy/mv88e61xx.c | 495 ++++++++++++++-------- drivers/net/phy/mv88e61xx.h | 39 ++- drivers/spi/kirkwood_spi.c | 12 +- include/configs/km/keymile-common.h | 3 - include/configs/lsxl.h | 2 +- include/configs/mv-common.h | 2 +- include/configs/wireless_space.h | 194 +++++++++ include/netdev.h | 21 +- 36 files changed, 896 insertions(+), 298 deletions(-) create mode 100644 board/LaCie/wireless_space/Makefile create mode 100644 board/LaCie/wireless_space/kwbimage.cfg create mode 100644 board/LaCie/wireless_space/wireless_space.c create mode 100644 include/configs/wireless_space.h
Regards... Prafulla . . .
From: Albert ARIBAUD [albert.u.boot@aribaud.net] Sent: Tuesday, January 08, 2013 8:33 PM To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik; 'Wolfgang Denk'; Andreas Bießmann Subject: Re: Pull request for u-boot-marvell.git
Hi Prafulla,
On Mon, 7 Jan 2013 04:26:09 -0800, Prafulla Wadaskar prafulla@marvell.com wrote:
-----Original Message----- From: Albert ARIBAUD [mailto:albert.u.boot@aribaud.net] Sent: 23 December 2012 20:40 To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik; 'Wolfgang Denk'; Andreas Bießmann Subject: Re: Pull request for u-boot-marvell.git
Hi Prafulla,
On Thu, 20 Dec 2012 02:05:36 -0800, Prafulla Wadaskar prafulla@marvell.com wrote:
Dear Albert Please discard my earlier pull request and please pull The following changes since commit
b8a7c467960ffb4d5a5e1eef5f7783fb6f594542:
Albert ARIBAUD (1): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
are available in the git repository at:
u-boot-marvell.git master branch.
Albert ARIBAUD (3): mv88e61xx: refactor PHY and SWITCH level-code kirkwood: make MPP arrays static const ARM: lacie_kw: add support for WIRELESS_SPACE
Holger Brunck (3): arm/km: fix memory settings km/common: drop unneeded std* environment variables km/common: cosmetic change reported from checkpatch
Luke Lowrey (1): arch-kirkwood: Ethernet port macro returning incorrect address
Michael Walle (1): lsxl: unset ncip for rescue mode
Valentin Longchamp (1): arm/km: remove duplicate code
andreas.devel@googlemail.com (1): mv-common.h: increase malloc arena to 4MiB
Is that last commit really supposed to be with Andreas Bießmann's e-mail only, without his name?
Hi Albert, Sorry for the late reply, Yes, it is with Andreas Bießmann' email only, I wonder how his name is removed from this commit. I will check and let you know.
Ok - note that meanwhile, I have merged in TI and IMX.
Regards... Prafulla . . .
Amicalement,
Albert.
Applied to u-boot-arm/master, thanks!
Actually I'll have to revert ARM and re-apply Marvell once I fix the CRT0 patch; no need to re-send a pull req, though.
Amicalement,
Hi Prafulla,
On Tue, 8 Jan 2013 09:21:40 -0800, Prafulla Wadaskar prafulla@marvell.com wrote:
Dear Albert Please pull
The following changes since commit 7528cf5f016b5b8b8b12b373f6f31a10bf89233d:
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' (2013-01-08 14:59:37 +0100)
are available in the git repository at:
u-boot-marvell.git master branch.
Albert ARIBAUD (3): mv88e61xx: refactor PHY and SWITCH level-code kirkwood: make MPP arrays static const ARM: lacie_kw: add support for WIRELESS_SPACE
Andreas Bießmann (1): mv-common.h: increase malloc arena to 4MiB
Holger Brunck (3): arm/km: fix memory settings km/common: drop unneeded std* environment variables km/common: cosmetic change reported from checkpatch
Luke Lowrey (1): arch-kirkwood: Ethernet port macro returning incorrect address
Michael Walle (1): lsxl: unset ncip for rescue mode
Valentin Longchamp (1): arm/km: remove duplicate code
arch/arm/cpu/arm926ejs/kirkwood/mpp.c | 2 +- arch/arm/include/asm/arch-kirkwood/cpu.h | 2 +- arch/arm/include/asm/arch-kirkwood/mpp.h | 2 +- board/LaCie/net2big_v2/net2big_v2.c | 2 +- board/LaCie/netspace_v2/netspace_v2.c | 2 +- board/LaCie/wireless_space/Makefile | 46 +++ board/LaCie/wireless_space/kwbimage.cfg | 82 ++++ board/LaCie/wireless_space/wireless_space.c | 176 ++++++++ board/Marvell/dreamplug/dreamplug.c | 2 +- board/Marvell/guruplug/guruplug.c | 2 +- board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c | 2 +- board/Marvell/openrd/openrd.c | 2 +- board/Marvell/rd6281a/rd6281a.c | 2 +- board/Marvell/sheevaplug/sheevaplug.c | 2 +- board/Seagate/dockstar/dockstar.c | 2 +- board/buffalo/lsxl/lsxl.c | 7 +- board/cloudengines/pogo_e02/pogo_e02.c | 2 +- board/d-link/dns325/dns325.c | 2 +- board/iomega/iconnect/iconnect.c | 2 +- board/karo/tk71/tk71.c | 2 +- board/keymile/common/common.c | 2 +- board/keymile/km_arm/km_arm.c | 16 +- board/keymile/km_arm/kwbimage-memphis.cfg | 6 +- board/keymile/km_arm/kwbimage.cfg | 6 +- board/keymile/km_arm/kwbimage_128M16_1.cfg | 25 +- board/keymile/km_arm/kwbimage_256M8_1.cfg | 25 +- board/raidsonic/ib62x0/ib62x0.c | 2 +- boards.cfg | 1 + drivers/net/phy/mv88e61xx.c | 495 ++++++++++++++-------- drivers/net/phy/mv88e61xx.h | 39 ++- drivers/spi/kirkwood_spi.c | 12 +- include/configs/km/keymile-common.h | 3 - include/configs/lsxl.h | 2 +- include/configs/mv-common.h | 2 +- include/configs/wireless_space.h | 194 +++++++++ include/netdev.h | 21 +- 36 files changed, 896 insertions(+), 298 deletions(-) create mode 100644 board/LaCie/wireless_space/Makefile create mode 100644 board/LaCie/wireless_space/kwbimage.cfg create mode 100644 board/LaCie/wireless_space/wireless_space.c create mode 100644 include/configs/wireless_space.h
Regards... Prafulla . . .
From: Albert ARIBAUD [albert.u.boot@aribaud.net] Sent: Tuesday, January 08, 2013 8:33 PM To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik; 'Wolfgang Denk'; Andreas Bießmann Subject: Re: Pull request for u-boot-marvell.git
Hi Prafulla,
On Mon, 7 Jan 2013 04:26:09 -0800, Prafulla Wadaskar prafulla@marvell.com wrote:
-----Original Message----- From: Albert ARIBAUD [mailto:albert.u.boot@aribaud.net] Sent: 23 December 2012 20:40 To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik; 'Wolfgang Denk'; Andreas Bießmann Subject: Re: Pull request for u-boot-marvell.git
Hi Prafulla,
On Thu, 20 Dec 2012 02:05:36 -0800, Prafulla Wadaskar prafulla@marvell.com wrote:
Dear Albert Please discard my earlier pull request and please pull The following changes since commit
b8a7c467960ffb4d5a5e1eef5f7783fb6f594542:
Albert ARIBAUD (1): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
are available in the git repository at:
u-boot-marvell.git master branch.
Albert ARIBAUD (3): mv88e61xx: refactor PHY and SWITCH level-code kirkwood: make MPP arrays static const ARM: lacie_kw: add support for WIRELESS_SPACE
Holger Brunck (3): arm/km: fix memory settings km/common: drop unneeded std* environment variables km/common: cosmetic change reported from checkpatch
Luke Lowrey (1): arch-kirkwood: Ethernet port macro returning incorrect address
Michael Walle (1): lsxl: unset ncip for rescue mode
Valentin Longchamp (1): arm/km: remove duplicate code
andreas.devel@googlemail.com (1): mv-common.h: increase malloc arena to 4MiB
Is that last commit really supposed to be with Andreas Bießmann's e-mail only, without his name?
Hi Albert, Sorry for the late reply, Yes, it is with Andreas Bießmann' email only, I wonder how his name is removed from this commit. I will check and let you know.
Ok - note that meanwhile, I have merged in TI and IMX.
Regards... Prafulla . . .
Amicalement,
Albert.
Applied *again* to u-boot-arm/master, thanks!
Amicalement,
-----Original Message----- From: Prafulla Wadaskar Sent: 03 July 2012 17:29 To: 'Albert ARIBAUD' Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik; 'Wolfgang Denk' Subject: Pull request for u-boot-marvell.git
Dear Albert
Please kindly pull The following changes since commit 3e0cac6b5158b22248f57cdf7769bf8d610fec5e: Rajeshwari Shinde (1): EXYNOS: SMDK5250: Enable the pinmux setup
are available in the git repository at:
u-boot-marvell.git ..BRANCH.NOT.VERIFIED..
Pls kindly consider this patch series for master branch Regards... Prafulla . . .
participants (4)
-
Albert ARIBAUD -
Andreas Bießmann -
Prafulla Wadaskar -
Simon Guinot