Convert CONFIG_SKIP_LOWLEVEL_INIT et al to Kconfig

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

diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index d3b5c58..52aca52 100644 (file)
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright 2018-2020 NXP
+ * Copyright 2018-2021 NXP
  */
 
 #ifndef __LX2_COMMON_H
@@ -12,15 +12,12 @@
 
 #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 */
@@ -30,9 +27,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
@@ -49,7 +43,6 @@
 #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_addr
@@ -110,13 +103,8 @@
 #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
@@ -129,11 +117,6 @@
 #define CONFIG_PCI_SCAN_SHOW
 #endif
 
-/* MMC */
-#ifdef CONFIG_MMC
-#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
-#endif
-
 /* SATA */
 
 #ifdef CONFIG_SCSI
@@ -147,31 +130,29 @@
 #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
+#endif
 
-/* FlexSPI */
-#ifdef CONFIG_NXP_FSPI
-#define NXP_FSPI_FLASH_SIZE            SZ_64M
-#define NXP_FSPI_FLASH_NUM             1
+/* GPIO */
+#ifdef CONFIG_DM_GPIO
+#ifndef CONFIG_MPC8XXX_GPIO
+#define CONFIG_MPC8XXX_GPIO
+#endif
 #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 CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE           128
 
-#define CONFIG_SYS_MMC_ENV_DEV          0
-
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
@@ -185,6 +166,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; "                    \
@@ -195,6 +177,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 && "   \
@@ -205,6 +188,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 && "   \
@@ -232,7 +216,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                                 \