diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-10-10 08:31:08 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-10-10 08:31:08 +0200 |
commit | 64b164356a103b86a899aea297774998adfe62e9 (patch) | |
tree | f991654a3672ebe88ada804d6fce87068764b9e2 /arch/arm/configs | |
parent | b85e0cba7db533ebc8e6753e09ed471ddebfe4d9 (diff) | |
parent | d66e242213320a4fed9960eee0ecc870a9e4c616 (diff) | |
download | barebox-64b164356a103b86a899aea297774998adfe62e9.tar.gz barebox-64b164356a103b86a899aea297774998adfe62e9.tar.xz |
Merge branch 'for-next/mvebu'
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/mvebu_defconfig | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig index bd978a9acb..39e7ef1798 100644 --- a/arch/arm/configs/mvebu_defconfig +++ b/arch/arm/configs/mvebu_defconfig @@ -6,7 +6,9 @@ CONFIG_MACH_MARVELL_ARMADA_XP_GP=y CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3=y CONFIG_MACH_SOLIDRUN_CUBOX=y CONFIG_MACH_GLOBALSCALE_GURUPLUG=y +CONFIG_MACH_PLATHOME_OPENBLOCKS_A6=y CONFIG_MACH_USI_TOPKICK=y +CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_TEXT_BASE=0x0 CONFIG_MALLOC_SIZE=0x0 @@ -17,7 +19,13 @@ CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y +CONFIG_BOOTM_SHOW_TYPE=y +CONFIG_BOOTM_VERBOSE=y +CONFIG_BOOTM_INITRD=y +CONFIG_BOOTM_OFTREE=y +CONFIG_BOOTM_OFTREE_UIMAGE=y CONFIG_BLSPEC=y +CONFIG_FLEXIBLE_BOOTARGS=y CONFIG_IMD_TARGET=y CONFIG_CONSOLE_ACTIVATE_NONE=y CONFIG_PARTITION_DISK_EFI=y @@ -26,13 +34,7 @@ CONFIG_CMD_IOMEM=y CONFIG_CMD_IMD=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_ARM_MMUINFO=y -CONFIG_FLEXIBLE_BOOTARGS=y CONFIG_CMD_BOOT=y -CONFIG_BOOTM_SHOW_TYPE=y -CONFIG_BOOTM_VERBOSE=y -CONFIG_BOOTM_INITRD=y -CONFIG_BOOTM_OFTREE=y -CONFIG_BOOTM_OFTREE_UIMAGE=y CONFIG_CMD_GO=y CONFIG_CMD_LOADS=y CONFIG_CMD_LOADY=y @@ -90,6 +92,7 @@ CONFIG_NET=y CONFIG_OFDEVICE=y CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_DRIVER_SERIAL_NS16550=y +CONFIG_DRIVER_NET_MVNETA=y CONFIG_DRIVER_NET_ORION=y CONFIG_MARVELL_PHY=y CONFIG_DRIVER_SPI_GPIO=y @@ -100,6 +103,7 @@ CONFIG_MTD=y CONFIG_MTD_M25P80=y CONFIG_NAND=y CONFIG_NAND_ORION=y +CONFIG_NAND_MRVL_NFC=y CONFIG_DISK_AHCI=y CONFIG_USB_HOST=y CONFIG_USB_EHCI=y @@ -119,6 +123,8 @@ CONFIG_GPIO_ORION=y CONFIG_PCI_MVEBU=y CONFIG_FS_CRAMFS=y CONFIG_FS_EXT4=y +CONFIG_FS_TFTP=y +CONFIG_FS_NFS=y CONFIG_FS_FAT=y CONFIG_FS_FAT_WRITE=y CONFIG_FS_FAT_LFN=y |