mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
eb9124f574
Make first step in DT/DM migration. Enable OF_CONTROL only for the main U-Boot image for now. Remove mmc_init_main() because board_mmc_init() is not called when DM_MMC is enabled. DM_MMC requires DM_GPIO for card-detect to work. That in turn makes gpio request mandatory. Add code to request/free gpios in platform code. MMC devices are now numbered according to DT. The SD card is 1, and eMMC is 2. Account for that in board_mmc_get_env_dev(), BOOT_TARGET_DEVICES, and has_emmc(). DM_MMC requires BLK. However, the (BLK && !DM_USB) combination disables USB_STORAGE. Enable DM_USB to preserve USB functionality. Add also DM_REGULATORS for the USB power controller. This allows us to drop board_ehci_hcd_init() and setup_usb(). Runtime selection of DT is necessary because of the i.MX6QD vs i.MX6SDL incompatibility. DT selection does not rely on GPIOs, since DM_GPIO depends on DT. Instead, we take one "fully featured" DT of each variant. That should be enough to boot from both SD card and eMMC. Since we don't select the exact DT, override the generic show_board_info() that shows the selected DT 'model' field. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Reviewed-by: Fabio Estevam <festevam@gmail.com>
63 lines
1.8 KiB
Text
63 lines
1.8 KiB
Text
CONFIG_ARM=y
|
|
CONFIG_ARCH_MX6=y
|
|
CONFIG_SYS_TEXT_BASE=0x17800000
|
|
CONFIG_SPL_GPIO_SUPPORT=y
|
|
CONFIG_SPL_LIBCOMMON_SUPPORT=y
|
|
CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
|
CONFIG_TARGET_MX6CUBOXI=y
|
|
CONFIG_SPL_MMC_SUPPORT=y
|
|
CONFIG_SPL_SERIAL_SUPPORT=y
|
|
CONFIG_ENV_SIZE=0x2000
|
|
CONFIG_ENV_OFFSET=0xFE000
|
|
CONFIG_NR_DRAM_BANKS=1
|
|
CONFIG_SPL=y
|
|
CONFIG_SPL_LIBDISK_SUPPORT=y
|
|
# CONFIG_CMD_BMODE is not set
|
|
CONFIG_CMD_HDMIDETECT=y
|
|
CONFIG_AHCI=y
|
|
CONFIG_SPL_TEXT_BASE=0x00908000
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
CONFIG_FIT=y
|
|
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
|
|
CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
|
|
CONFIG_USE_PREBOOT=y
|
|
CONFIG_PREBOOT="if hdmidet; then usb start; setenv stdin serial,usbkbd; setenv stdout serial,vga; setenv stderr serial,vga; else setenv stdin serial; setenv stdout serial; setenv stderr serial; fi;"
|
|
CONFIG_BOUNCE_BUFFER=y
|
|
CONFIG_BOARD_EARLY_INIT_F=y
|
|
CONFIG_SPL_FS_EXT4=y
|
|
CONFIG_SPL_I2C_SUPPORT=y
|
|
CONFIG_SPL_WATCHDOG_SUPPORT=y
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
# CONFIG_CMD_PINMUX is not set
|
|
CONFIG_CMD_SATA=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_CACHE=y
|
|
CONFIG_CMD_EXT4_WRITE=y
|
|
# CONFIG_SPL_PARTITION_UUIDS is not set
|
|
CONFIG_OF_CONTROL=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="imx6dl-hummingboard2-emmc-som-v15"
|
|
CONFIG_OF_LIST="imx6dl-hummingboard2-emmc-som-v15 imx6q-hummingboard2-emmc-som-v15"
|
|
CONFIG_MULTI_DTB_FIT=y
|
|
CONFIG_ENV_IS_IN_MMC=y
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
CONFIG_NET_RANDOM_ETHADDR=y
|
|
CONFIG_DM=y
|
|
CONFIG_DWC_AHSATA=y
|
|
CONFIG_DM_GPIO=y
|
|
CONFIG_DM_MMC=y
|
|
CONFIG_FSL_USDHC=y
|
|
CONFIG_PHYLIB=y
|
|
CONFIG_MII=y
|
|
CONFIG_PINCTRL=y
|
|
CONFIG_PINCTRL_IMX6=y
|
|
CONFIG_DM_REGULATOR=y
|
|
CONFIG_DM_REGULATOR_FIXED=y
|
|
CONFIG_DM_THERMAL=y
|
|
CONFIG_USB=y
|
|
CONFIG_DM_USB=y
|
|
CONFIG_USB_KEYBOARD=y
|
|
CONFIG_VIDEO_IPUV3=y
|
|
CONFIG_VIDEO=y
|
|
# CONFIG_VIDEO_SW_CURSOR is not set
|