BOOT: Fix unused variable issue when enabling bootz support
PATCH 1/3 BOOT: Fix unused variable issue when enabling bootz support
From: Stephen Warren <[email protected]>
cmd_bootm.c: In function 'do_bootz':
cmd_bootm.c:1590:9: warning: variable 'iflag' set but not used [-Wunused-but-set-variable]
---
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(-)
common/cmd_bootm.c +1 -2
@@ -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 )/*
Signature · 1 line
1.7.0.4
PATCH 2/3 tegra: enable bootz command
From: Stephen Warren <[email protected]>
bootz is just like bootm, except that it can boot a raw zImage, without requiring it to be wrapped inside a uImage.
--- include/configs/tegra2-common.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
include/configs/tegra2-common.h +1 -0
@@ -195,4 +195,5 @@#define CONFIG_TEGRA_GPIO #define CONFIG_CMD_GPIO #define CONFIG_CMD_ENTERRCM +#define CONFIG_CMD_BOOTZ #endif /* __TEGRA2_COMMON_H */
Signature · 1 line
1.7.0.4
PATCH 3/3 tegra: define fdt_load/fdt_high variables
In reply to Stephen WarrenFrom: Stephen Warren <[email protected]>
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.
--- include/configs/tegra2-common-post.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
include/configs/tegra2-common-post.h +2 -0
@@ -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 */
Signature · 1 line
1.7.0.4
PATCH 1/3 BOOT: Fix unused variable issue when enabling bootz support
In reply to Stephen WarrenDear Stephen Warren,
Quoted 5 lines
From: Stephen Warren <[email protected]>
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 ...
Quoted 28 lines
Cc Marek Vasut <[email protected]>Cc Wolfgang Denk <[email protected]>Signed-off-by Stephen Warren <[email protected]>---
I think this is best taken through the Tegra tree, since it's needed to avoid introducing warnings when enablingCONFIG_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(-)common/cmd_bootm.c +0
-1@@ -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;common/cmd_bootm.c +0
-0if (bootz_start (cmdtp, flag, argc, argv, &images))@@ -1598,7 +1597,7 @@ static int do_bootz(cmd_tbl_t *cmdtp, int flag, intargc, char * const argv[]) * overwrite all exception vector code, so we cannot easily
common/cmd_bootm.c static int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) · line 1603
Quoted 7 lines
common/cmd_bootm.c +1
-1* recover from any failures any more... */ - iflag =disable_interrupts (); +disable_interrupts ();#if defined(CONFIG_CMD_USB )/*
Best regards,
Marek Vasut
PATCH 1/3 BOOT: Fix unused variable issue when enabling bootz support
In reply to Stephen WarrenStephen,
Quoted 7 lines
-----Original Message-----
From: Stephen Warren [mailto:swarren at wwwdotorg.org]
Sent: Wednesday, June 13, 2012 12:55 PM
To: Tom Warren
Cc: u-boot at 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
Quoted 44 lines
From: Stephen Warren <[email protected]>
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 <[email protected]>Cc Wolfgang Denk <[email protected]>Signed-off-by Stephen Warren <[email protected]>---
I think this is best taken through the Tegra tree, since it's needed to avoid introducing warnings when enablingCONFIG_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(-)common/cmd_bootm.c index 5685232..45e726a renamed from common/cmd_bootm.c +0
-0100644
common/cmd_bootm.c +0
-1@@ -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 intdo_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])common/cmd_bootm.c +1
-2* 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
Signature · 1 line
nvpublic