arm, da850: add ipam390 board support

add the am1808 based ipam390 board from Barix.

- 128MByte, DDR2, synchronous RAM 16bit databus to SDRAM interface
- 128MByte, NAND Flash, 8bit databus to the NANDFlash Interface
- Ethernet PHY Micrel KSZ8051R via RMII
- Console on UART 0
- booting fron nand flash
- spl falcon bootmode

Needed patches posted on the ML but not yet in mainline:
- [U-Boot,05/10] arm: spl: For Falcon Mode, set a default machid of ~0
http://patchwork.ozlabs.org/patch/264336/

applies on git://git.denx.de/u-boot-ti.git master
last commit:

commit 500a0daeecf36b72797c53ef78d9ad096a464d32
Author: Dan Murphy <[email protected]>
Date: Thu Jul 11 13:10:27 2013 -0500
gpio: tca642x: Add the tca642x gpio expander driver

I am on vacation for two weeks, so I maybe not able to respond immediately but as the merge window closes soon, I post this board support now ...

Heiko Schocher (4):
arm/davinci/da850: add uart0_pins_rtscts and RMII_MHz_50_CLK in
emac_pins_rmii pinmux
bootstage: get more BOOTSTAGE_ID* in show_boot_progress() arm, da850: enable the correct uart in arch_cpu_init() arm, da850: add ipam390 board support

 MAINTAINERS                                     |   1 +
 arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c |   4 +
 arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c   |   6 +
 arch/arm/include/asm/arch-davinci/pinmux_defs.h |   3 +-
 board/Barix/ipam390/Makefile                    |  29 ++
 board/Barix/ipam390/README.ipam390              | 229 ++++++++++++++++
 board/Barix/ipam390/ipam390-ais-uart.cfg        | 202 ++++++++++++++
 board/Barix/ipam390/ipam390.c                   | 348 ++++++++++++++++++++++++
 board/Barix/ipam390/u-boot-spl-ipam390.lds      |  53 ++++
 boards.cfg                                      |   1 +
 include/bootstage.h                             |   1 +
 include/configs/ipam390.h                       | 331 ++++++++++++++++++++++
 12 Dateien ge?ndert, 1207 Zeilen hinzugef?gt(+), 1 Zeile entfernt(-)
 create mode 100644 board/Barix/ipam390/Makefile
 create mode 100644 board/Barix/ipam390/README.ipam390
 create mode 100644 board/Barix/ipam390/ipam390-ais-uart.cfg
 create mode 100644 board/Barix/ipam390/ipam390.c
 create mode 100644 board/Barix/ipam390/u-boot-spl-ipam390.lds
 create mode 100644 include/configs/ipam390.h

1.7.11.7

---
 arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c   | 6 ++++++
 arch/arm/include/asm/arch-davinci/pinmux_defs.h | 3 ++-

2 Dateien ge?ndert, 8 Zeilen hinzugef?gt(+), 1 Zeile entfernt(-)

index f603f2f..6105f63 100644
@@ -28,6 +28,11 @@ const struct pinmux_config uart0_pins_txrx[] = {
 	{ pinmux(3), 2, 5 }, /* UART0_TXD */
 };
 
+const struct pinmux_config uart0_pins_rtscts[] = {
+	{ pinmux(3), 2, 6 },
+	{ pinmux(3), 2, 7 },
+};
+
 const struct pinmux_config uart1_pins_txrx[] = {
 	{ pinmux(4), 2, 6 }, /* UART1_RXD */
 	{ pinmux(4), 2, 7 }, /* UART1_TXD */

@@ -51,6 +56,7 @@ const struct pinmux_config emac_pins_rmii[] = {
 	{ pinmux(14), 8, 5 }, /* RMII_RXD[1] */
 	{ pinmux(14), 8, 6 }, /* RMII_RXD[0] */
 	{ pinmux(14), 8, 7 }, /* RMII_RXER */
+	{ pinmux(15), 0, 0 }, /* RMII_MHz_50_CLK */
 	{ pinmux(15), 8, 1 }, /* RMII_CRS_DV */
 };
 

index 4d45799..2d82af5 100644
@@ -23,12 +23,13 @@ extern const struct pinmux_config spi1_pins_scs0[1];
 
 /* UART pin muxer settings */
 extern const struct pinmux_config uart0_pins_txrx[2];
+extern const struct pinmux_config uart0_pins_rtscts[2];
 extern const struct pinmux_config uart1_pins_txrx[2];
 extern const struct pinmux_config uart2_pins_txrx[2];
 extern const struct pinmux_config uart2_pins_rtscts[2];
 
 /* EMAC pin muxer settings*/
-extern const struct pinmux_config emac_pins_rmii[7];
+extern const struct pinmux_config emac_pins_rmii[8];
 extern const struct pinmux_config emac_pins_rmii_clk_source[1];
 extern const struct pinmux_config emac_pins_mii[15];
 extern const struct pinmux_config emac_pins_mdio[2];

1.7.11.7

In case CONFIG_BOOTSTAGE is not defined, call from bootstage_mark_name() show_boot_progress(), so get more BOOTSTAGE_ID* ids in show_boot_progress() if CONFIG_BOOTSTAGE is not defined.

---
 include/bootstage.h | 1 +

1 Datei ge?ndert, 1 Zeile hinzugef?gt(+)

index 25b4e07..87bf906 100644
@@ -353,6 +353,7 @@ static inline ulong bootstage_error(enum bootstage_id id)
 
 static inline ulong bootstage_mark_name(enum bootstage_id id, const char *name)
 {
+	show_boot_progress(id);
 	return 0;
 }
 

1.7.11.7

in arch_cpu_init() uart2 is fix enabled, without reference the setting from CONFIG_SYS_NS16550_COM1. Use the setting from CONFIG_SYS_NS16550_COM1 for enabling the console.

---
 arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c | 4 ++++

1 Datei ge?ndert, 4 Zeilen hinzugef?gt(+)

index f6bf1ef..a3bbbb8 100644
@@ -299,7 +299,11 @@ int arch_cpu_init(void)
 	 */
 	writel((DAVINCI_UART_PWREMU_MGMT_FREE | DAVINCI_UART_PWREMU_MGMT_URRST |
 		DAVINCI_UART_PWREMU_MGMT_UTRST),
+#if (CONFIG_SYS_NS16550_COM1 == DAVINCI_UART0_BASE)
+	       &davinci_uart0_ctrl_regs->pwremu_mgmt);
+#else
 	       &davinci_uart2_ctrl_regs->pwremu_mgmt);
+#endif
 
 #if defined(CONFIG_SYS_DA850_DDR_INIT)
 	da850_ddr_setup();

1.7.11.7

add the am1808 based ipam390 board from Barix.

- 128MByte, DDR2, synchronous RAM 16bit databus to SDRAM interface
- 128MByte, NAND Flash, 8bit databus to the NANDFlash Interface
- Ethernet PHY Micrel KSZ8051R via RMII
- Console on UART 0
- booting fron nand flash
- spl falcon bootmode

---
Needed patches posted on the ML but not in mainline:
- [U-Boot,05/10] arm: spl: For Falcon Mode, set a default machid of ~0
http://patchwork.ozlabs.org/patch/264336/

---
 MAINTAINERS                                |   1 +
 board/Barix/ipam390/Makefile               |  29 +++
 board/Barix/ipam390/README.ipam390         | 229 +++++++++++++++++++
 board/Barix/ipam390/ipam390-ais-uart.cfg   | 202 +++++++++++++++++
 board/Barix/ipam390/ipam390.c              | 348 +++++++++++++++++++++++++++++
 board/Barix/ipam390/u-boot-spl-ipam390.lds |  53 +++++
 boards.cfg                                 |   1 +
 include/configs/ipam390.h                  | 331 +++++++++++++++++++++++++++
 8 Dateien ge?ndert, 1194 Zeilen hinzugef?gt(+)
 create mode 100644 board/Barix/ipam390/Makefile
 create mode 100644 board/Barix/ipam390/README.ipam390
 create mode 100644 board/Barix/ipam390/ipam390-ais-uart.cfg
 create mode 100644 board/Barix/ipam390/ipam390.c
 create mode 100644 board/Barix/ipam390/u-boot-spl-ipam390.lds
 create mode 100644 include/configs/ipam390.h

index 022cb70..593529f 100644
@@ -448,6 +448,7 @@ Heiko Schocher <[email protected]>
 	cam_enc_4xx	davinci/ARM926EJS
 	charon		MPC5200
 	ids8247		MPC8247
+	ipam390		davinci/ARM926EJS
 	jupiter		MPC5200
 	kmsupx5		MPC8321
 	mucmc52		MPC5200

new file mode 100644
index 0000000..c84ee05
@@ -0,0 +1,29 @@
+#
+# (C) Copyright 2000, 2001, 2002
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# Copyright (C) 2007 Sergey Kubushyn <[email protected]>
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+include $(TOPDIR)/config.mk
+
+LIB	= $(obj)lib$(BOARD).o
+
+COBJS	+= ipam390.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))
+
+#########################################################################
+# This is for $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################

index 3f11f1d..f9ca099 100644
@@ -140,6 +140,7 @@ pm9g45                       arm         arm926ejs   pm9g45              ronetix
 portuxg20                    arm         arm926ejs   stamp9g20           taskit         at91        stamp9g20:AT91SAM9G20,PORTUXG20
 stamp9g20                    arm         arm926ejs   stamp9g20           taskit         at91        stamp9g20:AT91SAM9G20
 cam_enc_4xx                  arm         arm926ejs   cam_enc_4xx         ait            davinci     cam_enc_4xx
+ipam390                      arm         arm926ejs   ipam390             Barix          davinci
 da830evm                     arm         arm926ejs   da8xxevm            davinci        davinci
 da850_am18xxevm              arm         arm926ejs   da8xxevm            davinci        davinci     da850evm:DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50
 da850evm                     arm         arm926ejs   da8xxevm            davinci        davinci     da850evm:MAC_ADDR_IN_SPIFLASH

1.7.11.7

Applied to u-boot-ti/master, thanks.

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130816/1efd197a/attachment.pgp>