Merge tag 'v2021.04-rc4' into next

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

diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h
index fb31dc4..fcbf8ee 100644 (file)
--- a/include/configs/imx8qm_rom7720.h
+++ b/include/configs/imx8qm_rom7720.h
@@ -7,6 +7,7 @@
 #define __IMX8QM_ROM7720_H
 
 #include <linux/sizes.h>
+#include <linux/stringify.h>
 #include <asm/arch/imx-regs.h>
 #define CONFIG_REMAKE_ELF
 
@@ -14,17 +15,17 @@
 #define CONFIG_SPL_BSS_START_ADDR      0x00128000
 #define CONFIG_SPL_BSS_MAX_SIZE        0x1000  /* 4 KB */
 
-#undef CONFIG_BOOTM_NETBSD
-
 #define CONFIG_FSL_USDHC
+#define CONFIG_SYS_BOOTMAPSZ           (256 << 20)
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
+#define USDHC1_BASE_ADDR               0x5B010000
+#define USDHC2_BASE_ADDR               0x5B020000
+#define USDHC3_BASE_ADDR               0x5B030000
 
-#define CONFIG_ENV_OVERWRITE
+#define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
 
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 /* FUSE command */
-#define CONFIG_CMD_FUSE
 
 /* Boot M4 */
 #define M4_BOOT_ENV \
@@ -63,11 +64,9 @@
        "panel=NULL\0" \
        "console=ttyLP0\0" \
        "fdt_addr=0x83000000\0"                 \
-       "fdt_high=0xffffffffffffffff\0"         \
        "boot_fdt=try\0" \
        "fdt_file=imx8qm-rom7720-a1.dtb\0" \
        "initrd_addr=0x83800000\0"              \
-       "initrd_high=0xffffffffffffffff\0" \
        "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
        "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
@@ -130,18 +129,12 @@
 #define CONFIG_SYS_INIT_SP_ADDR                0x80200000
 
 /* Default environment is in SD */
-#define CONFIG_ENV_SIZE                        0x2000
 
 #ifdef CONFIG_QSPI_BOOT
-#define CONFIG_ENV_OFFSET      (4 * 1024 * 1024)
-#define CONFIG_ENV_SECT_SIZE   (128 * 1024)
 #define CONFIG_ENV_SPI_BUS     CONFIG_SF_DEFAULT_BUS
 #define CONFIG_ENV_SPI_CS      CONFIG_SF_DEFAULT_CS
 #define CONFIG_ENV_SPI_MODE    CONFIG_SF_DEFAULT_MODE
 #define CONFIG_ENV_SPI_MAX_HZ  CONFIG_SF_DEFAULT_SPEED
-#else
-#define CONFIG_ENV_OFFSET      (64 * SZ_64K)
-#define CONFIG_SYS_MMC_ENV_PART                0       /* user area */
 #endif
 
 #define CONFIG_SYS_MMC_IMG_LOAD_PART   1
@@ -150,7 +143,6 @@
  * USDHC3 is for SD on base board On DDR4 board, USDHC1 is mux for NAND,
  * USDHC2 is for SD, USDHC3 is for SD on base board
  */
-#define CONFIG_SYS_MMC_ENV_DEV         2   /* USDHC3 */
 #define CONFIG_MMCROOT                 "/dev/mmcblk2p2"  /* USDHC3 */
 #define CONFIG_SYS_FSL_USDHC_NUM       3
 
@@ -164,17 +156,11 @@
 /* LPDDR4 board total DDR is 6GB, DDR4 board total DDR is 4 GB */
 #define PHYS_SDRAM_2_SIZE              0x80000000      /* 2 GB */
 
-#define CONFIG_SYS_MEMTEST_START       0xA0000000
-#define CONFIG_SYS_MEMTEST_END      (CONFIG_SYS_MEMTEST_START + (PHYS_SDRAM_1_SIZE >> 2))
-
-/* Serial */
-#define CONFIG_BAUDRATE                        115200
-
 /* Generic Timer Definitions */
 #define COUNTER_FREQUENCY              8000000 /* 8MHz */
 
 /* Networking */
 #define CONFIG_FEC_XCV_TYPE            RGMII
-#define FEC_QUIRK_ENET_MAC
 
+#include <linux/stringify.h>
 #endif /* __IMX8QM_ROM7720_H */