[U-Boot] [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.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il Tested-by: Nikita Kiryanov nikita@compulab.co.il --- 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%)
diff --git a/board/cm_t35/Makefile b/board/compulab/cm_t35/Makefile similarity index 82% rename from board/cm_t35/Makefile rename to board/compulab/cm_t35/Makefile index bde56e6..31d9bbb 100644 --- a/board/cm_t35/Makefile +++ b/board/compulab/cm_t35/Makefile @@ -1,6 +1,8 @@ # -# (C) Copyright 2000, 2001, 2002 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# (C) Copyright 2011 - 2013 CompuLab, Ltd. <www.compulab.co.il> +# +# Authors: Nikita Kiryanov nikita@compulab.co.il +# Igor Grinberg grinberg@compulab.co.il # # 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 + +######################################################################### diff --git a/board/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c similarity index 99% rename from board/cm_t35/cm_t35.c rename to board/compulab/cm_t35/cm_t35.c index 84c36ba..1b96c7e 100644 --- a/board/cm_t35/cm_t35.c +++ b/board/compulab/cm_t35/cm_t35.c @@ -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 mike@compulab.co.il * Igor Grinberg grinberg@compulab.co.il diff --git a/board/cm_t35/display.c b/board/compulab/cm_t35/display.c similarity index 99% rename from board/cm_t35/display.c rename to board/compulab/cm_t35/display.c index a004ea1..adc4853 100644 --- a/board/cm_t35/display.c +++ b/board/compulab/cm_t35/display.c @@ -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 nikita@compulab.co.il * diff --git a/board/cm_t35/eeprom.c b/board/compulab/cm_t35/eeprom.c similarity index 100% rename from board/cm_t35/eeprom.c rename to board/compulab/cm_t35/eeprom.c diff --git a/board/cm_t35/eeprom.h b/board/compulab/cm_t35/eeprom.h similarity index 100% rename from board/cm_t35/eeprom.h rename to board/compulab/cm_t35/eeprom.h diff --git a/board/cm_t35/leds.c b/board/compulab/cm_t35/leds.c similarity index 95% rename from board/cm_t35/leds.c rename to board/compulab/cm_t35/leds.c index 48ad598..dcae135 100644 --- a/board/cm_t35/leds.c +++ b/board/compulab/cm_t35/leds.c @@ -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 grinberg@compulab.co.il * diff --git a/boards.cfg b/boards.cfg index 31483d6..e2bb484 100644 --- a/boards.cfg +++ b/boards.cfg @@ -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
"cm-t35" in U-Boot source code is called "cm_t35". Make the change "cm-t35" -> "cm_t35" for better greppability.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il --- MAINTAINERS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS index 643a5ac..8e707d5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -683,7 +683,7 @@ Simon Guinot simon.guinot@sequanux.org
Igor Grinberg grinberg@compulab.co.il
- cm-t35 ARM ARMV7 (OMAP3xx Soc) + cm_t35 ARM ARMV7 (OMAP3xx Soc)
Stefan Herbrechtsmeier stefan@code.herbrechtsmeier.net
Several minor updates to the cm-t35 config file.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il Tested-by: Nikita Kiryanov nikita@compulab.co.il --- include/configs/cm_t35.h | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 726714d..c6e357a 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -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 \
On Mon, Apr 22, 2013 at 01:06:53AM -0000, Igor Grinberg wrote:
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 grinberg@compulab.co.il Tested-by: Nikita Kiryanov nikita@compulab.co.il
Along with 2/3 and 3/3, applied to u-boot-ti/master, thanks!
participants (2)
-
Igor Grinberg -
Tom Rini