[U-Boot] [PATCH 1/3] BOOT: Fix unused variable issue when enabling bootz support
From: Stephen Warren swarren@nvidia.com
cmd_bootm.c: In function 'do_bootz': cmd_bootm.c:1590:9: warning: variable 'iflag' set but not used [-Wunused-but-set-variable]
Cc: Marek Vasut marek.vasut@gmail.com Cc: Wolfgang Denk wd@denx.de Signed-off-by: Stephen Warren swarren@nvidia.com --- I think this is best taken through the Tegra tree, since it's needed to avoid introducing warnings when enabling CONFIG_CMD_BOOTZ, which the next patch enables, and we don't want MAKEALL -s tegra2 to suddenly start giving warnings. --- common/cmd_bootm.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 5685232..45e726a 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -1587,7 +1587,6 @@ static int bootz_start(cmd_tbl_t *cmdtp, int flag, int argc,
static int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - ulong iflag; bootm_headers_t images;
if (bootz_start(cmdtp, flag, argc, argv, &images)) @@ -1598,7 +1597,7 @@ static int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * overwrite all exception vector code, so we cannot easily * recover from any failures any more... */ - iflag = disable_interrupts(); + disable_interrupts();
#if defined(CONFIG_CMD_USB) /*
From: Stephen Warren swarren@nvidia.com
bootz is just like bootm, except that it can boot a raw zImage, without requiring it to be wrapped inside a uImage.
Signed-off-by: Stephen Warren swarren@nvidia.com --- include/configs/tegra2-common.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/configs/tegra2-common.h b/include/configs/tegra2-common.h index 8393901..74f1140 100644 --- a/include/configs/tegra2-common.h +++ b/include/configs/tegra2-common.h @@ -195,4 +195,5 @@ #define CONFIG_TEGRA_GPIO #define CONFIG_CMD_GPIO #define CONFIG_CMD_ENTERRCM +#define CONFIG_CMD_BOOTZ #endif /* __TEGRA2_COMMON_H */
From: Stephen Warren swarren@nvidia.com
These variables act like loadaddr, but for a device tree image. Defining them in the environment allows boot scripts to be identical on Tegra20 and Tegra30, which have different memory base addresses, and hence need different values for these variables.
Signed-off-by: Stephen Warren swarren@nvidia.com --- include/configs/tegra2-common-post.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/include/configs/tegra2-common-post.h b/include/configs/tegra2-common-post.h index 80d9c35..c21fc28 100644 --- a/include/configs/tegra2-common-post.h +++ b/include/configs/tegra2-common-post.h @@ -142,6 +142,8 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ TEGRA2_DEVICE_SETTINGS \ + "fdt_load=0x01000000\0" \ + "fdt_high=01100000\0" \ BOOTCMDS_COMMON
#endif /* __TEGRA2_COMMON_POST_H */
Dear Stephen Warren,
From: Stephen Warren swarren@nvidia.com
cmd_bootm.c: In function 'do_bootz': cmd_bootm.c:1590:9: warning: variable 'iflag' set but not used [-Wunused-but-set-variable]
It can be applied directly too ...
Acked-by: Marek Vasut marex@denx.de
Cc: Marek Vasut marek.vasut@gmail.com Cc: Wolfgang Denk wd@denx.de Signed-off-by: Stephen Warren swarren@nvidia.com
I think this is best taken through the Tegra tree, since it's needed to avoid introducing warnings when enabling CONFIG_CMD_BOOTZ, which the next patch enables, and we don't want MAKEALL -s tegra2 to suddenly start giving warnings.
common/cmd_bootm.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 5685232..45e726a 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -1587,7 +1587,6 @@ static int bootz_start(cmd_tbl_t *cmdtp, int flag, int argc,
static int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) {
ulong iflag; bootm_headers_t images;
if (bootz_start(cmdtp, flag, argc, argv, &images))
@@ -1598,7 +1597,7 @@ static int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * overwrite all exception vector code, so we cannot easily * recover from any failures any more... */
- iflag = disable_interrupts();
- disable_interrupts();
#if defined(CONFIG_CMD_USB) /*
Best regards, Marek Vasut
Stephen,
-----Original Message----- From: Stephen Warren [mailto:swarren@wwwdotorg.org] Sent: Wednesday, June 13, 2012 12:55 PM To: Tom Warren Cc: u-boot@lists.denx.de; Stephen Warren; Marek Vasut; Wolfgang Denk Subject: [PATCH 1/3] BOOT: Fix unused variable issue when enabling bootz support
This series (3 patches) has been applied to u-boot-tegra/master. Thanks!
Tom
From: Stephen Warren swarren@nvidia.com
cmd_bootm.c: In function 'do_bootz': cmd_bootm.c:1590:9: warning: variable 'iflag' set but not used [-Wunused- but-set-variable]
Cc: Marek Vasut marek.vasut@gmail.com Cc: Wolfgang Denk wd@denx.de Signed-off-by: Stephen Warren swarren@nvidia.com
I think this is best taken through the Tegra tree, since it's needed to avoid introducing warnings when enabling CONFIG_CMD_BOOTZ, which the next patch enables, and we don't want MAKEALL -s tegra2 to suddenly start giving warnings.
common/cmd_bootm.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 5685232..45e726a 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -1587,7 +1587,6 @@ static int bootz_start(cmd_tbl_t *cmdtp, int flag, int argc,
static int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) {
ulong iflag; bootm_headers_t images;
if (bootz_start(cmdtp, flag, argc, argv, &images)) @@ -1598,7 +1597,7
@@ static int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * overwrite all exception vector code, so we cannot easily * recover from any failures any more... */
- iflag = disable_interrupts();
- disable_interrupts();
#if defined(CONFIG_CMD_USB) /* -- 1.7.0.4
participants (3)
-
Marek Vasut -
Stephen Warren -
Tom Warren