Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
[oweals/u-boot.git] / include / configs / mccmon6.h
index 7ea983991a3d300728bbed6aa6a18f744fd7e938..0aee1e1cf6b75863b22faa9b628736772044b0b0 100644 (file)
@@ -1,25 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2016-2017
  * Lukasz Majewski, DENX Software Engineering, lukma@denx.de
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #include "imx6_spl.h"
 
-#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + 0x80000)
-#define CONFIG_SPL_OS_BOOT
-#define CONFIG_SYS_OS_BASE (CONFIG_SYS_FLASH_BASE + 0x180000)
-#define CONFIG_SYS_FDT_BASE (CONFIG_SYS_FLASH_BASE + 0x1980000)
-#define CONFIG_SYS_FDT_SIZE (48 * SZ_1K)
 #define CONFIG_SYS_SPL_ARGS_ADDR       0x18000000
 
 /*
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR (0x800)
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (0x80)
 #define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR (0x1000)
-#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage"
-#define CONFIG_SPL_FS_LOAD_ARGS_NAME "imx6q-mccmon.dtb"
+#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "fitImage"
 
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (10 * SZ_1M)
 
-#define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_LATE_INIT
-
-#define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE           UART1_BASE
 
 #define CONFIG_SYS_MEMTEST_START       0x10000000
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
 
-#define CONFIG_MXC_SPI
-#define CONFIG_SF_DEFAULT_BUS  2
-#define CONFIG_SF_DEFAULT_CS   0
-#define CONFIG_SF_DEFAULT_SPEED 25000000
-#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0)
-
-/* 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_SPEED           100000
-
 /* MMC Configuration */
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
 /* NOR 16-bit mode */
 #define CONFIG_SYS_FLASH_BASE           WEIM_ARB_BASE_ADDR
-#define CONFIG_SYS_FLASH_PROTECTION
 #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT
-#define CONFIG_SYS_FLASH_CFI            /* Flash memory is CFI compliant */
-#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* Use buffered writes*/
 #define CONFIG_SYS_FLASH_EMPTY_INFO
-#define CONFIG_FLASH_CFI_DRIVER         /* Use drivers/cfi_flash.c */
 #define CONFIG_FLASH_VERIFY
 
 /* NOR Flash MTD */
-#define CONFIG_FLASH_CFI_DRIVER
-#define CONFIG_FLASH_CFI_MTD
 #define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1
 #define CONFIG_SYS_FLASH_BANKS_LIST    { (CONFIG_SYS_FLASH_BASE) }
 #define CONFIG_SYS_FLASH_BANKS_SIZES   { (32 * SZ_1M) }
 
-/* MTD support */
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-
-#define MTDIDS_DEFAULT                  "nor0=8000000.nor"
-#define MTDPARTS_DEFAULT  \
-       "mtdparts=8000000.nor:" \
-       "32m@0x0(mccmon6-image.nor)," \
-       "256k@0x40000(u-boot-env.nor)," \
-       "1m@0x80000(u-boot.nor)," \
-       "8m@0x180000(kernel.nor)," \
-       "8m@0x980000(swupdate-kernel.nor)," \
-       "8m@0x1180000(swupdate-rootfs.nor)," \
-       "128k@0x1980000(kernel-dtb.nor)," \
-       "128k@0x19C0000(swupdate-kernel-dtb.nor)"
-
-/* USB Configs */
-#define CONFIG_USB_STORAGE
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        2
-#define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS           0
-
 /* Ethernet Configuration */
-#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 CONFIG_FEC_MXC_PHYADDR         1
 
-#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=ttymxc0,115200 quiet\0" \
-       "fdtfile=imx6q-mccmon6.dtb\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
        "boot_os=yes\0" \
+       "kernelsize=0x300000\0" \
+       "disable_giga=yes\0" \
        "download_kernel=" \
-               "tftpboot ${kernel_addr} ${kernel_file};" \
-               "tftpboot ${fdt_addr} ${fdtfile};\0" \
+               "tftpboot ${loadaddr} ${kernel_file};\0" \
        "get_boot_medium=" \
                "setenv boot_medium nor;" \
                "setexpr.l _src_sbmr1 *0x020d8004;" \
                "if test ${_b_medium} = 40; then " \
                        "setenv boot_medium sdcard;" \
                "fi\0" \
-       "kernel_file=uImage\0" \
-       "load_kernel=" \
-               "load mmc ${bootdev}:${bootpart} ${kernel_addr} uImage;" \
-               "load mmc ${bootdev}:${bootpart} ${fdt_addr} ${fdtfile};\0" \
+       "kernel_file=fitImage\0" \
        "boot_sd=" \
                "echo '#######################';" \
                "echo '# Factory SDcard Boot #';" \
                "run factory_flash_img;\0" \
        "boot_nor=" \
                "setenv kernelnor 0x08180000;" \
-               "setenv dtbnor 0x09980000;" \
                "setenv bootargs console=${console} " \
-               ""MTDPARTS_DEFAULT" " \
+               CONFIG_MTDPARTS_DEFAULT " " \
                "root=/dev/mmcblk1 rootfstype=ext4 rw rootwait noinitrd;" \
-               "cp.l ${dtbnor} ${dtbloadaddr} 0x8000;" \
-               "bootm ${kernelnor} - ${dtbloadaddr};\0" \
+               "cp.l ${kernelnor} ${loadaddr} ${kernelsize};" \
+               "bootm ${loadaddr};reset;\0" \
        "boot_recovery=" \
                "echo '#######################';" \
                "echo '# RECOVERY SWU Boot   #';" \
                "setenv rootfsloadaddr 0x13000000;" \
                "setenv swukernelnor 0x08980000;" \
                "setenv swurootfsnor 0x09180000;" \
-               "setenv swudtbnor 0x099A0000;" \
                "setenv bootargs console=${console} " \
-               ""MTDPARTS_DEFAULT" " \
+               CONFIG_MTDPARTS_DEFAULT " " \
                "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
                    ":${hostname}::off root=/dev/ram rw;" \
                "cp.l ${swurootfsnor} ${rootfsloadaddr} 0x200000;" \
-               "cp.l ${swudtbnor} ${dtbloadaddr} 0x8000;" \
-               "bootm ${swukernelnor} ${rootfsloadaddr} ${dtbloadaddr};\0" \
+               "cp.l ${swukernelnor} ${loadaddr} ${kernelsize};" \
+               "bootm ${loadaddr} ${rootfsloadaddr};reset;\0" \
        "boot_tftp=" \
                "echo '#######################';" \
                "echo '# TFTP Boot           #';" \
                "if run download_kernel; then " \
                     "setenv bootargs console=${console} " \
                     "root=/dev/mmcblk0p2 rootwait;" \
-                    "bootm ${kernel_addr} - ${fdt_addr};" \
+                    "bootm $loadaddr};reset;" \
                "fi\0" \
        "bootcmd=" \
                "if test -n ${recovery_status}; then " \
                          "fi;" \
                     "fi;" \
                "fi\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
-       "fdt_addr=0x18000000\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "bootdev=1\0" \
        "bootpart=1\0" \
-       "kernel_addr=" __stringify(CONFIG_LOADADDR) "\0" \
        "netdev=eth0\0" \
        "load_addr=0x11000000\0" \
-       "dtbloadaddr=0x12000000\0" \
        "uboot_file=u-boot.img\0" \
        "SPL_file=SPL\0" \
        "load_uboot=tftp ${load_addr} ${uboot_file}\0" \
                    "device ${mmcdev};" \
                    "run factory_nor_img;" \
                    "run factory_eMMC_img;" \
+                   "run factory_SPL_falcon_setup;" \
                "fi\0" \
        "factory_eMMC_img="\
                "echo 'Update mccmon6 eMMC image'; " \
                    "erase ${nor_bank_start} +${nor_img_size};" \
                    "setexpr nor_img_size ${nor_img_size} / 4; " \
                    "cp.l ${nor_img_addr} ${nor_bank_start} ${nor_img_size}\0" \
+       "factory_SPL_falcon_setup="\
+               "echo 'Write Falcon boot data'; " \
+               "setenv kernelnor 0x08180000;" \
+               "cp.l ${kernelnor} ${loadaddr} ${kernelsize};" \
+               "spl export fdt ${loadaddr};" \
+               "setenv nor_img_addr ${fdtargsaddr};" \
+               "setenv nor_img_size 0x20000;" \
+               "setenv nor_bank_start " \
+                               __stringify(CONFIG_CMD_SPL_NOR_OFS)";" \
+               "run nor_update\0" \
        "tftp_nor_uboot="\
                "echo 'Update mccmon6 NOR U-BOOT via TFTP'; " \
                "setenv nor_img_file u-boot.img; " \
                "if tftpboot ${nor_img_addr} ${nor_img_file}; then " \
                    "run nor_update;" \
                "fi\0" \
-       "tftp_nor_uImg="\
-               "echo 'Update mccmon6 NOR uImage via TFTP'; " \
-               "setenv nor_img_file uImage; " \
+       "tftp_nor_fitImg="\
+               "echo 'Update mccmon6 NOR fitImage via TFTP'; " \
+               "setenv nor_img_file fitImage; " \
                "setenv nor_img_size 0x500000; " \
                "setenv nor_bank_start 0x08180000; " \
                "if tftpboot ${nor_img_addr} ${nor_img_file}; then " \
                    "run nor_update;" \
                "fi\0" \
-       "tftp_nor_dtb="\
-               "echo 'Update mccmon6 NOR DTB via TFTP'; " \
-               "setenv nor_img_file imx6q-mccmon6.dtb; " \
-               "setenv nor_img_size 0x20000; " \
-               "setenv nor_bank_start 0x09980000; " \
-               "if tftpboot ${nor_img_addr} ${nor_img_file}; then " \
-                   "run nor_update;" \
-               "fi\0" \
        "tftp_nor_img="\
                "echo 'Update mccmon6 NOR image via TFTP'; " \
                "if tftpboot ${nor_img_addr} ${nor_img_file}; then " \
            "fi;\0"
 
 /* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS           1
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* Environment organization */
-#define CONFIG_ENV_SIZE                        (SZ_128K)
 
 /* Envs are stored in NOR flash */
-#define CONFIG_ENV_SECT_SIZE    (SZ_128K)
-#define CONFIG_ENV_ADDR        (CONFIG_SYS_FLASH_BASE + 0x40000)
-
-#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-#define CONFIG_ENV_ADDR_REDUND (CONFIG_SYS_FLASH_BASE + 0x60000)
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 
 #endif                        /* __CONFIG_H * */