From: Tom Rini <trini@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 06/11] spl: Make CONFIG_SPL_ENV_SUPPORT have to be set by all users of env in SPL
Date: Thu, 26 Sep 2013 16:28:02 -0400 [thread overview]
Message-ID: <1380227287-26057-7-git-send-email-trini@ti.com> (raw)
In-Reply-To: <1380227287-26057-1-git-send-email-trini@ti.com>
Previously, we forced a "no environment" choice on network using SPL.
Now we allow all users to set where they want to look for their
environment. This means we have to set CONFIG_SPL_ENV_SUPPORT now for
ti_armv7_common.h.
Signed-off-by: Tom Rini <trini@ti.com>
---
common/Makefile | 4 +---
include/configs/ti_armv7_common.h | 1 +
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/common/Makefile b/common/Makefile
index 288690b..4568388 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -197,17 +197,15 @@ COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o
COBJS-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o
# environment
+ifeq ($(CONFIG_SPL_ENV_SUPPORT),y)
COBJS-$(CONFIG_SPL_ENV_SUPPORT) += env_attr.o
COBJS-$(CONFIG_SPL_ENV_SUPPORT) += env_flags.o
COBJS-$(CONFIG_SPL_ENV_SUPPORT) += env_callback.o
-ifneq ($(CONFIG_SPL_NET_SUPPORT),y)
COBJS-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
COBJS-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
COBJS-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
-else
-COBJS-y += env_nowhere.o
endif
endif
# core command
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 32110f6..d15850b 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -202,6 +202,7 @@
#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
#ifdef CONFIG_SPL_OS_BOOT
+#define CONFIG_SPL_ENV_SUPPORT /* For 'boot_os' and similar */
#define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + 0x100)
/* FAT */
--
1.7.9.5
next prev parent reply other threads:[~2013-09-26 20:28 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-26 20:27 [U-Boot] [PATCH 00/11] NAND/MMC environment in SPL, Falcon Mode enhancements Tom Rini
2013-09-26 20:27 ` [U-Boot] [PATCH 01/11] fw_env.c: Increase max dev path to 32 Tom Rini
2013-10-05 20:02 ` Wolfgang Denk
2013-10-06 20:55 ` Tom Rini
2013-10-07 5:47 ` Wolfgang Denk
2013-10-07 12:06 ` Tom Rini
2013-09-26 20:27 ` [U-Boot] [PATCH 02/11] env_mmc.c: Make the non-redundant env_relocate_spec use malloc not stack Tom Rini
2013-10-05 20:00 ` Wolfgang Denk
2013-10-06 20:40 ` Tom Rini
2013-10-07 5:41 ` Wolfgang Denk
2013-09-26 20:27 ` [U-Boot] [PATCH 03/11] env_mmc.c: Allow environment to be used within SPL Tom Rini
2013-09-26 20:28 ` [U-Boot] [PATCH 04/11] mtd: Add a CONFIG_SPL_MTD_SUPPORT for a more full NAND subsystem in SPL Tom Rini
2013-09-26 20:39 ` Scott Wood
2013-09-26 20:28 ` [U-Boot] [PATCH 05/11] mtd: Build nand_util.o for CONFIG_ENV_IS_IN_NAND " Tom Rini
2013-09-26 20:42 ` Scott Wood
2013-09-26 20:45 ` Tom Rini
2013-09-26 20:51 ` Scott Wood
2013-09-26 21:14 ` Tom Rini
2013-09-26 20:28 ` Tom Rini [this message]
2013-09-26 20:28 ` [U-Boot] [PATCH 07/11] am335x_evm: Make SPL_OS also check the boot_os variable for falcon mode Tom Rini
2013-09-26 20:28 ` [U-Boot] [PATCH 08/11] README: Add CONFIG_SPL_OS_BOOT to README Tom Rini
2013-09-26 20:28 ` [U-Boot] [PATCH 09/11] README.falcon: Document environment variables for falcon mode Tom Rini
2013-09-26 20:28 ` [U-Boot] [PATCH 10/11] a3m071: Make spl_start_uboot test like getenv_yesno does Tom Rini
2013-09-27 7:04 ` Stefan Roese
2013-09-26 20:28 ` [U-Boot] [PATCH 11/11] spl_mmc/CONFIG_SPL_OS_BOOT: Allow environment to determine what to boot Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1380227287-26057-7-git-send-email-trini@ti.com \
--to=trini@ti.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox