Message ID | 1441777364-30172-1-git-send-email-thomas@wytron.com.tw |
---|---|
State | Accepted, archived |
Delegated to: | Thomas Chou |
Headers | show |
On Wednesday, September 09, 2015 at 07:42:44 AM, Thomas Chou wrote: > There is a weak version_string[] at common/cmd_version.c . > Remove the one in start.S. > > Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Acked-by: Marek Vasut <marex@denx.de> Best regards, Marek Vasut
On 09/09/2015 01:42 PM, Thomas Chou wrote: > There is a weak version_string[] at common/cmd_version.c . > Remove the one in start.S. > > Signed-off-by: Thomas Chou <thomas@wytron.com.tw> > --- > arch/nios2/cpu/start.S | 6 ------ > 1 file changed, 6 deletions(-) Applied to u-boot-nios.
diff --git a/arch/nios2/cpu/start.S b/arch/nios2/cpu/start.S index e92f06e..5c7074e 100644 --- a/arch/nios2/cpu/start.S +++ b/arch/nios2/cpu/start.S @@ -174,9 +174,3 @@ relocate_code: ori r8, r8, %lo(board_init_r@h) callr r8 ret - - .data - .globl version_string - -version_string: - .ascii U_BOOT_VERSION_STRING, "\0"
There is a weak version_string[] at common/cmd_version.c . Remove the one in start.S. Signed-off-by: Thomas Chou <thomas@wytron.com.tw> --- arch/nios2/cpu/start.S | 6 ------ 1 file changed, 6 deletions(-)