Patchwork [U-Boot,2/2] ARM: tegra: make CONFIG_CMD_PART common

login
register
mail settings
Submitter Stephen Warren
Date Feb. 26, 2013, 11 p.m.
Message ID <1361919658-3150-2-git-send-email-swarren@wwwdotorg.org>
Download mbox | patch
Permalink /patch/223424/
State Superseded
Delegated to: Tom Warren
Headers show

Comments

Stephen Warren - Feb. 26, 2013, 11 p.m.
From: Stephen Warren <swarren@nvidia.com>

This is useful on all Tegras, so that boot.scr on all devices can use
the same commands. Hence, move it to tegra-common.h.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 include/configs/tegra-common.h   |    2 ++
 include/configs/tegra20-common.h |    3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)
Stephen Warren - Feb. 27, 2013, 9:03 p.m.
On 02/26/2013 04:00 PM, Stephen Warren wrote:
> This is useful on all Tegras, so that boot.scr on all devices can use
> the same commands. Hence, move it to tegra-common.h.

Unfortunately, this breaks Tegra114 builds because no partition types
are enabled, and CONFIG_CMD_PART requires functionality that's only
enabled if some partition types are supported.

There are two possible solutions:

1) Conditionally enable PARTITION_UUIDS and CMD_PART in
tegra-common-post.h only if some partition type is enabled.

2) Also enable DOS and EFI partitions in tegra-common.h, along with all
of FS_EXT4, FS_FAT, CMD_EXT2, CMD_FAT, CMD_FS_GENERIC. For most boards
this won't be any change. For the Colibri T20 and Avionic Design boards,
this ends up enabling a few more options.

(or perhaps enable all of those in tegra-common-post.h only if support
for any block device is enabled)

I prefer option (2). Does anyone object?
Thierry Reding - Feb. 27, 2013, 9:43 p.m.
On Wed, Feb 27, 2013 at 02:03:37PM -0700, Stephen Warren wrote:
> On 02/26/2013 04:00 PM, Stephen Warren wrote:
> > This is useful on all Tegras, so that boot.scr on all devices can use
> > the same commands. Hence, move it to tegra-common.h.
> 
> Unfortunately, this breaks Tegra114 builds because no partition types
> are enabled, and CONFIG_CMD_PART requires functionality that's only
> enabled if some partition types are supported.
> 
> There are two possible solutions:
> 
> 1) Conditionally enable PARTITION_UUIDS and CMD_PART in
> tegra-common-post.h only if some partition type is enabled.
> 
> 2) Also enable DOS and EFI partitions in tegra-common.h, along with all
> of FS_EXT4, FS_FAT, CMD_EXT2, CMD_FAT, CMD_FS_GENERIC. For most boards
> this won't be any change. For the Colibri T20 and Avionic Design boards,
> this ends up enabling a few more options.
> 
> (or perhaps enable all of those in tegra-common-post.h only if support
> for any block device is enabled)
> 
> I prefer option (2). Does anyone object?

Fine with me. I recently posted patches that enable some of these
options as part of boot script support on Tamonten boards anyway.

Thierry
Lucas Stach - Feb. 28, 2013, 2:58 p.m.
Am Mittwoch, den 27.02.2013, 14:03 -0700 schrieb Stephen Warren:
> On 02/26/2013 04:00 PM, Stephen Warren wrote:
> > This is useful on all Tegras, so that boot.scr on all devices can use
> > the same commands. Hence, move it to tegra-common.h.
> 
> Unfortunately, this breaks Tegra114 builds because no partition types
> are enabled, and CONFIG_CMD_PART requires functionality that's only
> enabled if some partition types are supported.
> 
> There are two possible solutions:
> 
> 1) Conditionally enable PARTITION_UUIDS and CMD_PART in
> tegra-common-post.h only if some partition type is enabled.
> 
> 2) Also enable DOS and EFI partitions in tegra-common.h, along with all
> of FS_EXT4, FS_FAT, CMD_EXT2, CMD_FAT, CMD_FS_GENERIC. For most boards
> this won't be any change. For the Colibri T20 and Avionic Design boards,
> this ends up enabling a few more options.
> 
> (or perhaps enable all of those in tegra-common-post.h only if support
> for any block device is enabled)
> 
> I prefer option (2). Does anyone object?
> 
No objections. There is no real reason to leave out all those options as
we are not size limited on the Colibri.

Regards,
Lucas

Patch

diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index a3cb5b9..45f0099 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -141,6 +141,8 @@ 
 #define CONFIG_CMD_GPIO
 #define CONFIG_CMD_ENTERRCM
 #define CONFIG_CMD_BOOTZ
+#define CONFIG_PARTITION_UUIDS
+#define CONFIG_CMD_PART
 
 /* Defines for SPL */
 #define CONFIG_SPL
diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h
index c51de00..e464e06 100644
--- a/include/configs/tegra20-common.h
+++ b/include/configs/tegra20-common.h
@@ -114,9 +114,6 @@ 
 /* Total I2C ports on Tegra20 */
 #define TEGRA_I2C_NUM_CONTROLLERS	4
 
-#define CONFIG_PARTITION_UUIDS
-#define CONFIG_CMD_PART
-
 #define CONFIG_SYS_NAND_SELF_INIT
 #define CONFIG_SYS_NAND_ONFI_DETECTION