Merge tag 'v2022.04-rc4' into next
[platform/kernel/u-boot.git] / include / configs / lx2160a_common.h
index 9bc287f..469989a 100644 (file)
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright 2018-2020 NXP
+ * Copyright 2018-2021 NXP
  */
 
 #ifndef __LX2_COMMON_H
 #include <asm/arch/config.h>
 #include <asm/arch/soc.h>
 
-#define CONFIG_REMAKE_ELF
-#define CONFIG_FSL_LAYERSCAPE
-#define CONFIG_GICV3
-#define CONFIG_FSL_TZPC_BP147
 #define CONFIG_FSL_MEMAC
 
 #define CONFIG_SYS_INIT_SP_ADDR                CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_FLASH_BASE          0x20000000
 
-#define CONFIG_SKIP_LOWLEVEL_INIT
-
 /* DDR */
-#define CONFIG_FSL_DDR_INTERACTIVE     /* Interactive debugging */
 #define CONFIG_SYS_FSL_DDR_INTLV_256B  /* force 256 byte interleaving */
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_SYS_DDR_SDRAM_BASE              0x80000000UL
@@ -30,9 +23,6 @@
 #define CONFIG_SYS_DDR_BLOCK2_BASE             0x2080000000ULL
 #define CONFIG_SYS_FSL_DDR_MAIN_NUM_CTRLS      2
 #define CONFIG_SYS_SDRAM_SIZE                  0x200000000UL
-#define CONFIG_DDR_SPD
-#define CONFIG_DDR_ECC
-#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER
 #define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
 #define CONFIG_MEM_INIT_VALUE          0xdeadbeef
 #define SPD_EEPROM_ADDRESS1            0x51
 #define SPD_EEPROM_ADDRESS             SPD_EEPROM_ADDRESS1
 #define CONFIG_SYS_SPD_BUS_NUM         0       /* SPD on I2C bus 0 */
 #define CONFIG_DIMM_SLOTS_PER_CTLR     2
-#define CONFIG_CHIP_SELECTS_PER_CTRL   4
-#define CONFIG_FSL_DDR_BIST    /* enable built-in memory test */
 #define CONFIG_SYS_MONITOR_LEN         (936 * 1024)
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LOAD_ADDR   (CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000)
 
 /* SMP Definitinos  */
-#define CPU_RELEASE_ADDR               secondary_boot_func
+#define CPU_RELEASE_ADDR               secondary_boot_addr
 
 /* Generic Timer Definitions */
 /*
 
 #define COUNTER_FREQUENCY              25000000        /* 25MHz */
 
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 2048 * 1024)
-
 /* Serial Port */
-#define CONFIG_PL01X_SERIAL
 #define CONFIG_PL011_CLOCK             (get_bus_freq(0) / 4)
 #define CONFIG_SYS_SERIAL0             0x21c0000
 #define CONFIG_SYS_SERIAL1             0x21d0000
@@ -77,7 +60,6 @@
                                        (void *)CONFIG_SYS_SERIAL1, \
                                        (void *)CONFIG_SYS_SERIAL2, \
                                        (void *)CONFIG_SYS_SERIAL3 }
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 
 /* MC firmware */
 #define CONFIG_SYS_LS_MC_DPC_MAX_LENGTH                0x20000
 #define CONFIG_SYS_I2C_RTC_ADDR                0x51  /* Channel 3*/
 
 /* EEPROM */
-#define CONFIG_ID_EEPROM
 #define CONFIG_SYS_I2C_EEPROM_NXID
 #define CONFIG_SYS_EEPROM_BUS_NUM              0
-#define CONFIG_SYS_I2C_EEPROM_ADDR             0x57
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN         1
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS      3
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  5
 
 /* Qixis */
 #define CONFIG_FSL_QIXIS
 
 /* PCI */
 #ifdef CONFIG_PCI
-#define CONFIG_SYS_PCI_64BIT
 #define CONFIG_PCI_SCAN_SHOW
 #endif
 
-/* MMC */
-#ifdef CONFIG_MMC
-#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
-#endif
-
 /* SATA */
 
 #ifdef CONFIG_SCSI
-#define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SATA1               AHCI_BASE_ADDR1
 #define CONFIG_SYS_SATA2               AHCI_BASE_ADDR2
-#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)
 #endif
 
 /* USB */
-#ifdef CONFIG_USB
-#define CONFIG_HAS_FSL_XHCI_USB
+#ifdef CONFIG_USB_HOST
+#ifndef CONFIG_TARGET_LX2162AQDS
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #endif
-
-/* FlexSPI */
-#ifdef CONFIG_NXP_FSPI
-#define NXP_FSPI_FLASH_SIZE            SZ_64M
-#define NXP_FSPI_FLASH_NUM             1
-#endif
-
-#ifndef __ASSEMBLY__
-unsigned long get_board_sys_clk(void);
-unsigned long get_board_ddr_clk(void);
 #endif
 
-#define CONFIG_SYS_CLK_FREQ            get_board_sys_clk()
-#define CONFIG_DDR_CLK_FREQ            get_board_ddr_clk()
-#define COUNTER_FREQUENCY_REAL         (CONFIG_SYS_CLK_FREQ / 4)
+#define COUNTER_FREQUENCY_REAL         (get_board_sys_clk() / 4)
 
 #define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE           128
 
-#define CONFIG_SYS_MMC_ENV_DEV          0
-
-/* Allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
@@ -188,6 +137,7 @@ unsigned long get_board_ddr_clk(void);
 #define XSPI_MC_INIT_CMD                               \
        "sf probe 0:0 && "                              \
        "sf read 0x80640000 0x640000 0x80000 && "       \
+       "sf read $fdt_addr_r 0xf00000 0x100000 && "     \
        "env exists secureboot && "                     \
        "esbc_validate 0x80640000 && "                  \
        "esbc_validate 0x80680000; "                    \
@@ -198,6 +148,7 @@ unsigned long get_board_ddr_clk(void);
 #define SD_MC_INIT_CMD                         \
        "mmc read 0x80a00000 0x5000 0x1200;"    \
        "mmc read 0x80e00000 0x7000 0x800;"     \
+       "mmc read $fdt_addr_r 0x7800 0x800;"    \
        "env exists secureboot && "             \
        "mmc read 0x80640000 0x3200 0x20 && "   \
        "mmc read 0x80680000 0x3400 0x20 && "   \
@@ -208,6 +159,7 @@ unsigned long get_board_ddr_clk(void);
 #define SD2_MC_INIT_CMD                                \
        "mmc dev 1; mmc read 0x80a00000 0x5000 0x1200;" \
        "mmc read 0x80e00000 0x7000 0x800;"     \
+       "mmc read $fdt_addr_r 0x7800 0x800;"    \
        "env exists secureboot && "             \
        "mmc read 0x80640000 0x3200 0x20 && "   \
        "mmc read 0x80680000 0x3400 0x20 && "   \
@@ -235,7 +187,7 @@ unsigned long get_board_ddr_clk(void);
        "kernel_size=0x2800000\0"               \
        "kernel_addr_sd=0x8000\0"               \
        "kernelhdr_addr_sd=0x3000\0"            \
-       "kernel_size_sd=0x1d000\0"              \
+       "kernel_size_sd=0x14000\0"              \
        "kernelhdr_size_sd=0x20\0"              \
        "console=ttyAMA0,38400n8\0"             \
        BOOTENV                                 \
@@ -291,12 +243,36 @@ unsigned long get_board_ddr_clk(void);
                "run distro_bootcmd;run sd2_bootcmd;"           \
                "env exists secureboot && esbc_halt;"
 
+#ifdef CONFIG_CMD_USB
+#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0)
+#else
+#define BOOT_TARGET_DEVICES_USB(func)
+#endif
+
+#ifdef CONFIG_MMC
+#define BOOT_TARGET_DEVICES_MMC(func, instance) func(MMC, mmc, instance)
+#else
+#define BOOT_TARGET_DEVICES_MMC(func)
+#endif
+
+#ifdef CONFIG_SCSI
+#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0)
+#else
+#define BOOT_TARGET_DEVICES_SCSI(func)
+#endif
+
+#ifdef CONFIG_CMD_DHCP
+#define BOOT_TARGET_DEVICES_DHCP(func) func(DHCP, dhcp, na)
+#else
+#define BOOT_TARGET_DEVICES_DHCP(func)
+#endif
+
 #define BOOT_TARGET_DEVICES(func) \
-       func(USB, usb, 0) \
-       func(MMC, mmc, 0) \
-       func(MMC, mmc, 1) \
-       func(SCSI, scsi, 0) \
-       func(DHCP, dhcp, na)
+       BOOT_TARGET_DEVICES_USB(func) \
+       BOOT_TARGET_DEVICES_MMC(func, 0) \
+       BOOT_TARGET_DEVICES_MMC(func, 1) \
+       BOOT_TARGET_DEVICES_SCSI(func) \
+       BOOT_TARGET_DEVICES_DHCP(func)
 #include <config_distro_bootcmd.h>
 
 #endif /* __LX2_COMMON_H */