Merge tag 'next-20220328' of https://source.denx.de/u-boot/custodians/u-boot-video...

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

diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 25fa793..de84e3b 100644 (file)
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright 2020 Toradex
+ * Copyright 2020-2021 Toradex
  */
 
 #ifndef __VERDIN_IMX8MM_H
@@ -11,11 +11,11 @@
 
 #define CONFIG_SPL_MAX_SIZE            (148 * 1024)
 #define CONFIG_SYS_MONITOR_LEN         SZ_512K
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR        0x300
 #define CONFIG_SYS_UBOOT_BASE  \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
+#define CONFIG_SYS_BOOTM_LEN           SZ_64M
+
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_STACK               0x920000
 #define CONFIG_SPL_BSS_START_ADDR      0x910000
@@ -35,9 +35,6 @@
        "ramdisk_addr_r=0x46400000\0" \
        "scriptaddr=0x46000000\0"
 
-#define CONFIG_LOADADDR                0x40480000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 /* Enable Distro Boot */
 #ifndef CONFIG_SPL_BUILD
 #define BOOT_TARGET_DEVICES(func) \
@@ -55,16 +52,16 @@
        BOOTENV \
        MEM_LAYOUT_ENV_SETTINGS \
        "bootcmd_mfg=fastboot 0\0" \
+       "boot_file=Image\0" \
        "console=ttymxc0\0" \
        "fdt_addr=0x43000000\0" \
-       "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
+       "fdt_board=dev\0" \
        "initrd_addr=0x43800000\0" \
        "initrd_high=0xffffffffffffffff\0" \
-       "kernel_image=Image\0" \
        "netargs=setenv bootargs console=${console},${baudrate} " \
                "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp" \
                "\0" \
-       "nfsboot=run netargs; dhcp ${loadaddr} ${kernel_image}; " \
+       "nfsboot=run netargs; dhcp ${loadaddr} ${boot_file}; " \
                "tftp ${fdt_addr} verdin/${fdtfile}; " \
                "booti ${loadaddr} - ${fdt_addr}\0" \
        "setup=setenv setupargs console=${console},${baudrate} " \
@@ -84,12 +81,8 @@
 
 #if defined(CONFIG_ENV_IS_IN_MMC)
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0       /* USDHC1 eMMC */
-#define CONFIG_SYS_MMC_ENV_PART        1
 #endif
 
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN          SZ_32M
 #define CONFIG_SYS_SDRAM_BASE           0x40000000
 
 /* SDRAM configuration */
@@ -100,25 +93,23 @@
 #define CONFIG_MXC_UART_BASE           UART1_BASE_ADDR
 
 /* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #define CONFIG_SYS_CBSIZE              SZ_2K
 #define CONFIG_SYS_MAXARGS             64
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
                                        sizeof(CONFIG_SYS_PROMPT) + 16)
 /* USDHC */
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-#define CONFIG_SYS_I2C_SPEED           100000
 
 /* ENET */
-#define CONFIG_ETHPRIME                 "FEC"
-#define CONFIG_FEC_XCV_TYPE             RGMII
 #define CONFIG_FEC_MXC_PHYADDR          7
 #define FEC_QUIRK_ENET_MAC
 #define IMX_FEC_BASE                   0x30BE0000
 
-#endif /*_VERDIN_IMX8MM_H */
+/* USB Configs */
+#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
+#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
 
+#endif /* __VERDIN_IMX8MM_H */