Skip to contentSkip to conversation

OMAP5: Improve uEVM support

PATCH New Tom Rini 3 participants 10 messages Apr 5, 2013 – Apr 9, 2013

Subsystems (2)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

cover OMAP5: Improve uEVM support

Today, the eMMC on the omap5_uevm cannot be booted from, due to a bug in the save_boot_params function that tests for a range of XIP to MMC2. But in the case of OMAP5, MMC2 is eMMC boot partition and MMC2_2 is eMMC (main), and uEVM can only boot from MMC2_2. We cannot just update the test as-is because other platforms define away MMC2_2 to 0xFF as they cannot be passed that value. I've fixed this by making it clearer in the comments what we do, and use a platform definable variable to say where we must check the range for. This part has been tested on some relevant platforms for each case. While doing this, the question arose of how to partition eMMC (since u-boot must be written RAW and not put on FAT), so I've added GPT support for this. Finally, while in here I see we weren't using the fallbacks baud rate table, so I changed to that. This series will mildly conflict (mainly over the rename) with Sricharan's current series of fixes, so I shall resolve that.

Signature · 1 line
Tom
author
#1 lore raw

PATCH 1/3 OMAP3/4/5/AM33xx: Correct logic for checking FAT or RAW MMC

In the case of booting from certain peripherals, such as UART, we must not see what the device descriptor says for RAW or FAT mode because in addition to being nonsensical, it leads to a hang. This is why we have a test currently for the boot mode being within range. The problem however is that on some platforms we get MMC2_2 as the boot mode and not the defined value for MMC2, and in others we get the value for MMC2_2. This is required to fix eMMC booting on omap5_uevm.

Tested on am335x_evm (UART, NAND, SD), omap3_beagle (NAND, SD on classic, SD only on xM rev C5) and omap5_uevm (SD, eMMC).

---
 arch/arm/cpu/armv7/omap-common/lowlevel_init.S |   10 +++++++---
 arch/arm/include/asm/arch-am33xx/spl.h         |    3 +++
 arch/arm/include/asm/arch-omap3/spl.h          |    3 +++
 arch/arm/include/asm/arch-omap4/spl.h          |    2 ++
 arch/arm/include/asm/arch-omap5/spl.h          |    2 ++
 5 files changed, 17 insertions(+), 3 deletions(-)
arch/arm/cpu/armv7/omap-common/lowlevel_init.S +7 -3
index b933fe8..90b3c8a 100644
@@ -60,10 +60,14 @@ ENTRY(save_boot_params)
 	ldr	r3, =boot_params
 	strb	r2, [r3, #BOOT_DEVICE_OFFSET]	@ spl_boot_device <- r1
 
-	/* boot mode is passed only for devices that can raw/fat mode */
-	cmp	r2, #BOOT_DEVICE_XIP
+	/*
+	 * boot mode is only valid for device that can be raw or FAT booted.
+	 * in other cases it may be fatal to look.  While platforms differ
+	 * in the values used for each MMC slot, they are contiguous.
+	 */
+	cmp	r2, #MMC_BOOT_DEVICES_START
 	blt	2f
-	cmp	r2, #BOOT_DEVICE_MMC2
+	cmp	r2, #MMC_BOOT_DEVICES_END
 	bgt	2f
 	/* Store the boot mode (raw/FAT) in omap_bootmode */
 	ldr	r2, [r0, #DEV_DESC_PTR_OFFSET]	@ get the device descriptor ptr
arch/arm/include/asm/arch-am33xx/spl.h +3 -0
index f60b086..14a2c7c 100644
@@ -37,4 +37,7 @@
 #define BOOT_DEVICE_USBETH	68
 #define BOOT_DEVICE_CPGMAC	70
 #define BOOT_DEVICE_MMC2_2      0xFF
+
+#define MMC_BOOT_DEVICES_START	BOOT_DEVICE_MMC1
+#define MMC_BOOT_DEVICES_END	BOOT_DEVICE_MMC2
 #endif
arch/arm/include/asm/arch-omap3/spl.h +3 -0
index dec4dac..84e6d7b 100644
@@ -31,4 +31,7 @@
 #define BOOT_DEVICE_MMC1	6
 #define BOOT_DEVICE_XIPWAIT	7
 #define BOOT_DEVICE_MMC2_2      0xFF
+
+#define MMC_BOOT_DEVICES_START	BOOT_DEVICE_MMC2
+#define MMC_BOOT_DEVICES_END	BOOT_DEVICE_MMC1
 #endif
arch/arm/include/asm/arch-omap4/spl.h +2 -0
index 4e094f9..f61627f 100644
@@ -32,4 +32,6 @@
 #define BOOT_DEVICE_MMC2	6
 #define BOOT_DEVICE_MMC2_2	0xFF
 
+#define MMC_BOOT_DEVICES_START	BOOT_DEVICE_MMC1
+#define MMC_BOOT_DEVICES_END	BOOT_DEVICE_MMC2
 #endif
arch/arm/include/asm/arch-omap5/spl.h +2 -0
index 323cd63..d4d353c 100644
@@ -32,4 +32,6 @@
 #define BOOT_DEVICE_MMC2        6
 #define BOOT_DEVICE_MMC2_2	7
 
+#define MMC_BOOT_DEVICES_START	BOOT_DEVICE_MMC1
+#define MMC_BOOT_DEVICES_END	BOOT_DEVICE_MMC2_2
 #endif
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 1/3 OMAP3/4/5/AM33xx: Correct logic for checking FAT or RAW MMC

Hi Tom,

Quoted 83 lines · Tom Rini

In the case of booting from certain peripherals, such as UART, we must not see what the device descriptor says for RAW or FAT mode because in addition to being nonsensical, it leads to a hang. This is why we have a test currently for the boot mode being within range. The problem however is that on some platforms we get MMC2_2 as the boot mode and not the defined value for MMC2, and in others we get the value for MMC2_2. This is required to fix eMMC booting on omap5_uevm.

Tested on am335x_evm (UART, NAND, SD), omap3_beagle (NAND, SD on classic, SD only on xM rev C5) and omap5_uevm (SD, eMMC).

---
 arch/arm/cpu/armv7/omap-common/lowlevel_init.S |   10 +++++++---
 arch/arm/include/asm/arch-am33xx/spl.h         |    3 +++
 arch/arm/include/asm/arch-omap3/spl.h          |    3 +++
 arch/arm/include/asm/arch-omap4/spl.h          |    2 ++
 arch/arm/include/asm/arch-omap5/spl.h          |    2 ++
 5 files changed, 17 insertions(+), 3 deletions(-)
arch/arm/cpu/armv7/omap-common/lowlevel_init.S +7 -3
index b933fe8..90b3c8a 100644
@@ -60,10 +60,14 @@ ENTRY(save_boot_params)
 	ldr	r3, =boot_params
 	strb	r2, [r3, #BOOT_DEVICE_OFFSET]	@ spl_boot_device <- r1
 
-	/* boot mode is passed only for devices that can raw/fat mode */
-	cmp	r2, #BOOT_DEVICE_XIP
+	/*
+	 * boot mode is only valid for device that can be raw or FAT booted.
+	 * in other cases it may be fatal to look.  While platforms differ
+	 * in the values used for each MMC slot, they are contiguous.
+	 */
+	cmp	r2, #MMC_BOOT_DEVICES_START
 	blt	2f
-	cmp	r2, #BOOT_DEVICE_MMC2
+	cmp	r2, #MMC_BOOT_DEVICES_END
 	bgt	2f
 	/* Store the boot mode (raw/FAT) in omap_bootmode */
 	ldr	r2, [r0, #DEV_DESC_PTR_OFFSET]	@ get the device descriptor ptr
arch/arm/include/asm/arch-am33xx/spl.h +3 -0
index f60b086..14a2c7c 100644
@@ -37,4 +37,7 @@
 #define BOOT_DEVICE_USBETH	68
 #define BOOT_DEVICE_CPGMAC	70
 #define BOOT_DEVICE_MMC2_2      0xFF
+
+#define MMC_BOOT_DEVICES_START	BOOT_DEVICE_MMC1
+#define MMC_BOOT_DEVICES_END	BOOT_DEVICE_MMC2
 #endif
arch/arm/include/asm/arch-omap3/spl.h +3 -0
index dec4dac..84e6d7b 100644
@@ -31,4 +31,7 @@
 #define BOOT_DEVICE_MMC1	6
 #define BOOT_DEVICE_XIPWAIT	7
 #define BOOT_DEVICE_MMC2_2      0xFF
+
+#define MMC_BOOT_DEVICES_START	BOOT_DEVICE_MMC2
+#define MMC_BOOT_DEVICES_END	BOOT_DEVICE_MMC1
 #endif
arch/arm/include/asm/arch-omap4/spl.h +2 -0
index 4e094f9..f61627f 100644
@@ -32,4 +32,6 @@
 #define BOOT_DEVICE_MMC2	6
 #define BOOT_DEVICE_MMC2_2	0xFF
 
+#define MMC_BOOT_DEVICES_START	BOOT_DEVICE_MMC1
+#define MMC_BOOT_DEVICES_END	BOOT_DEVICE_MMC2
 #endif
arch/arm/include/asm/arch-omap5/spl.h +0 -0
index 323cd63..d4d353c 100644

arch/arm/include/asm/arch-omap5/spl.h line 37

Quoted 6 lines
arch/arm/include/asm/arch-omap5/spl.h +2 -0
@@ -32,4 +32,6 @@
 #define BOOT_DEVICE_MMC2        6
 #define BOOT_DEVICE_MMC2_2	7
 
+#define MMC_BOOT_DEVICES_START	BOOT_DEVICE_MMC1
+#define MMC_BOOT_DEVICES_END	BOOT_DEVICE_MMC2_2
 #endif
#3 lore raw

PATCH 1/3 OMAP3/4/5/AM33xx: Correct logic for checking FAT or RAW MMC

In reply to Tom Rini
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Tom" == Tom Rini <[email protected]> writes:

Tom> In the case of booting from certain peripherals, such as UART, we must Tom> not see what the device descriptor says for RAW or FAT mode because in Tom> addition to being nonsensical, it leads to a hang. This is why we have Tom> a test currently for the boot mode being within range. The problem Tom> however is that on some platforms we get MMC2_2 as the boot mode and not Tom> the defined value for MMC2, and in others we get the value for MMC2_2. Tom> This is required to fix eMMC booting on omap5_uevm.

Tom> Tested on am335x_evm (UART, NAND, SD), omap3_beagle (NAND, SD on Tom> classic, SD only on xM rev C5) and omap5_uevm (SD, eMMC).

Tom> Signed-off-by: Tom Rini <[email protected]>
Tom> ---

 Tom>  arch/arm/cpu/armv7/omap-common/lowlevel_init.S |   10 +++++++---
 Tom>  arch/arm/include/asm/arch-am33xx/spl.h         |    3 +++
 Tom>  arch/arm/include/asm/arch-omap3/spl.h          |    3 +++
 Tom>  arch/arm/include/asm/arch-omap4/spl.h          |    2 ++
 Tom>  arch/arm/include/asm/arch-omap5/spl.h          |    2 ++

Tom> 5 files changed, 17 insertions(+), 3 deletions(-)

Tom> diff --git a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S Tom> index b933fe8..90b3c8a 100644
Tom> --- a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
Tom> +++ b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
Tom> @@ -60,10 +60,14 @@ ENTRY(save_boot_params)
Tom> ldr r3, =boot_params
Tom> strb r2, [r3, #BOOT_DEVICE_OFFSET] @ spl_boot_device <- r1

Tom> - /* boot mode is passed only for devices that can raw/fat mode */
Tom> - cmp r2, #BOOT_DEVICE_XIP
Tom> + /*
Tom> + * boot mode is only valid for device that can be raw or FAT booted.
Tom> + * in other cases it may be fatal to look. While platforms differ
Tom> + * in the values used for each MMC slot, they are contiguous.
Tom> + */
Tom> + cmp r2, #MMC_BOOT_DEVICES_START
Tom> blt 2f
Tom> - cmp r2, #BOOT_DEVICE_MMC2
Tom> + cmp r2, #MMC_BOOT_DEVICES_END

 Tom>  	bgt	2f
 Tom>  	/* Store the boot mode (raw/FAT) in omap_bootmode */
 Tom>  	ldr	r2, [r0, #DEV_DESC_PTR_OFFSET]	@ get the device descriptor ptr
 Tom> diff --git a/arch/arm/include/asm/arch-am33xx/spl.h b/arch/arm/include/asm/arch-am33xx/spl.h
 Tom> index f60b086..14a2c7c 100644
 Tom> --- a/arch/arm/include/asm/arch-am33xx/spl.h
 Tom> +++ b/arch/arm/include/asm/arch-am33xx/spl.h
 Tom> @@ -37,4 +37,7 @@
 Tom>  #define BOOT_DEVICE_USBETH	68
 Tom>  #define BOOT_DEVICE_CPGMAC	70
 Tom>  #define BOOT_DEVICE_MMC2_2      0xFF

Tom> +
Tom> +#define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC1
Tom> +#define MMC_BOOT_DEVICES_END BOOT_DEVICE_MMC2

Doesn't this break ti814x with the funky inverted mmc1/mmc2?

Signature · 1 line
Bye, Peter Korsgaard
author
#4 lore raw

PATCH 1/3 OMAP3/4/5/AM33xx: Correct logic for checking FAT or RAW MMC

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 50 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Tom" == Tom Rini <[email protected]> writes:

Tom> In the case of booting from certain peripherals, such as UART, we must Tom> not see what the device descriptor says for RAW or FAT mode because in Tom> addition to being nonsensical, it leads to a hang. This is why we have Tom> a test currently for the boot mode being within range. The problem Tom> however is that on some platforms we get MMC2_2 as the boot mode and not Tom> the defined value for MMC2, and in others we get the value for MMC2_2. Tom> This is required to fix eMMC booting on omap5_uevm.

Tom> Tested on am335x_evm (UART, NAND, SD), omap3_beagle (NAND, SD on Tom> classic, SD only on xM rev C5) and omap5_uevm (SD, eMMC).

Tom> Signed-off-by: Tom Rini <[email protected]> Tom> --- Tom>
arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 10 +++++++---

Tom>  arch/arm/include/asm/arch-am33xx/spl.h         |    3 +++ 
Tom>  arch/arm/include/asm/arch-omap3/spl.h          |    3 +++ 
Tom>  arch/arm/include/asm/arch-omap4/spl.h          |    2 ++ Tom>

arch/arm/include/asm/arch-omap5/spl.h | 2 ++ Tom> 5
files changed, 17 insertions(+), 3 deletions(-)

Tom> diff --git a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S Tom> index b933fe8..90b3c8a 100644 Tom> --- a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S Tom> +++ b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S Tom> @@ -60,10
+60,14 @@ ENTRY(save_boot_params) Tom> ldr r3, =boot_params Tom>
strb r2, [r3, #BOOT_DEVICE_OFFSET] @ spl_boot_device <- r1

Tom> - /* boot mode is passed only for devices that can raw/fat
mode */ Tom> - cmp r2, #BOOT_DEVICE_XIP Tom> + /* Tom> + * boot
mode is only valid for device that can be raw or FAT booted. Tom> +
* in other cases it may be fatal to look. While platforms differ
Tom> + * in the values used for each MMC slot, they are
contiguous. Tom> + */ Tom> + cmp r2, #MMC_BOOT_DEVICES_START Tom>
blt 2f Tom> - cmp r2, #BOOT_DEVICE_MMC2 Tom> + cmp r2,
#MMC_BOOT_DEVICES_END Tom> bgt 2f Tom> /* Store the boot mode
(raw/FAT) in omap_bootmode */ Tom> ldr r2, [r0,
#DEV_DESC_PTR_OFFSET] @ get the device descriptor ptr Tom> diff
--git a/arch/arm/include/asm/arch-am33xx/spl.h b/arch/arm/include/asm/arch-am33xx/spl.h Tom> index f60b086..14a2c7c 100644 Tom> --- a/arch/arm/include/asm/arch-am33xx/spl.h Tom> +++ b/arch/arm/include/asm/arch-am33xx/spl.h Tom> @@ -37,4 +37,7 @@
Tom> #define BOOT_DEVICE_USBETH 68 Tom> #define
BOOT_DEVICE_CPGMAC 70 Tom> #define BOOT_DEVICE_MMC2_2 0xFF
Tom> + Tom> +#define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC1 Tom>
+#define MMC_BOOT_DEVICES_END BOOT_DEVICE_MMC2

Quoted 1 line

Doesn't this break ti814x with the funky inverted mmc1/mmc2?

That's probably true, dang. I knew OMAP3 also had them swapped, number-wise but didn't recall until you said this that it doesn't use that code at all. I'll V2 this part. Thanks!

- --
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJRZDY4AAoJENk4IS6UOR1WUBoP/1wPoJ5C0ZCSpEDmm7YFs5b2 XaafK0dIJ/aw7K264vYY8tHBj/ku6mbgNOvfRUL9rxGAPPStESMQynkwF/H7llbd 7GkFlsWpLAgotPnCSwHGqQnApCeUeu0BGCAGvaB8NK0uFlU+D0bsWBdgRe/sML+m LjF0/2eQmm2rTo8ifkDTvCdldaeyGqUo0amefEvfW2cLMxPlYGWcfPh/MW1X35ib RnnBUhdVM38XPKmktjSQMQ4IBkLnd2Hu64KFkZl3ejyMPDjr/uOkm+1UawL34IPH wgSC5Y1+w7HvnxM+D3pre4yrpRSYq+dcg3m9CLb7HcrGFCjLxtTEEcy6DOCF3RG0 aK62JQ0itrXcGCnwMYO6t/w7JlNj/flqCTQW4qU4HJ/ixaICRrg30IePqqcJ0Rj0 69EA4BjgR8JhRZOWRuCkwirz0LQpg7DY43Ioax7EmZ6qjve7/ryEnPxdfSEWTPgr ZcqhsYCwoc0wkADW894UveUW49qXhQCBR0C1eXbynfbpdWSu0ObHX4ErAH1JP4x/ ihtuMZAoTcpYTM0b/Fg+A9t45QhIZBMRKLWar4h5zFrMGyfIODPUjXLqJRSI6Lef kTcUZY9Fy837Vok1NlllTMFxGd8Ot5mRgDehvZiZlTjzbRUfPdC212NUQQ/px7C8 7KPGRHhQds5Fsur7bnXJ
=2NME
-----END PGP SIGNATURE-----

author
#5 lore raw

PATCH 2/3 omap5_evm.h: Move uEVM-specific choices to omap5_evm.h

In reply to Tom Rini

The omap5_uevm platform has eMMC, and it makes sense to say that our default env storage shall reside there. Other platforms may not, so move this choice to the EVM config. In addition, we should provide some way to partition the flash for later usage, so take advantage of the GPT partition table support code and allow that to be setup with some reasonable defaults.

---
 include/configs/omap5_common.h |   13 +++++--------
 include/configs/omap5_evm.h    |   18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 8 deletions(-)
include/configs/omap5_common.h +5 -8
index af97564..6ba5022 100644
@@ -94,19 +94,12 @@
 #define CONFIG_DRIVER_OMAP34XX_I2C
 #define CONFIG_I2C_MULTI_BUS
 
-
 /* MMC */
 #define CONFIG_GENERIC_MMC
 #define CONFIG_MMC
 #define CONFIG_OMAP_HSMMC
 #define CONFIG_DOS_PARTITION
 
-/* MMC ENV related defines */
-#define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SYS_MMC_ENV_DEV		1	/* SLOT2: eMMC(1) */
-#define CONFIG_ENV_OFFSET		0xE0000
-#define CONFIG_CMD_SAVEENV
-
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
 /* Flash */
@@ -124,7 +117,6 @@
 #define CONFIG_CMD_FAT		/* FAT support                  */
 #define CONFIG_CMD_I2C		/* I2C serial bus support	*/
 #define CONFIG_CMD_MMC		/* MMC support                  */
-#define CONFIG_CMD_SAVEENV
 
 /* Disabled commands */
 #undef CONFIG_CMD_NET
@@ -140,11 +132,16 @@
 
 #define CONFIG_ENV_OVERWRITE
 
+#ifndef PARTS_DEFAULT
+#define PARTS_DEFAULT
+#endif
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x82000000\0" \
 	"console=ttyO2,115200n8\0" \
 	"usbtty=cdc_acm\0" \
 	"vram=16M\0" \
+	"partitions=" PARTS_DEFAULT "\0" \
 	"mmcdev=0\0" \
 	"mmcroot=/dev/mmcblk0p2 rw\0" \
 	"mmcrootfstype=ext3 rootwait\0" \
include/configs/omap5_evm.h +18 -0
index 22a8e13..e490523 100644
@@ -28,6 +28,12 @@
 #ifndef __CONFIG_OMAP5_EVM_H
 #define __CONFIG_OMAP5_EVM_H
 
+/* Define the default GPT table for eMMC */
+#define PARTS_DEFAULT \
+	"uuid_disk=${uuid_gpt_disk};" \
+	"name=u-boot,size=1792KiB,uuid=${uuid_gpt_u-boot};" \
+	"name=rootfs,size=-,uuid=${uuid_gpt_rootfs}"
+
 #include <configs/omap5_common.h>
 
 /* TWL6035 */
@@ -35,6 +41,18 @@
 #define CONFIG_TWL6035_POWER
 #endif
 
+/* MMC ENV related defines */
+#define CONFIG_ENV_IS_IN_MMC
+#define CONFIG_SYS_MMC_ENV_DEV		1	/* SLOT2: eMMC(1) */
+#define CONFIG_ENV_OFFSET		0xE0000
+#define CONFIG_CMD_SAVEENV
+
+/* Enhance our eMMC support / experience. */
+#define CONFIG_CMD_GPT
+#define CONFIG_EFI_PARTITION
+#define CONFIG_PARTITION_UUIDS
+#define CONFIG_CMD_PART
+
 #define CONFIG_SYS_PROMPT		"OMAP5430 EVM # "
 
 #endif /* __CONFIG_OMAP5_EVM_H */
Signature · 1 line
1.7.9.5
author
#6 lore raw

PATCH 2/3 omap5_evm.h: Move uEVM-specific choices to omap5_evm.h

Quoted 9 lines · Tom Rini

The omap5_uevm platform has eMMC, and it makes sense to say that our default env storage shall reside there. Other platforms may not, so move this choice to the EVM config. In addition, we should provide some way to partition the flash for later usage, so take advantage of the GPT partition table support code and allow that to be setup with some reasonable defaults.

With the following change (in addition to _evm.h -> _uevm.h):

include/configs/dra7xx_evm.h +2 -0
index 10a4939..28a306b 100644
@@ -28,6 +28,8 @@
 #ifndef __CONFIG_DRA7XX_EVM_H
 #define __CONFIG_DRA7XX_EVM_H
 
+#define CONFIG_ENV_IS_NOWHERE		/* For now. */
+
 #include <configs/omap5_common.h>
 
 #define CONFIG_DRA7XX		/* in a TI DRA7XX core */

Applied to u-boot-ti/master. And the "for now" comment is about waiting until the platform is in some peoples hands and we can better evaluate defaults and so forth for it.

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/20130408/281248f8/attachment.pgp>
author
#7 lore raw

PATCH 3/3 omap5_common.h: Use fallback CONFIG_SYS_BAUDRATE_TABLE

In reply to Tom Rini
---
 include/configs/omap5_common.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
include/configs/omap5_common.h +1 -2
index 6ba5022..a6348a6 100644
@@ -85,8 +85,7 @@
 #define CONFIG_SYS_NS16550_COM3		UART3_BASE
 
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600,\
-					115200}
+
 /* I2C  */
 #define CONFIG_HARD_I2C
 #define CONFIG_SYS_I2C_SPEED		100000
Signature · 1 line
1.7.9.5
author
#8 lore raw

cover OMAP5: Improve uEVM support

In reply to Tom Rini
Quoted 6 lines · Tom Rini

Today, the eMMC on the omap5_uevm cannot be booted from, due to a bug in the save_boot_params function that tests for a range of XIP to MMC2. But in the case of OMAP5, MMC2 is eMMC boot partition and MMC2_2 is eMMC (main), and uEVM can only boot from MMC2_2. We cannot just update the test as-is because other platforms define away MMC2_2 to 0xFF as they cannot be passed that value. I've fixed this by making it clearer in

Quoted 8 lines

the comments what we do, and use a platform definable variable to say where we must check the range for. This part has been tested on some relevant platforms for each case. While doing this, the question arose of how to partition eMMC (since u-boot must be written RAW and not put on FAT), so I've added GPT support for this. Finally, while in here I see we weren't using the fallbacks baud rate table, so I changed to that. This series will mildly conflict (mainly over the rename) with Sricharan's current series of fixes, so I shall resolve that.

With the small change to 2/3, applied to u-boot-ti/master.

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/20130408/3305f21b/attachment.pgp>
author
#9 lore raw

cover OMAP5: Improve uEVM support

In reply to Tom Rini
Quoted 6 lines · Tom Rini

Today, the eMMC on the omap5_uevm cannot be booted from, due to a bug in the save_boot_params function that tests for a range of XIP to MMC2. But in the case of OMAP5, MMC2 is eMMC boot partition and MMC2_2 is eMMC (main), and uEVM can only boot from MMC2_2. We cannot just update the test as-is because other platforms define away MMC2_2 to 0xFF as they cannot be passed that value. I've fixed this by making it clearer in

Quoted 8 lines

the comments what we do, and use a platform definable variable to say where we must check the range for. This part has been tested on some relevant platforms for each case. While doing this, the question arose of how to partition eMMC (since u-boot must be written RAW and not put on FAT), so I've added GPT support for this. Finally, while in here I see we weren't using the fallbacks baud rate table, so I changed to that. This series will mildly conflict (mainly over the rename) with Sricharan's current series of fixes, so I shall resolve that.

With the change to 2/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/20130408/3e17d3f4/attachment.pgp>