diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-04-08 10:17:15 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-04-08 10:17:15 +0200 |
| commit | 62e4a326f060853bb2ef0bb03c11f1b5bab2cdb9 (patch) | |
| tree | 4cd32da1607946c4f8d683dedf9b66f2dd285dd6 /arch/arm/configs | |
| parent | 7fee6058f048afce4a76d961e03166ad573cc350 (diff) | |
| parent | ff2a647bbf5caeacfba12de03451d318d7188d3a (diff) | |
| download | barebox-62e4a326f060853bb2ef0bb03c11f1b5bab2cdb9.tar.gz barebox-62e4a326f060853bb2ef0bb03c11f1b5bab2cdb9.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/kindle-mx50_defconfig | 28 | ||||
| -rw-r--r-- | arch/arm/configs/kindle3_defconfig | 3 |
2 files changed, 13 insertions, 18 deletions
diff --git a/arch/arm/configs/kindle-mx50_defconfig b/arch/arm/configs/kindle-mx50_defconfig index 31bfc9c06b..95b505fda2 100644 --- a/arch/arm/configs/kindle-mx50_defconfig +++ b/arch/arm/configs/kindle-mx50_defconfig @@ -4,8 +4,8 @@ CONFIG_MACH_KINDLE_MX50=y CONFIG_THUMB2_BAREBOX=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y +CONFIG_IMAGE_COMPRESSION_XZKERN=y CONFIG_MMU=y -CONFIG_MMU_EARLY=y CONFIG_MALLOC_SIZE=0x0 CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y @@ -13,7 +13,6 @@ CONFIG_RELOCATABLE=y CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y -CONFIG_FLEXIBLE_BOOTARGS=y CONFIG_BOOTM_SHOW_TYPE=y CONFIG_BOOTM_VERBOSE=y CONFIG_BOOTM_INITRD=y @@ -24,47 +23,42 @@ CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_CMD_DMESG=y CONFIG_LONGHELP=y CONFIG_CMD_MEMINFO=y -CONFIG_CMD_BOOT=y +CONFIG_CMD_REGULATOR=y +CONFIG_CMD_LOADY=y CONFIG_CMD_RESET=y -CONFIG_CMD_AUTOMOUNT=y CONFIG_CMD_EXPORT=y -CONFIG_CMD_GLOBAL=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_MAGICVAR=y CONFIG_CMD_MAGICVAR_HELP=y +CONFIG_CMD_EDIT=y +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_CLK=y CONFIG_CMD_DETECT=y CONFIG_CMD_FLASH=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_SPI=y -CONFIG_CMD_USB=y CONFIG_CMD_USBGADGET=y -CONFIG_CMD_OF_DUMP=y CONFIG_CMD_OFTREE=y CONFIG_OFDEVICE=y -CONFIG_OF_GPIO=y CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_MTD=y -CONFIG_MTD_WRITE=y CONFIG_MTD_M25P80=y -CONFIG_MTD_SPI_NOR=y -CONFIG_USB=y CONFIG_USB_HOST=y CONFIG_USB_IMX_CHIPIDEA=y CONFIG_USB_EHCI=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_DRIVER_ARC=y CONFIG_USB_GADGET_SERIAL=y CONFIG_USB_GADGET_FASTBOOT=y CONFIG_MCI=y -CONFIG_MCI_INFO=y -CONFIG_MCI_WRITE=y +CONFIG_MCI_STARTUP=y CONFIG_MCI_MMC_BOOT_PARTITIONS=y CONFIG_MCI_IMX_ESDHC=y -CONFIG_PINCTRL=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED=y CONFIG_GENERIC_PHY=y CONFIG_USB_NOP_XCEIV=y -CONFIG_FS_AUTOMOUNT=y -CONFIG_IMAGE_COMPRESSION_XZKERN=y +CONFIG_FS_EXT4=y +CONFIG_FS_FAT=y +CONFIG_FS_FAT_WRITE=y +CONFIG_FS_FAT_LFN=y diff --git a/arch/arm/configs/kindle3_defconfig b/arch/arm/configs/kindle3_defconfig index a4e08dfad0..98691c3a81 100644 --- a/arch/arm/configs/kindle3_defconfig +++ b/arch/arm/configs/kindle3_defconfig @@ -2,7 +2,6 @@ CONFIG_ARCH_IMX=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x30000 CONFIG_MACH_KINDLE3=y CONFIG_IMX_IIM=y -CONFIG_ARCH_IMX_USBLOADER=y CONFIG_AEABI=y CONFIG_ARM_BOARD_APPEND_ATAG=y CONFIG_ARM_BOARD_PREPEND_ATAG=y @@ -10,6 +9,7 @@ CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_PBL_IMAGE=y CONFIG_PBL_RELOCATABLE=y CONFIG_IMAGE_COMPRESSION_XZKERN=y +CONFIG_MMU=y CONFIG_MALLOC_SIZE=0x2000000 CONFIG_MALLOC_TLSF=y CONFIG_RELOCATABLE=y @@ -64,3 +64,4 @@ CONFIG_FS_EXT4=y CONFIG_FS_FAT=y CONFIG_FS_FAT_WRITE=y CONFIG_FS_FAT_LFN=y +CONFIG_ARCH_IMX_USBLOADER=y |