Skip to contentSkip to conversation

omap4: duovero: Add Gumstix DuoVero machine.

PATCH New Ash Charles 2 participants 5 messages Apr 29, 2014 – May 13, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 omap4: duovero: Add Gumstix DuoVero machine.

This adds the Gumstix DuoVero machine [1]. This is a OMAP4430-based computer-on-module (COM aka SOM) that can be mounted on various expansion boards with different peripherals.

[1] https://store.gumstix.com/index.php/category/43/

---
 board/gumstix/duovero/Makefile           |   8 +
 board/gumstix/duovero/duovero.c          | 264 +++++++++++++++++++++++++++++++
 board/gumstix/duovero/duovero_mux_data.h | 199 +++++++++++++++++++++++
 boards.cfg                               |   1 +
 include/configs/duovero.h                |  62 ++++++++
 include/configs/ti_omap4_common.h        |   9 ++
 6 files changed, 543 insertions(+)
 create mode 100644 board/gumstix/duovero/Makefile
 create mode 100644 board/gumstix/duovero/duovero.c
 create mode 100644 board/gumstix/duovero/duovero_mux_data.h
 create mode 100644 include/configs/duovero.h
board/gumstix/duovero/Makefile new file +8 -0
new file mode 100644
index 0000000..f738c58
@@ -0,0 +1,8 @@
+#
+# (C) Copyright 2000, 2001, 2002
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y	:= duovero.o
board/gumstix/duovero/duovero.c new file +264 -0

264 lines not on this page · raw message

board/gumstix/duovero/duovero_mux_data.h new file +199 -0

199 lines not on this page · raw message

boards.cfg +1 -0
index 983c657..05f24e1 100644
@@ -357,6 +357,7 @@ Active  arm         armv7          omap3       ti              evm
 Active  arm         armv7          omap3       ti              evm                 omap3_evm_quick_nand                 -                                                                                                                                 -
 Active  arm         armv7          omap3       ti              sdp3430             omap3_sdp3430                        -                                                                                                                                 Nishanth Menon <[email protected]>
 Active  arm         armv7          omap3       timll           devkit8000          devkit8000                           -                                                                                                                                 Thomas Weber <[email protected]>
+Active  arm         armv7          omap4       gumstix         duovero             duovero                              -                                                                                                                                 Ash Charles <[email protected]>
 Active  arm         armv7          omap4       ti              panda               omap4_panda                          -                                                                                                                                 Sricharan R <[email protected]>
 Active  arm         armv7          omap4       ti              sdp4430             omap4_sdp4430                        -                                                                                                                                 Sricharan R <[email protected]>
 Active  arm         armv7          omap5       ti              dra7xx              dra7xx_evm                           dra7xx_evm:CONS_INDEX=1                                                                                                           Lokesh Vutla <[email protected]>
include/configs/duovero.h new file +62 -0

62 lines not on this page · raw message

include/configs/ti_omap4_common.h +9 -0
index bcb5eab..4563cbb 100644
@@ -111,9 +111,13 @@
 	"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
 		"env import -t ${loadaddr} ${filesize}\0" \
 	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+	"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
 		"run mmcargs; " \
 		"bootz ${loadaddr} - ${fdtaddr}\0" \
+	"uimageboot=echo Booting from mmc${mmcdev} ...; " \
+		"run mmcargs; " \
+		"bootm ${loadaddr}\0" \
 	"findfdt="\
 		"if test $board_name = sdp4430; then " \
 			"setenv fdtfile omap4-sdp.dtb; fi; " \
@@ -123,6 +127,8 @@
 			"setenv fdtfile omap4-panda-a4.dtb; fi;" \
 		"if test $board_name = panda-es; then " \
 			"setenv fdtfile omap4-panda-es.dtb; fi;" \
+		"if test $board_name = duovero; then " \
+			"setenv fdtfile omap4-duovero.dtb; fi;" \
 		"if test $fdtfile = undefined; then " \
 			"echo WARNING: Could not determine device tree to use; fi; \0" \
 	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
@@ -146,6 +152,9 @@
 			"run loadfdt;" \
 			"run mmcboot; " \
 		"fi; " \
+		"if run loaduimage; then " \
+			"run uimageboot;" \
+		"fi; " \
 	"fi"
 
 /*
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/1 omap4: duovero: Add Gumstix DuoVero machine.

Quoted 3 lines · Ash Charles

This adds the Gumstix DuoVero machine [1]. This is a OMAP4430-based computer-on-module (COM aka SOM) that can be mounted on various expansion boards with different peripherals.

[snip]

board/gumstix/duovero/duovero.c line 50

Quoted 1 line
board/gumstix/duovero/duovero.c new file +1 -0
+	gd->bd->bi_arch_number = MACH_TYPE_OMAP4_DUOVERO;

You don't really support non-DT kernels do you?

board/gumstix/duovero/duovero.c line 51

Quoted 1 line
board/gumstix/duovero/duovero.c new file +1 -0
+	gd->bd->bi_boot_params = (0x80000000 + 0x100); /* boot param addr */

CONFIG_SYS_SDRAM_BASE + ...

Quoted 5 lines
include/configs/ti_omap4_common.h +0 -0
index bcb5eab..4563cbb 100644

include/configs/ti_omap4_common.h line 120

Quoted 10 lines
include/configs/ti_omap4_common.h +4 -0
@@ -111,9 +111,13 @@
 	"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
 		"env import -t ${loadaddr} ${filesize}\0" \
 	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+	"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
 		"run mmcargs; " \
 		"bootz ${loadaddr} - ${fdtaddr}\0" \
+	"uimageboot=echo Booting from mmc${mmcdev} ...; " \
+		"run mmcargs; " \
+		"bootm ${loadaddr}\0" \

First, please use 'load' not 'fatload' and second..

Quoted 13 lines
include/configs/ti_omap4_common.h +2 -0
 	"findfdt="\
 		"if test $board_name = sdp4430; then " \
 			"setenv fdtfile omap4-sdp.dtb; fi; " \
@@ -123,6 +127,8 @@
 			"setenv fdtfile omap4-panda-a4.dtb; fi;" \
 		"if test $board_name = panda-es; then " \
 			"setenv fdtfile omap4-panda-es.dtb; fi;" \
+		"if test $board_name = duovero; then " \
+			"setenv fdtfile omap4-duovero.dtb; fi;" \
 		"if test $fdtfile = undefined; then " \
 			"echo WARNING: Could not determine device tree to use; fi; \0" \
 	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \

include/configs/ti_omap4_common.h line 157

Quoted 6 lines
include/configs/ti_omap4_common.h +3 -0
@@ -146,6 +152,9 @@
 			"run loadfdt;" \
 			"run mmcboot; " \
 		"fi; " \
+		"if run loaduimage; then " \
+			"run uimageboot;" \
+		"fi; " \

You really are using uImage and not zImage for this board, but not for pepper?

Signature · 8 lines
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/20140506/76aa1ff2/attachment.pgp>
#2 lore raw

PATCH 1/1 omap4: duovero: Add Gumstix DuoVero machine.

Quoted 2 lines · Tom Rini

You really are using uImage and not zImage for this board, but not for pepper?

As with Pepper, the default kernel for this DuoVero board is currently a uImage. We're moving to a device tree kernel but having the fall-back to uImage, particularly for customers required to use an old kernel for the hw acceleration, is useful. I'm sending an updated patch on this thread but I understand if the changes to ti_omap4_common can't be included.

--Ash

#3 lore raw

PATCH v2 1/1 omap4: duovero: Add Gumstix DuoVero machine.

This adds the Gumstix DuoVero machine [1]. This is a OMAP4430-based computer-on-module (COM aka SOM) that can be mounted on various expansion boards with different peripherals.

[1] https://store.gumstix.com/index.php/category/43/

---
 board/gumstix/duovero/Makefile           |   8 +
 board/gumstix/duovero/duovero.c          | 264 +++++++++++++++++++++++++++++++
 board/gumstix/duovero/duovero_mux_data.h | 199 +++++++++++++++++++++++
 boards.cfg                               |   1 +
 include/configs/duovero.h                |  62 ++++++++
 include/configs/ti_omap4_common.h        |   9 ++
 6 files changed, 543 insertions(+)
 create mode 100644 board/gumstix/duovero/Makefile
 create mode 100644 board/gumstix/duovero/duovero.c
 create mode 100644 board/gumstix/duovero/duovero_mux_data.h
 create mode 100644 include/configs/duovero.h
board/gumstix/duovero/Makefile new file +8 -0
new file mode 100644
index 0000000..f738c58
@@ -0,0 +1,8 @@
+#
+# (C) Copyright 2000, 2001, 2002
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y	:= duovero.o
board/gumstix/duovero/duovero.c new file +264 -0

264 lines not on this page · raw message

board/gumstix/duovero/duovero_mux_data.h new file +199 -0

199 lines not on this page · raw message

boards.cfg +1 -0
index 983c657..05f24e1 100644
@@ -357,6 +357,7 @@ Active  arm         armv7          omap3       ti              evm
 Active  arm         armv7          omap3       ti              evm                 omap3_evm_quick_nand                 -                                                                                                                                 -
 Active  arm         armv7          omap3       ti              sdp3430             omap3_sdp3430                        -                                                                                                                                 Nishanth Menon <[email protected]>
 Active  arm         armv7          omap3       timll           devkit8000          devkit8000                           -                                                                                                                                 Thomas Weber <[email protected]>
+Active  arm         armv7          omap4       gumstix         duovero             duovero                              -                                                                                                                                 Ash Charles <[email protected]>
 Active  arm         armv7          omap4       ti              panda               omap4_panda                          -                                                                                                                                 Sricharan R <[email protected]>
 Active  arm         armv7          omap4       ti              sdp4430             omap4_sdp4430                        -                                                                                                                                 Sricharan R <[email protected]>
 Active  arm         armv7          omap5       ti              dra7xx              dra7xx_evm                           dra7xx_evm:CONS_INDEX=1                                                                                                           Lokesh Vutla <[email protected]>
include/configs/duovero.h new file +62 -0

62 lines not on this page · raw message

include/configs/ti_omap4_common.h +9 -0
index 387f570..1eee1c8 100644
@@ -109,9 +109,13 @@
 	"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
 		"env import -t ${loadaddr} ${filesize}\0" \
 	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+	"loaduimage=load mmc ${mmcdev} ${loadaddr} uImage\0" \
 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
 		"run mmcargs; " \
 		"bootz ${loadaddr} - ${fdtaddr}\0" \
+	"uimageboot=echo Booting from mmc${mmcdev} ...; " \
+		"run mmcargs; " \
+		"bootm ${loadaddr}\0" \
 	"findfdt="\
 		"if test $board_name = sdp4430; then " \
 			"setenv fdtfile omap4-sdp.dtb; fi; " \
@@ -121,6 +125,8 @@
 			"setenv fdtfile omap4-panda-a4.dtb; fi;" \
 		"if test $board_name = panda-es; then " \
 			"setenv fdtfile omap4-panda-es.dtb; fi;" \
+		"if test $board_name = duovero; then " \
+			"setenv fdtfile omap4-duovero.dtb; fi;" \
 		"if test $fdtfile = undefined; then " \
 			"echo WARNING: Could not determine device tree to use; fi; \0" \
 	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
@@ -144,6 +150,9 @@
 			"run loadfdt;" \
 			"run mmcboot; " \
 		"fi; " \
+		"if run loaduimage; then " \
+			"run uimageboot;" \
+		"fi; " \
 	"fi"
 
 /*
Signature · 1 line
1.8.3.2
#4 lore raw

PATCH v2 1/1 omap4: duovero: Add Gumstix DuoVero machine.

Quoted 3 lines · Ash Charles

This adds the Gumstix DuoVero machine [1]. This is a OMAP4430-based computer-on-module (COM aka SOM) that can be mounted on various expansion boards with different peripherals.

[snip]

board/gumstix/duovero/duovero.c line 221

Quoted 1 line
board/gumstix/duovero/duovero.c new file +1 -0
+	sr32((void *)CM_L3INIT_HSUSBHOST_CLKCTRL, 0, 32, utmi_clk);

We've dropped sr32 in a88e55c, please update and resent a v3, thanks! (everything else seems fine).

Signature · 8 lines
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/20140513/6f4702d3/attachment.pgp>