* [U-Boot] [PATCH V2 1/4] ARM: tegra: make bounce buffer option common
@ 2013-03-01 1:03 Stephen Warren
2013-03-01 1:03 ` [U-Boot] [PATCH V2 2/4] disk: define HAVE_BLOCK_DEVICE in a common place Stephen Warren
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Stephen Warren @ 2013-03-01 1:03 UTC (permalink / raw)
To: u-boot
From: Stephen Warren <swarren@nvidia.com>
All Tegra devices will need CONFIG_BOUNCE_BUFFER. Move it to
tegra-common.h to ensure it's always set.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
v2: Add missing word to commit subject.
This is based on u-boot-tegra/next, plus my reset vector fix (which
shouldn't conflict), plus Tom's Tegra30 MMC series.
include/configs/tegra-common.h | 3 +++
include/configs/tegra20-common.h | 3 ---
include/configs/tegra30-common.h | 3 ---
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 4a656bb..a3cb5b9 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -157,4 +157,7 @@
#define CONFIG_SPL_SERIAL_SUPPORT
#define CONFIG_SPL_GPIO_SUPPORT
+/* Misc utility code */
+#define CONFIG_BOUNCE_BUFFER
+
#endif /* _TEGRA_COMMON_H_ */
diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h
index 33e5f52..dac8245 100644
--- a/include/configs/tegra20-common.h
+++ b/include/configs/tegra20-common.h
@@ -114,7 +114,4 @@
#define CONFIG_SYS_NAND_SELF_INIT
#define CONFIG_SYS_NAND_ONFI_DETECTION
-/* Misc utility code */
-#define CONFIG_BOUNCE_BUFFER
-
#endif /* _TEGRA20_COMMON_H_ */
diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h
index bd1dfe8..04517e1 100644
--- a/include/configs/tegra30-common.h
+++ b/include/configs/tegra30-common.h
@@ -86,7 +86,4 @@
/* Total I2C ports on Tegra30 */
#define TEGRA_I2C_NUM_CONTROLLERS 5
-/* Misc utility code */
-#define CONFIG_BOUNCE_BUFFER
-
#endif /* _TEGRA30_COMMON_H_ */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH V2 2/4] disk: define HAVE_BLOCK_DEVICE in a common place
2013-03-01 1:03 [U-Boot] [PATCH V2 1/4] ARM: tegra: make bounce buffer option common Stephen Warren
@ 2013-03-01 1:03 ` Stephen Warren
2013-03-02 19:02 ` Simon Glass
2013-03-08 16:56 ` Tom Rini
2013-03-01 1:03 ` [U-Boot] [PATCH V2 3/4] disk: define HAVE_BLOCK_DEVICE if CONFIG_CMD_PART Stephen Warren
` (2 subsequent siblings)
3 siblings, 2 replies; 10+ messages in thread
From: Stephen Warren @ 2013-03-01 1:03 UTC (permalink / raw)
To: u-boot
From: Stephen Warren <swarren@nvidia.com>
This set of ifdefs is used in a number of places. Move its definition
somewhere common so it doesn't have to be repeated.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
v2: New patch
---
disk/part.c | 10 ----------
disk/part_amiga.c | 6 +-----
disk/part_dos.c | 7 +------
disk/part_efi.c | 8 +-------
disk/part_iso.c | 7 +------
disk/part_mac.c | 7 +------
include/config_fallbacks.h | 10 ++++++++++
7 files changed, 15 insertions(+), 40 deletions(-)
diff --git a/disk/part.c b/disk/part.c
index 7bdc90e..1525ed9 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -35,16 +35,6 @@
#define PRINTF(fmt,args...)
#endif
-/* Rather than repeat this expression each time, add a define for it */
-#if (defined(CONFIG_CMD_IDE) || \
- defined(CONFIG_CMD_SATA) || \
- defined(CONFIG_CMD_SCSI) || \
- defined(CONFIG_CMD_USB) || \
- defined(CONFIG_MMC) || \
- defined(CONFIG_SYSTEMACE) )
-#define HAVE_BLOCK_DEVICE
-#endif
-
struct block_drvr {
char *name;
block_dev_desc_t* (*get_dev)(int dev);
diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index dc7d462..0e6d82d 100644
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -26,11 +26,7 @@
#include <ide.h>
#include "part_amiga.h"
-#if defined(CONFIG_CMD_IDE) || \
- defined(CONFIG_CMD_SCSI) || \
- defined(CONFIG_CMD_USB) || \
- defined(CONFIG_MMC) || \
- defined(CONFIG_SYSTEMACE)
+#ifdef HAVE_BLOCK_DEVICE
#undef AMIGA_DEBUG
diff --git a/disk/part_dos.c b/disk/part_dos.c
index 3fe901b..37087a6 100644
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -35,12 +35,7 @@
#include <ide.h>
#include "part_dos.h"
-#if defined(CONFIG_CMD_IDE) || \
- defined(CONFIG_CMD_SATA) || \
- defined(CONFIG_CMD_SCSI) || \
- defined(CONFIG_CMD_USB) || \
- defined(CONFIG_MMC) || \
- defined(CONFIG_SYSTEMACE)
+#ifdef HAVE_BLOCK_DEVICE
/* Convert char[4] in little endian format to the host format integer
*/
diff --git a/disk/part_efi.c b/disk/part_efi.c
index 7665017..b3fd0e9 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -39,13 +39,7 @@
DECLARE_GLOBAL_DATA_PTR;
-#if defined(CONFIG_CMD_IDE) || \
- defined(CONFIG_CMD_SATA) || \
- defined(CONFIG_CMD_SCSI) || \
- defined(CONFIG_CMD_USB) || \
- defined(CONFIG_MMC) || \
- defined(CONFIG_SYSTEMACE)
-
+#ifdef HAVE_BLOCK_DEVICE
/**
* efi_crc32() - EFI version of crc32 function
* @buf: buffer to calculate crc32 of
diff --git a/disk/part_iso.c b/disk/part_iso.c
index 4401790..49639af 100644
--- a/disk/part_iso.c
+++ b/disk/part_iso.c
@@ -25,12 +25,7 @@
#include <command.h>
#include "part_iso.h"
-#if defined(CONFIG_CMD_IDE) || \
- defined(CONFIG_CMD_SCSI) || \
- defined(CONFIG_CMD_SATA) || \
- defined(CONFIG_CMD_USB) || \
- defined(CONFIG_MMC) || \
- defined(CONFIG_SYSTEMACE)
+#ifdef HAVE_BLOCK_DEVICE
/* #define ISO_PART_DEBUG */
diff --git a/disk/part_mac.c b/disk/part_mac.c
index cb443ac..74dc12f 100644
--- a/disk/part_mac.c
+++ b/disk/part_mac.c
@@ -34,12 +34,7 @@
#include <ide.h>
#include "part_mac.h"
-#if defined(CONFIG_CMD_IDE) || \
- defined(CONFIG_CMD_SCSI) || \
- defined(CONFIG_CMD_SATA) || \
- defined(CONFIG_CMD_USB) || \
- defined(CONFIG_MMC) || \
- defined(CONFIG_SYSTEMACE)
+#ifdef HAVE_BLOCK_DEVICE
/* stdlib.h causes some compatibility problems; should fixe these! -- wd */
#ifndef __ldiv_t_defined
diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h
index bfb9680..653ff2b 100644
--- a/include/config_fallbacks.h
+++ b/include/config_fallbacks.h
@@ -26,4 +26,14 @@
#define CONFIG_EXT4_WRITE
#endif
+/* Rather than repeat this expression each time, add a define for it */
+#if defined(CONFIG_CMD_IDE) || \
+ defined(CONFIG_CMD_SATA) || \
+ defined(CONFIG_CMD_SCSI) || \
+ defined(CONFIG_CMD_USB) || \
+ defined(CONFIG_MMC) || \
+ defined(CONFIG_SYSTEMACE)
+#define HAVE_BLOCK_DEVICE
+#endif
+
#endif /* __CONFIG_FALLBACKS_H */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH V2 3/4] disk: define HAVE_BLOCK_DEVICE if CONFIG_CMD_PART
2013-03-01 1:03 [U-Boot] [PATCH V2 1/4] ARM: tegra: make bounce buffer option common Stephen Warren
2013-03-01 1:03 ` [U-Boot] [PATCH V2 2/4] disk: define HAVE_BLOCK_DEVICE in a common place Stephen Warren
@ 2013-03-01 1:03 ` Stephen Warren
2013-03-02 19:03 ` Simon Glass
2013-03-08 16:56 ` Tom Rini
2013-03-01 1:03 ` [U-Boot] [PATCH V2 4/4] ARM: tegra: enable a common set of disk-related commands everywhere Stephen Warren
2013-03-02 19:02 ` [U-Boot] [PATCH V2 1/4] ARM: tegra: make bounce buffer option common Simon Glass
3 siblings, 2 replies; 10+ messages in thread
From: Stephen Warren @ 2013-03-01 1:03 UTC (permalink / raw)
To: u-boot
From: Stephen Warren <swarren@nvidia.com>
Various code that is conditional upon HAVE_BLOCK_DEVICE is required by
code conditional upon CONFIG_CMD_PART. So, enable HAVE_BLOCK_DEVICE if
CONFIG_CMD_PART is enabled.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
v2: New patch
---
include/config_fallbacks.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h
index 653ff2b..9298d0e 100644
--- a/include/config_fallbacks.h
+++ b/include/config_fallbacks.h
@@ -31,6 +31,7 @@
defined(CONFIG_CMD_SATA) || \
defined(CONFIG_CMD_SCSI) || \
defined(CONFIG_CMD_USB) || \
+ defined(CONFIG_CMD_PART) || \
defined(CONFIG_MMC) || \
defined(CONFIG_SYSTEMACE)
#define HAVE_BLOCK_DEVICE
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH V2 4/4] ARM: tegra: enable a common set of disk-related commands everywhere
2013-03-01 1:03 [U-Boot] [PATCH V2 1/4] ARM: tegra: make bounce buffer option common Stephen Warren
2013-03-01 1:03 ` [U-Boot] [PATCH V2 2/4] disk: define HAVE_BLOCK_DEVICE in a common place Stephen Warren
2013-03-01 1:03 ` [U-Boot] [PATCH V2 3/4] disk: define HAVE_BLOCK_DEVICE if CONFIG_CMD_PART Stephen Warren
@ 2013-03-01 1:03 ` Stephen Warren
2013-03-02 19:04 ` Simon Glass
2013-03-02 19:02 ` [U-Boot] [PATCH V2 1/4] ARM: tegra: make bounce buffer option common Simon Glass
3 siblings, 1 reply; 10+ messages in thread
From: Stephen Warren @ 2013-03-01 1:03 UTC (permalink / raw)
To: u-boot
From: Stephen Warren <swarren@nvidia.com>
Enable a common set of partition types, filesystems, and related
commands in tegra-common.h, so that they are available on all Tegra
boards. This allows boot.scr (loaded and executed by the default
built-in environment) on those boards to assume that certain features
are always available.
Do this in tegra-common.h, so that individual board files can undefine
the features if they really don't want any of them.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
v2: Reworked to avoid compilation issues on Dalmore, and enable all
features on all Tegra boards.
---
include/configs/cardhu.h | 8 --------
include/configs/colibri_t20_iris.h | 6 ------
include/configs/harmony.h | 8 --------
include/configs/medcom-wide.h | 5 -----
include/configs/paz00.h | 8 --------
include/configs/plutux.h | 5 -----
include/configs/seaboard.h | 8 --------
include/configs/tec.h | 5 -----
include/configs/tegra-common.h | 12 ++++++++++++
include/configs/tegra20-common.h | 3 ---
include/configs/trimslice.h | 8 --------
include/configs/ventana.h | 8 --------
include/configs/whistler.h | 8 --------
13 files changed, 12 insertions(+), 80 deletions(-)
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 18c7eb8..55dc83d 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -53,14 +53,6 @@
#define CONFIG_TEGRA_MMC
#define CONFIG_CMD_MMC
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_FS_EXT4
-#define CONFIG_FS_FAT
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_FS_GENERIC
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET ((512 * 1024) - CONFIG_ENV_SIZE)
diff --git a/include/configs/colibri_t20_iris.h b/include/configs/colibri_t20_iris.h
index 0e5f281..856c860 100644
--- a/include/configs/colibri_t20_iris.h
+++ b/include/configs/colibri_t20_iris.h
@@ -40,12 +40,6 @@
#define CONFIG_TEGRA_MMC
#define CONFIG_CMD_MMC
-/* File system support */
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-
/* USB host support */
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_TEGRA
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 8d1fd47..0c73f86 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -56,14 +56,6 @@
#define CONFIG_TEGRA_MMC
#define CONFIG_CMD_MMC
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_FS_EXT4
-#define CONFIG_FS_FAT
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_FS_GENERIC
-
/* NAND support */
#define CONFIG_CMD_NAND
#define CONFIG_TEGRA_NAND
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index bae4ba0..57a50d7 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -66,11 +66,6 @@
#define CONFIG_CMD_NET
#define CONFIG_CMD_DHCP
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-
#define CONFIG_FIT
#define CONFIG_BOOTCOMMAND \
diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index 2edb4aa..eac1ef9 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -44,14 +44,6 @@
#define CONFIG_TEGRA_MMC
#define CONFIG_CMD_MMC
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_FS_EXT4
-#define CONFIG_FS_FAT
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_FS_GENERIC
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET ((1024 * 1024) - CONFIG_ENV_SIZE)
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index deee237..4cfe88a 100644
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -65,11 +65,6 @@
#define CONFIG_CMD_NET
#define CONFIG_CMD_DHCP
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-
#define CONFIG_FIT
#define CONFIG_BOOTCOMMAND \
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index de0c777..f66173e 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -70,14 +70,6 @@
#define CONFIG_TEGRA_MMC
#define CONFIG_CMD_MMC
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_FS_EXT4
-#define CONFIG_FS_FAT
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_FS_GENERIC
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET ((512 * 1024) - CONFIG_ENV_SIZE)
diff --git a/include/configs/tec.h b/include/configs/tec.h
index caeb9cd..f90f5c7 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -73,11 +73,6 @@
#define CONFIG_CMD_NET
#define CONFIG_CMD_DHCP
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-
#define CONFIG_FIT
#define CONFIG_BOOTCOMMAND \
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index a3cb5b9..9598104 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -90,6 +90,18 @@
#define CONFIG_COMMAND_HISTORY
#define CONFIG_AUTO_COMPLETE
+/* turn on commonly used storage-related commands */
+
+#define CONFIG_DOS_PARTITION
+#define CONFIG_EFI_PARTITION
+#define CONFIG_PARTITION_UUIDS
+#define CONFIG_FS_EXT4
+#define CONFIG_FS_FAT
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_FS_GENERIC
+#define CONFIG_CMD_PART
+
#define CONFIG_SYS_NO_FLASH
#define CONFIG_CONSOLE_MUX
diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h
index dac8245..311680e 100644
--- a/include/configs/tegra20-common.h
+++ b/include/configs/tegra20-common.h
@@ -108,9 +108,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
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 334d3a3..0644f7a 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -67,14 +67,6 @@
#define CONFIG_TEGRA_MMC
#define CONFIG_CMD_MMC
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_FS_EXT4
-#define CONFIG_FS_FAT
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_FS_GENERIC
-
/* Environment in SPI */
#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SPI_MAX_HZ 48000000
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index b55ebc9..5755f11 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -50,14 +50,6 @@
#define CONFIG_TEGRA_MMC
#define CONFIG_CMD_MMC
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_FS_EXT4
-#define CONFIG_FS_FAT
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_FS_GENERIC
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_ENV_OFFSET ((1024 * 1024) - CONFIG_ENV_SIZE)
diff --git a/include/configs/whistler.h b/include/configs/whistler.h
index 1e554d8..9542c7e 100644
--- a/include/configs/whistler.h
+++ b/include/configs/whistler.h
@@ -59,14 +59,6 @@
#define CONFIG_TEGRA_MMC
#define CONFIG_CMD_MMC
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_FS_EXT4
-#define CONFIG_FS_FAT
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_FS_GENERIC
-
/*
* Environment in eMMC, at the end of 2nd "boot sector". Note: This assumes
* the user plugged the standard 8MB MoviNAND card into J29/HSMMC/POP. If
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH V2 2/4] disk: define HAVE_BLOCK_DEVICE in a common place
2013-03-01 1:03 ` [U-Boot] [PATCH V2 2/4] disk: define HAVE_BLOCK_DEVICE in a common place Stephen Warren
@ 2013-03-02 19:02 ` Simon Glass
2013-03-08 16:56 ` Tom Rini
1 sibling, 0 replies; 10+ messages in thread
From: Simon Glass @ 2013-03-02 19:02 UTC (permalink / raw)
To: u-boot
On Thu, Feb 28, 2013 at 5:03 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> This set of ifdefs is used in a number of places. Move its definition
> somewhere common so it doesn't have to be repeated.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH V2 1/4] ARM: tegra: make bounce buffer option common
2013-03-01 1:03 [U-Boot] [PATCH V2 1/4] ARM: tegra: make bounce buffer option common Stephen Warren
` (2 preceding siblings ...)
2013-03-01 1:03 ` [U-Boot] [PATCH V2 4/4] ARM: tegra: enable a common set of disk-related commands everywhere Stephen Warren
@ 2013-03-02 19:02 ` Simon Glass
3 siblings, 0 replies; 10+ messages in thread
From: Simon Glass @ 2013-03-02 19:02 UTC (permalink / raw)
To: u-boot
On Thu, Feb 28, 2013 at 5:03 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> All Tegra devices will need CONFIG_BOUNCE_BUFFER. Move it to
> tegra-common.h to ensure it's always set.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
> ---
> v2: Add missing word to commit subject.
>
> This is based on u-boot-tegra/next, plus my reset vector fix (which
> shouldn't conflict), plus Tom's Tegra30 MMC series.
>
> include/configs/tegra-common.h | 3 +++
> include/configs/tegra20-common.h | 3 ---
> include/configs/tegra30-common.h | 3 ---
> 3 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
> index 4a656bb..a3cb5b9 100644
> --- a/include/configs/tegra-common.h
> +++ b/include/configs/tegra-common.h
> @@ -157,4 +157,7 @@
> #define CONFIG_SPL_SERIAL_SUPPORT
> #define CONFIG_SPL_GPIO_SUPPORT
>
> +/* Misc utility code */
> +#define CONFIG_BOUNCE_BUFFER
> +
> #endif /* _TEGRA_COMMON_H_ */
> diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h
> index 33e5f52..dac8245 100644
> --- a/include/configs/tegra20-common.h
> +++ b/include/configs/tegra20-common.h
> @@ -114,7 +114,4 @@
> #define CONFIG_SYS_NAND_SELF_INIT
> #define CONFIG_SYS_NAND_ONFI_DETECTION
>
> -/* Misc utility code */
> -#define CONFIG_BOUNCE_BUFFER
> -
> #endif /* _TEGRA20_COMMON_H_ */
> diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h
> index bd1dfe8..04517e1 100644
> --- a/include/configs/tegra30-common.h
> +++ b/include/configs/tegra30-common.h
> @@ -86,7 +86,4 @@
> /* Total I2C ports on Tegra30 */
> #define TEGRA_I2C_NUM_CONTROLLERS 5
>
> -/* Misc utility code */
> -#define CONFIG_BOUNCE_BUFFER
> -
> #endif /* _TEGRA30_COMMON_H_ */
> --
> 1.7.10.4
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH V2 3/4] disk: define HAVE_BLOCK_DEVICE if CONFIG_CMD_PART
2013-03-01 1:03 ` [U-Boot] [PATCH V2 3/4] disk: define HAVE_BLOCK_DEVICE if CONFIG_CMD_PART Stephen Warren
@ 2013-03-02 19:03 ` Simon Glass
2013-03-08 16:56 ` Tom Rini
1 sibling, 0 replies; 10+ messages in thread
From: Simon Glass @ 2013-03-02 19:03 UTC (permalink / raw)
To: u-boot
On Thu, Feb 28, 2013 at 5:03 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> Various code that is conditional upon HAVE_BLOCK_DEVICE is required by
> code conditional upon CONFIG_CMD_PART. So, enable HAVE_BLOCK_DEVICE if
> CONFIG_CMD_PART is enabled.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
> ---
> v2: New patch
> ---
> include/config_fallbacks.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h
> index 653ff2b..9298d0e 100644
> --- a/include/config_fallbacks.h
> +++ b/include/config_fallbacks.h
> @@ -31,6 +31,7 @@
> defined(CONFIG_CMD_SATA) || \
> defined(CONFIG_CMD_SCSI) || \
> defined(CONFIG_CMD_USB) || \
> + defined(CONFIG_CMD_PART) || \
> defined(CONFIG_MMC) || \
> defined(CONFIG_SYSTEMACE)
> #define HAVE_BLOCK_DEVICE
> --
> 1.7.10.4
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH V2 4/4] ARM: tegra: enable a common set of disk-related commands everywhere
2013-03-01 1:03 ` [U-Boot] [PATCH V2 4/4] ARM: tegra: enable a common set of disk-related commands everywhere Stephen Warren
@ 2013-03-02 19:04 ` Simon Glass
0 siblings, 0 replies; 10+ messages in thread
From: Simon Glass @ 2013-03-02 19:04 UTC (permalink / raw)
To: u-boot
On Thu, Feb 28, 2013 at 5:03 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> Enable a common set of partition types, filesystems, and related
> commands in tegra-common.h, so that they are available on all Tegra
> boards. This allows boot.scr (loaded and executed by the default
> built-in environment) on those boards to assume that certain features
> are always available.
>
> Do this in tegra-common.h, so that individual board files can undefine
> the features if they really don't want any of them.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
> ---
> v2: Reworked to avoid compilation issues on Dalmore, and enable all
> features on all Tegra boards.
> ---
> include/configs/cardhu.h | 8 --------
> include/configs/colibri_t20_iris.h | 6 ------
> include/configs/harmony.h | 8 --------
> include/configs/medcom-wide.h | 5 -----
> include/configs/paz00.h | 8 --------
> include/configs/plutux.h | 5 -----
> include/configs/seaboard.h | 8 --------
> include/configs/tec.h | 5 -----
> include/configs/tegra-common.h | 12 ++++++++++++
> include/configs/tegra20-common.h | 3 ---
> include/configs/trimslice.h | 8 --------
> include/configs/ventana.h | 8 --------
> include/configs/whistler.h | 8 --------
> 13 files changed, 12 insertions(+), 80 deletions(-)
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH V2 3/4] disk: define HAVE_BLOCK_DEVICE if CONFIG_CMD_PART
2013-03-01 1:03 ` [U-Boot] [PATCH V2 3/4] disk: define HAVE_BLOCK_DEVICE if CONFIG_CMD_PART Stephen Warren
2013-03-02 19:03 ` Simon Glass
@ 2013-03-08 16:56 ` Tom Rini
1 sibling, 0 replies; 10+ messages in thread
From: Tom Rini @ 2013-03-08 16:56 UTC (permalink / raw)
To: u-boot
On Thu, Feb 28, 2013 at 06:03:47PM -0700, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> Various code that is conditional upon HAVE_BLOCK_DEVICE is required by
> code conditional upon CONFIG_CMD_PART. So, enable HAVE_BLOCK_DEVICE if
> CONFIG_CMD_PART is enabled.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Tom Rini <trini@ti.com>
--
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/20130308/c7804412/attachment.pgp>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH V2 2/4] disk: define HAVE_BLOCK_DEVICE in a common place
2013-03-01 1:03 ` [U-Boot] [PATCH V2 2/4] disk: define HAVE_BLOCK_DEVICE in a common place Stephen Warren
2013-03-02 19:02 ` Simon Glass
@ 2013-03-08 16:56 ` Tom Rini
1 sibling, 0 replies; 10+ messages in thread
From: Tom Rini @ 2013-03-08 16:56 UTC (permalink / raw)
To: u-boot
On Thu, Feb 28, 2013 at 06:03:46PM -0700, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> This set of ifdefs is used in a number of places. Move its definition
> somewhere common so it doesn't have to be repeated.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Tom Rini <trini@ti.com>
--
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/20130308/3978e2f0/attachment.pgp>
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-03-08 16:56 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-01 1:03 [U-Boot] [PATCH V2 1/4] ARM: tegra: make bounce buffer option common Stephen Warren
2013-03-01 1:03 ` [U-Boot] [PATCH V2 2/4] disk: define HAVE_BLOCK_DEVICE in a common place Stephen Warren
2013-03-02 19:02 ` Simon Glass
2013-03-08 16:56 ` Tom Rini
2013-03-01 1:03 ` [U-Boot] [PATCH V2 3/4] disk: define HAVE_BLOCK_DEVICE if CONFIG_CMD_PART Stephen Warren
2013-03-02 19:03 ` Simon Glass
2013-03-08 16:56 ` Tom Rini
2013-03-01 1:03 ` [U-Boot] [PATCH V2 4/4] ARM: tegra: enable a common set of disk-related commands everywhere Stephen Warren
2013-03-02 19:04 ` Simon Glass
2013-03-02 19:02 ` [U-Boot] [PATCH V2 1/4] ARM: tegra: make bounce buffer option common Simon Glass
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox