From: Tom Rini Date: Mon, 23 Jul 2018 14:51:13 +0000 (-0400) Subject: Merge branch 'master' of git://git.denx.de/u-boot-imx X-Git-Tag: v2018.09-rc1~63 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f0306a145b3234ae4bd3b46f2567b6f1ad7b8f4f;p=oweals%2Fu-boot.git Merge branch 'master' of git://git.denx.de/u-boot-imx trini: Update colibri-imx6ull to use Kconfig for mtdparts related options. Signed-off-by: Tom Rini --- f0306a145b3234ae4bd3b46f2567b6f1ad7b8f4f diff --cc configs/colibri-imx6ull_defconfig index 0000000000,a6db0b8c6a..85962e52e8 mode 000000,100644..100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@@ -1,0 -1,76 +1,78 @@@ + CONFIG_ARM=y + CONFIG_SYS_THUMB_BUILD=y + # CONFIG_SPL_SYS_THUMB_BUILD is not set + CONFIG_ARCH_MX6=y + CONFIG_SYS_TEXT_BASE=0x87800000 + CONFIG_TARGET_COLIBRI_IMX6ULL=y + CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri" + CONFIG_DISTRO_DEFAULTS=y + CONFIG_FIT=y + CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri-imx6ull/imximage.cfg,MX6ULL,IMX_NAND" + CONFIG_BOOTDELAY=1 + # CONFIG_USE_BOOTCOMMAND is not set + # CONFIG_CONSOLE_MUX is not set + CONFIG_SYS_CONSOLE_IS_IN_ENV=y + CONFIG_VERSION_VARIABLE=y + # CONFIG_DISPLAY_BOARDINFO is not set + CONFIG_DISPLAY_BOARDINFO_LATE=y + CONFIG_BOARD_EARLY_INIT_F=y + CONFIG_SYS_PROMPT="Colibri iMX6ULL # " + # CONFIG_CMD_IMI is not set + # CONFIG_CMD_XIMG is not set + CONFIG_CMD_ASKENV=y + CONFIG_CMD_MEMTEST=y + CONFIG_CMD_DFU=y + CONFIG_CMD_GPIO=y + CONFIG_CMD_GPT=y + # CONFIG_RANDOM_UUID is not set + CONFIG_CMD_I2C=y + CONFIG_CMD_MMC=y + CONFIG_CMD_NAND_TRIMFFS=y + CONFIG_CMD_NAND_TORTURE=y + CONFIG_CMD_USB=y + CONFIG_CMD_USB_MASS_STORAGE=y + CONFIG_CMD_BMP=y + CONFIG_CMD_CACHE=y ++CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand" ++CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:512k(mx6ull-bcb),1536k(u-boot1)ro,1536k(u-boot2)ro,512k(u-boot-env),-(ubi)" + CONFIG_CMD_UBI=y + # CONFIG_ISO_PARTITION is not set + CONFIG_OF_CONTROL=y + CONFIG_ENV_IS_IN_NAND=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y + CONFIG_DFU_MMC=y + CONFIG_DFU_NAND=y + CONFIG_DM_GPIO=y + CONFIG_DM_I2C=y + CONFIG_SYS_I2C_MXC=y + CONFIG_FSL_ESDHC=y + CONFIG_MTD=y + CONFIG_NAND=y + CONFIG_NAND_MXS=y + CONFIG_NAND_MXS_DT=y + CONFIG_MTD_UBI_FASTMAP=y + CONFIG_PHYLIB=y + CONFIG_PHY_ADDR_ENABLE=y + CONFIG_PHY_MICREL=y + CONFIG_PHY_MICREL_KSZ90X1=y + CONFIG_NETDEVICES=y + CONFIG_FEC_MXC=y + CONFIG_PINCTRL=y + CONFIG_PINCTRL_IMX6=y + CONFIG_DM_REGULATOR=y + # CONFIG_SPL_SERIAL_PRESENT is not set + CONFIG_DM_SERIAL=y + CONFIG_MXC_UART=y + CONFIG_USB=y + CONFIG_USB_STORAGE=y + CONFIG_USB_GADGET=y + CONFIG_USB_GADGET_MANUFACTURER="Toradex" + CONFIG_USB_GADGET_VENDOR_NUM=0x1b67 + CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 + CONFIG_CI_UDC=y + CONFIG_USB_GADGET_DOWNLOAD=y + CONFIG_USB_FUNCTION_SDP=y + CONFIG_VIDEO=y + CONFIG_OF_LIBFDT_OVERLAY=y + CONFIG_FDT_FIXUP_PARTITIONS=y + # CONFIG_EFI_LOADER is not set diff --cc configs/imx6q_logic_defconfig index 022dbde21b,7d921cde05..ebab2956fc --- a/configs/imx6q_logic_defconfig +++ b/configs/imx6q_logic_defconfig @@@ -16,18 -36,25 +36,26 @@@ CONFIG_CMD_GPIO= CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_NAND_TRIMFFS=y + CONFIG_CMD_USB=y + CONFIG_CMD_USB_SDP=y + CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_CACHE=y + # CONFIG_CMD_LED is not set CONFIG_CMD_PMIC=y - CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y - CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand" - CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:4m(uboot),1m(env),16m(kernel),1m(dtb),-(fs)" + CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:2m(spl),2m(uboot),1m(env),16m(kernel),1m(dtb),-(fs)" + CONFIG_CMD_UBI=y + CONFIG_SPL_OF_CONTROL=y CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y + CONFIG_SPL_DM=y + CONFIG_PCF8575_GPIO=y CONFIG_SYS_I2C_MXC=y + CONFIG_LED=y + CONFIG_LED_GPIO=y CONFIG_FSL_ESDHC=y +CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y CONFIG_NAND_MXS=y CONFIG_PHYLIB=y diff --cc include/configs/colibri-imx6ull.h index 0000000000,7661000b45..a692da5ea2 mode 000000,100644..100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@@ -1,0 -1,199 +1,188 @@@ + /* SPDX-License-Identifier: GPL-2.0+ */ + /* + * Copyright 2018 Toradex AG + * + * Configuration settings for the Colibri iMX6ULL module. + * + * based on colibri_imx7.h + */ + + #ifndef __COLIBRI_IMX6ULL_CONFIG_H + #define __COLIBRI_IMX6ULL_CONFIG_H + + #include "mx6_common.h" + #define CONFIG_IOMUX_LPSR + + /* #define CONFIG_DBG_MONITOR*/ + #define PHYS_SDRAM_SIZE SZ_512M + + /* Size of malloc() pool */ + #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) + + /* Network */ + #define CONFIG_MII + #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 ENET2_BASE_ADDR + + /* MMC Config*/ + #define CONFIG_SYS_FSL_ESDHC_ADDR 0 + #define CONFIG_SYS_FSL_USDHC_NUM 1 + + #undef CONFIG_BOOTM_PLAN9 + #undef CONFIG_BOOTM_RTEMS + + /* I2C configs */ + #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 FDT_FILE "imx6ull-colibri${variant}-${fdt_board}.dtb" + + #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" \ + "pxefile_addr_r=0x87100000\0" \ + "ramdisk_addr_r=0x82100000\0" \ + "scriptaddr=0x87000000\0" + + #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} " FDT_FILE " && " \ + "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ + + #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...; " \ + "load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \ + "load mmc 0:1 ${fdt_addr_r} " FDT_FILE " && " \ + "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ + + #define UBI_BOOTCMD \ + "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rw rootfstype=ubifs " \ + "ubi.fm_autoconvert=1\0" \ + "ubiboot=run setup; " \ + "setenv bootargs ${defargs} ${ubiargs} " \ + "${setupargs} ${vidargs}; echo Booting from NAND...; " \ + "ubi part ubi &&" \ + "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; " \ + "setenv fdtfile " FDT_FILE " && run distro_bootcmd;" + + #define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(USB, usb, 0) \ + func(DHCP, dhcp, na) + #include + + #define DFU_ALT_NAND_INFO "imx6ull-bcb part 0,1;u-boot1 part 0,2;u-boot2 part 0,3;u-boot-env part 0,4;ubi partubi 0,5" + + #define CONFIG_EXTRA_ENV_SETTINGS \ + BOOTENV \ + MEM_LAYOUT_ENV_SETTINGS \ + NFS_BOOTCMD \ + SD_BOOTCMD \ + UBI_BOOTCMD \ + "console=ttymxc0\0" \ + "defargs=user_debug=30\0" \ + "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \ + "fdt_board=eval-v3\0" \ + "fdt_fixup=;\0" \ + "ip_dyn=yes\0" \ + "kernel_file=zImage\0" \ - "mtdparts=" MTDPARTS_DEFAULT "\0" \ ++ "mtdparts=" CONFIG_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" \ + "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" \ + "vidargs=video=mxsfb:640x480-16@60" + + #define CONFIG_SYS_MEMTEST_START 0x80000000 + #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x08000000) + + #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 + #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) + + #if 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 + + /* NAND stuff */ + #define CONFIG_SYS_MAX_NAND_DEVICE 1 + /* used to initialize CONFIG_SYS_NAND_BASE_LIST which is unused */ + #define CONFIG_SYS_NAND_BASE -1 + #define CONFIG_SYS_NAND_ONFI_DETECTION + #define CONFIG_SYS_NAND_USE_FLASH_BBT + -/* Dynamic MTD partition 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(mx6ull-bcb)," \ - "1536k(u-boot1)ro," \ - "1536k(u-boot2)ro," \ - "512k(u-boot-env)," \ - "-(ubi)" - + /* 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 MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR + #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 diff --cc include/configs/imx6_logic.h index 8de4c1bb98,a8f02d3136..36be589241 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@@ -143,8 -145,10 +145,8 @@@ #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 */