leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
dbeaa1d131
u-boot/configs/cm_fx6_defconfig

79 lines
2.0 KiB
Plaintext
Raw Normal View History

kconfig: remove meaningless prefixes in defconfig files Since commit e02ee2548afe (kconfig: switch to single .config configuration), the prefixes in defconfig files such as "+S:", "+ST:", etc., are meaningless. This commit was generated by the following command: find configs -name '*_defconfig' | xargs sed -i 's/^+*S*T*://' Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2015-03-12 04:24:39 +00:00
CONFIG_ARM=y
arm: mx6: cm-fx6: move cm-fx6 target under ARCH_MX6 cm-fx6 is an MX6 based board, and the menuconfig hierarchy should reflect that. Make TARGET_CM_FX6 dependant on ARCH_MX6. Cc: Stefano Babic <sbabic@denx.de> Cc: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
2015-07-23 14:19:33 +00:00
CONFIG_ARCH_MX6=y
Convert CONFIG_SPL_GPIO_SUPPORT to Kconfig Move this option to Kconfig and tidy up existing uses. Signed-off-by: Simon Glass <sjg@chromium.org>
2016-09-13 05:18:39 +00:00
CONFIG_SPL_GPIO_SUPPORT=y
Convert CONFIG_SPL_LIBCOMMON_SUPPORT to Kconfig Move this option to Kconfig and tidy up existing uses. Signed-off-by: Simon Glass <sjg@chromium.org>
2016-09-13 05:18:41 +00:00
CONFIG_SPL_LIBCOMMON_SUPPORT=y
Convert CONFIG_SPL_LIBGENERIC_SUPPORT to Kconfig Move this option to Kconfig and tidy up existing uses. Signed-off-by: Simon Glass <sjg@chromium.org>
2016-09-13 05:18:43 +00:00
CONFIG_SPL_LIBGENERIC_SUPPORT=y
kconfig: remove meaningless prefixes in defconfig files Since commit e02ee2548afe (kconfig: switch to single .config configuration), the prefixes in defconfig files such as "+S:", "+ST:", etc., are meaningless. This commit was generated by the following command: find configs -name '*_defconfig' | xargs sed -i 's/^+*S*T*://' Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2015-03-12 04:24:39 +00:00
CONFIG_TARGET_CM_FX6=y
Convert CONFIG_SPL_MMC_SUPPORT to Kconfig Move this option to Kconfig and tidy up existing uses. Signed-off-by: Simon Glass <sjg@chromium.org>
2016-09-13 05:18:44 +00:00
CONFIG_SPL_MMC_SUPPORT=y
Convert CONFIG_SPL_SERIAL_SUPPORT to Kconfig Move this option to Kconfig and tidy up existing uses. Signed-off-by: Simon Glass <sjg@chromium.org>
2016-09-13 05:18:56 +00:00
CONFIG_SPL_SERIAL_SUPPORT=y
Convert CONFIG_SPL_SPI_FLASH_SUPPORT to Kconfig Move this option to Kconfig and tidy up existing uses. Signed-off-by: Simon Glass <sjg@chromium.org>
2016-09-13 05:18:57 +00:00
CONFIG_SPL_SPI_FLASH_SUPPORT=y
Convert CONFIG_SPL_SPI_SUPPORT to Kconfig Move this option to Kconfig and tidy up existing uses. Signed-off-by: Simon Glass <sjg@chromium.org>
2016-09-13 05:18:58 +00:00
CONFIG_SPL_SPI_SUPPORT=y
Convert CONFIG_SPL_WATCHDOG_SUPPORT to Kconfig Move this option to Kconfig and tidy up existing uses. Signed-off-by: Simon Glass <sjg@chromium.org>
2016-09-13 05:19:02 +00:00
CONFIG_SPL_WATCHDOG_SUPPORT=y
configs: Resync defconfigs Signed-off-by: Tom Rini <trini@konsulko.com>
2017-06-19 13:47:40 +00:00
# CONFIG_CMD_BMODE is not set
dm: imx: cm_fx6: Enable more driver model support Enable driver model for MMC (including BLK), SATA and USB. Note that USB does not yet work correctly since the nodes are disabled. Hopefully this can be resolved by the maintainer. Signed-off-by: Simon Glass <sjg@chromium.org>
2017-07-29 17:35:28 +00:00
CONFIG_DEFAULT_DEVICE_TREE="imx6q-cm-fx6"
CONFIG_AHCI=y
ARM: imx: cm_fx6: env: support distro boot command The current default environment of the cm_fx6 is not suitable for booting modern distributions. Instead of extending the custom environment, let's use the distro boot command, which has been developed for precisely this use case. If the distro boot command fails, fall back to the old behavior (except for USB drives where the old behaviour is completely covered by the distro boot command). That way it is still possible to create "rescue SD cards" for old installations (e.g. if one messes up the on-flash environment). Signed-off-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-12-09 15:37:42 +00:00
CONFIG_DISTRO_DEFAULTS=y
Kconfig: Move CONFIG_FIT and related options to Kconfig There are already two FIT options in Kconfig but the CONFIG options are still in the header files. We need to do a proper move to fix this. Move these options to Kconfig and tidy up board configuration: CONFIG_FIT CONFIG_OF_BOARD_SETUP CONFIG_OF_SYSTEM_SETUP CONFIG_FIT_SIGNATURE CONFIG_FIT_BEST_MATCH CONFIG_FIT_VERBOSE CONFIG_OF_STDOUT_VIA_ALIAS CONFIG_RSA Unfortunately the first one is a little complicated. We need to make sure this option is not enabled in SPL by this change. Also this option is enabled automatically in the host builds by defining CONFIG_FIT in the image.h file. To solve this, add a new IMAGE_USE_FIT #define which can be used in files that are built on the host but must also build for U-Boot and SPL. Note: Masahiro's moveconfig.py script is amazing. Signed-off-by: Simon Glass <sjg@chromium.org> [trini: Add microblaze change, various configs/ re-applies] Signed-off-by: Tom Rini <trini@konsulko.com>
2016-02-23 05:55:43 +00:00
CONFIG_OF_BOARD_SETUP=y
mx6: Select MX6QDL option via Kconfig Currently the MX6QDL option is selected via CONFIG_SYS_EXTRA_OPTIONS, but it is better to select it directly via Kconfig. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-11-15 19:04:03 +00:00
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
configs: Re-sync BOOTDELAY changes With updated moveconfig.py and an better default, re-generate the migration of BOOTDELAY to the defconfig. Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Tom Rini <trini@konsulko.com>
2016-06-13 13:45:14 +00:00
CONFIG_BOOTDELAY=3
ARM: imx: cm_fx6: env: support distro boot command The current default environment of the cm_fx6 is not suitable for booting modern distributions. Instead of extending the custom environment, let's use the distro boot command, which has been developed for precisely this use case. If the distro boot command fails, fall back to the old behavior (except for USB drives where the old behaviour is completely covered by the distro boot command). That way it is still possible to create "rescue SD cards" for old installations (e.g. if one messes up the on-flash environment). Signed-off-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-12-09 15:37:42 +00:00
CONFIG_BOOTCOMMAND="run distro_bootcmd; run legacy_bootcmd"
Kconfig: Move SPL settings into their own file Move the SPL settings into common/spl where most of the SPL code is kept. Signed-off-by: Simon Glass <sjg@chromium.org>
2016-09-13 05:18:22 +00:00
CONFIG_SPL=y
spl: Convert CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR to Kconfig Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> [trini: Fix sniper and kc1 migration] Signed-off-by: Tom Rini <trini@konsulko.com>
2016-11-16 17:19:05 +00:00
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x80
configs: Re-sync Signed-off-by: Tom Rini <trini@konsulko.com>
2017-03-13 17:48:42 +00:00
CONFIG_SPL_I2C_SUPPORT=y
configs: Re-sync HUSH options Move all cases of CONFIG_SYS_HUSH_PARSER out of the config.h files. Remove all cases of CONFIG_SYS_PROMPT_HUSH_PS2 as everyone uses the default. Signed-off-by: Tom Rini <trini@konsulko.com>
2016-04-22 01:37:19 +00:00
CONFIG_HUSH_PARSER=y
Reorder defconfigs with 'savedefconfig' Some boards' defconfigs are disordered. Reorder them. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
2015-09-28 12:14:15 +00:00
CONFIG_SYS_PROMPT="CM-FX6 # "
configs: Re-sync with cmd/Kconfig Update the config.h and defconfig files for the commands that 8e3c036 converted over to Kconfig Signed-off-by: Tom Rini <trini@konsulko.com>
2016-04-24 21:29:26 +00:00
CONFIG_CMD_BOOTZ=y
Move defaults from config_cmd_default.h to Kconfig This sets the default commands Kconfig to match include/config_cmd_default.h commands in the common/Kconfig and removes them from include/configs. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> [trini: rastaban, am43xx_evm_usbhost_boot, am43xx_evm_ethboot updates] Signed-off-by: Tom Rini <trini@konsulko.com>
2015-06-22 21:15:30 +00:00
# CONFIG_CMD_XIMG is not set
configs: Re-sync with cmd/Kconfig Update the config.h and defconfig files for the commands that 8e3c036 converted over to Kconfig Signed-off-by: Tom Rini <trini@konsulko.com>
2016-04-24 21:29:26 +00:00
CONFIG_CMD_GREPENV=y
Convert CONFIG_CMD_EEPROM et al to Kconfig This converts the following to Kconfig: CONFIG_CMD_EEPROM CONFIG_CMD_EEPROM_LAYOUT CONFIG_EEPROM_LAYOUT_HELP_STRING Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com> [trini: Rework Kconfig logic slightly, define EEPROM location on TI eval platforms] Signed-off-by: Tom Rini <trini@konsulko.com>
2017-05-17 09:25:10 +00:00
CONFIG_CMD_EEPROM=y
CONFIG_CMD_EEPROM_LAYOUT=y
CONFIG_EEPROM_LAYOUT_HELP_STRING="v2, v3"
configs: Resync with savedefconfig Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini <trini@konsulko.com>
2017-08-14 23:58:53 +00:00
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y
Move defaults from config_cmd_default.h to Kconfig This sets the default commands Kconfig to match include/config_cmd_default.h commands in the common/Kconfig and removes them from include/configs. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> [trini: rastaban, am43xx_evm_usbhost_boot, am43xx_evm_ethboot updates] Signed-off-by: Tom Rini <trini@konsulko.com>
2015-06-22 21:15:30 +00:00
# CONFIG_CMD_LOADB is not set
# CONFIG_CMD_LOADS is not set
configs: Re-sync with cmd/Kconfig Update the config.h and defconfig files for the commands that 8e3c036 converted over to Kconfig Signed-off-by: Tom Rini <trini@konsulko.com>
2016-04-24 21:29:26 +00:00
CONFIG_CMD_MMC=y
configs: Migrate CMD_NAND* Migrate all remaining instances of CMD_NAND, CMD_NAND_TRIMFFS CMD_NAND_LOCK_UNLOCK and CMD_NAND_TORTURE from the headers into the defconfig files. Tested-by: Adam Ford <aford173@gmail.com> Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
2017-07-29 01:31:42 +00:00
CONFIG_CMD_NAND=y
configs: Resync with savedefconfig Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini <trini@konsulko.com>
2017-08-14 23:58:53 +00:00
CONFIG_CMD_SATA=y
Tidy up some defconfig files Several files are out of order. This means that when the moveconfig tool moves CONFIG options to Kconfig it generates a large diff. To avoid this, reorder the files first. Signed-off-by: Simon Glass <sjg@chromium.org>
2015-08-19 15:33:42 +00:00
CONFIG_CMD_SF=y
CONFIG_CMD_USB=y
Move defaults from config_cmd_default.h to Kconfig This sets the default commands Kconfig to match include/config_cmd_default.h commands in the common/Kconfig and removes them from include/configs. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> [trini: rastaban, am43xx_evm_usbhost_boot, am43xx_evm_ethboot updates] Signed-off-by: Tom Rini <trini@konsulko.com>
2015-06-22 21:15:30 +00:00
# CONFIG_CMD_SETEXPR is not set
arm: mx6: cm-fx6: move CMD configs to defconfig Move CONFIG_CMD_* options that can be selected in menuconfig to cm-fx6 defconfig. Cc: Stefano Babic <sbabic@denx.de> Cc: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
2015-07-23 14:19:32 +00:00
CONFIG_CMD_DHCP=y
CONFIG_CMD_PING=y
Convert CONFIG_CMD_BMP to Kconfig This converts the following to Kconfig: CONFIG_CMD_BMP Signed-off-by: Simon Glass <sjg@chromium.org> [trini: Add depends on LCD || DM_VIDEO || VIDEO] Signed-off-by: Tom Rini <trini@konsulko.com>
2017-04-27 04:27:55 +00:00
CONFIG_CMD_BMP=y
configs: Re-sync with cmd/Kconfig Update the config.h and defconfig files for the commands that 8e3c036 converted over to Kconfig Signed-off-by: Tom Rini <trini@konsulko.com>
2016-04-24 21:29:26 +00:00
CONFIG_CMD_CACHE=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
configs: Migrate RBTREE, LZO, CMD_MTDPARTS, CMD_UBI and CMD_UBIFS The above CONFIG options are in Kconfig, and now have correct depends and inter-dependencies. Migrate these to configs/ from include/configs/. In the case of CMD_UBIFS also change it to be a default y if CMD_UBI. Signed-off-by: Tom Rini <trini@konsulko.com>
2017-07-22 22:36:16 +00:00
CONFIG_CMD_MTDPARTS=y
Kconfig: Migrate MTDIDS_DEFAULT / MTDPARTS_DEFAULT We move all instances of CONFIG_MTDIDS_DEFAULT and CONFIG_MTDPARTS_DEFAULT from the header files to the defconfig files. There's a few cases here where we need to expand upon what was in the header file. Tested-by: Adam Ford <aford173@gmail.com> #omap3_logic Signed-off-by: Tom Rini <trini@konsulko.com>
2017-10-22 21:55:07 +00:00
CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:768k(uboot),256k(uboot-environment),-(reserved)"
dm: imx: cm_fx6: Enable more driver model support Enable driver model for MMC (including BLK), SATA and USB. Note that USB does not yet work correctly since the nodes are disabled. Hopefully this can be resolved by the maintainer. Signed-off-by: Simon Glass <sjg@chromium.org>
2017-07-29 17:35:28 +00:00
CONFIG_OF_CONTROL=y
configs: Resync with savedefconfig Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini <trini@konsulko.com>
2017-08-28 11:16:32 +00:00
CONFIG_ENV_IS_IN_SPI_FLASH=y
ata: Migrate CONFIG_DWC_AHSATA to Kconfig Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
2017-12-08 13:36:18 +00:00
CONFIG_DWC_AHSATA=y
ARM: imx: cm_fx6: defconfig: enable CONFIG_DM_KEYBOARD Commit 5248930ebf48 ("dm: imx: cm_fx6: Enable more driver model support") enabled driver model support for USB. But it missed to enable driver model support for keyboards. As a result, USB keyboards do no longer work. Fix this by enabling driver model support for keyboards. Fixes: 5248930ebf48 ("dm: imx: cm_fx6: Enable more driver model support") Signed-off-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2017-11-30 21:38:38 +00:00
CONFIG_DM_KEYBOARD=y
dm: imx: cm_fx6: Enable more driver model support Enable driver model for MMC (including BLK), SATA and USB. Note that USB does not yet work correctly since the nodes are disabled. Hopefully this can be resolved by the maintainer. Signed-off-by: Simon Glass <sjg@chromium.org>
2017-07-29 17:35:28 +00:00
CONFIG_DM_MMC=y
Move default y configs out of arch/board Kconfig Some archs/boards specify their own default by pre-defining the config which causes the Kconfig system to mix up the order of the configs in the defconfigs... This will cause merge pain if allowed to proliferate. Remove the configs that behave this way from the archs. A few configs still remain, but that is because they only exist as defaults and do not have a proper Kconfig entry. Those appear to be: SPIFLASH DISPLAY_BOARDINFO Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> [trini: rastaban, am43xx_evm_usbhost_boot, am43xx_evm_ethboot updates, drop DM_USB from MSI_Primo81 as USB_MUSB_SUNXI isn't converted yet to DM] Signed-off-by: Tom Rini <trini@konsulko.com>
2015-06-22 21:15:29 +00:00
CONFIG_SPI_FLASH=y
sf: kconfig: add kconfig options for spi flashes Add kconfig options for various SPI flashes and use them in cm-fx6 defconfig. Cc: Jagan Teki <jteki@openedev.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
2015-07-23 14:19:38 +00:00
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_EON=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_WINBOND=y
Move PHYLIB to Kconfig Signed-off-by: Alexandru Gagniuc <alex.g@adaptrum.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
2017-08-02 00:19:59 +00:00
CONFIG_PHYLIB=y
dm: imx: cm_fx6: Enable more driver model support Enable driver model for MMC (including BLK), SATA and USB. Note that USB does not yet work correctly since the nodes are disabled. Hopefully this can be resolved by the maintainer. Signed-off-by: Simon Glass <sjg@chromium.org>
2017-07-29 17:35:28 +00:00
CONFIG_DM_PMIC=y
CONFIG_DM_REGULATOR=y
arm: mx6: usb: kconfig: add USB_EHCI_MX6 kconfig option Add USB_EHCI_MX6 option to menuconfig and use it when migrating cm-fx6 usb config to defconfig. Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: Marek Vasut <marex@denx.de> Cc: Stefano Babic <sbabic@denx.de> Cc: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
2015-07-23 14:19:35 +00:00
CONFIG_USB=y
dm: imx: cm_fx6: Enable more driver model support Enable driver model for MMC (including BLK), SATA and USB. Note that USB does not yet work correctly since the nodes are disabled. Hopefully this can be resolved by the maintainer. Signed-off-by: Simon Glass <sjg@chromium.org>
2017-07-29 17:35:28 +00:00
CONFIG_DM_USB=y
arm: mx6: usb: kconfig: add USB_EHCI_MX6 kconfig option Add USB_EHCI_MX6 option to menuconfig and use it when migrating cm-fx6 usb config to defconfig. Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: Marek Vasut <marex@denx.de> Cc: Stefano Babic <sbabic@denx.de> Cc: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
2015-07-23 14:19:35 +00:00
CONFIG_USB_STORAGE=y
usb: kconfig: usb keyboard kconfig Add Kconfig options for USB keyboard and use them for cm-fx6. Cc: Marek Vasut <marex@denx.de> Cc: Stefano Babic <sbabic@denx.de> Cc: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
2015-07-23 14:19:36 +00:00
CONFIG_USB_KEYBOARD=y
arm: mx6: cm-fx6: switch to usb kbd polling via int queue CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE works better than CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP (keyboards that previously didn't work such as Microsoft Comfort Curve 1000 now do work, and it's also faster). Switch to CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE. Cc: Stefano Babic <sbabic@denx.de> Cc: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
2015-08-30 12:36:49 +00:00
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
configs: Resync with savedefconfig Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini <trini@konsulko.com>
2017-10-30 16:58:33 +00:00
CONFIG_VIDEO=y
spl: move FDT_FIXUP_PARTITIONS to Kconfig Move FDT_FIXUP_PARTITIONS to Kconfig and cleanup existing uses. Signed-off-by: Heiko Schocher <hs@denx.de>
2016-10-06 05:31:45 +00:00
CONFIG_FDT_FIXUP_PARTITIONS=y
Reference in New Issue Copy Permalink