[U-Boot] [PATCH 1/2] tegra: Remove unnecessary CONFIG_SYS_NAND_BASE

Now that we are using the new CONFIG_SYS_NAND_SELF_INIT setup, we don't need CONFIG_SYS_NAND_BASE. Punt it.
Signed-off-by: Simon Glass sjg@chromium.org --- include/configs/seaboard.h | 3 --- include/configs/tec.h | 1 - 2 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 7680c77..3fca8d9 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -124,7 +124,4 @@
/* Max number of NAND devices */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 - -/* Somewhat oddly, the NAND base address must be a config option */ -#define CONFIG_SYS_NAND_BASE NV_PA_NAND_BASE #endif /* __CONFIG_H */ diff --git a/include/configs/tec.h b/include/configs/tec.h index 140d2e6..200cf66 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -54,7 +54,6 @@ #define CONFIG_CMD_NAND #define CONFIG_TEGRA_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BASE NV_PA_NAND_BASE
/* Environment in NAND, aligned to start of last sector */ #define CONFIG_ENV_IS_IN_NAND

The NAND defines ended up before this include file, but should be after it, so it doesn't become a post-pre-NAND.
Signed-off-by: Simon Glass sjg@chromium.org --- include/configs/seaboard.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 3fca8d9..32816b1 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -116,12 +116,13 @@ #define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_CONSOLE_SCROLL_LINES 10
-#include "tegra-common-post.h" - /* NAND support */ #define CONFIG_CMD_NAND #define CONFIG_TEGRA_NAND
/* Max number of NAND devices */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 + +#include "tegra-common-post.h" + #endif /* __CONFIG_H */

On 11/05/2012 04:21 PM, Simon Glass wrote:
The NAND defines ended up before this include file, but should be after it, so it doesn't become a post-pre-NAND.
The series, Acked-by: Stephen Warren swarren@nvidia.com

Simon,
-----Original Message----- From: Simon Glass [mailto:sjg@chromium.org] Sent: Monday, November 05, 2012 4:21 PM To: U-Boot Mailing List Cc: Tom Warren; Stephen Warren; Simon Glass; Stephen Warren Subject: [PATCH 1/2] tegra: Remove unnecessary CONFIG_SYS_NAND_BASE
Now that we are using the new CONFIG_SYS_NAND_SELF_INIT setup, we don't need CONFIG_SYS_NAND_BASE. Punt it.
Signed-off-by: Simon Glass sjg@chromium.org
include/configs/seaboard.h | 3 --- include/configs/tec.h | 1 - 2 files changed, 0 insertions(+), 4 deletions(-)
Harmony.h uses it, too.
Tom
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 7680c77..3fca8d9 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -124,7 +124,4 @@
/* Max number of NAND devices */ #define CONFIG_SYS_MAX_NAND_DEVICE 1
-/* Somewhat oddly, the NAND base address must be a config option */ -#define CONFIG_SYS_NAND_BASE NV_PA_NAND_BASE #endif /* __CONFIG_H */ diff --git a/include/configs/tec.h b/include/configs/tec.h index 140d2e6..200cf66 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -54,7 +54,6 @@ #define CONFIG_CMD_NAND #define CONFIG_TEGRA_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BASE NV_PA_NAND_BASE
/* Environment in NAND, aligned to start of last sector */ #define CONFIG_ENV_IS_IN_NAND -- 1.7.7.3

Hi Tom,
On Mon, Nov 5, 2012 at 3:28 PM, Tom Warren TWarren@nvidia.com wrote:
Simon,
-----Original Message----- From: Simon Glass [mailto:sjg@chromium.org] Sent: Monday, November 05, 2012 4:21 PM To: U-Boot Mailing List Cc: Tom Warren; Stephen Warren; Simon Glass; Stephen Warren Subject: [PATCH 1/2] tegra: Remove unnecessary CONFIG_SYS_NAND_BASE
Now that we are using the new CONFIG_SYS_NAND_SELF_INIT setup, we don't need CONFIG_SYS_NAND_BASE. Punt it.
Signed-off-by: Simon Glass sjg@chromium.org
include/configs/seaboard.h | 3 --- include/configs/tec.h | 1 - 2 files changed, 0 insertions(+), 4 deletions(-)
Harmony.h uses it, too.
Oh right. The two harmonies on my windowsill are staring at me. I will update it.
Regards, Simon
Tom
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 7680c77..3fca8d9 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -124,7 +124,4 @@
/* Max number of NAND devices */ #define CONFIG_SYS_MAX_NAND_DEVICE 1
-/* Somewhat oddly, the NAND base address must be a config option */ -#define CONFIG_SYS_NAND_BASE NV_PA_NAND_BASE #endif /* __CONFIG_H */ diff --git a/include/configs/tec.h b/include/configs/tec.h index 140d2e6..200cf66 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -54,7 +54,6 @@ #define CONFIG_CMD_NAND #define CONFIG_TEGRA_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BASE NV_PA_NAND_BASE
/* Environment in NAND, aligned to start of last sector */ #define CONFIG_ENV_IS_IN_NAND -- 1.7.7.3
-- nvpublic
participants (3)
-
Simon Glass
-
Stephen Warren
-
Tom Warren