Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit e48e4d8dd54b1d8ca3201824204d776c48b5ed02

Authored by Lokesh Vutla
1 parent d42be546fc
Exists in v2015.07-smarct4x and in 3 other branches ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc

ARM: AM43xx: configs: Fix enabling of saveenv 

commit 319a9963e68a ("am43xx: Add USB device boot support to SPL")
tries to disable env for for SPL with CONFIG_SPL_USBETH_SUPPORT but
it also disables env for all non SPL builds.
Fix it by disabling env for SPL with CONFIG_SPL_USBETH_SUPPORT.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

Showing 1 changed file with 5 additions and 2 deletions Side-by-side Diff

include/configs/am43xx_evm.h
Diff comments   View file @ e48e4d8
... ... @@ -123,8 +123,6 @@
123 123 /* USB GADGET */
124 124 #if !defined(CONFIG_SPL_BUILD) || \
125 125 (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT))
126   -#undef CONFIG_ENV_IS_IN_FAT
127   -#define CONFIG_ENV_IS_NOWHERE
128 126 #define CONFIG_USB_DWC3_PHY_OMAP
129 127 #define CONFIG_USB_DWC3_OMAP
130 128 #define CONFIG_USB_DWC3
... ... @@ -140,6 +138,11 @@
140 138 #define CONFIG_G_DNL_VENDOR_NUM 0x0403
141 139 #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00
142 140 #define CONFIG_USB_GADGET_DUALSPEED
  141 +#endif
  142 +
  143 +#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT))
  144 +#undef CONFIG_ENV_IS_IN_FAT
  145 +#define CONFIG_ENV_IS_NOWHERE
143 146 #endif
144 147  
145 148 #if defined(CONFIG_SPL_USBETH_SUPPORT) || defined(CONFIG_SPL_ETH_SUPPORT)