Merge branch '2019-11-20-env-migration'
[oweals/u-boot.git] / include / configs / apalis_imx6.h
index eb8ffda67e1a18102678f9c5133c3a829179f172..50a4391cd47d8c50128b906be209d93a333eb235 100644 (file)
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright 2013-2015 Toradex, Inc.
+ * Copyright 2013-2019 Toradex, Inc.
  *
  * Configuration settings for the Toradex Apalis iMX6
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -15,8 +14,6 @@
 
 #define CONFIG_MACH_TYPE               4886
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/gpio.h>
 
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (32 * 1024 * 1024)
 
-#define CONFIG_MISC_INIT_R
-
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE           UART1_BASE
 
 /* I2C Configs */
-#define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1         /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2         /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3         /* enable I2C bus 3 */
+#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
+#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
+#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
 #define CONFIG_SYS_I2C_SPEED           100000
-
-/* OCOTP Configs */
-#ifdef CONFIG_CMD_FUSE
-#define CONFIG_MXC_OCOTP
-#endif
+#define CONFIG_SYS_MXC_I2C3_SPEED      400000
 
 /* MMC Configs */
-#define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       3
 
-#define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
-#define CONFIG_BOUNCE_BUFFER
-
 /*
  * SATA Configs
  */
 #ifdef CONFIG_CMD_SATA
-#define CONFIG_SYS_SATA_MAX_DEVICE     1
-#define CONFIG_DWC_AHSATA_PORT_ID      0
-#define CONFIG_DWC_AHSATA_BASE_ADDR    SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
 #endif
 
 /* Network */
 #define CONFIG_FEC_MXC
-#define CONFIG_MII
 #define IMX_FEC_BASE                   ENET_BASE_ADDR
 #define CONFIG_FEC_XCV_TYPE            RGMII
 #define CONFIG_ETHPRIME                        "FEC"
+#define PHY_ANEG_TIMEOUT               15000 /* PHY needs longer aneg time */
 #define CONFIG_FEC_MXC_PHYADDR         6
-#define CONFIG_IP_DEFRAG
-#define CONFIG_TFTP_BLOCKSIZE          4096
 #define CONFIG_TFTP_TSIZE
 
 /* USB Configs */
 /* Client */
 #define CONFIG_USBD_HS
 
-#define CONFIG_USB_GADGET_MASS_STORAGE
-/* USB DFU */
-#define CONFIG_DFU_MMC
-
-/* Miscellaneous commands */
-
 /* Framebuffer and LCD */
-#define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 
 #define CONFIG_LOADADDR                        0x12000000
 
-#ifdef CONFIG_CMD_SATA
-#define CONFIG_DRIVE_SATA "sata "
-#else
-#define CONFIG_DRIVE_SATA
-#endif
-
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_DRIVE_MMC "mmc "
-#else
-#define CONFIG_DRIVE_MMC
-#endif
-
-#define CONFIG_DRIVE_TYPES CONFIG_DRIVE_SATA CONFIG_DRIVE_MMC
+#ifndef CONFIG_SPL_BUILD
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
+       func(MMC, mmc, 1) \
+       func(MMC, mmc, 2) \
+       func(USB, usb, 0) \
+       func(DHCP, dhcp, na)
+#include <config_distro_bootcmd.h>
+#undef BOOTENV_RUN_NET_USB_START
+#define BOOTENV_RUN_NET_USB_START ""
+#else /* CONFIG_SPL_BUILD */
+#define BOOTENV
+#endif /* CONFIG_SPL_BUILD */
 
 #define DFU_ALT_EMMC_INFO \
        "u-boot.imx raw 0x2 0x3ff mmcpart 0;" \
        "boot part 0 1;" \
        "rootfs part 0 2;" \
-       "uImage fat 0 1;" \
-       "imx6q-colibri-eval-v3.dtb fat 0 1;" \
-       "imx6q-colibri-cam-eval-v3.dtb fat 0 1"
+       "zImage fat 0 1;" \
+       "imx6q-apalis-eval.dtb fat 0 1;" \
+       "imx6q-apalis-cam-eval.dtb fat 0 1"
 
 #define EMMC_BOOTCMD \
-       "emmcargs=ip=off root=/dev/mmcblk0p2 rw,noatime rootfstype=ext3 " \
-               "rootwait\0" \
-       "emmcboot=run setup; " \
+       "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} " \
+               "ro,noatime rootfstype=ext4 rootwait\0" \
+       "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \
                "setenv bootargs ${defargs} ${emmcargs} ${setupargs} " \
                "${vidargs}; echo Booting from internal eMMC chip...; " \
-               "run emmcdtbload; load mmc 0:1 ${kernel_addr_r} " \
-               "${boot_file} && run fdt_fixup && " \
-               "bootm ${kernel_addr_r} ${dtbparam}\0" \
-       "emmcdtbload=setenv dtbparam; load mmc 0:1 ${fdt_addr_r} " \
-               "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
+               "run emmcdtbload; load mmc ${emmcdev}:${emmcbootpart} " \
+               "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
+               "bootz ${kernel_addr_r} ${dtbparam}\0" \
+       "emmcbootpart=1\0" \
+       "emmcdev=0\0" \
+       "emmcdtbload=setenv dtbparam; load mmc ${emmcdev}:${emmcbootpart} " \
+               "${fdt_addr_r} ${fdt_file} && " \
+               "setenv dtbparam \" - ${fdt_addr_r}\" && true\0" \
+       "emmcfinduuid=part uuid mmc ${mmcdev}:${emmcrootpart} uuid\0" \
+       "emmcrootpart=2\0"
 
 #define MEM_LAYOUT_ENV_SETTINGS \
        "bootm_size=0x20000000\0" \
-       "fdt_addr_r=0x12000000\0" \
+       "fdt_addr_r=0x12100000\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
        "kernel_addr_r=0x11000000\0" \
-       "ramdisk_addr_r=0x12100000\0"
+       "pxefile_addr_r=0x17100000\0" \
+       "ramdisk_addr_r=0x12200000\0" \
+       "scriptaddr=0x17000000\0"
 
 #define NFS_BOOTCMD \
-       "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \
+       "nfsargs=ip=:::::eth0:on root=/dev/nfs ro\0" \
        "nfsboot=run setup; " \
                "setenv bootargs ${defargs} ${nfsargs} ${setupargs} " \
                "${vidargs}; echo Booting via DHCP/TFTP/NFS...; " \
                "run nfsdtbload; dhcp ${kernel_addr_r} " \
-               "&& run fdt_fixup && bootm ${kernel_addr_r} ${dtbparam}\0" \
+               "&& run fdt_fixup && bootz ${kernel_addr_r} ${dtbparam}\0" \
        "nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} ${fdt_file} " \
                "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
 
-#define SD_BOOTCMD                                             \
-       "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \
-               "rootwait\0" \
-       "sdboot=run setup; " \
-               "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
-               "${vidargs}; echo Booting from SD card; " \
-               "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
-               "${boot_file} && run fdt_fixup && " \
-               "bootm ${kernel_addr_r} ${dtbparam}\0" \
-       "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
-               "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
-
-#define USB_BOOTCMD \
-       "usbargs=ip=off root=/dev/sda2 rw,noatime rootfstype=ext3 " \
-               "rootwait\0" \
-       "usbboot=run setup; setenv bootargs ${defargs} ${setupargs} " \
-               "${usbargs} ${vidargs}; echo Booting from USB stick...; " \
-               "usb start && run usbdtbload; load usb 0:1 ${kernel_addr_r} " \
-               "${boot_file} && run fdt_fixup && " \
-               "bootm ${kernel_addr_r} ${dtbparam}\0" \
-       "usbdtbload=setenv dtbparam; load usb 0:1 ${fdt_addr_r} " \
-               "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
-
 #ifndef CONFIG_TDX_APALIS_IMX6_V1_0
 #define FDT_FILE "imx6q-apalis-eval.dtb"
 #define FDT_FILE_V1_0 "imx6q-apalis_v1_0-eval.dtb"
 #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb"
 #endif
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
-               "run nfsboot ; echo ; echo nfsboot failed ; " \
-               "usb start ;" \
+       BOOTENV \
+       "bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd ; " \
+               "usb start ; " \
                "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
-       "boot_file=uImage\0" \
+       "boot_file=zImage\0" \
        "console=ttymxc0\0" \
        "defargs=enable_wait_mode=off vmalloc=400M\0" \
        "dfu_alt_info=" DFU_ALT_EMMC_INFO "\0" \
        "fdt_fixup=;\0" \
        MEM_LAYOUT_ENV_SETTINGS \
        NFS_BOOTCMD \
-       SD_BOOTCMD \
        "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
                "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
                "flash_eth.img && source ${loadaddr}\0" \
-       "setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; load " \
-               "${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
+       "setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; " \
+               "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img " \
+               "|| setenv drive 2; mmc rescan; load ${interface} ${drive}:1" \
+               " ${loadaddr} flash_blk.img && " \
                "source ${loadaddr}\0" \
        "setup=setenv setupargs fec_mac=${ethaddr} " \
                "consoleblank=0 no_console_suspend=1 console=tty1 " \
                "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
                "source ${loadaddr}\0" \
        "splashpos=m,m\0" \
+       "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \
        "vidargs=mxc_hdmi.only_cea=1 " \
                "video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24 " \
                "video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 
 /* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS           1
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
 
 /* environment organization */
 
-#define CONFIG_ENV_SIZE                        (8 * 1024)
-
 #if defined(CONFIG_ENV_IS_IN_MMC)
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
-#define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE + \
-                                        CONFIG_TDX_CFG_BLOCK_OFFSET)
 #define CONFIG_SYS_MMC_ENV_DEV         0
 #define CONFIG_SYS_MMC_ENV_PART                1
 #endif
 
-#define CONFIG_OF_SYSTEM_SETUP
-
 #define CONFIG_CMD_TIME
 
 #endif /* __CONFIG_H */