diff options
| author | Tom Rini <trini@konsulko.com> | 2016-12-23 23:41:32 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-23 23:41:32 (GMT) |
| commit | 7ceae0eac04154a651caf2b1c8399fefd3de308d (patch) | |
| tree | 79b088e26b9ad6db58bb05c9a009f87978f3223b /configs | |
| parent | 0683e7e0f3cf9e5e1d02c9a0bb57eecb203ab800 (diff) | |
| parent | cb71c6d85409715f541261f0bdda4a8060128689 (diff) | |
| download | u-boot-fsl-qoriq-7ceae0eac04154a651caf2b1c8399fefd3de308d.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/digsy_mtc_RAMBOOT_defconfig | 1 | ||||
| -rw-r--r-- | configs/digsy_mtc_defconfig | 1 | ||||
| -rw-r--r-- | configs/digsy_mtc_rev5_RAMBOOT_defconfig | 1 | ||||
| -rw-r--r-- | configs/digsy_mtc_rev5_defconfig | 1 | ||||
| -rw-r--r-- | configs/gplugd_defconfig | 5 |
5 files changed, 0 insertions, 9 deletions
diff --git a/configs/digsy_mtc_RAMBOOT_defconfig b/configs/digsy_mtc_RAMBOOT_defconfig index 71fa0b7..66c3393 100644 --- a/configs/digsy_mtc_RAMBOOT_defconfig +++ b/configs/digsy_mtc_RAMBOOT_defconfig @@ -13,7 +13,6 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR="d" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_LOOPW=y -CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/digsy_mtc_defconfig b/configs/digsy_mtc_defconfig index 20491a4..daf08ce 100644 --- a/configs/digsy_mtc_defconfig +++ b/configs/digsy_mtc_defconfig @@ -11,7 +11,6 @@ CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR=" " CONFIG_LOOPW=y -CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/digsy_mtc_rev5_RAMBOOT_defconfig b/configs/digsy_mtc_rev5_RAMBOOT_defconfig index 0db5f92..e55653b 100644 --- a/configs/digsy_mtc_rev5_RAMBOOT_defconfig +++ b/configs/digsy_mtc_rev5_RAMBOOT_defconfig @@ -13,7 +13,6 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR="d" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_LOOPW=y -CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/digsy_mtc_rev5_defconfig b/configs/digsy_mtc_rev5_defconfig index 713fa3d..f1f5f2e 100644 --- a/configs/digsy_mtc_rev5_defconfig +++ b/configs/digsy_mtc_rev5_defconfig @@ -13,7 +13,6 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR="d" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_LOOPW=y -CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/gplugd_defconfig b/configs/gplugd_defconfig index 59c9fdf..3d98f8d 100644 --- a/configs/gplugd_defconfig +++ b/configs/gplugd_defconfig @@ -4,9 +4,7 @@ CONFIG_IDENT_STRING="\nMarvell-gplugD" CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMD_IMLS is not set -CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set -CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_FPGA is not set @@ -16,9 +14,6 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_ATMEL=y -CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_STORAGE=y |