Merge branch '2020-05-07-more-kconfig-migrations'
[oweals/u-boot.git] / include / configs / imx6_logic.h
index bfc9b33e8c8df3feff81730a084b1a8a2f1c6241..63662dd18d400d9633c452bbd8341c63b5ca3a12 100644 (file)
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2017 Logic PD, Inc.
  *
  * Configuration settings for the LogicPD i.MX6 SOM.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __IMX6LOGIC_CONFIG_H
 #define CONFIG_MXC_UART_BASE   UART1_BASE
 #define CONSOLE_DEV            "ttymxc0"
 
+#ifdef CONFIG_SPL
+#include "imx6_spl.h"
+#endif
+
 #include "mx6_common.h"
 
 /* Size of malloc() pool */
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       2
-#define CONFIG_MMCROOT         "/dev/mmcblk1p2" /* Dev kit SD card */
+
 
 /* Ethernet Configs */
-#define CONFIG_MII
 #define CONFIG_FEC_XCV_TYPE            RMII
 #define CONFIG_ETHPRIME                "FEC"
 #define CONFIG_FEC_MXC_PHYADDR         0
        "script=boot.scr\0" \
        "image=zImage\0" \
        "bootm_size=0x10000000\0" \
-       "fdt_addr_r=0x18000000\0" \
-       "fdt_addr=0x18000000\0" \
-       "ramdisk_addr_r=0x13000000\0" \
-       "ramdiskaddr=0x13000000\0" \
+       "fdt_addr_r=0x13000000\0" \
+       "ramdisk_addr_r=0x14000000\0" \
        "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
        "ramdisk_file=rootfs.cpio.uboot\0" \
        "boot_fdt=try\0" \
        "console=" CONSOLE_DEV "\0" \
        "mmcdev=1\0" \
        "mmcpart=1\0" \
-       "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+       "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
        "nandroot=ubi0:rootfs rootfstype=ubifs\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate}" \
-       " root=${mmcroot} ${mtdparts}\0" \
+       " root=PARTUUID=${uuid} rootwait rw ${mtdparts} ${optargs}\0" \
        "nandargs=setenv bootargs console=${console},${baudrate}" \
-       " ubi.mtd=fs root=${nandroot} ${mtdparts}\0" \
+       " ubi.mtd=fs root=${nandroot} ${mtdparts} ${optargs}\0" \
        "ramargs=setenv bootargs console=${console},${baudrate}" \
-       " root=/dev/ram rw ${mtdparts}\0"                    \
+       " root=/dev/ram rw ${mtdparts} ${optargs}\0"                    \
        "loadbootscript=" \
        "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
        "bootscript=echo Running bootscript from mmc ...;" \
        " source\0" \
        "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image};" \
        " setenv kernelsize ${filesize}\0" \
-       "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
-       "loadramdisk=fatload mmc ${mmcdev}:${mmcpart} ${ramdiskaddr}" \
+       "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdt_file}\0" \
+       "loadramdisk=fatload mmc ${mmcdev}:${mmcpart} ${ramdisk_addr_r}" \
        " ${ramdisk_file}; setenv ramdisksize ${filesize}\0" \
-       "mmcboot=echo Booting from mmc...; run mmcargs; run loadimage;" \
-       " run loadfdt; bootz ${loadaddr} - ${fdt_addr}\0" \
+       "mmcboot=echo Booting from mmc...; run finduuid; run mmcargs;" \
+       "run loadimage; run loadfdt; bootz ${loadaddr} - ${fdt_addr_r}\0" \
        "mmcramboot=run ramargs; run loadimage;" \
        " run loadfdt; run loadramdisk;" \
-       " bootz ${loadaddr} ${ramdiskaddr} ${fdt_addr}\0" \
+       " bootz ${loadaddr} ${ramdisk_addr_r} ${fdt_addr_r}\0" \
        "nandboot=echo Booting from nand ...; " \
        " run nandargs;" \
        " nand read ${loadaddr} kernel ${kernelsize};" \
-       " nand read ${fdt_addr} dtb;" \
-       " bootz ${loadaddr} - ${fdt_addr}\0" \
+       " nand read ${fdt_addr_r} dtb;" \
+       " bootz ${loadaddr} - ${fdt_addr_r}\0" \
        "nandramboot=echo Booting RAMdisk from nand ...; " \
-       " nand read ${ramdiskaddr} fs ${ramdisksize};" \
+       " nand read ${ramdisk_addr_r} fs ${ramdisksize};" \
        " nand read ${loadaddr} kernel ${kernelsize};" \
-       " nand read ${fdt_addr} dtb;" \
+       " nand read ${fdt_addr_r} dtb;" \
        " run ramargs;" \
-       " bootz ${loadaddr} ${ramdiskaddr} ${fdt_addr}\0" \
+       " bootz ${loadaddr} ${ramdisk_addr_r} ${fdt_addr_r}\0" \
        "netargs=setenv bootargs console=${console},${baudrate} " \
        "root=/dev/nfs" \
        " ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
@@ -88,8 +88,8 @@
        "fi; " \
        "${get_cmd} ${image}; " \
        "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-               "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
-                       "bootz ${loadaddr} - ${fdt_addr}; " \
+               "if ${get_cmd} ${fdt_addr_r} ${fdt_file}; then " \
+                       "bootz ${loadaddr} - ${fdt_addr_r}; " \
                "else " \
                        "if test ${boot_fdt} = try; then " \
                                "bootz; " \
 
 #define CONFIG_ARP_TIMEOUT     200UL
 
-#define CONFIG_SYS_MEMTEST_START       0x10000000
-#define CONFIG_SYS_MEMTEST_END         0x10010000
-#define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
-
 /* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS           1
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* Environment organization */
-#define CONFIG_ENV_SIZE                        (8 * 1024)
-#define CONFIG_ENV_OFFSET             0x400000
-#define CONFIG_ENV_SECT_SIZE          CONFIG_ENV_SIZE
 
 /* NAND stuff */
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_SYS_NAND_U_BOOT_START   CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x200000
+#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00500000
 
 /* MTD device */
-# define CONFIG_MTD_DEVICE
-# define CONFIG_MTD_PARTITIONS
 
 /* DMA stuff, needed for GPMI/MXS NAND support */
 
 /* EEPROM  contains serial no, MAC addr and other Logic PD info */
 #define CONFIG_I2C_EEPROM
 
+/* USB Configs */
+#ifdef CONFIG_CMD_USB
+#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
+#define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CONFIG_MXC_USB_FLAGS           0
+#define CONFIG_USB_MAX_CONTROLLER_COUNT        1 /* Enabled USB controller number */
+#endif
+
+/* Falcon Mode */
+#define CONFIG_SPL_FS_LOAD_ARGS_NAME   "args"
+#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage"
+#define CONFIG_SYS_SPL_ARGS_ADDR       0x18000000
+
+/* Falcon Mode - MMC support: args@1MB kernel@2MB */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512)
+#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x1000  /* 2MB */
+
 #endif                         /* __IMX6LOGIC_CONFIG_H */