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

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

diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index bf48b2f831ff0bee41e2bc987bb24453c6e00e6f..c3b0f4d47edcf34c8c301bddac860d8d67a617fa 100644 (file)
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -136,16 +136,7 @@ unsigned long get_board_ddr_clk(void);
 #define CFG_LPUART_EN          0x2
 #endif
 
-/* USB */
-#define CONFIG_HAS_FSL_XHCI_USB
-#ifdef CONFIG_HAS_FSL_XHCI_USB
-#define CONFIG_USB_XHCI_FSL
-#define CONFIG_USB_MAX_CONTROLLER_COUNT         3
-#endif
-
 /* SATA */
-#define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 
 /* EEPROM */
@@ -185,12 +176,13 @@ unsigned long get_board_ddr_clk(void);
                                        CSOR_NOR_TRHZ_80)
 #define CONFIG_SYS_NOR_FTIM0           (FTIM0_NOR_TACSE(0x4) | \
                                        FTIM0_NOR_TEADC(0x5) | \
+                                       FTIM0_NOR_TAVDS(0x6) | \
                                        FTIM0_NOR_TEAHC(0x5))
 #define CONFIG_SYS_NOR_FTIM1           (FTIM1_NOR_TACO(0x35) | \
                                        FTIM1_NOR_TRAD_NOR(0x1a) | \
                                        FTIM1_NOR_TSEQRAD_NOR(0x13))
-#define CONFIG_SYS_NOR_FTIM2           (FTIM2_NOR_TCS(0x4) | \
-                                       FTIM2_NOR_TCH(0x4) | \
+#define CONFIG_SYS_NOR_FTIM2           (FTIM2_NOR_TCS(0x8) | \
+                                       FTIM2_NOR_TCH(0x8) | \
                                        FTIM2_NOR_TWPH(0xe) | \
                                        FTIM2_NOR_TWP(0x1c))
 #define CONFIG_SYS_NOR_FTIM3           0
@@ -417,7 +409,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_MISC_INIT_R
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
 #define CONFIG_SYS_MEMTEST_START       0x80000000
 #define CONFIG_SYS_MEMTEST_END         0x9fffffff
@@ -436,7 +427,7 @@ unsigned long get_board_ddr_clk(void);
 
 #ifdef CONFIG_NAND_BOOT
 #define CONFIG_ENV_SIZE                        0x2000
-#define CONFIG_ENV_OFFSET              (24 * CONFIG_SYS_NAND_BLOCK_SIZE)
+#define CONFIG_ENV_OFFSET              (12 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #elif defined(CONFIG_SD_BOOT)
 #define CONFIG_ENV_OFFSET              (3 * 1024 * 1024)
 #define CONFIG_SYS_MMC_ENV_DEV         0
@@ -462,23 +453,6 @@ unsigned long get_board_ddr_clk(void);
                                        "$kernel_size && bootm $kernel_load"
 #endif
 
-#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
-#define MTDPARTS_DEFAULT "mtdparts=1550000.quadspi:2m(uboot)," \
-                       "14m(free)"
-#else
-#define MTDPARTS_DEFAULT "mtdparts=60000000.nor:" \
-                       "2m@0x100000(nor_bank0_uboot),"\
-                       "40m@0x1100000(nor_bank0_fit)," \
-                       "7m(nor_bank0_user)," \
-                       "2m@0x4100000(nor_bank4_uboot)," \
-                       "40m@0x5100000(nor_bank4_fit),"\
-                       "-(nor_bank4_user);" \
-                       "7e800000.flash:" \
-                       "4m(nand_uboot),36m(nand_kernel)," \
-                       "472m(nand_free);spi0.0:2m(uboot)," \
-                       "14m(free)"
-#endif
-
 #include <asm/fsl_secure_boot.h>
 
 #endif /* __LS1046AQDS_H__ */