Skip to contentSkip to conversation

Pandora config fixes and updates

PATCH New Grazvydas Ignotas 3 participants 10 messages Nov 5, 2010 – Nov 19, 2010 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

v2 cover Pandora config fixes and updates

These patches update pandora's config for relocations and memory layout changes. They also sync the config with one shipped on production units.

Please apply at least the first patch for v2010.12 so that we have pandora buildable.
Patches generated on top of u-boot-ti, also applies on mainline u-boot.

Grazvydas Ignotas (3):
OMAP3: pandora: fix relocation and init memory map
OMAP3: pandora: remove unused config macros
OMAP3: pandora: update config for production

 board/pandora/config.mk         |   33 -----------
 include/configs/omap3_pandora.h |  117 +++++++++++++++++---------------------
 2 files changed, 52 insertions(+), 98 deletions(-)
 delete mode 100644 board/pandora/config.mk
#1 lore raw

PATCH v2 1/3 OMAP3: pandora: fix relocation and init memory map

Fix the build breakage introduced by the recent relocation and memory layout changes for ARM.

---
 board/pandora/config.mk         |   33 ---------------------------------
 include/configs/omap3_pandora.h |    8 ++++++++
 2 files changed, 8 insertions(+), 33 deletions(-)
 delete mode 100644 board/pandora/config.mk
board/pandora/config.mk deleted +0 -33
deleted file mode 100644
index 0fab80c..0000000
@@ -1,33 +0,0 @@
-#
-# (C) Copyright 2006
-# Texas Instruments, <www.ti.com>
-#
-# Pandora uses OMAP3 (ARM-CortexA8) cpu
-# see http://www.ti.com/ for more information on Texas Instruments
-#
-# 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., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-# Physical Address:
-# 8000'0000 (bank0)
-# A000/0000 (bank1)
-# Linux-Kernel is expected to be at 8000'8000, entry 8000'8000
-# (mem base + reserved)
-
-# For use with external or internal boots.
-CONFIG_SYS_TEXT_BASE = 0x80e80000
include/configs/omap3_pandora.h +8 -0
index b78aacf..b8cd2cd 100644
@@ -243,6 +243,14 @@
 /* SDRAM Bank Allocation method */
 #define SDRC_R_B_C		1
 
+#define CONFIG_SYS_TEXT_BASE		0x80008000
+#define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_RAM_ADDR	0x4020f800
+#define CONFIG_SYS_INIT_RAM_SIZE	0x800
+#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_INIT_RAM_ADDR + \
+					CONFIG_SYS_INIT_RAM_SIZE - \
+					GENERATED_GBL_DATA_SIZE)
+
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
  */
Signature · 1 line
1.6.3.3
#2 lore raw

PATCH v2 2/3 OMAP3: pandora: remove unused config macros

In reply to Grazvydas Ignotas

Pandora's config has various flash related macros that are either not referenced anywhere in the code or are used by drivers that are not enabled. Remove them.

---
Alternatively this old patch can be applied to clean up more OMAP boards:
http://lists.denx.de/pipermail/u-boot/2010-April/070860.html

 include/configs/omap3_pandora.h |   20 --------------------
 1 files changed, 0 insertions(+), 20 deletions(-)
include/configs/omap3_pandora.h +0 -20
index b8cd2cd..f386bc4 100644
@@ -261,40 +261,20 @@
 #define PISMO1_NAND_SIZE		GPMC_SIZE_128M
 #define PISMO1_ONEN_SIZE		GPMC_SIZE_128M
 
-#define CONFIG_SYS_MAX_FLASH_SECT	520	/* max number of sectors on */
-						/* one chip */
-#define CONFIG_SYS_MAX_FLASH_BANKS	2	/* max number of flash banks */
 #define CONFIG_SYS_MONITOR_LEN		(256 << 10)	/* Reserve 2 sectors */
 
 #define CONFIG_SYS_FLASH_BASE		boot_flash_base
 
 /* Monitor@start of flash */
 #define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_ONENAND_BASE		ONENAND_MAP
 
 #define CONFIG_ENV_IS_IN_NAND		1
-#define ONENAND_ENV_OFFSET		0x240000 /* environment starts here */
 #define SMNAND_ENV_OFFSET		0x240000 /* environment starts here */
 
 #define CONFIG_SYS_ENV_SECT_SIZE	boot_flash_sec
 #define CONFIG_ENV_OFFSET		boot_flash_off
 #define CONFIG_ENV_ADDR			SMNAND_ENV_OFFSET
 
-/*-----------------------------------------------------------------------
- * CFI FLASH driver setup
- */
-/* timeout values are in ticks */
-#define CONFIG_SYS_FLASH_ERASE_TOUT	(100 * CONFIG_SYS_HZ)
-#define CONFIG_SYS_FLASH_WRITE_TOUT	(100 * CONFIG_SYS_HZ)
-
-/* Flash banks JFFS2 should use */
-#define CONFIG_SYS_MAX_MTD_BANKS	(CONFIG_SYS_MAX_FLASH_BANKS + \
-					CONFIG_SYS_MAX_NAND_DEVICE)
-#define CONFIG_SYS_JFFS2_MEM_NAND
-/* use flash_info[2] */
-#define CONFIG_SYS_JFFS2_FIRST_BANK	CONFIG_SYS_MAX_FLASH_BANKS
-#define CONFIG_SYS_JFFS2_NUM_BANKS	1
-
 #ifndef __ASSEMBLY__
 extern unsigned int boot_flash_base;
 extern volatile unsigned int boot_flash_env_addr;
Signature · 1 line
1.6.3.3
#3 lore raw

PATCH v2 2/3 OMAP3: pandora: remove unused config macros

Quoted 10 lines

Pandora's config has various flash related macros that are either not referenced anywhere in the code or are used by drivers that are not enabled. Remove them.

---
Alternatively this old patch can be applied to clean up more OMAP boards:
http://lists.denx.de/pipermail/u-boot/2010-April/070860.html

Do you think this patch still applies clean?

It will be better if you repost to refresh us all.

Regards,
Sandeep

A message that is not in the archive (sent off-list or not yet received): [email protected]

#5 lore raw

PATCH v2 2/3 OMAP3: pandora: remove unused config macros

Quoted 15 lines
Quoted 9 lines · Sandeep
Quoted 9 lines

Pandora's config has various flash related macros that are either not referenced anywhere in the code or are used by drivers that are not enabled. Remove them.

---
Alternatively this old patch can be applied to clean up more OMAP

boards:

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

http://lists.denx.de/pipermail/u-boot/2010-April/070860.html

Do you think this patch still applies clean?

It will be better if you repost to refresh us all.

Yes it still does, attaching for your convenience (with Steve's ack from June 9).

This does not apply. This is probably because I added your other patches

--Sandeep

#6 lore raw

PATCH v2 2/3 OMAP3: pandora: remove unused config macros

Quoted 14 lines · Sandeep
Quoted 14 lines
Quoted 9 lines · Sandeep
Quoted 9 lines

Pandora's config has various flash related macros that are either not referenced anywhere in the code or are used by drivers that are not enabled. Remove them.

---
Alternatively this old patch can be applied to clean up more OMAP

boards:

Quoted 2 lines
Quoted 1 line

http://lists.denx.de/pipermail/u-boot/2010-April/070860.html

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

Do you think this patch still applies clean?

It will be better if you repost to refresh us all.

Yes it still does, attaching for your convenience (with Steve's ack from June 9).

This does not apply. This is probably because I added your other patches

Yeah this this was supposed to be applied instead of "OMAP3: pandora:
remove unused config macros" (it covers pandora and other boards, you applied pandora-only version).

I see my email got mangled in u-boot-ti.git, could you fix it up if you haven't sent pull request yet? You could replace this patch with 2/3 along the way too (can be done easily with git rebase -i).

#7 lore raw

PATCH v2 2/3 OMAP3: pandora: remove unused config macros

Dear Sandeep,

In message <[email protected]>

Quoted 10 lines · Grazvydas Ignotas
Quoted 2 lines

This does not apply. This is probably because I added your other patches

Yeah this this was supposed to be applied instead of "OMAP3: pandora:
remove unused config macros" (it covers pandora and other boards, you applied pandora-only version).

I see my email got mangled in u-boot-ti.git, could you fix it up if you haven't sent pull request yet? You could replace this patch with 2/3 along the way too (can be done easily with git rebase -i).

I think Grazvydas is right on both accounts. I dropped the pull from the -ti repo again and suggest you do the changes as suggested by Grazvydas. Is this OK with you?

Please send new pull request when you are ready.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The human mind treats a new idea the way the body  treats  a  strange
protein - it rejects it.                                 - P. Medawar
#8 lore raw

PATCH v2 2/3 OMAP3: pandora: remove unused config macros

Quoted 14 lines

Dear Sandeep,

In message <[email protected]>

Quoted 2 lines · Grazvydas Ignotas
Quoted 2 lines

This does not apply. This is probably because I added your other

patches

Quoted 5 lines

Yeah this this was supposed to be applied instead of "OMAP3: pandora:
remove unused config macros" (it covers pandora and other boards, you applied pandora-only version).

Quoted 7 lines
Quoted 3 lines

I see my email got mangled in u-boot-ti.git, could you fix it up if you haven't sent pull request yet? You could replace this patch with 2/3 along the way too (can be done easily with git rebase -i).

I think Grazvydas is right on both accounts. I dropped the pull from the -ti repo again and suggest you do the changes as suggested by Grazvydas. Is this OK with you?

Yes not problem

Quoted 2 lines

Please send new pull request when you are ready.

I just did

Regards,
Sandeep

#9 lore raw

PATCH v2 3/3 OMAP3: pandora: update config for production

In reply to Grazvydas Ignotas

Update pandora's config so that it can boot production kernels from NAND. This enables UBI, USB, sets up NAND layout and default boot command. It also expands malloc area so that UBI works.

---
 include/configs/omap3_pandora.h |   89 +++++++++++++++++++--------------------
 1 files changed, 44 insertions(+), 45 deletions(-)
include/configs/omap3_pandora.h +44 -45
index f386bc4..72b0cc2 100644
@@ -1,6 +1,6 @@
 /*
- * (C) Copyright 2008
- * Grazvydas Ignotas <[email protected]>
+ * (C) Copyright 2008-2010
+ * Gra??vydas Ignotas <[email protected]>
  *
  * Configuration settings for the OMAP3 Pandora.
  *
@@ -59,14 +59,24 @@
  * Size of malloc() pool
  */
 #define CONFIG_ENV_SIZE			(128 << 10)	/* 128 KiB */
-						/* Sector */
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (128 << 10))
-						/* initial data */
+#define CONFIG_SYS_MALLOC_LEN		(1024 * 1024 + CONFIG_ENV_SIZE)
 
 /*
  * Hardware drivers
  */
 
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV	1
+#define CONFIG_SYS_DEVICE_NULLDEV	1
+
+/* USB */
+#define CONFIG_MUSB_UDC			1
+#define CONFIG_USB_OMAP3		1
+#define CONFIG_TWL4030_USB		1
+
+/* USB device configuration */
+#define CONFIG_USB_DEVICE		1
+#define CONFIG_USB_TTY			1
+
 /*
  * NS16550 Configuration
  */
@@ -101,11 +111,11 @@
 
 #define CONFIG_CMD_EXT2		/* EXT2 Support			*/
 #define CONFIG_CMD_FAT		/* FAT support			*/
-#define CONFIG_CMD_JFFS2	/* JFFS2 Support		*/
 
 #define CONFIG_CMD_I2C		/* I2C serial bus support	*/
 #define CONFIG_CMD_MMC		/* MMC support			*/
 #define CONFIG_CMD_NAND		/* NAND support			*/
+#define CONFIG_CMD_CACHE	/* Cache control		*/
 
 #undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
 #undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
@@ -141,52 +151,41 @@
 
 #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 */
+
+#ifdef CONFIG_CMD_NAND
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_MTD_PARTITIONS
+#define CONFIG_MTD_DEVICE
+#define CONFIG_CMD_UBI
+#define CONFIG_CMD_UBIFS
+#define CONFIG_RBTREE
+#define CONFIG_LZO
+
+#define MTDIDS_DEFAULT			"nand0=nand"
+#define MTDPARTS_DEFAULT		"mtdparts=nand:512k(xloader),"\
+					"1920k(uboot),128k(uboot-env),"\
+					"10m(boot),-(rootfs)"
+#else
+#define MTDPARTS_DEFAULT
+#endif
 
 /* Environment information */
 #define CONFIG_BOOTDELAY		1
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
+	"usbtty=cdc_acm\0" \
 	"loadaddr=0x82000000\0" \
-	"console=ttyS0,115200n8\0" \
-	"videospec=omapfb:vram:2M,vram:4M\0" \
-	"mmcargs=setenv bootargs console=${console} " \
-		"video=${videospec} " \
-		"root=/dev/mmcblk0p2 rw " \
-		"rootfstype=ext3 rootwait\0" \
-	"nandargs=setenv bootargs console=${console} " \
-		"video=${videospec} " \
-		"root=/dev/mtdblock4 rw " \
-		"rootfstype=jffs2\0" \
-	"loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \
-	"bootscript=echo Running bootscript from mmc ...; " \
-		"source ${loadaddr}\0" \
-	"loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \
-	"mmcboot=echo Booting from mmc ...; " \
-		"run mmcargs; " \
-		"bootm ${loadaddr}\0" \
-	"nandboot=echo Booting from nand ...; " \
-		"run nandargs; " \
-		"nand read ${loadaddr} 280000 400000; " \
-		"bootm ${loadaddr}\0" \
+	"bootargs=ubi.mtd=4 ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs " \
+	"rw rootflags=bulk_read console=ttyS0,115200n8 " \
+	"vram=6272K omapfb.vram=0:3000K\0" \
+	"mtdparts=" MTDPARTS_DEFAULT "\0" \
 
 #define CONFIG_BOOTCOMMAND \
-	"if mmc init; then " \
-		"if run loadbootscript; then " \
-			"run bootscript; " \
-		"else " \
-			"if run loaduimage; then " \
-				"run mmcboot; " \
-			"else run nandboot; " \
-			"fi; " \
-		"fi; " \
-	"else run nandboot; fi"
+	"if mmc init && fatload mmc1 0 ${loadaddr} autoboot.scr || " \
+			"ext2load mmc1 0 ${loadaddr} autoboot.scr; then " \
+		"source ${loadaddr}; " \
+	"fi; " \
+	"ubi part boot && ubifsmount boot && ubifsload ${loadaddr} uImage && bootm ${loadaddr}"
 
 #define CONFIG_AUTO_COMPLETE	1
 /*
@@ -269,7 +268,7 @@
 #define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_FLASH_BASE
 
 #define CONFIG_ENV_IS_IN_NAND		1
-#define SMNAND_ENV_OFFSET		0x240000 /* environment starts here */
+#define SMNAND_ENV_OFFSET		0x260000 /* environment starts here */
 
 #define CONFIG_SYS_ENV_SECT_SIZE	boot_flash_sec
 #define CONFIG_ENV_OFFSET		boot_flash_off
Signature · 1 line
1.6.3.3
#10 lore raw

v2 cover Pandora config fixes and updates

In reply to Grazvydas Ignotas
Quoted 13 lines

These patches update pandora's config for relocations and memory layout changes. They also sync the config with one shipped on production units.

Please apply at least the first patch for v2010.12 so that we have pandora buildable.
Patches generated on top of u-boot-ti, also applies on mainline u-boot.

Grazvydas Ignotas (3):
OMAP3: pandora: fix relocation and init memory map
OMAP3: pandora: remove unused config macros
OMAP3: pandora: update config for production

Quoted 5 lines
 board/pandora/config.mk         |   33 -----------
 include/configs/omap3_pandora.h |  117 +++++++++++++++++-----------------
----
 2 files changed, 52 insertions(+), 98 deletions(-)
 delete mode 100644 board/pandora/config.mk

Pushed the entire series to u-boot-ti

--Sandeep