Merge tag 'versal-qspi-for-v2022.10' of https://gitlab.denx.de/u-boot/custodians...

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

diff --git a/include/configs/ls1028aqds.h b/include/configs/ls1028aqds.h
index 9ae37b9..2539115 100644 (file)
--- a/include/configs/ls1028aqds.h
+++ b/include/configs/ls1028aqds.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright 2019-2020 NXP
+ * Copyright 2019-2021 NXP
  */
 
 #ifndef __LS1028A_QDS_H
@@ -8,19 +8,11 @@
 
 #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)
-
-/* DDR */
-#define CONFIG_DIMM_SLOTS_PER_CTLR             2
-
-#define CONFIG_QIXIS_I2C_ACCESS
+#define COUNTER_FREQUENCY_REAL         (get_board_sys_clk() / 4)
 
 /*
  * QIXIS Definitions
  */
-#define CONFIG_FSL_QIXIS
 
 #ifdef CONFIG_FSL_QIXIS
 #define QIXIS_BASE                     0x7fb00000
@@ -60,27 +52,14 @@
 
 /* Store environment at top of flash */
 
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE
-#else
-#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
-#endif
-
 /* LPUART */
 #ifdef CONFIG_LPUART
-#define CONFIG_LPUART_32B_REG
 #define CFG_LPUART_MUX_MASK    0xf0
 #define CFG_LPUART_EN          0xf0
 #endif
 
 /* SATA */
-#define CONFIG_SCSI_AHCI_PLAT
 
-#define CONFIG_SYS_SATA1                       AHCI_BASE_ADDR1
-#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 * \
-                                               CONFIG_SYS_SCSI_MAX_LUN)
 #ifndef SPL_NO_ENV
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -88,7 +67,6 @@
        "hwconfig=fsl_ddr:bank_intlv=auto\0" \
        "ramdisk_addr=0x800000\0" \
        "ramdisk_size=0x2000000\0" \
-       "fdt_addr=0x00f00000\0" \
        "kernel_addr=0x01000000\0" \
        "scriptaddr=0x80000000\0" \
        "scripthdraddr=0x80080000\0" \
@@ -109,7 +87,6 @@
        "kernelhdr_addr_sd=0x3000\0" \
        "kernelhdr_size_sd=0x10\0" \
        "console=ttyS0,115200\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        BOOTENV \
        "boot_scripts=ls1028aqds_boot.scr\0" \
        "boot_script_hdr=hdr_ls1028aqds_bs.out\0" \