configs: at91sam9260ek/9g20ek: Update for DT and DM

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

diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h
index a2f6dab294d4594162a3075ccef12fe81c91d9a3..cdfaf7c912386245129d7bfe3c4421c7425003d9 100644 (file)
--- a/include/configs/pengwyn.h
+++ b/include/configs/pengwyn.h
@@ -104,7 +104,6 @@
 
 /* NS16550 Configuration: primary UART via FTDI */
 #define CONFIG_SYS_NS16550_COM1                0x44e09000
-#define CONFIG_BAUDRATE                        115200
 
 /* I2C Configuration */
 #define        CONFIG_SYS_I2C_SPEED            100000
@@ -114,11 +113,6 @@
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
 
 /* SPL */
-#define CONFIG_SPL_POWER_SUPPORT
-#define CONFIG_SPL_YMODEM_SUPPORT
-
-/* General network SPL */
-#define CONFIG_SPL_NET_SUPPORT
 
 /* NAND support */
 #define CONFIG_CMD_NAND
@@ -161,8 +155,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)," \
@@ -188,7 +180,6 @@
  * add mass storage support.
  */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_ARCH_MISC_INIT
 #define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
@@ -212,6 +203,6 @@
 
 /* CPSW support */
 
-#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_PENGWYN_H */