| Message ID | 20200127080453.413719-1-nathan@nathanrossi.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | cmd: Handle CONFIG_(SPL_)ENV_SUPPORT for toggling the nvedit object | expand |
On Mon, Jan 27, 2020 at 08:04:53AM +0000, Nathan Rossi wrote: > When CONFIG_SPL_ENV_SUPPORT is disabled, nvedit was still being included > as part of the build. Use the CONFIG_SPL_ENV_SUPPORT value as well as > the non SPL CONFIG_ENV_SUPPORT variable to enable/disable the inclusion > of nvedit. > > Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> This breaks a number of platforms such as P1010RDB-PB_NAND please address and resubmit, thanks!
diff --git a/cmd/Makefile b/cmd/Makefile index 4f29b72c69..90dc09d095 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -186,7 +186,7 @@ endif # !CONFIG_SPL_BUILD obj-$(CONFIG_$(SPL_)CMD_TLV_EEPROM) += tlv_eeprom.o # core command -obj-y += nvedit.o +obj-$(CONFIG_$(SPL_)ENV_SUPPORT) += nvedit.o obj-$(CONFIG_TI_COMMON_CMD_OPTIONS) += ti/
When CONFIG_SPL_ENV_SUPPORT is disabled, nvedit was still being included as part of the build. Use the CONFIG_SPL_ENV_SUPPORT value as well as the non SPL CONFIG_ENV_SUPPORT variable to enable/disable the inclusion of nvedit. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> --- cmd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 2.24.1