diff options
| author | Stefano Babic <sbabic@denx.de> | 2015-07-10 07:21:44 (GMT) |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-07-10 07:21:44 (GMT) |
| commit | 1254ff97abb7606ccd0d7bdcd9f22581c50fe535 (patch) | |
| tree | 61b31e61173154abd38aaa6584e84ea77314b861 /include/configs/omap5_uevm.h | |
| parent | 54e0f96f764f662be186baae7d6c2c97423bc29d (diff) | |
| parent | f3edfd30541d6f245d7dfa6fa7354cc916cc53e1 (diff) | |
| download | u-boot-1254ff97abb7606ccd0d7bdcd9f22581c50fe535.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'include/configs/omap5_uevm.h')
| -rw-r--r-- | include/configs/omap5_uevm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 4215156..8647921 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -12,10 +12,12 @@ #ifndef __CONFIG_OMAP5_EVM_H #define __CONFIG_OMAP5_EVM_H +#ifndef CONFIG_SPL_BUILD /* Define the default GPT table for eMMC */ #define PARTS_DEFAULT \ "uuid_disk=${uuid_gpt_disk};" \ "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}" +#endif #include <configs/ti_omap5_common.h> @@ -31,7 +33,6 @@ #define CONFIG_ENV_OFFSET 0xE0000 #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#define CONFIG_CMD_SAVEENV /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT @@ -59,7 +60,6 @@ /* Enabled commands */ #define CONFIG_CMD_DHCP /* DHCP Support */ -#define CONFIG_CMD_NFS /* NFS support */ /* USB Networking options */ #define CONFIG_USB_HOST_ETHER |