Merge branch 'network_master' of https://source.denx.de/u-boot/custodians/u-boot...

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

diff --git a/include/configs/ls1028ardb.h b/include/configs/ls1028ardb.h
index 0f289cb..348db1e 100644 (file)
--- a/include/configs/ls1028ardb.h
+++ b/include/configs/ls1028ardb.h
@@ -9,7 +9,6 @@
 #include "ls1028a_common.h"
 
 #define CONFIG_SYS_CLK_FREQ            100000000
-#define CONFIG_DDR_CLK_FREQ            100000000
 #define COUNTER_FREQUENCY_REAL         (CONFIG_SYS_CLK_FREQ / 4)
 
 #define CONFIG_SYS_RTC_BUS_NUM         0
@@ -38,10 +37,10 @@
 #define QIXIS_LBMAP_ALTBANK            0x00
 #define QIXIS_LBMAP_SD                 0x00
 #define QIXIS_LBMAP_EMMC               0x00
-#define QIXIS_LBMAP_QSPI               0x00
+#define QIXIS_LBMAP_XSPI               0x00
 #define QIXIS_RCW_SRC_SD               0xf8
 #define QIXIS_RCW_SRC_EMMC             0xf9
-#define QIXIS_RCW_SRC_QSPI             0xff
+#define QIXIS_RCW_SRC_XSPI             0xff
 #define QIXIS_RST_CTL_RESET            0x31
 #define QIXIS_RCFG_CTL_RECONFIG_IDLE   0x10
 #define QIXIS_RCFG_CTL_RECONFIG_START  0x11
@@ -59,9 +58,6 @@
 #endif
 
 /* SATA */
-#ifndef CONFIG_CMD_EXT2
-#define CONFIG_CMD_EXT2
-#endif
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID            1
 #define CONFIG_SYS_SCSI_MAX_LUN                        1
 #define CONFIG_SYS_SCSI_MAX_DEVICE             (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
@@ -115,13 +111,6 @@
                        "run scan_dev_for_boot; "            \
                  "fi; "                                   \
                "done\0"                                   \
-       "scan_dev_for_boot="                              \
-               "echo Scanning ${devtype} "               \
-                               "${devnum}:${distro_bootpart}...; "  \
-               "for prefix in ${boot_prefixes}; do "     \
-                       "run scan_dev_for_scripts; "      \
-               "done;"                                   \
-               "\0"                                      \
        "boot_a_script="                                  \
                "load ${devtype} ${devnum}:${distro_bootpart} "  \
                        "${scriptaddr} ${prefix}${script}; "    \