summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-06-12 20:52:29 -0400
committerTom Rini <trini@konsulko.com>2015-06-15 10:57:28 -0400
commit08520bf5e4da36ec4a190e7234cac3e7641dc6d5 (patch)
tree51649d92d6961232df22ec53881a48294d4e8423
parent6ce8932494043246667979b3efacdee5e4ec5dfd (diff)
downloadtalos-obmc-uboot-08520bf5e4da36ec4a190e7234cac3e7641dc6d5.tar.gz
talos-obmc-uboot-08520bf5e4da36ec4a190e7234cac3e7641dc6d5.zip
omap5: Exclude more environment from SPL builds
In the cases where we make use of environment in SPL we do not need these defaults compiled in and available. These are taking up space that in some cases now prevent linking, so drop. Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r--include/configs/dra7xx_evm.h2
-rw-r--r--include/configs/omap5_uevm.h2
-rw-r--r--include/configs/ti_omap5_common.h2
3 files changed, 6 insertions, 0 deletions
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index edd51a22bd..24fe1231f1 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -42,6 +42,7 @@
#define CONFIG_SYS_OMAP_ABE_SYSCK
+#ifndef CONFIG_SPL_BUILD
/* Define the default GPT table for eMMC */
#define PARTS_DEFAULT \
"uuid_disk=${uuid_gpt_disk};" \
@@ -95,6 +96,7 @@
#define CONFIG_USB_FASTBOOT_BUF_SIZE 0x2F000000
#define CONFIG_FASTBOOT_FLASH
#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1
+#endif
#include <configs/ti_omap5_common.h>
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index 4215156063..cb12c6c2ac 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>
diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index 4faffef047..3da7816527 100644
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -71,6 +71,7 @@
#define DFUARGS
#endif
+#ifndef CONFIG_SPL_BUILD
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \
@@ -146,6 +147,7 @@
"setenv mmcroot /dev/mmcblk0p2 rw; " \
"run mmcboot;" \
""
+#endif
/*
OpenPOWER on IntegriCloud