diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-10 08:36:45 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-10 09:55:43 +0100 |
commit | 4497013f0a602cf77d25c433e0d5e4ae5a7e1f58 (patch) | |
tree | 4fa8d1a6955dae220095a635760f44de9ca97357 | |
parent | 6f88d51efdc3989375363ea4fe015bf7ffa81e91 (diff) | |
download | barebox-4497013f0a602cf77d25c433e0d5e4ae5a7e1f58.tar.gz barebox-4497013f0a602cf77d25c433e0d5e4ae5a7e1f58.tar.xz |
ARM: Phytec phyCORE OMAP4460: Split xload defconfigs
The configs grew too big to support both NAND and MMC at the
same time, so split them.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | arch/arm/configs/phytec-phycore-omap4460-xload-mmc_defconfig | 27 | ||||
-rw-r--r-- | arch/arm/configs/phytec-phycore-omap4460-xload-nand_defconfig (renamed from arch/arm/configs/phytec-phycore-omap4460-xload_defconfig) | 10 |
2 files changed, 28 insertions, 9 deletions
diff --git a/arch/arm/configs/phytec-phycore-omap4460-xload-mmc_defconfig b/arch/arm/configs/phytec-phycore-omap4460-xload-mmc_defconfig new file mode 100644 index 0000000000..4e9e266524 --- /dev/null +++ b/arch/arm/configs/phytec-phycore-omap4460-xload-mmc_defconfig @@ -0,0 +1,27 @@ +CONFIG_ARCH_OMAP=y +CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xC000 +CONFIG_OMAP_BUILD_IFT=y +CONFIG_MACH_PCM049=y +CONFIG_THUMB2_BAREBOX=y +# CONFIG_ARM_EXCEPTIONS is not set +# CONFIG_MEMINFO is not set +CONFIG_MMU=y +CONFIG_TEXT_BASE=0x40300000 +CONFIG_MALLOC_SIZE=0x2000000 +CONFIG_MALLOC_DUMMY=y +CONFIG_PROMPT="barebox> " +CONFIG_SHELL_NONE=y +# CONFIG_ERRNO_MESSAGES is not set +# CONFIG_TIMESTAMP is not set +CONFIG_CONSOLE_SIMPLE=y +# CONFIG_DEFAULT_ENVIRONMENT is not set +CONFIG_DRIVER_SERIAL_NS16550=y +CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y +# CONFIG_SPI is not set +CONFIG_MCI=y +CONFIG_MCI_STARTUP=y +# CONFIG_MCI_WRITE is not set +CONFIG_MCI_OMAP_HSMMC=y +# CONFIG_FS_RAMFS is not set +# CONFIG_FS_DEVFS is not set +CONFIG_FS_FAT=y diff --git a/arch/arm/configs/phytec-phycore-omap4460-xload_defconfig b/arch/arm/configs/phytec-phycore-omap4460-xload-nand_defconfig index 6bbc2e4193..14b82885c8 100644 --- a/arch/arm/configs/phytec-phycore-omap4460-xload_defconfig +++ b/arch/arm/configs/phytec-phycore-omap4460-xload-nand_defconfig @@ -1,17 +1,12 @@ CONFIG_ARCH_OMAP=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xC000 -CONFIG_ARCH_OMAP4=y CONFIG_OMAP_BUILD_IFT=y CONFIG_MACH_PCM049=y CONFIG_THUMB2_BAREBOX=y -# CONFIG_CMD_ARM_CPUINFO is not set # CONFIG_ARM_EXCEPTIONS is not set # CONFIG_MEMINFO is not set CONFIG_MMU=y CONFIG_TEXT_BASE=0x40300000 -CONFIG_MEMORY_LAYOUT_FIXED=y -CONFIG_STACK_BASE=0x8f000000 -CONFIG_MALLOC_BASE=0x84000000 CONFIG_MALLOC_SIZE=0x2000000 CONFIG_MALLOC_DUMMY=y CONFIG_PROMPT="barebox> " @@ -19,6 +14,7 @@ CONFIG_SHELL_NONE=y # CONFIG_ERRNO_MESSAGES is not set # CONFIG_TIMESTAMP is not set CONFIG_CONSOLE_SIMPLE=y +CONFIG_PARTITION=y # CONFIG_DEFAULT_ENVIRONMENT is not set CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y @@ -33,10 +29,6 @@ CONFIG_NAND=y # 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_FS_RAMFS is not set # CONFIG_FS_DEVFS is not set CONFIG_FS_FAT=y |