Merge git://git.denx.de/u-boot-dm

[platform/kernel/u-boot.git] / include / configs / pengwyn.h

diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h
index b8fb371..9c8720b 100644 (file)
--- a/include/configs/pengwyn.h
+++ b/include/configs/pengwyn.h
@@ -107,7 +107,6 @@
 
 /* I2C Configuration */
 #define        CONFIG_SYS_I2C_SPEED            100000
-#define CONFIG_CMD_EEPROM
 #define CONFIG_ENV_EEPROM_IS_ON_I2C
 #define CONFIG_SYS_I2C_EEPROM_ADDR     0x50
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
@@ -155,8 +154,6 @@
 
 #define CONFIG_CMD_MTDPARTS
 
-#define CONFIG_CMD_DIAG /* monitor functions : Diagnostics */
-
 #define MTDIDS_DEFAULT                 "nand0=omap2-nand.0"
 /* Size must be a multiple of Nand erase size (524288 b) */
 #define MTDPARTS_DEFAULT               "mtdparts=omap2-nand.0:512k(SPL)," \
@@ -205,6 +202,6 @@
 
 /* CPSW support */
 
-#define CONFIG_SPL_LDSCRIPT            "arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT            "arch/arm/mach-omap2/u-boot-spl.lds"
 
 #endif /* ! __CONFIG_PENGWYN_H */