This should not really be a CONFIG option since it is only used as a way of controlling another option. Rename it and remove it from the whitelist.
Signed-off-by: Simon Glass sjg@chromium.org ---
include/configs/tegra-common.h | 2 +- include/configs/tegra114-common.h | 2 +- include/configs/tegra124-common.h | 2 +- include/configs/tegra186-common.h | 2 +- include/configs/tegra20-common.h | 2 +- include/configs/tegra210-common.h | 2 +- include/configs/tegra30-common.h | 2 +- scripts/config_whitelist.txt | 1 - 8 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 63b711b..91d7e57 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -94,7 +94,7 @@
#define CONFIG_SYS_BOOTMAPSZ (256 << 20) /* 256M */
-#define CONFIG_SYS_INIT_RAM_ADDR CONFIG_STACKBASE +#define CONFIG_SYS_INIT_RAM_ADDR TEGRA_STACKBASE #define CONFIG_SYS_INIT_RAM_SIZE CONFIG_SYS_MALLOC_LEN #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - \ diff --git a/include/configs/tegra114-common.h b/include/configs/tegra114-common.h index 107a0f8..89f954f 100644 --- a/include/configs/tegra114-common.h +++ b/include/configs/tegra114-common.h @@ -16,7 +16,7 @@ /* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x82800000 /* 40MB */ +#define TEGRA_STACKBASE 0x82800000 /* 40MB */
/*----------------------------------------------------------------------- * Physical Memory Map diff --git a/include/configs/tegra124-common.h b/include/configs/tegra124-common.h index 8cf9bac..0e6d281 100644 --- a/include/configs/tegra124-common.h +++ b/include/configs/tegra124-common.h @@ -18,7 +18,7 @@ /* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x82800000 /* 40MB */ +#define TEGRA_STACKBASE 0x82800000 /* 40MB */
/*----------------------------------------------------------------------- * Physical Memory Map diff --git a/include/configs/tegra186-common.h b/include/configs/tegra186-common.h index 98e4fc2..fba88b1 100644 --- a/include/configs/tegra186-common.h +++ b/include/configs/tegra186-common.h @@ -17,7 +17,7 @@ /* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x82800000 /* 40MB */ +#define TEGRA_STACKBASE 0x82800000 /* 40MB */
/*----------------------------------------------------------------------- * Physical Memory Map diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h index 793310f..d1f10c9 100644 --- a/include/configs/tegra20-common.h +++ b/include/configs/tegra20-common.h @@ -24,7 +24,7 @@ /* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x02800000 /* 40MB */ +#define TEGRA_STACKBASE 0x02800000 /* 40MB */
/*----------------------------------------------------------------------- * Physical Memory Map diff --git a/include/configs/tegra210-common.h b/include/configs/tegra210-common.h index 874fe34d..6d493bd 100644 --- a/include/configs/tegra210-common.h +++ b/include/configs/tegra210-common.h @@ -18,7 +18,7 @@ /* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x82800000 /* 40MB */ +#define TEGRA_STACKBASE 0x82800000 /* 40MB */
/*----------------------------------------------------------------------- * Physical Memory Map diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h index baf3d00..655a863 100644 --- a/include/configs/tegra30-common.h +++ b/include/configs/tegra30-common.h @@ -23,7 +23,7 @@ /* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x82800000 /* 40MB */ +#define TEGRA_STACKBASE 0x82800000 /* 40MB */
/*----------------------------------------------------------------------- * Physical Memory Map diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8814841..e79486d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4242,7 +4242,6 @@ CONFIG_SSI2_FREQ CONFIG_SSP1_BASE CONFIG_SSP2_BASE CONFIG_SSP3_BASE -CONFIG_STACKBASE CONFIG_STACKSIZE CONFIG_STACKSIZE_FIQ CONFIG_STACKSIZE_IRQ