* [U-Boot] [PATCH v4] add new board nas62x0
@ 2012-03-21 0:53 Luka Perkov
2012-03-21 6:55 ` Igor Grinberg
2012-03-21 10:10 ` Prafulla Wadaskar
0 siblings, 2 replies; 4+ messages in thread
From: Luka Perkov @ 2012-03-21 0:53 UTC (permalink / raw)
To: u-boot
Add support for new boards RaidSonic ICY BOX NAS6210 and NAS6220.
Only difference between boards is number of SATA ports.
Signed-off-by: Luka Perkov <uboot@lukaperkov.net>
Signed-off-by: Gerald Kerma <dreagle@doukki.net>
---
Changes from version v3:
* don't use utf8 for Geralds name
* don't mix upper/lower case in kwbimage.cfg
* fix prompt
Found problems that should be looked at (this is not related with adding
support for this board):
* IB62x0_OE_LOW and IB62x0_OE_HIGH issue
* CONFIG_SKIP_LOWLEVEL_INIT issue
In separate patch I'll resend fix for CONFIG_SKIP_LOWLEVEL_INIT.
MAINTAINERS | 4 +
board/Marvell/ib62x0/Makefile | 51 +++++++++++
board/Marvell/ib62x0/ib62x0.c | 114 ++++++++++++++++++++++++
board/Marvell/ib62x0/ib62x0.h | 41 +++++++++
board/Marvell/ib62x0/kwbimage.cfg | 167 +++++++++++++++++++++++++++++++++++
boards.cfg | 2 +
include/configs/ib62x0.h | 176 +++++++++++++++++++++++++++++++++++++
7 files changed, 555 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 46f63a0..11d023e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -782,6 +782,10 @@ Linus Walleij <linus.walleij@linaro.org>
integratorap various
integratorcp various
+Luka Perkov <uboot@lukaperkov.net>
+
+ ib62x0 ARM926EJS
+
Dave Peverley <dpeverley@mpc-data.co.uk>
omap730p2 ARM926EJS
diff --git a/board/Marvell/ib62x0/Makefile b/board/Marvell/ib62x0/Makefile
new file mode 100644
index 0000000..3d82f27
--- /dev/null
+++ b/board/Marvell/ib62x0/Makefile
@@ -0,0 +1,51 @@
+#
+# (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.
+#
+# 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
+#
+
+include $(TOPDIR)/config.mk
+
+LIB = $(obj)lib$(BOARD).o
+
+COBJS := ib62x0.o
+
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS := $(addprefix $(obj),$(SOBJS))
+
+$(LIB): $(obj).depend $(OBJS) $(SOBJS)
+ $(call cmd_link_o_target, $(OBJS) $(SOBJS))
+
+clean:
+ rm -f $(SOBJS) $(OBJS)
+
+distclean: clean
+ rm -f $(LIB) core *.bak .depend
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/board/Marvell/ib62x0/ib62x0.c b/board/Marvell/ib62x0/ib62x0.c
new file mode 100644
index 0000000..e6853e7
--- /dev/null
+++ b/board/Marvell/ib62x0/ib62x0.c
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2011 Gerald Kerma <dreagle@doukki.net>
+ *
+ * Written-by: Gerald Kerma <dreagle@doukki.net>
+ *
+ * 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
+ */
+
+#include <common.h>
+#include <miiphy.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/kirkwood.h>
+#include <asm/arch/mpp.h>
+#include "ib62x0.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int board_early_init_f(void)
+{
+ /*
+ * default gpio configuration
+ * There are maximum 64 gpios controlled through 2 sets of registers
+ * the below configuration configures mainly initial LED status
+ */
+ kw_config_gpio(IB62x0_OE_VAL_LOW,
+ IB62x0_OE_VAL_HIGH,
+ IB62x0_OE_LOW, IB62x0_OE_HIGH);
+
+ /* Multi-Purpose Pins Functionality configuration */
+ u32 kwmpp_config[] = {
+ MPP0_NF_IO2,
+ MPP1_NF_IO3,
+ MPP2_NF_IO4,
+ MPP3_NF_IO5,
+ MPP4_NF_IO6,
+ MPP5_NF_IO7,
+ MPP6_SYSRST_OUTn,
+ MPP7_GPO,
+ MPP8_UART0_RTS,
+ MPP9_UART0_CTS,
+ MPP10_UART0_TXD,
+ MPP11_UART0_RXD,
+ MPP12_SD_CLK,
+ MPP13_SD_CMD,
+ MPP14_SD_D0,
+ MPP15_SD_D1,
+ MPP16_SD_D2,
+ MPP17_SD_D3,
+ MPP18_NF_IO0,
+ MPP19_NF_IO1,
+ MPP20_GPIO,
+ MPP21_GPIO,
+ MPP22_GPIO, /* Power LED red */
+ MPP23_GPIO,
+ MPP24_GPIO,
+ MPP25_GPIO, /* Power LED green */
+ MPP26_GPIO,
+ MPP27_GPIO, /* USB transfer LED */
+ MPP28_GPIO, /* Reset button */
+ MPP29_TSMP9, /* USB Copy button */
+ MPP30_GPIO,
+ MPP31_GPIO,
+ MPP32_GPIO,
+ MPP33_GPIO,
+ MPP34_GPIO,
+ MPP35_GPIO,
+ MPP36_GPIO,
+ MPP37_GPIO,
+ MPP38_GPIO,
+ MPP39_GPIO,
+ MPP40_GPIO,
+ MPP41_GPIO,
+ MPP42_GPIO,
+ MPP43_GPIO,
+ MPP44_GPIO,
+ MPP45_GPIO,
+ MPP46_GPIO,
+ MPP47_GPIO,
+ MPP48_GPIO,
+ MPP49_GPIO,
+ 0
+ };
+ kirkwood_mpp_conf(kwmpp_config);
+ return 0;
+}
+
+int board_init(void)
+{
+ /*
+ * arch number of board
+ */
+ gd->bd->bi_arch_number = MACH_TYPE_NAS6210;
+
+ /* adress of boot parameters */
+ gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100;
+
+ return 0;
+}
diff --git a/board/Marvell/ib62x0/ib62x0.h b/board/Marvell/ib62x0/ib62x0.h
new file mode 100644
index 0000000..0e1e7c4
--- /dev/null
+++ b/board/Marvell/ib62x0/ib62x0.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2011 Gerald Kerma <dreagle@doukki.net>
+ *
+ * Written-by: Gerald Kerma <dreagle@doukki.net>
+ *
+ * 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
+ */
+
+#ifndef __IB62x0_H
+#define __IB62x0_H
+
+#define IB62x0_OE_LOW (~(0))
+#define IB62x0_OE_HIGH (~(0))
+#define IB62x0_OE_VAL_LOW (1 << 29) /* USB_PWEN low */
+#define IB62x0_OE_VAL_HIGH (1 << 17) /* LED pin high */
+
+/* PHY related */
+#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)
+
+#endif /* __IB62x0_H */
diff --git a/board/Marvell/ib62x0/kwbimage.cfg b/board/Marvell/ib62x0/kwbimage.cfg
new file mode 100644
index 0000000..32f3dca
--- /dev/null
+++ b/board/Marvell/ib62x0/kwbimage.cfg
@@ -0,0 +1,167 @@
+#
+# Copyright (C) 2011 Gerald Kerma <dreagle@doukki.net>
+#
+# Written-by: Gerald Kerma <dreagle@doukki.net>
+#
+# 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 nand # change from nand to uart if building UART image
+NAND_ECC_MODE default
+NAND_PAGE_SIZE 0x0800
+
+# 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 0x43000c30 # DDR Configuration register
+# bit13-0: 0xc30 (3120 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 0x37543000 # 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: 7= CL+2, STARTBURST sample stages, for freqs 400MHz, unbuffered DIMM
+# bit30-28: 3 required
+# bit31: 0=no additional STARTBURST delay
+
+DATA 0xffd01408 0x22125451 # DDR Timing (Low) (active cycles value +1)
+# bit3-0: TRAS lsbs
+# 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 0x00000a33 # DDR Timing (High)
+# bit6-0: TRFC
+# bit8-7: TR2R
+# bit10-9: TR2W
+# bit12-11: TW2W
+# bit31-13: zero required
+
+DATA 0xffd01410 0x000000cc # DDR Address Control
+# bit1-0: 00, Cs0width=x8
+# bit3-2: 11, Cs0size=1Gb
+# bit5-4: 00, Cs1width=x8
+# bit7-6: 11, Cs1size=1Gb
+# 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 0x00000c52 # 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: 0, DDR drive strenght normal
+# bit2: 1, DDR ODT control lsd (disabled)
+# bit5-3: 000, required
+# bit6: 0, DDR ODT control msb, (disabled)
+# bit9-7: 000, required
+# bit10: 0, differential DQS enabled
+# bit11: 0, required
+# bit12: 0, DDR output buffer enabled
+# bit31-13: 0 required
+
+DATA 0xffd01424 0x0000f17f # DDR Controller Control High
+# bit2-0: 111, required
+# bit3 : 1 , MBUS Burst Chop disabled
+# bit6-4: 111, required
+# bit7 : 0
+# 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 0x0ffffff1 # 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: 0x0f, Size (i.e. 256MB)
+
+DATA 0xffd01508 0x10000000 # CS[1]n Base address to 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 0x00120012 # DDR ODT Control (Low)
+# bit3-0: 2, ODT0Rd, MODT[0] asserted during read from DRAM CS1
+# bit7-4: 1, ODT0Rd, MODT[0] asserted during read from DRAM CS0
+# bit19-16:2, ODT0Wr, MODT[0] asserted during write to DRAM CS1
+# bit23-20: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
+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/boards.cfg b/boards.cfg
index 28cc345..a4e8852 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -147,6 +147,8 @@ netspace_max_v2 arm arm926ejs netspace_v2 LaCie
netspace_v2 arm arm926ejs netspace_v2 LaCie kirkwood lacie_kw:NETSPACE_V2
dreamplug arm arm926ejs - Marvell kirkwood
guruplug arm arm926ejs - Marvell kirkwood
+ib_nas6210 arm arm926ejs ib62x0 Marvell kirkwood ib62x0:BOARD_IS_IB_NAS6210
+ib_nas6220 arm arm926ejs ib62x0 Marvell kirkwood ib62x0:BOARD_IS_IB_NAS6220
mv88f6281gtw_ge arm arm926ejs - Marvell kirkwood
openrd_base arm arm926ejs openrd Marvell kirkwood openrd:BOARD_IS_OPENRD_BASE
openrd_client arm arm926ejs openrd Marvell kirkwood openrd:BOARD_IS_OPENRD_CLIENT
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
new file mode 100644
index 0000000..1c4778d
--- /dev/null
+++ b/include/configs/ib62x0.h
@@ -0,0 +1,176 @@
+/*
+ * Copyright (C) 2011-2012
+ * Gerald Kerma <dreagle@doukki.net>
+ * Luka Perkov <uboot@lukaperkov.net>
+ *
+ * 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
+ */
+
+#ifndef _CONFIG_IB62x0_H
+#define _CONFIG_IB62x0_H
+
+/*
+ * Version number information
+ */
+#if defined(CONFIG_BOARD_IS_IB_NAS6210)
+# define CONFIG_IDENT_STRING " RaidSonic ICY BOX IB-NAS6210"
+#elif defined(CONFIG_BOARD_IS_IB_NAS6220)
+# define CONFIG_IDENT_STRING " RaidSonic ICY BOX IB-NAS6220"
+#else
+# error Unknown RaidSonic ICY BOX board specified
+#endif
+
+/*
+ * 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_MACH_NAS6210 /* Machine type */
+#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
+
+/*
+ * Other required minimal configurations
+ */
+#define CONFIG_DISPLAY_CPUINFO /* Display cpu info */
+#define CONFIG_SYS_ALT_MEMTEST
+
+/*
+ * Compression configuration
+ */
+#define CONFIG_BZIP2
+#define CONFIG_LZMA
+#define CONFIG_LZO
+
+/*
+ * Commands configuration
+ */
+#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
+#define CONFIG_SYS_MVFS
+#include <config_cmd_default.h>
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_NAND
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_USB
+/*
+ * mv-common.h should be defined after CMD configs since it used them
+ * to enable certain macros
+ */
+#include "mv-common.h"
+
+#undef CONFIG_SYS_PROMPT
+#if defined(CONFIG_BOARD_IS_IB_NAS6210)
+# define CONFIG_SYS_PROMPT "IB-NAS6210 => "
+#elif defined(CONFIG_BOARD_IS_IB_NAS6220)
+# define CONFIG_SYS_PROMPT "IB-NAS6220 => "
+#else
+# error Unknown RaidSonic ICY BOX board specified
+#endif
+
+/*
+ * Environment variables configurations
+ */
+#ifdef CONFIG_CMD_NAND
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_SECT_SIZE 0x20000
+#else
+#define CONFIG_ENV_IS_NOWHERE
+#endif
+#define CONFIG_ENV_SIZE 0x20000
+#define CONFIG_ENV_OFFSET 0x80000
+
+/*
+ * Default environment variables
+ */
+#define CONFIG_BOOTCOMMAND \
+ "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
+ "ubi part root; " \
+ "ubifsmount root; " \
+ "ubifsload 0x800000 ${kernel}; " \
+ "ubifsload 0x1100000 ${initrd}; " \
+ "bootm 0x800000 0x1100000"
+
+#define CONFIG_MTDPARTS \
+ "mtdparts=orion_nand:" \
+ "0x80000 at 0x0(uboot)," \
+ "0x20000 at 0x80000(uboot_env)," \
+ "- at 0xa0000(root)\0"
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ "console=console=ttyS0,115200\0" \
+ "mtdids=nand0=orion_nand\0" \
+ "mtdparts="CONFIG_MTDPARTS \
+ "kernel=/boot/uImage\0" \
+ "initrd=/boot/uInitrd\0" \
+ "bootargs_root=ubi.mtd=2 root=ubi0:root rootfstype=ubifs\0"
+
+/*
+ * Ethernet Driver configuration
+ */
+#ifdef CONFIG_CMD_NET
+#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
+#define CONFIG_PHY_BASE_ADR 0
+#undef CONFIG_RESET_PHY_R
+#endif /* CONFIG_CMD_NET */
+
+/*
+ * SATA Driver configuration
+ */
+#ifdef CONFIG_CMD_IDE
+#define __io
+#define CONFIG_IDE_PREINIT
+#define CONFIG_DOS_PARTITION
+#define CONFIG_MVSATA_IDE_USE_PORT0
+# if defined(CONFIG_BOARD_IS_IB_NAS6210)
+# undef CONFIG_SYS_IDE_MAXBUS
+# define CONFIG_SYS_IDE_MAXBUS 1
+# undef CONFIG_SYS_IDE_MAXDEVICE
+# define CONFIG_SYS_IDE_MAXDEVICE 1
+# elif defined(CONFIG_BOARD_IS_IB_NAS6220)
+# define CONFIG_MVSATA_IDE_USE_PORT1
+# endif
+#define CONFIG_SYS_ATA_IDE0_OFFSET KW_SATA_PORT0_OFFSET
+# if defined(CONFIG_BOARD_IS_IB_NAS6220)
+# define CONFIG_SYS_ATA_IDE1_OFFSET KW_SATA_PORT1_OFFSET
+# endif
+#endif /* CONFIG_CMD_IDE */
+
+/*
+ * RTC driver configuration
+ */
+#ifdef CONFIG_CMD_DATE
+#define CONFIG_RTC_MV
+#endif /* CONFIG_CMD_DATE */
+
+/*
+ * File system
+ */
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_JFFS2
+#define CONFIG_CMD_UBI
+#define CONFIG_CMD_UBIFS
+#define CONFIG_RBTREE
+#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD_PARTITIONS
+#define CONFIG_CMD_MTDPARTS
+
+#endif /* _CONFIG_IB62x0_H */
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v4] add new board nas62x0
2012-03-21 0:53 [U-Boot] [PATCH v4] add new board nas62x0 Luka Perkov
@ 2012-03-21 6:55 ` Igor Grinberg
2012-03-21 9:45 ` Prafulla Wadaskar
2012-03-21 10:10 ` Prafulla Wadaskar
1 sibling, 1 reply; 4+ messages in thread
From: Igor Grinberg @ 2012-03-21 6:55 UTC (permalink / raw)
To: u-boot
Hi Luka,
On 03/21/12 02:53, Luka Perkov wrote:
> Add support for new boards RaidSonic ICY BOX NAS6210 and NAS6220.
>
> Only difference between boards is number of SATA ports.
>
> Signed-off-by: Luka Perkov <uboot@lukaperkov.net>
> Signed-off-by: Gerald Kerma <dreagle@doukki.net>
> ---
>
> Changes from version v3:
>
> * don't use utf8 for Geralds name
> * don't mix upper/lower case in kwbimage.cfg
> * fix prompt
>
> Found problems that should be looked at (this is not related with adding
> support for this board):
>
> * IB62x0_OE_LOW and IB62x0_OE_HIGH issue
> * CONFIG_SKIP_LOWLEVEL_INIT issue
>
> In separate patch I'll resend fix for CONFIG_SKIP_LOWLEVEL_INIT.
>
>
> MAINTAINERS | 4 +
> board/Marvell/ib62x0/Makefile | 51 +++++++++++
> board/Marvell/ib62x0/ib62x0.c | 114 ++++++++++++++++++++++++
> board/Marvell/ib62x0/ib62x0.h | 41 +++++++++
> board/Marvell/ib62x0/kwbimage.cfg | 167 +++++++++++++++++++++++++++++++++++
> boards.cfg | 2 +
> include/configs/ib62x0.h | 176 +++++++++++++++++++++++++++++++++++++
> 7 files changed, 555 insertions(+)
[...]
> diff --git a/board/Marvell/ib62x0/Makefile b/board/Marvell/ib62x0/Makefile
> new file mode 100644
> index 0000000..3d82f27
> --- /dev/null
> +++ b/board/Marvell/ib62x0/Makefile
> @@ -0,0 +1,51 @@
> +# 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
It is better to remove the postal address, as it is subject to change.
Please, check all files you add.
> +clean:
> + rm -f $(SOBJS) $(OBJS)
> +
> +distclean: clean
> + rm -f $(LIB) core *.bak .depend
clean and distclean have no effect here and should be removed.
[...]
> diff --git a/board/Marvell/ib62x0/ib62x0.c b/board/Marvell/ib62x0/ib62x0.c
> new file mode 100644
> index 0000000..e6853e7
> --- /dev/null
> +++ b/board/Marvell/ib62x0/ib62x0.c
[...]
> +int board_init(void)
> +{
> + /*
> + * arch number of board
> + */
> + gd->bd->bi_arch_number = MACH_TYPE_NAS6210;
This should be handled in a generic way:
#define CONFIG_MACH_TYPE MACH_TYPE_NAS6210
in your board config file.
> +
> + /* adress of boot parameters */
> + gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100;
> +
> + return 0;
> +}
[...]
--
Regards,
Igor.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v4] add new board nas62x0
2012-03-21 6:55 ` Igor Grinberg
@ 2012-03-21 9:45 ` Prafulla Wadaskar
0 siblings, 0 replies; 4+ messages in thread
From: Prafulla Wadaskar @ 2012-03-21 9:45 UTC (permalink / raw)
To: u-boot
> -----Original Message-----
> From: u-boot-bounces at lists.denx.de [mailto:u-boot-
> bounces at lists.denx.de] On Behalf Of Igor Grinberg
> Sent: 21 March 2012 12:25
> To: u-boot at lists.denx.de; dreagle at doukki.net; marek.vasut at gmail.com;
> gmbnomis at gmail.com
> Subject: Re: [U-Boot] [PATCH v4] add new board nas62x0
>
> Hi Luka,
>
> On 03/21/12 02:53, Luka Perkov wrote:
> > Add support for new boards RaidSonic ICY BOX NAS6210 and NAS6220.
> >
> > Only difference between boards is number of SATA ports.
> >
> > Signed-off-by: Luka Perkov <uboot@lukaperkov.net>
> > Signed-off-by: Gerald Kerma <dreagle@doukki.net>
> > ---
> >
> > Changes from version v3:
> >
> > * don't use utf8 for Geralds name
> > * don't mix upper/lower case in kwbimage.cfg
> > * fix prompt
> >
> > Found problems that should be looked at (this is not related with
> adding
> > support for this board):
> >
> > * IB62x0_OE_LOW and IB62x0_OE_HIGH issue
> > * CONFIG_SKIP_LOWLEVEL_INIT issue
> >
> > In separate patch I'll resend fix for CONFIG_SKIP_LOWLEVEL_INIT.
> >
> >
> > MAINTAINERS | 4 +
> > board/Marvell/ib62x0/Makefile | 51 +++++++++++
> > board/Marvell/ib62x0/ib62x0.c | 114 ++++++++++++++++++++++++
> > board/Marvell/ib62x0/ib62x0.h | 41 +++++++++
> > board/Marvell/ib62x0/kwbimage.cfg | 167
> +++++++++++++++++++++++++++++++++++
> > boards.cfg | 2 +
> > include/configs/ib62x0.h | 176
> +++++++++++++++++++++++++++++++++++++
> > 7 files changed, 555 insertions(+)
>
> [...]
>
> > diff --git a/board/Marvell/ib62x0/Makefile
> b/board/Marvell/ib62x0/Makefile
> > new file mode 100644
> > index 0000000..3d82f27
> > --- /dev/null
> > +++ b/board/Marvell/ib62x0/Makefile
> > @@ -0,0 +1,51 @@
> > +# 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
>
> It is better to remove the postal address, as it is subject to change.
> Please, check all files you add.
I think specifying email address or/and website is more meaning full.
>
> > +clean:
> > + rm -f $(SOBJS) $(OBJS)
> > +
> > +distclean: clean
> > + rm -f $(LIB) core *.bak .depend
>
> clean and distclean have no effect here and should be removed.
>
> [...]
>
> > diff --git a/board/Marvell/ib62x0/ib62x0.c
> b/board/Marvell/ib62x0/ib62x0.c
> > new file mode 100644
> > index 0000000..e6853e7
> > --- /dev/null
> > +++ b/board/Marvell/ib62x0/ib62x0.c
>
> [...]
>
> > +int board_init(void)
> > +{
> > + /*
> > + * arch number of board
> > + */
> > + gd->bd->bi_arch_number = MACH_TYPE_NAS6210;
>
> This should be handled in a generic way:
> #define CONFIG_MACH_TYPE MACH_TYPE_NAS6210
> in your board config file.
Is this board support already available in Linux kernel ?
Regards..
Prafulla . . .
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v4] add new board nas62x0
2012-03-21 0:53 [U-Boot] [PATCH v4] add new board nas62x0 Luka Perkov
2012-03-21 6:55 ` Igor Grinberg
@ 2012-03-21 10:10 ` Prafulla Wadaskar
1 sibling, 0 replies; 4+ messages in thread
From: Prafulla Wadaskar @ 2012-03-21 10:10 UTC (permalink / raw)
To: u-boot
> -----Original Message-----
> From: u-boot-bounces at lists.denx.de [mailto:u-boot-
> bounces at lists.denx.de] On Behalf Of Luka Perkov
> Sent: 21 March 2012 06:23
> To: u-boot at lists.denx.de
> Cc: dreagle at doukki.net; gmbnomis at gmail.com
> Subject: [U-Boot] [PATCH v4] add new board nas62x0
Please specify the patch header as Kirkwood: add NAS62x0 board support
This reflects on patch subject as patch for Kirkwood.
>
> Add support for new boards RaidSonic ICY BOX NAS6210 and NAS6220.
Add few links about board being supported here for quick reference
>
> Only difference between boards is number of SATA ports.
>
> Signed-off-by: Luka Perkov <uboot@lukaperkov.net>
> Signed-off-by: Gerald Kerma <dreagle@doukki.net>
> ---
>
V1, v2 change log missing ???
> Changes from version v3:
>
> * don't use utf8 for Geralds name
> * don't mix upper/lower case in kwbimage.cfg
> * fix prompt
>
> Found problems that should be looked at (this is not related with
> adding
> support for this board):
>
> * IB62x0_OE_LOW and IB62x0_OE_HIGH issue
> * CONFIG_SKIP_LOWLEVEL_INIT issue
>
> In separate patch I'll resend fix for CONFIG_SKIP_LOWLEVEL_INIT.
>
>
> MAINTAINERS | 4 +
> board/Marvell/ib62x0/Makefile | 51 +++++++++++
This board does not belongs to Marvell it should be added to boards/<vendor>
> board/Marvell/ib62x0/ib62x0.c | 114 ++++++++++++++++++++++++
> board/Marvell/ib62x0/ib62x0.h | 41 +++++++++
> board/Marvell/ib62x0/kwbimage.cfg | 167
Is this exactly copy paste from other available kwbimage.cfg, if yes then you can reuse it, if no then what are the key changes w.r.to referred board?
> +++++++++++++++++++++++++++++++++++
> boards.cfg | 2 +
> include/configs/ib62x0.h | 176
> +++++++++++++++++++++++++++++++++++++
> 7 files changed, 555 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 46f63a0..11d023e 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -782,6 +782,10 @@ Linus Walleij <linus.walleij@linaro.org>
> integratorap various
> integratorcp various
>
> +Luka Perkov <uboot@lukaperkov.net>
> +
> + ib62x0 ARM926EJS
It's better to add both boards being supported
> +
> Dave Peverley <dpeverley@mpc-data.co.uk>
>
> omap730p2 ARM926EJS
...snip...
> diff --git a/board/Marvell/ib62x0/ib62x0.c
> b/board/Marvell/ib62x0/ib62x0.c
> new file mode 100644
> index 0000000..e6853e7
> --- /dev/null
> +++ b/board/Marvell/ib62x0/ib62x0.c
> @@ -0,0 +1,114 @@
> +/*
> + * Copyright (C) 2011 Gerald Kerma <dreagle@doukki.net>
> + *
> + * Written-by: Gerald Kerma <dreagle@doukki.net>
> + *
> + * 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
> + */
> +
> +#include <common.h>
> +#include <miiphy.h>
> +#include <asm/arch/cpu.h>
> +#include <asm/arch/kirkwood.h>
> +#include <asm/arch/mpp.h>
> +#include "ib62x0.h"
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +int board_early_init_f(void)
> +{
> + /*
> + * default gpio configuration
> + * There are maximum 64 gpios controlled through 2 sets of
> registers
> + * the below configuration configures mainly initial LED status
> + */
> + kw_config_gpio(IB62x0_OE_VAL_LOW,
> + IB62x0_OE_VAL_HIGH,
> + IB62x0_OE_LOW, IB62x0_OE_HIGH);
> +
> + /* Multi-Purpose Pins Functionality configuration */
> + u32 kwmpp_config[] = {
> + MPP0_NF_IO2,
> + MPP1_NF_IO3,
> + MPP2_NF_IO4,
> + MPP3_NF_IO5,
> + MPP4_NF_IO6,
> + MPP5_NF_IO7,
> + MPP6_SYSRST_OUTn,
> + MPP7_GPO,
> + MPP8_UART0_RTS,
> + MPP9_UART0_CTS,
> + MPP10_UART0_TXD,
> + MPP11_UART0_RXD,
> + MPP12_SD_CLK,
> + MPP13_SD_CMD,
> + MPP14_SD_D0,
> + MPP15_SD_D1,
> + MPP16_SD_D2,
> + MPP17_SD_D3,
> + MPP18_NF_IO0,
> + MPP19_NF_IO1,
> + MPP20_GPIO,
> + MPP21_GPIO,
> + MPP22_GPIO, /* Power LED red */
> + MPP23_GPIO,
> + MPP24_GPIO,
> + MPP25_GPIO, /* Power LED green */
> + MPP26_GPIO,
> + MPP27_GPIO, /* USB transfer LED */
> + MPP28_GPIO, /* Reset button */
> + MPP29_TSMP9, /* USB Copy button */
> + MPP30_GPIO,
> + MPP31_GPIO,
> + MPP32_GPIO,
> + MPP33_GPIO,
> + MPP34_GPIO,
> + MPP35_GPIO,
> + MPP36_GPIO,
> + MPP37_GPIO,
> + MPP38_GPIO,
> + MPP39_GPIO,
> + MPP40_GPIO,
> + MPP41_GPIO,
> + MPP42_GPIO,
> + MPP43_GPIO,
> + MPP44_GPIO,
> + MPP45_GPIO,
> + MPP46_GPIO,
> + MPP47_GPIO,
> + MPP48_GPIO,
> + MPP49_GPIO,
> + 0
> + };
You have configured so many GPIOS, do you need all these, just keep only needed configuration here.
> + kirkwood_mpp_conf(kwmpp_config);
> + return 0;
> +}
> +
> +int board_init(void)
> +{
> + /*
> + * arch number of board
> + */
> + gd->bd->bi_arch_number = MACH_TYPE_NAS6210;
CONFIG_MACH_TYPE,
> +
> + /* adress of boot parameters */
> + gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100;
> +
> + return 0;
> +}
> diff --git a/board/Marvell/ib62x0/ib62x0.h
> b/board/Marvell/ib62x0/ib62x0.h
> new file mode 100644
> index 0000000..0e1e7c4
> --- /dev/null
> +++ b/board/Marvell/ib62x0/ib62x0.h
> @@ -0,0 +1,41 @@
> +/*
> + * Copyright (C) 2011 Gerald Kerma <dreagle@doukki.net>
> + *
> + * Written-by: Gerald Kerma <dreagle@doukki.net>
> + *
> + * 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
> + */
> +
> +#ifndef __IB62x0_H
> +#define __IB62x0_H
> +
> +#define IB62x0_OE_LOW (~(0))
> +#define IB62x0_OE_HIGH (~(0))
> +#define IB62x0_OE_VAL_LOW (1 << 29) /* USB_PWEN low */
> +#define IB62x0_OE_VAL_HIGH (1 << 17) /* LED pin high */
> +
> +/* PHY related */
> +#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)
> +
> +#endif /* __IB62x0_H */
> diff --git a/board/Marvell/ib62x0/kwbimage.cfg
> b/board/Marvell/ib62x0/kwbimage.cfg
> new file mode 100644
> index 0000000..32f3dca
> --- /dev/null
> +++ b/board/Marvell/ib62x0/kwbimage.cfg
> @@ -0,0 +1,167 @@
> +#
> +# Copyright (C) 2011 Gerald Kerma <dreagle@doukki.net>
> +#
> +# Written-by: Gerald Kerma <dreagle@doukki.net>
> +#
> +# 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
> +#
> +
What change you have done in this file with reference?
...snip...
> diff --git a/boards.cfg b/boards.cfg
> index 28cc345..a4e8852 100644
> --- a/boards.cfg
> +++ b/boards.cfg
> @@ -147,6 +147,8 @@ netspace_max_v2 arm arm926ejs
> netspace_v2 LaCie
> netspace_v2 arm arm926ejs netspace_v2
> LaCie kirkwood lacie_kw:NETSPACE_V2
> dreamplug arm arm926ejs -
> Marvell kirkwood
> guruplug arm arm926ejs -
> Marvell kirkwood
> +ib_nas6210 arm arm926ejs ib62x0
> Marvell kirkwood ib62x0:BOARD_IS_IB_NAS6210
> +ib_nas6220 arm arm926ejs ib62x0
Even this should change
Regards..
Prafulla . . .
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-03-21 10:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-21 0:53 [U-Boot] [PATCH v4] add new board nas62x0 Luka Perkov
2012-03-21 6:55 ` Igor Grinberg
2012-03-21 9:45 ` Prafulla Wadaskar
2012-03-21 10:10 ` Prafulla Wadaskar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox