Merge git://www.denx.de/git/u-boot-marvell

[people/ms/u-boot.git] / include / configs / pepper.h

diff --git a/include/configs/pepper.h b/include/configs/pepper.h
index 1bc8c4b7fa7eafab74db7a907ba58e0a38805419..6034baa63410a12aba33ff6047f6d9ec578abba6 100644 (file)
--- a/include/configs/pepper.h
+++ b/include/configs/pepper.h
@@ -7,12 +7,8 @@
 #ifndef __CONFIG_PEPPER_H
 #define __CONFIG_PEPPER_H
 
-#define CONFIG_MMC
 #include <configs/ti_am335x_common.h>
 
-#undef CONFIG_BOARD_LATE_INIT
-#undef CONFIG_SPL_OS_BOOT
-
 /* Clock defines */
 #define V_OSCK                         24000000  /* Clock output from T2 */
 #define V_SCLK                         (V_OSCK)
@@ -25,8 +21,6 @@
 
 #define CONFIG_ENV_SIZE                        (128 << 10)     /* 128 KiB */
 #define CONFIG_ENV_IS_NOWHERE
-/* Display cpuinfo */
-#define CONFIG_DISPLAY_CPUINFO
 
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -93,6 +87,6 @@
 #define CONFIG_PHY_RESET_DELAY 1000
 
 /* SPL */
-#define CONFIG_SPL_LDSCRIPT            "$(CPUDIR)/am33xx/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT            "arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
 
 #endif /* __CONFIG_PEPPER_H */