cm-t35: move cm-t35 to live in compulab directory
PATCH 1/3 cm-t35: move cm-t35 to live in compulab directory
Currently the cm-t35 support code lives under board/cm_t35 directory. Some of the code can be shared with other/future CompuLab boards, so move the cm-t35 to live under board/compulab/cm_t35 directory.
---
board/{ => compulab}/cm_t35/Makefile | 12 +++++++-----
board/{ => compulab}/cm_t35/cm_t35.c | 2 +-
board/{ => compulab}/cm_t35/display.c | 2 +-
board/{ => compulab}/cm_t35/eeprom.c | 0
board/{ => compulab}/cm_t35/eeprom.h | 0
board/{ => compulab}/cm_t35/leds.c | 3 +--
boards.cfg | 2 +-
7 files changed, 11 insertions(+), 10 deletions(-)
rename board/{ => compulab}/cm_t35/Makefile (82%)
rename board/{ => compulab}/cm_t35/cm_t35.c (99%)
rename board/{ => compulab}/cm_t35/display.c (99%)
rename board/{ => compulab}/cm_t35/eeprom.c (100%)
rename board/{ => compulab}/cm_t35/eeprom.h (100%)
rename board/{ => compulab}/cm_t35/leds.c (95%)board/compulab/cm_t35/Makefile renamed from board/cm_t35/Makefile +7 -5
@@ -1,6 +1,8 @@ # -# (C) Copyright 2000, 2001, 2002 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. +# (C) Copyright 2011 - 2013 CompuLab, Ltd. <www.compulab.co.il> +# +# Authors: Nikita Kiryanov <[email protected]> +# Igor Grinberg <[email protected]> # # See file CREDITS for list of people who contributed to this # project.
@@ -17,9 +19,7 @@ # # 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., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# +# Foundation, Inc. include $(TOPDIR)/config.mk
@@ -42,3 +42,5 @@ $(LIB): $(obj).depend $(OBJS) include $(SRCTREE)/rules.mk sinclude $(obj).depend + +#########################################################################
board/compulab/cm_t35/cm_t35.c renamed from board/cm_t35/cm_t35.c +1 -1
@@ -1,5 +1,5 @@/* -* (C) Copyright 2011 CompuLab, Ltd. <www.compulab.co.il> +* (C) Copyright 2011 - 2013 CompuLab, Ltd. <www.compulab.co.il> * * Authors: Mike Rapoport <[email protected]> * Igor Grinberg <[email protected]>
board/compulab/cm_t35/display.c renamed from board/cm_t35/display.c +1 -1
@@ -1,5 +1,5 @@/* -* (C) Copyright 2012 CompuLab, Ltd. <www.compulab.co.il> +* (C) Copyright 2012 - 2013 CompuLab, Ltd. <www.compulab.co.il> * * Authors: Nikita Kiryanov <[email protected]> *
board/compulab/cm_t35/eeprom.c renamed from board/cm_t35/eeprom.c +0 -0
board/compulab/cm_t35/eeprom.h renamed from board/cm_t35/eeprom.h +0 -0
board/compulab/cm_t35/leds.c renamed from board/cm_t35/leds.c +1 -2
@@ -1,6 +1,5 @@/* -* (C) Copyright 2011 -* CompuLab, Ltd. <www.compulab.co.il> +* (C) Copyright 2011 - 2013 CompuLab, Ltd. <www.compulab.co.il> * * Author: Igor Grinberg <[email protected]> *
boards.cfg +1 -1
@@ -268,10 +268,10 @@ nitrogen6s arm armv7 nitrogen6x boundar nitrogen6s1g arm armv7 nitrogen6x boundary mx6 nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024 wandboard_dl arm armv7 wandboard - mx6 wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024 wandboard_solo arm armv7 wandboard - mx6 wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512 -cm_t35 arm armv7 cm_t35 - omap3 omap3_overo arm armv7 overo - omap3 omap3_pandora arm armv7 pandora - omap3 dig297 arm armv7 dig297 comelit omap3 +cm_t35 arm armv7 cm_t35 compulab omap3 igep0020 arm armv7 igep00x0 isee omap3 igep00x0:MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND igep0020_nand arm armv7 igep00x0 isee omap3 igep00x0:MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND igep0030 arm armv7 igep00x0 isee omap3 igep00x0:MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND
Signature · 1 line
1.7.3.4
PATCH 2/3 MAINTAINERS: fix the cm-t35 board name
"cm-t35" in U-Boot source code is called "cm_t35". Make the change "cm-t35" -> "cm_t35" for better greppability.
--- MAINTAINERS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
MAINTAINERS +1 -1
@@ -683,7 +683,7 @@ Simon Guinot <[email protected]> Igor Grinberg <[email protected]> - cm-t35 ARM ARMV7 (OMAP3xx Soc) + cm_t35 ARM ARMV7 (OMAP3xx Soc) Stefan Herbrechtsmeier <[email protected]>
Signature · 1 line
1.7.3.4
PATCH 3/3 cm-t35: update config file
In reply to Igor GrinbergSeveral minor updates to the cm-t35 config file.
--- include/configs/cm_t35.h | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-)
include/configs/cm_t35.h +5 -13
@@ -135,12 +135,12 @@#define CONFIG_CMD_CACHE #define CONFIG_CMD_EXT2 /* EXT2 Support */ #define CONFIG_CMD_FAT /* FAT support */ -#define CONFIG_CMD_JFFS2 /* JFFS2 Support */ #define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */ #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_PARTITIONS #define MTDIDS_DEFAULT "nand0=nand"#define MTDPARTS_DEFAULT "mtdparts=nand:512k(x-loader),"\ - "1920k(u-boot),128k(u-boot-env),"\ + "1920k(u-boot),256k(u-boot-env),"\ "4m(kernel),-(fs)"#define CONFIG_CMD_I2C /* I2C serial bus support */
@@ -182,14 +182,6 @@#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of NAND */ /* devices */ -#define CONFIG_JFFS2_NAND -/* nand device jffs2 lives on */ -#define CONFIG_JFFS2_DEV "nand0" -/* start of jffs2 partition */ -#define CONFIG_JFFS2_PART_OFFSET 0x680000 -#define CONFIG_JFFS2_PART_SIZE 0xf980000/* size of jffs2 */ -/* partition */ -/* Environment information */ #define CONFIG_BOOTDELAY 10#define CONFIG_ZERO_BOOTDELAY_CHECK
@@ -204,9 +196,9 @@"defaultdisplay=dvi\0" \"mmcdev=0\0" \"mmcroot=/dev/mmcblk0p2 rw\0" \ -"mmcrootfstype=ext3 rootwait\0" \ +"mmcrootfstype=ext4 rootwait\0" \"nandroot=/dev/mtdblock4 rw\0" \ -"nandrootfstype=jffs2\0" \ +"nandrootfstype=ubifs\0" \"mmcargs=setenv bootargs console=${console} " \"mpurate=${mpurate} " \"vram=${vram} " \
@@ -232,7 +224,7 @@"bootm ${loadaddr}\0" \"nandboot=echo Booting from nand ...; " \"run nandargs; " \ -"nand read ${loadaddr} 280000 400000; " \ +"nand read ${loadaddr} 2a0000 400000; " \"bootm ${loadaddr}\0" \ #define CONFIG_BOOTCOMMAND \
Signature · 1 line
1.7.3.4
PATCH 1/3 cm-t35: move cm-t35 to live in compulab directory
In reply to Igor GrinbergQuoted 6 lines · Igor Grinberg
Currently the cm-t35 support code lives under board/cm_t35 directory. Some of the code can be shared with other/future CompuLab boards, so move the cm-t35 to live under board/compulab/cm_t35 directory.
Signed-off-by Igor Grinberg <[email protected]>Tested-by Nikita Kiryanov <[email protected]>
Along with 2/3 and 3/3, applied to u-boot-ti/master, thanks!
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/20130429/0814a2bb/attachment.pgp>