global: Migrate CONFIG_MXC_USB_FLAGS et al to CFG

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

diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 9fd8979..cd9d21e 100644 (file)
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -159,16 +159,11 @@
 /* PSRAM */
 #define        PHYS_PSRAM                      0x70000000
 #define        PHYS_PSRAM_SIZE                 0x00400000      /* 4MB */
-/* Slave EBI1, PSRAM connected */
-#define CONFIG_PSRAM_SCFG              (AT91_MATRIX_SCFG_ARBT_FIXED_PRIORITY   | \
-                                        AT91_MATRIX_SCFG_FIXED_DEFMSTR(5)      | \
-                                        AT91_MATRIX_SCFG_DEFMSTR_TYPE_FIXED    | \
-                                        AT91_MATRIX_SCFG_SLOT_CYCLE(255))
 
 /* USB */
 #define CFG_SYS_USB_OHCI_REGS_BASE             0x00a00000      /* AT91SAM9263_UHP_BASE */
 
-#define CONFIG_EXTRA_ENV_SETTINGS                              \
+#define CFG_EXTRA_ENV_SETTINGS                         \
        "partition=nand0,0\0"                                   \
        "ramargs=setenv bootargs $(bootargs) $(mtdparts)\0"     \
        "nfsargs=setenv bootargs root=/dev/nfs rw "             \