diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-11-26 15:53:05 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-10 14:35:35 +0100 |
| commit | 58be7f230b8635e9e80ac118ec306bc01bfd1847 (patch) | |
| tree | 26c17564b738e311a92c3f1300ca76e1678de999 /arch | |
| parent | 7ae1da8acf2c21c6e37240a10d4669004722b147 (diff) | |
| download | barebox-58be7f230b8635e9e80ac118ec306bc01bfd1847.tar.gz barebox-58be7f230b8635e9e80ac118ec306bc01bfd1847.tar.xz | |
ARM: OMAP: consolidate am335x mlo defconfigs
The Beaglebone and the AM335x Phytec phyCORE can be compiled
together, so merge the configs into a am335x_mlo_defconfig.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/am335x_beaglebone_mlo_defconfig | 33 | ||||
| -rw-r--r-- | arch/arm/configs/am335x_mlo_defconfig (renamed from arch/arm/configs/pcm051_mlo_defconfig) | 13 |
2 files changed, 10 insertions, 36 deletions
diff --git a/arch/arm/configs/am335x_beaglebone_mlo_defconfig b/arch/arm/configs/am335x_beaglebone_mlo_defconfig deleted file mode 100644 index 905cc6dd5a..0000000000 --- a/arch/arm/configs/am335x_beaglebone_mlo_defconfig +++ /dev/null @@ -1,33 +0,0 @@ -CONFIG_ARCH_OMAP=y -# CONFIG_OMAP_GPMC is not set -CONFIG_OMAP_BUILD_IFT=y -CONFIG_OMAP_MULTI_BOARDS=y -CONFIG_MACH_BEAGLEBONE=y -CONFIG_THUMB2_BAREBOX=y -# CONFIG_CMD_ARM_CPUINFO is not set -# CONFIG_BANNER is not set -# CONFIG_MEMINFO is not set -CONFIG_ENVIRONMENT_VARIABLES=y -CONFIG_MMU=y -CONFIG_TEXT_BASE=0x0 -CONFIG_MALLOC_SIZE=0x0 -CONFIG_MALLOC_TLSF=y -CONFIG_RELOCATABLE=y -CONFIG_PROMPT="MLO>" -CONFIG_SHELL_NONE=y -# CONFIG_ERRNO_MESSAGES is not set -# CONFIG_TIMESTAMP is not set -# CONFIG_DEFAULT_ENVIRONMENT is not set -CONFIG_OFDEVICE=y -CONFIG_DRIVER_SERIAL_NS16550=y -CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y -# CONFIG_SPI is not set -CONFIG_MCI=y -# CONFIG_MCI_WRITE is not set -CONFIG_MCI_OMAP_HSMMC=y -CONFIG_PINCTRL=y -CONFIG_PINCTRL_SINGLE=y -# CONFIG_FS_RAMFS is not set -# CONFIG_FS_DEVFS is not set -CONFIG_FS_FAT=y -CONFIG_FS_FAT_LFN=y diff --git a/arch/arm/configs/pcm051_mlo_defconfig b/arch/arm/configs/am335x_mlo_defconfig index ae5764bfca..19f78d0ae8 100644 --- a/arch/arm/configs/pcm051_mlo_defconfig +++ b/arch/arm/configs/am335x_mlo_defconfig @@ -1,11 +1,11 @@ CONFIG_ARCH_OMAP=y CONFIG_OMAP_BUILD_IFT=y CONFIG_OMAP_MULTI_BOARDS=y +CONFIG_MACH_BEAGLEBONE=y CONFIG_MACH_PCM051=y CONFIG_THUMB2_BAREBOX=y # CONFIG_CMD_ARM_CPUINFO is not set # CONFIG_MEMINFO is not set -CONFIG_ENVIRONMENT_VARIABLES=y CONFIG_MMU=y CONFIG_TEXT_BASE=0x0 CONFIG_MALLOC_SIZE=0x0 @@ -15,18 +15,25 @@ CONFIG_PROMPT="MLO>" CONFIG_SHELL_NONE=y # CONFIG_ERRNO_MESSAGES is not set # CONFIG_TIMESTAMP is not set -CONFIG_CONSOLE_SIMPLE=y +CONFIG_CONSOLE_ACTIVATE_NONE=y # CONFIG_DEFAULT_ENVIRONMENT is not set CONFIG_OFDEVICE=y CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y CONFIG_DRIVER_SPI_OMAP3=y CONFIG_MTD=y +# CONFIG_MTD_WRITE is not set +# CONFIG_MTD_OOB_DEVICE is not set CONFIG_MTD_M25P80=y CONFIG_NAND=y +# CONFIG_NAND_ECC_SOFT is not set +# CONFIG_NAND_ECC_HW_SYNDROME is not set +# CONFIG_NAND_ECC_HW_NONE is not set +# CONFIG_NAND_INFO is not set +# CONFIG_NAND_BBT is not set CONFIG_NAND_OMAP_GPMC=y CONFIG_MCI=y -CONFIG_MCI_STARTUP=y +# CONFIG_MCI_WRITE is not set CONFIG_MCI_OMAP_HSMMC=y CONFIG_PINCTRL=y CONFIG_PINCTRL_SINGLE=y |