mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 23:51:33 +00:00
2bc18ce570
Fix mixed up boot commands between raw NAND and eMMC variant. Also
make sure that the boot_file is defined for the eMMC boot command.
Fixes: a62c60610f
("colibri_imx7_emmc: add Colibri iMX7D 1GB (eMMC) module support")
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
240 lines
7.4 KiB
C
240 lines
7.4 KiB
C
/* SPDX-License-Identifier: GPL-2.0+ */
|
|
/*
|
|
* Copyright 2016-2018 Toradex AG
|
|
*
|
|
* Configuration settings for the Colibri iMX7 module.
|
|
*
|
|
* based on mx7dsabresd.h:
|
|
* Copyright (C) 2015 Freescale Semiconductor, Inc.
|
|
*/
|
|
|
|
#ifndef __COLIBRI_IMX7_CONFIG_H
|
|
#define __COLIBRI_IMX7_CONFIG_H
|
|
|
|
#include "mx7_common.h"
|
|
|
|
/* Size of malloc() pool */
|
|
#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M)
|
|
|
|
/* Network */
|
|
#define CONFIG_FEC_MXC
|
|
#define CONFIG_FEC_XCV_TYPE RMII
|
|
#define CONFIG_ETHPRIME "FEC"
|
|
#define CONFIG_FEC_MXC_PHYADDR 0
|
|
|
|
#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
|
|
#elif CONFIG_TARGET_COLIBRI_IMX7_EMMC
|
|
#define CONFIG_SYS_FSL_USDHC_NUM 2
|
|
|
|
#define CONFIG_SUPPORT_EMMC_BOOT
|
|
#endif
|
|
|
|
#undef CONFIG_BOOTM_PLAN9
|
|
#undef CONFIG_BOOTM_RTEMS
|
|
|
|
/* I2C configs */
|
|
#define CONFIG_SYS_I2C_MXC
|
|
#define CONFIG_SYS_I2C_SPEED 100000
|
|
|
|
#define CONFIG_IPADDR 192.168.10.2
|
|
#define CONFIG_NETMASK 255.255.255.0
|
|
#define CONFIG_SERVERIP 192.168.10.1
|
|
|
|
#define EMMC_BOOTCMD \
|
|
"emmcargs=ip=off root=/dev/mmcblk0p2 ro rootfstype=ext4 rootwait\0" \
|
|
"emmcboot=run setup; " \
|
|
"setenv bootargs ${defargs} ${emmcargs} ${setupargs} " \
|
|
"${vidargs}; echo Booting from internal eMMC chip...; " \
|
|
"run m4boot && " \
|
|
"load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-emmc-${fdt_board}.dtb && " \
|
|
"load mmc 0:1 ${kernel_addr_r} ${boot_file} && " \
|
|
"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\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"
|
|
|
|
#if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND)
|
|
#define SD_BOOTCMD \
|
|
"sdargs=root=/dev/mmcblk0p2 ro 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"
|
|
#elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
|
|
#define SD_BOOTCMD \
|
|
"sdargs=root=/dev/mmcblk1p2 ro rootwait\0" \
|
|
"sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \
|
|
"${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
|
|
"run m4boot && " \
|
|
"load mmc 1:1 ${kernel_addr_r} ${kernel_file} && " \
|
|
"load mmc 1:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
|
|
"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0"
|
|
#endif
|
|
|
|
|
|
#define NFS_BOOTCMD \
|
|
"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${variant}-${fdt_board}.dtb && " \
|
|
"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
|
|
|
|
#define UBI_BOOTCMD \
|
|
"ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \
|
|
"ubi.fm_autoconvert=1\0" \
|
|
"ubiboot=run setup; " \
|
|
"setenv bootargs ${defargs} ${ubiargs} " \
|
|
"${setupargs} ${vidargs}; 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" \
|
|
|
|
#if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND)
|
|
#define CONFIG_BOOTCOMMAND "run ubiboot ; echo ; echo ubiboot failed ; " \
|
|
"setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;"
|
|
#define MODULE_EXTRA_ENV_SETTINGS \
|
|
"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
|
|
UBI_BOOTCMD
|
|
#elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
|
|
#define CONFIG_BOOTCOMMAND "run emmcboot ; echo ; echo emmcboot failed ; " \
|
|
"setenv fdtfile ${soc}-colibri-emmc-${fdt_board}.dtb && run distro_bootcmd;"
|
|
#define MODULE_EXTRA_ENV_SETTINGS \
|
|
"variant=-emmc\0" \
|
|
EMMC_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, 0) \
|
|
func(MMC, mmc, 1) \
|
|
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 \
|
|
MODULE_EXTRA_ENV_SETTINGS \
|
|
"boot_file=zImage\0" \
|
|
"console=ttymxc0\0" \
|
|
"defargs=\0" \
|
|
"fdt_board=eval-v3\0" \
|
|
"fdt_fixup=;\0" \
|
|
"m4boot=;\0" \
|
|
"ip_dyn=yes\0" \
|
|
"kernel_file=zImage\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" \
|
|
"setsdupdate=mmc rescan && setenv interface mmc && " \
|
|
"fatload ${interface} 0:1 ${loadaddr} " \
|
|
"${board}/flash_blk.img && source ${loadaddr}\0" \
|
|
"setup=setenv setupargs " \
|
|
"console=tty1 console=${console}" \
|
|
",${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" \
|
|
"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_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
|
|
|
|
/* Physical Memory Map */
|
|
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
|
|
|
|
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
|
|
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
|
|
#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
|
|
|
|
#define CONFIG_SYS_INIT_SP_OFFSET \
|
|
(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
|
|
#define CONFIG_SYS_INIT_SP_ADDR \
|
|
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
|
|
|
|
/* environment organization */
|
|
|
|
#if defined(CONFIG_ENV_IS_IN_MMC)
|
|
/* Environment in eMMC, before config block at the end of 1st "boot sector" */
|
|
#define CONFIG_ENV_SIZE (8 * 1024)
|
|
#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
|
|
#elif defined(CONFIG_ENV_IS_IN_NAND)
|
|
#define CONFIG_ENV_SECT_SIZE (128 * 1024)
|
|
#define CONFIG_ENV_OFFSET (28 * CONFIG_ENV_SECT_SIZE)
|
|
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
|
|
#endif
|
|
|
|
#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
|
|
#endif
|
|
|
|
/* USB Configs */
|
|
#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 2
|
|
|
|
#define CONFIG_IMX_THERMAL
|
|
|
|
#define CONFIG_USBD_HS
|
|
|
|
/* USB Device Firmware Update support */
|
|
#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
|
|
#define DFU_DEFAULT_POLL_TIMEOUT 300
|
|
|
|
#ifdef CONFIG_VIDEO
|
|
#define CONFIG_VIDEO_MXS
|
|
#define CONFIG_VIDEO_LOGO
|
|
#define CONFIG_SPLASH_SCREEN
|
|
#define CONFIG_SPLASH_SCREEN_ALIGN
|
|
#define CONFIG_BMP_16BPP
|
|
#define CONFIG_VIDEO_BMP_RLE8
|
|
#define CONFIG_VIDEO_BMP_LOGO
|
|
#endif
|
|
|
|
#endif
|