global: Convert CONFIG_LOADADDR to CONFIG_SYS_LOADADDR
[platform/kernel/u-boot.git] / include / configs / colibri_imx7.h
index 69b0ae7..4d9de07 100644 (file)
@@ -1,12 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright 2016 Toradex AG
+ * Copyright 2016-2018 Toradex AG
  *
  * Configuration settings for the Colibri iMX7 module.
  *
  * based on mx7dsabresd.h:
  * Copyright (C) 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __COLIBRI_IMX7_CONFIG_H
 
 #include "mx7_common.h"
 
-#define CONFIG_SYS_THUMB_BUILD
-
-/*#define CONFIG_DBG_MONITOR*/
-#define PHYS_SDRAM_SIZE                        SZ_512M
-
-#define CONFIG_ARCH_MISC_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
-
-#define CONFIG_DISPLAY_BOARDINFO_LATE  /* Calls show_board_info() */
-
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
-#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (32 * SZ_1M)
 
-#define CONFIG_CMD_BMODE
-
-/* Network */
-#define CONFIG_FEC_MXC
-#define CONFIG_MII
-#define CONFIG_FEC_XCV_TYPE             RMII
-#define CONFIG_ETHPRIME                 "FEC"
-#define CONFIG_FEC_MXC_PHYADDR          0
-
-#define CONFIG_PHYLIB
-#define CONFIG_PHY_MICREL
-#define CONFIG_IP_DEFRAG
-#define CONFIG_TFTP_BLOCKSIZE          16352
-#define CONFIG_TFTP_TSIZE
-
-/* ENET1 */
-#define IMX_FEC_BASE                   ENET_IPS_BASE_ADDR
-
 /* MMC Config*/
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
+#ifdef CONFIG_TARGET_COLIBRI_IMX7_NAND
 #define CONFIG_SYS_FSL_USDHC_NUM       1
-
-#undef CONFIG_BOOTM_PLAN9
-#undef CONFIG_BOOTM_RTEMS
-
-/* I2C configs */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_SPEED           100000
+#elif CONFIG_TARGET_COLIBRI_IMX7_EMMC
+#define CONFIG_SYS_FSL_USDHC_NUM       2
+#endif
 
 #define CONFIG_IPADDR                  192.168.10.2
 #define CONFIG_NETMASK                 255.255.255.0
 #define CONFIG_SERVERIP                        192.168.10.1
 
+#if defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
+#define UBOOT_UPDATE \
+       "uboot_hwpart=1\0" \
+       "uboot_blk=2\0" \
+       "set_blkcnt=setexpr blkcnt ${filesize} + 0x1ff && " \
+               "setexpr blkcnt ${blkcnt} / 0x200\0" \
+       "update_uboot=run set_blkcnt && mmc dev 0 ${uboot_hwpart} && " \
+               "mmc write ${loadaddr} ${uboot_blk} ${blkcnt}\0"
+#elif defined(CONFIG_TARGET_COLIBRI_IMX7_NAND)
+#define UBOOT_UPDATE \
+       "update_uboot=nand erase.part u-boot1 && " \
+               "nand write ${loadaddr} u-boot1 ${filesize} && " \
+               "nand erase.part u-boot2 && " \
+               "nand write ${loadaddr} u-boot2 ${filesize}\0"
+#endif
+
+#ifndef PARTS_DEFAULT
+/* Define the default GPT table for eMMC */
+#define PARTS_DEFAULT \
+       /* Android partitions */ \
+       "partitions_android=" \
+       "uuid_disk=${uuid_gpt_disk};" \
+       "name=boot,start=1M,size=32M,uuid=${uuid_gpt_boot};" \
+       "name=environment,size=4M,uuid=${uuid_gpt_environment};" \
+       "name=recovery,size=16M,uuid=${uuid_gpt_recovery};" \
+       "name=system,size=1536M,uuid=${uuid_gpt_system};" \
+       "name=cache,size=512M,uuid=${uuid_gpt_cache};" \
+       "name=device,size=8M,uuid=${uuid_gpt_device};" \
+       "name=misc,size=4M,uuid=${uuid_gpt_misc};" \
+       "name=datafooter,size=2M,uuid=${uuid_gpt_datafooter};" \
+       "name=metadata,size=2M,uuid=${uuid_gpt_metadata};" \
+       "name=persistdata,size=2M,uuid=${uuid_gpt_persistdata};" \
+       "name=userdata,size=128M,uuid=${uuid_gpt_userdata};" \
+       "name=fbmisc,size=-,uuid=${uuid_gpt_fbmisc}\0"
+#endif /* PARTS_DEFAULT */
+
+#define EMMC_ANDROID_BOOTCMD \
+       "android_args=androidboot.storage_type=emmc\0" \
+       PARTS_DEFAULT \
+       "android_fdt_addr=0x83700000\0" \
+       "android_mmc_dev=0\0" \
+       "m4binary=rpmsg_imu_freertos.elf\0" \
+       "androidboot=ext4load mmc 0:a ${loadaddr} media/0/${m4binary}; "\
+               "bootaux ${loadaddr}; " \
+               "setenv loadaddr 0x88000000; " \
+               "setenv bootm_boot_mode sec;" \
+               "setenv bootargs androidboot.serialno=${serial#} " \
+                       "$android_args; " \
+               "part start mmc ${android_mmc_dev} boot boot_start; " \
+               "part size mmc ${android_mmc_dev} boot boot_size; " \
+               "mmc read ${loadaddr} ${boot_start} ${boot_size}; " \
+               "part start mmc ${android_mmc_dev} environment env_start; " \
+               "part size mmc ${android_mmc_dev} environment env_size; " \
+               "mmc read ${android_fdt_addr} ${env_start} ${env_size}; " \
+               "bootm ${loadaddr} ${loadaddr} ${android_fdt_addr}\0 "
+
 #define MEM_LAYOUT_ENV_SETTINGS \
+       "bootm_size=0x10000000\0" \
        "fdt_addr_r=0x82000000\0" \
-       "fdt_high=0xffffffff\0" \
-       "initrd_high=0xffffffff\0" \
        "kernel_addr_r=0x81000000\0" \
-       "ramdisk_addr_r=0x82100000\0"
-
-#define SD_BOOTCMD \
-       "sdargs=root=/dev/mmcblk0p2 rw rootwait\0"      \
-       "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \
-       "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
-       "run m4boot && " \
-       "load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \
-       "load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
-       "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+       "pxefile_addr_r=0x87100000\0" \
+       "ramdisk_addr_r=0x82100000\0" \
+       "scriptaddr=0x87000000\0"
 
 #define NFS_BOOTCMD \
-       "nfsargs=ip=:::::eth0: root=/dev/nfs\0" \
+       "nfsargs=ip=:::::eth0: root=/dev/nfs\0" \
        "nfsboot=run setup; " \
                "setenv bootargs ${defargs} ${nfsargs} " \
                "${setupargs} ${vidargs}; echo Booting from NFS...;" \
-               "dhcp ${kernel_addr_r} && "     \
-               "tftp ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
+               "dhcp ${kernel_addr_r} && " \
+               "tftp ${fdt_addr_r} ${soc}-colibri${variant}-${fdt_board}.dtb && " \
                "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
 
 #define UBI_BOOTCMD    \
                "ubi.fm_autoconvert=1\0" \
        "ubiboot=run setup; " \
                "setenv bootargs ${defargs} ${ubiargs} " \
-               "${setupargs} ${vidargs}; echo Booting from NAND...; " \
+               "${setupargs} ${vidargs} ${tdxargs}; echo Booting from NAND...; " \
                "ubi part ubi && run m4boot && " \
                "ubi read ${kernel_addr_r} kernel && " \
                "ubi read ${fdt_addr_r} dtb && " \
                "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
 
-#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot"
+#if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND)
+#define CONFIG_BOOTCOMMAND "run ubiboot ; echo ; echo ubiboot failed ; " \
+       "run distro_bootcmd;"
+#define MODULE_EXTRA_ENV_SETTINGS \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
+       UBI_BOOTCMD
+#elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
+#define MODULE_EXTRA_ENV_SETTINGS \
+       "variant=-emmc\0" \
+       EMMC_ANDROID_BOOTCMD
+#endif
+
+#if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND)
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
+       func(USB, usb, 0) \
+       func(DHCP, dhcp, na)
+#elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 1) \
+       func(MMC, mmc, 0) \
+       func(USB, usb, 0) \
+       func(DHCP, dhcp, na)
+#endif
+#include <config_distro_bootcmd.h>
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
+       BOOTENV \
        MEM_LAYOUT_ENV_SETTINGS \
        NFS_BOOTCMD \
-       SD_BOOTCMD \
-       UBI_BOOTCMD \
+       MODULE_EXTRA_ENV_SETTINGS \
+       UBOOT_UPDATE \
+       "boot_file=zImage\0" \
+       "bootubipart=ubi\0" \
        "console=ttymxc0\0" \
        "defargs=\0" \
        "fdt_board=eval-v3\0" \
        "m4boot=;\0" \
        "ip_dyn=yes\0" \
        "kernel_file=zImage\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
        "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
                "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
                "${board}/flash_eth.img && source ${loadaddr}\0" \
                "${board}/flash_blk.img && source ${loadaddr}\0" \
        "setup=setenv setupargs " \
                "console=tty1 console=${console}" \
-               ",${baudrate}n8 ${memargs} consoleblank=0 ${mtdparts}\0" \
+               ",${baudrate}n8 ${memargs} consoleblank=0\0" \
        "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
        "setusbupdate=usb start && setenv interface usb && " \
                "fatload ${interface} 0:1 ${loadaddr} " \
                "${board}/flash_blk.img && source ${loadaddr}\0" \
        "splashpos=m,m\0" \
+       "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "videomode=video=ctfb:x:640,y:480,depth:18,pclk:39722,le:48,ri:16,up:33,lo:10,hs:96,vs:2,sync:0,vmode:0\0" \
+       "updlevel=2\0"
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-
-#define CONFIG_SYS_MEMTEST_START       0x80000000
-#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 0x0c000000)
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
-#define CONFIG_STACKSIZE               SZ_128K
-
 /* 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_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-/* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_IS_IN_NAND
-
-#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV         0   /* USDHC1 */
-#define CONFIG_SYS_MMC_ENV_PART                0       /* user area */
-#define CONFIG_MMCROOT                 "/dev/mmcblk0p2"  /* USDHC1 */
-#define CONFIG_ENV_OFFSET              (8 * SZ_64K)
-#elif defined(CONFIG_ENV_IS_IN_NAND)
-#define CONFIG_ENV_OFFSET              (4 * 1024 * 1024)
-#define CONFIG_ENV_SECT_SIZE           (128 * 1024)
-#define CONFIG_ENV_SIZE                        CONFIG_ENV_SECT_SIZE
-#endif
-
-#define CONFIG_NAND_MXS
-#define CONFIG_CMD_NAND_TRIMFFS
-
+#ifdef CONFIG_TARGET_COLIBRI_IMX7_NAND
 /* NAND stuff */
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_BASE           0x40000000
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_SYS_NAND_MX7_GPMI_62_ECC_BYTES
-#define CONFIG_CMD_NAND_TORTURE
-
-/* UBI stuff */
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBIFS       /* increases size by almost 60 KB */
-
-/* Dynamic MTD partition support */
-#define CONFIG_CMD_MTDPARTS    /* Enable 'mtdparts' command line support */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE      /* needed for mtdparts commands */
-#define MTDIDS_DEFAULT         "nand0=gpmi-nand"
-#define MTDPARTS_DEFAULT       "mtdparts=gpmi-nand:"           \
-                               "512k(mx7-bcb),"                \
-                               "3584k(u-boot)ro,"              \
-                               "512k(u-boot-env),"             \
-                               "-(ubi)"
-
-/* DMA stuff, needed for GPMI/MXS NAND support */
-#define CONFIG_APBH_DMA
-#define CONFIG_APBH_DMA_BURST
-#define CONFIG_APBH_DMA_BURST8
+#endif
 
 /* USB Configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
 
-#define CONFIG_IMX_THERMAL
-
 #define CONFIG_USBD_HS
 
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
-
-/* USB Device Firmware Update support */
-#define CONFIG_SYS_DFU_DATA_BUF_SIZE   SZ_16M
-#define DFU_DEFAULT_POLL_TIMEOUT       300
-
-#ifdef CONFIG_VIDEO
+#if defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO)
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO
-#define CONFIG_SPLASH_SCREEN
-#define CONFIG_SPLASH_SCREEN_ALIGN
-#define CONFIG_CMD_BMP
-#define CONFIG_BMP_16BPP
-#define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_VIDEO_BMP_LOGO
 #endif