xtensa: clean up CONFIG_SYS_TEXT_ADDR

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

diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h
index 2fa280e7eede90af6796267a6129801efa6aede7..d9a50cacf288b193885b415b0fbef627e1aa0626 100644 (file)
--- a/include/configs/pengwyn.h
+++ b/include/configs/pengwyn.h
@@ -82,8 +82,8 @@
                "tftp ${fdtaddr} ${fdtfile}; " \
                "run netargs; " \
                "bootz ${loadaddr} - ${fdtaddr}\0" \
-       "mtdids=" MTDIDS_DEFAULT "\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandargs=setenv bootargs console=${console} " \
                "${optargs} " \
                "root=${nandroot} " \
@@ -148,14 +148,7 @@
 /* #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 */
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x200000
 
-#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)," \
-                                       "512k(SPL.backup1)," \
-                                       "512k(SPL.backup2)," \
-                                       "512k(SPL.backup3),1536k(u-boot)," \
-                                       "512k(u-boot-spl-os)," \
-                                       "512k(u-boot-env),5m(kernel),-(rootfs)"
 #define CONFIG_ENV_OFFSET              0x260000 /* environment starts here */
 #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */
 /* NAND: SPL falcon mode configs */
@@ -169,8 +162,6 @@
  * board schematic and physical port wired to each.  Then for host we
  * add mass storage support.
  */
-#define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE        MUSB_PERIPHERAL