Patchwork [U-Boot] nios2: Make STANDALONE_LOAD_ADDR configurable per board

login
register
mail settings
Submitter Thomas Chou
Date April 17, 2011, 2:52 a.m.
Message ID <1303008766-13773-1-git-send-email-thomas@wytron.com.tw>
Download mbox | patch
Permalink /patch/91528/
State Accepted
Commit e09e083f7ff1b0140c5d5a2bdc29902b7b23ffba
Delegated to: Scott McNutt
Headers show

Comments

Thomas Chou - April 17, 2011, 2:52 a.m.
Follow commit 8ae86b76c648d8bef97241c78e2fddb1c4f164d3
which changed the variable name.

Fix this error,
nios2-elf-ld: invalid hex number `-o'

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
---
for u-boot

 arch/nios2/config.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Scott McNutt - May 13, 2011, 12:34 p.m.
Thomas,

Applied to git://git.denx.de/u-boot-nios.git next

Thanks,
--Scott

Thomas Chou wrote:
> Follow commit 8ae86b76c648d8bef97241c78e2fddb1c4f164d3
> which changed the variable name.
> 
> Fix this error,
> nios2-elf-ld: invalid hex number `-o'
> 
> Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
> ---
> for u-boot
> 
>  arch/nios2/config.mk |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/nios2/config.mk b/arch/nios2/config.mk
> index d241a96..6890018 100644
> --- a/arch/nios2/config.mk
> +++ b/arch/nios2/config.mk
> @@ -24,7 +24,7 @@
>  
>  CROSS_COMPILE ?= nios2-elf-
>  
> -STANDALONE_LOAD_ADDR ?= 0x02000000
> +CONFIG_STANDALONE_LOAD_ADDR ?= 0x02000000
>  
>  PLATFORM_CPPFLAGS += -DCONFIG_NIOS2 -D__NIOS2__
>  PLATFORM_CPPFLAGS += -G0

Patch

diff --git a/arch/nios2/config.mk b/arch/nios2/config.mk
index d241a96..6890018 100644
--- a/arch/nios2/config.mk
+++ b/arch/nios2/config.mk
@@ -24,7 +24,7 @@ 
 
 CROSS_COMPILE ?= nios2-elf-
 
-STANDALONE_LOAD_ADDR ?= 0x02000000
+CONFIG_STANDALONE_LOAD_ADDR ?= 0x02000000
 
 PLATFORM_CPPFLAGS += -DCONFIG_NIOS2 -D__NIOS2__
 PLATFORM_CPPFLAGS += -G0