Merge branch 'master' of git://git.denx.de/u-boot-microblaze

[karo-tx-uboot.git] / include / configs / omap5_evm.h

diff --git a/include/configs/omap5_evm.h b/include/configs/omap5_evm.h
index 60c7a291c020ddbcbcb862349f6e0914b73b50ab..c5874bbf67b6d6d077df2697c5a7788292268726 100644 (file)
--- a/include/configs/omap5_evm.h
+++ b/include/configs/omap5_evm.h
@@ -50,8 +50,6 @@
 /* Clock Defines */
 #define V_OSCK                 19200000        /* Clock output from T2 */
 #define V_SCLK V_OSCK
-#define CONFIG_SYS_CLOCKS_ENABLE_ALL   1       /* Enable all clocks */
-#define CONFIG_SYS_ENABLE_PADS_ALL     1       /* Enable all PADS for now */
 
 #undef CONFIG_USE_IRQ  /* no support for IRQs */
 #define CONFIG_MISC_INIT_R
@@ -261,7 +259,7 @@
 #define CONFIG_SPL_FAT_SUPPORT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
-#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv7/omap-common/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
 
 /*
  * 64 bytes before this address should be set aside for u-boot.img's