diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-07-21 22:17:36 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-01-17 09:17:26 -0500 |
| commit | 76d82187c6cccbcd8d514015c3b283f05ee8ac5c (patch) | |
| tree | c6b3c90c469c7a61ee6b14854565eecb30f1e92f /lib_blackfin | |
| parent | 2ff6922280025c1315c53fa2eb4ab33f0c9591de (diff) | |
| download | u-boot-imx-76d82187c6cccbcd8d514015c3b283f05ee8ac5c.zip u-boot-imx-76d82187c6cccbcd8d514015c3b283f05ee8ac5c.tar.gz u-boot-imx-76d82187c6cccbcd8d514015c3b283f05ee8ac5c.tar.bz2 | |
Blackfin: tweak embedded LDR env config option
Use the common config option for extracting the environment for embedding
into LDR files and clarify the LDR-specific option.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'lib_blackfin')
| -rw-r--r-- | lib_blackfin/config.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib_blackfin/config.mk b/lib_blackfin/config.mk index ce2fe67..323d28f 100644 --- a/lib_blackfin/config.mk +++ b/lib_blackfin/config.mk @@ -43,6 +43,11 @@ endif ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS) ALL += $(obj)u-boot.ldr endif +ifeq ($(CONFIG_ENV_IS_EMBEDDED_IN_LDR),y) +CREATE_LDR_ENV = $(obj)tools/envcrc --binary > $(obj)env-ldr.o +else +CREATE_LDR_ENV = +endif SYM_PREFIX = _ @@ -53,9 +58,8 @@ LDR_FLAGS += --bmode $(subst BFIN_BOOT_,,$(CONFIG_BFIN_BOOT_MODE)) LDR_FLAGS += --use-vmas LDR_FLAGS += --initcode $(obj)cpu/$(CPU)/initcode.o ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_UART) -ifneq ($(ENV_IS_EMBEDDED_CUSTOM),ENV_IS_EMBEDDED_CUSTOM) -LDR_FLAGS += --punchit $$(($(CONFIG_ENV_OFFSET))):$$(($(CONFIG_ENV_SIZE))):$(obj)env-ldr.o -endif +LDR_FLAGS-$(CONFIG_ENV_IS_EMBEDDED_IN_LDR) += \ + --punchit $$(($(CONFIG_ENV_OFFSET))):$$(($(CONFIG_ENV_SIZE))):$(obj)env-ldr.o endif ifneq (,$(findstring s,$(MAKEFLAGS))) LDR_FLAGS += --quiet |