> -----Original Message----- > From: Holger Brunck [mailto:holger.bru...@keymile.com] > Sent: 12 June 2012 14:04 > To: Prafulla Wadaskar > Cc: Valentin Longchamp; prafu...@mavell.com; u-boot@lists.denx.de; > Gerlando Falauto > Subject: Re: [PATCH 04/20] arm/km: add kmnusa board support > > On 06/12/2012 06:39 AM, Prafulla Wadaskar wrote: > > > > > >> -----Original Message----- > >> From: Valentin Longchamp [mailto:valentin.longch...@keymile.com] > >> Sent: 07 June 2012 15:37 > >> To: prafu...@mavell.com > >> Cc: Holger Brunck; u-boot@lists.denx.de; Valentin Longchamp; > Gerlando > >> Falauto; Prafulla Wadaskar > >> Subject: [PATCH 04/20] arm/km: add kmnusa board support > >> > >> From: Holger Brunck <holger.bru...@keymile.com> > >> > >> This board is similar to portl2, but it has the u-boot environment > >> in a SPI NOR flash and not in an i2c eeprom like portl2 have. > >> > >> Some other details: > >> - IVM EEPROM is at adress: pca9547:70:9 > >> - PCI is enabled > >> - PIGGY4 is connected via MV88E6352 simple switch. There is no phy > >> between the simple switch and the kirkwood. > >> > >> Signed-off-by: Holger Brunck <holger.bru...@keymile.com> > >> Signed-off-by: Valentin Longchamp <valentin.longch...@keymile.com> > >> cc: Gerlando Falauto <gerlando.fala...@keymile.com> > >> cc: Prafulla Wadaskar <prafu...@marvell.com> > >> --- > >> MAINTAINERS | 1 + > >> board/keymile/km_arm/128M16-1.cfg | 294 > >> +++++++++++++++++++++++++++++++++++++ > > > > Please avoid file names starting with numbers. > > > > would sdram128M16-1.cfg be ok? The reason for this numbering is to > have a chance > to know which organisation this RAM has.
I think kwbimage_128M16_1.cfg should be okay, BTW: if the configuration is similar to any other already supported board, may you think to reuse the same. Regards.. Prafulla . . . > > >> board/keymile/km_arm/km_arm.c | 9 +- > >> boards.cfg | 1 + > >> include/configs/km/km_arm.h | 44 +++++- > >> include/configs/km_kirkwood.h | 67 +++++++-- > >> 6 files changed, 392 insertions(+), 24 deletions(-) > >> create mode 100644 board/keymile/km_arm/128M16-1.cfg > >> > >> diff --git a/MAINTAINERS b/MAINTAINERS > >> index 0445539..aa11268 100644 > >> --- a/MAINTAINERS > >> +++ b/MAINTAINERS > >> @@ -738,6 +738,7 @@ Sergey Lapin <sla...@ossfans.org> > >> Valentin Longchamp <valentin.longch...@keymile.com> > >> > >> km_kirkwood ARM926EJS (Kirkwood SoC) > >> + kmnusa ARM926EJS (Kirkwood SoC) > > > > Again.... I would like to suggest to separate out new boards > addition, bugfixes/updates specific to km_*boards and generic kirkwood > specific patches. > > > > It's always faster to merger small patch series that big one. > > > > Yes ok, but was has this to do with this patch? What is meant to be > kirkwood > specific? This is all board related code. > > >> mgcoge3un ARM926EJS (Kirkwood SoC) > >> portl2 ARM926EJS (Kirkwood SoC) > >> > >> diff --git a/board/keymile/km_arm/128M16-1.cfg > >> b/board/keymile/km_arm/128M16-1.cfg > >> new file mode 100644 > >> index 0000000..bcce907 > >> --- /dev/null > >> +++ b/board/keymile/km_arm/128M16-1.cfg > >> @@ -0,0 +1,294 @@ > >> +# > >> +# (C) Copyright 2010 > >> +# Heiko Schocher, DENX Software Engineering, h...@denx.de. > >> +# > >> +# (C) Copyright 2012 > >> +# Valentin Longchamp, Keymile AG, valentin.longch...@keymile.com > >> +# Stefan Bigler, Keymile AG, stefan.big...@keymile.com > >> +# > >> +# (C) Copyright 2012 > >> +# 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. > >> +# > >> +# You should have received a copy of the GNU General Public > License > >> +# along with this program; if not, write to the Free Software > >> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, > >> +# MA 02110-1301 USA > >> +# > >> +# 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 > >> + > >> +DATA 0xFFD10000 0x01112222 # MPP Control 0 Register > >> +# bit 3-0: 2, MPPSel0 SPI_CSn (1=NF_IO[2]) > >> +# bit 7-4: 2, MPPSel1 SPI_SI (1=NF_IO[3]) > >> +# bit 12-8: 2, MPPSel2 SPI_SCK (1=NF_IO[4]) > >> +# bit 15-12: 2, MPPSel3 SPI_SO (1=NF_IO[5]) > >> +# bit 19-16: 1, MPPSel4 NF_IO[6] > >> +# bit 23-20: 1, MPPSel5 NF_IO[7] > >> +# bit 27-24: 1, MPPSel6 SYSRST_O > >> +# bit 31-28: 0, MPPSel7 GPO[7] > >> + > >> +DATA 0xFFD10004 0x03303300 # MPP Control 1 Register > >> +# bit 3-0: 0, MPPSel8 GPIO[8] > >> +# bit 7-4: 0, MPPSel9 GPIO[9] > >> +# bit 12-8: 3, MPPSel10 UA0_TXD > >> +# bit 15-12: 3, MPPSel11 UA0_RXD > >> +# bit 19-16: 0, MPPSel12 not connected > >> +# bit 23-20: 3, MPPSel13 UA1_TXD > >> +# bit 27-24: 3, MPPSel14 UA1_RXD > >> +# bit 31-28: 0, MPPSel15 GPIO[15] > >> + > >> +DATA 0xFFD10008 0x00001100 # MPP Control 2 Register > >> +# bit 3-0: 0, MPPSel16 GPIO[16] > >> +# bit 7-4: 0, MPPSel17 not connected > >> +# bit 12-8: 1, MPPSel18 NF_IO[0] > >> +# bit 15-12: 1, MPPSel19 NF_IO[1] > >> +# bit 19-16: 0, MPPSel20 GPIO[20] > >> +# bit 23-20: 0, MPPSel21 GPIO[21] > >> +# bit 27-24: 0, MPPSel22 GPIO[22] > >> +# bit 31-28: 0, MPPSel23 GPIO[23] > >> + > >> +# MPP Control 3-6 Register untouched (MPP24-49) > >> + > >> +DATA 0xFFD100E0 0x1B1B1B1B # IO Configuration 0 Register > >> +# bit 2-0: 3, Reserved > >> +# bit 5-3: 3, Reserved > >> +# bit 6: 0, Reserved > >> +# bit 7: 0, RGMII-pads voltage = 3.3V > >> +# bit 10-8: 3, Reserved > >> +# bit 13-11: 3, Reserved > >> +# bit 14: 0, Reserved > >> +# bit 15: 0, MPP RGMII-pads voltage = 3.3V > >> +# bit 31-16 0x1B1B, Reserved > >> + > >> +DATA 0xFFD20134 0x66666666 # L2 RAM Timing 0 Register > >> +# bit 0-1: 2, Tag RAM RTC RAM0 > >> +# bit 3-2: 1, Tag RAM WTC RAM0 > >> +# bit 7-4: 6, Reserve > >> +# bit 9-8: 2, Valid RAM RTC RAM > >> +# bit 11-10: 1, Valid RAM WTC RAM > >> +# bit 13-12: 2, Dirty RAM RTC RAM > >> +# bit 15-14: 1, Dirty RAM WTC RAM > >> +# bit 17-16: 2, Data RAM RTC RAM0 > >> +# bit 19-18: 1, Data RAM WTC RAM0 > >> +# bit 21-20: 2, Data RAM RTC RAM1 > >> +# bit 23-22: 1, Data RAM WTC RAM1 > >> +# bit 25-24: 2, Data RAM RTC RAM2 > >> +# bit 27-26: 1, Data RAM WTC RAM2 > >> +# bit 29-28: 2, Data RAM RTC RAM3 > >> +# bit 31-30: 1, Data RAM WTC RAM4 > >> + > >> +DATA 0xFFD20138 0x66666666 # L2 RAM Timing 1 Register > >> +# bit 15-0: ???, Reserve > >> +# bit 17-16: 2, ECC RAM RTC RAM0 > >> +# bit 19-18: 1, ECC RAM WTC RAM0 > >> +# bit 31-20: ???,Reserve > >> + > >> +DATA 0xFFD20154 0x00000200 # CPU RAM Management Control3 > Register > >> +# bit 23-0: 0x000200, Addr Config tuning > >> +# bit 31-24: 0, Reserved > >> + > >> +# ??? Missing register # CPU RAM Management Control2 Register > >> + > >> +DATA 0xFFD2014C 0x00001C00 # CPU RAM Management Control1 > Register > >> +# bit 15-0: 0x1C00, Opmux Tuning > >> +# bit 31-16: 0, Pc Dp Tuning > >> + > >> +DATA 0xFFD20148 0x00000001 # CPU RAM Management Control0 > Register > >> +# bit 1-0: 1, addr clk tune > >> +# bit 3-2: 0, reserved > >> +# bit 5-4: 0, dtcmp clk tune > >> +# bit 7-6: 0, reserved > >> +# bit 9-8: 0, macdrv clk tune > >> +# bit 11-10: 0, opmuxgm2 clk tune > >> +# bit 15-14: 0, rf clk tune > >> +# bit 17-16: 0, rfbypass clk tune > >> +# bit 19-18: 0, pc dp clk tune > >> +# bit 23-20: 0, icache clk tune > >> +# bit 27:24: 0, dcache clk tune > >> +# bit 31:28: 0, regfile tunin > >> + > >> +# SDRAM initalization > >> +DATA 0xFFD01400 0x430004E0 # SDRAM Configuration Register > >> +# bit 13-0: 0x4E0, DDR2 clks refresh rate > >> +# bit 14: 0, reserved > >> +# bit 15: 0, reserved > >> +# bit 16: 0, CPU to Dram Write buffer policy > >> +# bit 17: 0, Enable Registered DIMM or Equivalent Sampling > Logic > >> +# bit 19-18: 0, reserved > >> +# bit 23-20: 0, reserved > >> +# bit 24: 1, enable exit self refresh mode on DDR access > >> +# bit 25: 1, required > >> +# bit 29-26: 0, reserved > >> +# bit 31-30: 1, reserved > >> + > >> +DATA 0xFFD01404 0x36543000 # DDR Controller Control Low > >> +# bit 3-0: 0, reserved > >> +# bit 4: 0, 2T mode =addr/cmd in same 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 > >> +# bit 7-11: 0, reserved > >> +# bit 12-13: 1, reserved, required 1 > >> +# bit 14: 0, input buffer always powered up > >> +# bit 17-15: 0, reserved > >> +# bit 18: 1, cpu lock transaction enabled > >> +# bit 19: 0, reserved > >> +# bit 23-20: 5, recommended value for CL=4 and STARTBURST_DEL > >> disabled bit31=0 > >> +# bit 27-24: 6, CL+1, STARTBURST sample stages, for freqs 200- > 399MHz, > >> unbuffered DIMM > >> +# bit 30-28: 3, required > >> +# bit 31: 0,no additional STARTBURST delay > >> + > >> +DATA 0xFFD01408 0x2302444e # DDR Timing (Low) (active cycles > value > >> +1) > >> +# bit 3-0: 0xE, TRAS, 15 clk (45 ns) > >> +# bit 7-4: 0x4, TRCD, 5 clk (15 ns) > >> +# bit 11-8: 0x4, TRP, 5 clk (15 ns) > >> +# bit 15-12: 0x4, TWR, 5 clk (15 ns) > >> +# bit 19-16: 0x2, TWTR, 3 clk (7.5 ns) > >> +# bit 20: 0, extended TRAS msb > >> +# bit 23-21: 0, reserved > >> +# bit 27-24: 0x3, TRRD, 4 clk (10 ns) > >> +# bit 31-28: 0x2, TRTP, 3 clk (7.5 ns) > >> + > >> +DATA 0xFFD0140C 0x0000003e # DDR Timing (High) > >> +# bit 6-0: 0x3E, TRFC, 63 clk (195 ns) > >> +# bit 8-7: 0, TR2R > >> +# bit 10-9: 0, TR2W > >> +# bit 12-11: 0, TW2W > >> +# bit 31-13: 0, reserved > >> + > >> +DATA 0xFFD01410 0x00000001 # DDR Address Control > >> +# bit 1-0: 1, Cs0width=x16 > >> +# bit 3-2: 0, Cs0size=2Gb > >> +# bit 5-4: 0, Cs1width=nonexistent > >> +# bit 7-6: 0, Cs1size =nonexistent > >> +# bit 9-8: 0, Cs2width=nonexistent > >> +# bit 11-10: 0, Cs2size =nonexistent > >> +# bit 13-12: 0, Cs3width=nonexistent > >> +# bit 15-14: 0, Cs3size =nonexistent > >> +# bit 16: 0, Cs0AddrSel > >> +# bit 17: 0, Cs1AddrSel > >> +# bit 18: 0, Cs2AddrSel > >> +# bit 19: 0, Cs3AddrSel > >> +# bit 31-20: 0, required > >> + > >> +DATA 0xFFD01414 0x00000000 # DDR Open Pages Control > >> +# bit 0: 0, OpenPage enabled > >> +# bit 31-1: 0, required > >> + > >> +DATA 0xFFD01418 0x00000000 # DDR Operation > >> +# bit 3-0: 0, DDR cmd > >> +# bit 31-4: 0, required > >> + > >> +DATA 0xFFD0141C 0x00000652 # DDR Mode > >> +# bit 2-0: 2, Burst Length = 4 > >> +# bit 3: 0, Burst Type > >> +# bit 6-4: 5, CAS Latency = 5 > >> +# bit 7: 0, Test mode > >> +# bit 8: 0, DLL Reset > >> +# bit 11-9: 3, Write recovery for auto-precharge must be 3 > >> +# bit 12: 0, Active power down exit time, fast exit > >> +# bit 14-13: 0, reserved > >> +# bit 31-15: 0, reserved > >> + > >> +DATA 0xFFD01420 0x00000006 # DDR Extended Mode > >> +# bit 0: 0, DDR DLL enabled > >> +# bit 1: 1, DDR drive strength reduced > >> +# bit 2: 1, DDR ODT control lsb, 75 ohm termination [RTT0] > >> +# bit 5-3: 0, required > >> +# bit 6: 0, DDR ODT control msb, 75 ohm termination [RTT1] > >> +# bit 9-7: 0, required > >> +# bit 10: 0, differential DQS enabled > >> +# bit 11: 0, required > >> +# bit 12: 0, DDR output buffer enabled > >> +# bit 31-13: 0 required > >> + > >> +DATA 0xFFD01424 0x0000F17F # DDR Controller Control High > >> +# bit 2-0: 7, required > >> +# bit 3: 1, MBUS Burst Chop disabled > >> +# bit 6-4: 7, required > >> +# bit 7: 0, reserved > >> +# bit 8: 1, add sample stage required for f > 266 MHz > >> +# bit 9: 0, no half clock cycle addition to dataout > >> +# bit 10: 0, 1/4 clock cycle skew enabled for addr/ctl signals > >> +# bit 11: 0, 1/4 clock cycle skew disabled for write mesh > >> +# bit 15-12:0xf, required > >> +# bit 31-16: 0, required > >> + > >> +DATA 0xFFD01428 0x00084520 # DDR2 SDRAM Timing Low > >> +# bit 3-0: 0, required > >> +# bit 7-4: 2, M_ODT assertion 2 cycles after read start command > >> +# bit 11-8: 5, M_ODT de-assertion 5 cycles after read start > command > >> +# (ODT turn off delay 2,5 clk cycles) > >> +# bit 15-12: 4, internal ODT time based on bit 7-4 > >> +# with the considered SDRAM internal delay > >> +# bit 19-16: 8, internal ODT de-assertion based on bit 11-8 > >> +# with the considered SDRAM internal delay > >> +# bit 31-20: 0, required > >> + > >> +DATA 0xFFD0147c 0x00008452 # DDR2 SDRAM Timing High > >> +# bit 3-0: 2, M_ODT assertion same as bit 11-8 > >> +# bit 7-4: 5, M_ODT de-assertion same as bit 15-12 > >> +# bit 11-8: 4, internal ODT assertion 2 cycles after write start > >> command > >> +# with the considered SDRAM internal delay > >> +# bit 15-12: 8, internal ODT de-assertion 5 cycles after write > start > >> command > >> +# with the considered SDRAM internal delay > >> + > >> +DATA 0xFFD01500 0x00000000 # CS[0]n Base address to 0x0 > >> +# bit 23-0: 0, reserved > >> +# bit 31-24: 0, CPU CS Window0 Base Address, addr bits [31:24] > >> + > >> +DATA 0xFFD01504 0x0FFFFFF1 # CS[0]n Size > >> +# bit 0: 1, Window enabled > >> +# bit 1: 0, Write Protect disabled > >> +# bit 3-2: 0, CS0 hit selected > >> +# bit 23-4:ones, required > >> +# bit 31-24: 0x0F, Size (i.e. 256MB) > >> + > >> +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) > >> +# bit 3-0: 0, ODT0Rd, MODT[0] not asserted during read from > DRAM > >> CS0 > >> +# bit 7-4: 0, ODT0Rd, MODT[1] not asserted > >> +# bit 11-8: 0, required > >> +# big 15-11: 0, required > >> +# bit 19-16: 1, ODT0Wr, MODT[0] asserted during write to DRAM > CS0 > >> +# bit 23-20: 0, ODT0Wr, MODT[1] not asserted > >> +# bit 27-24: 0, required > >> +# bit 31-28: 0, required > >> + > >> +DATA 0xFFD01498 0x00000000 # DDR ODT Control (High) > >> +# bit 1-0: 0, ODT0 controlled by ODT Control (low) register > above > >> +# bit 3-2: 0, ODT1 controlled by register > >> +# bit 31-4: 0, required > >> + > >> +DATA 0xFFD0149C 0x0000E801 # CPU ODT Control > >> +# bit 3-0: 1, ODTRd, Internal ODT asserted during read from > DRAM > >> bank0 > >> +# bit 7-4: 0, ODTWr, Internal ODT not asserted during write to > >> DRAM > >> +# bit 9-8: 0, ODTEn, controlled by ODTRd and ODTWr > >> +# bit 11-10: 2, DQ_ODTSel. ODT select turned on, 75 ohm > >> +# bit 13-12: 2, STARTBURST ODT buffer selected, 75 ohm > >> +# bit 14: 1, STARTBURST ODT enabled > >> +# bit 15: 1, Use ODT Block > >> + > >> +DATA 0xFFD01480 0x00000001 # DDR Initialization Control > >> +# bit 0: 1, enable DDR init upon this register write > >> +# bit 31-1: 0, reserved > >> + > >> +# End of Header extension > > > > Is this configuration similar to any other board already mainlined? > if there is small delta like RAM/flash sizes then you can manage it > through board_init() > > > > Just think of it. > > > > I would like to keep it as it is. > > >> +DATA 0x0 0x0 > >> diff --git a/board/keymile/km_arm/km_arm.c > >> b/board/keymile/km_arm/km_arm.c > >> index e4ae1fb..ffe13cd 100644 > >> --- a/board/keymile/km_arm/km_arm.c > >> +++ b/board/keymile/km_arm/km_arm.c > >> @@ -133,10 +133,11 @@ int startup_allowed(void) > >> } > >> #endif > >> > >> -#if (defined(CONFIG_MGCOGE3UN)|defined(CONFIG_PORTL2)) > >> +#if (defined(CONFIG_MGCOGE3UN)|defined(CONFIG_PORTL2)| \ > >> + defined(CONFIG_KM_PIGGY4_88E6352)) > >> /* > >> - * These two boards have always ethernet present. Its connected to > >> the mv > >> - * switch. > >> + * All boards with PIGGY4 connected via a simple switch have > ethernet > >> always > >> + * present. > >> */ > >> int ethernet_present(void) > >> { > >> @@ -384,7 +385,7 @@ void reset_phy(void) > >> /* reset the phy */ > >> miiphy_reset(name, CONFIG_PHY_BASE_ADR); > >> } > >> -#else > >> +#elif !defined(CONFIG_KM_PIGGY4_88E6352) > >> /* Configure and enable MV88E1118 PHY on the piggy*/ > >> void reset_phy(void) > >> { > >> diff --git a/boards.cfg b/boards.cfg > >> index b711e0d..1a4c2ad 100644 > >> --- a/boards.cfg > >> +++ b/boards.cfg > >> @@ -140,6 +140,7 @@ pogo_e02 arm > arm926ejs > >> - clouden > >> dns325 arm arm926ejs - > >> d-link kirkwood > >> km_kirkwood arm arm926ejs km_arm > >> keymile kirkwood km_kirkwood:KM_KIRKWOOD,KM_DISABLE_PCI > >> km_kirkwood_pci arm arm926ejs km_arm > >> keymile kirkwood > km_kirkwood:KM_KIRKWOOD_PCI,KM_RECONFIG_XLX > >> +kmnusa arm arm926ejs km_arm > > > > Why name is not km_nusa? > > > > Could be also km_nusa. But isn't it up to us how we name our boards? > > >> keymile kirkwood km_kirkwood:KM_NUSA > >> mgcoge3un arm arm926ejs km_arm > >> keymile kirkwood > >> portl2 arm arm926ejs km_arm > >> keymile kirkwood > >> inetspace_v2 arm arm926ejs netspace_v2 > >> LaCie kirkwood lacie_kw:INETSPACE_V2 > >> diff --git a/include/configs/km/km_arm.h > b/include/configs/km/km_arm.h > >> index 28b5021..a35ef61 100644 > >> --- a/include/configs/km/km_arm.h > >> +++ b/include/configs/km/km_arm.h > >> @@ -57,6 +57,13 @@ > >> #define CONFIG_CMD_SF > >> #define CONFIG_SOFT_I2C /* I2C bit-banged */ > >> > >> +#if defined CONFIG_KM_ENV_IS_IN_SPI_NOR > >> +#define CONFIG_ENV_SPI_BUS 0 > >> +#define CONFIG_ENV_SPI_CS 0 > >> +#define CONFIG_ENV_SPI_MAX_HZ 5000000 > >> +#define CONFIG_ENV_SPI_MODE SPI_MODE_3 > >> +#endif > >> + > > > > Do you still need this? Your patch 03/20 takes care of this. > > > > Yes we need it. Patch 03/20 makes it possible to overwrite these > default values. > And in this patch we use 5MHz as max frequency rather than 50MHz which > is the > default setting. > > Regards > Holger > _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot