diff options
author | Kevin Hilman <khilman@deeprootsystems.com> | 2009-05-26 10:26:13 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@deeprootsystems.com> | 2009-05-28 18:29:37 -0400 |
commit | 77bbca138c64cb80259732db6f70e1668123f2a7 (patch) | |
tree | ae4862e733cc0fa423c02f59cf6e0e445cb36f0d /arch/arm/configs/davinci_all_defconfig | |
parent | 20e9969b3aa5166d50c8df474967c9d80bf6d481 (diff) |
davinci: defconfig update: add EMAC
DaVinci EMAC driver is now upstream. Enable it in default defconfig.
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/configs/davinci_all_defconfig')
-rw-r--r-- | arch/arm/configs/davinci_all_defconfig | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index c371c6536990..ac18662f38cc 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.30-rc6 | 3 | # Linux kernel version: 2.6.30-rc7 |
4 | # Wed May 20 17:45:58 2009 | 4 | # Tue May 26 07:24:28 2009 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
@@ -179,6 +179,7 @@ CONFIG_ARCH_DAVINCI=y | |||
179 | # CONFIG_ARCH_OMAP is not set | 179 | # CONFIG_ARCH_OMAP is not set |
180 | # CONFIG_ARCH_MSM is not set | 180 | # CONFIG_ARCH_MSM is not set |
181 | # CONFIG_ARCH_W90X900 is not set | 181 | # CONFIG_ARCH_W90X900 is not set |
182 | CONFIG_AINTC=y | ||
182 | 183 | ||
183 | # | 184 | # |
184 | # TI DaVinci Implementations | 185 | # TI DaVinci Implementations |
@@ -251,7 +252,7 @@ CONFIG_PREEMPT=y | |||
251 | CONFIG_HZ=100 | 252 | CONFIG_HZ=100 |
252 | CONFIG_AEABI=y | 253 | CONFIG_AEABI=y |
253 | # CONFIG_OABI_COMPAT is not set | 254 | # CONFIG_OABI_COMPAT is not set |
254 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y | 255 | # CONFIG_ARCH_HAS_HOLES_MEMORYMODEL is not set |
255 | # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set | 256 | # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set |
256 | # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set | 257 | # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set |
257 | # CONFIG_HIGHMEM is not set | 258 | # CONFIG_HIGHMEM is not set |
@@ -667,6 +668,7 @@ CONFIG_NET_ETHERNET=y | |||
667 | CONFIG_MII=y | 668 | CONFIG_MII=y |
668 | # CONFIG_AX88796 is not set | 669 | # CONFIG_AX88796 is not set |
669 | # CONFIG_SMC91X is not set | 670 | # CONFIG_SMC91X is not set |
671 | CONFIG_TI_DAVINCI_EMAC=y | ||
670 | CONFIG_DM9000=y | 672 | CONFIG_DM9000=y |
671 | CONFIG_DM9000_DEBUGLEVEL=4 | 673 | CONFIG_DM9000_DEBUGLEVEL=4 |
672 | # CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set | 674 | # CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set |
@@ -1326,6 +1328,7 @@ CONFIG_MMC_BLOCK=m | |||
1326 | # MMC/SD/SDIO Host Controller Drivers | 1328 | # MMC/SD/SDIO Host Controller Drivers |
1327 | # | 1329 | # |
1328 | # CONFIG_MMC_SDHCI is not set | 1330 | # CONFIG_MMC_SDHCI is not set |
1331 | # CONFIG_MMC_DAVINCI is not set | ||
1329 | # CONFIG_MEMSTICK is not set | 1332 | # CONFIG_MEMSTICK is not set |
1330 | # CONFIG_ACCESSIBILITY is not set | 1333 | # CONFIG_ACCESSIBILITY is not set |
1331 | CONFIG_NEW_LEDS=y | 1334 | CONFIG_NEW_LEDS=y |
@@ -1787,6 +1790,7 @@ CONFIG_CRC32=y | |||
1787 | CONFIG_ZLIB_INFLATE=y | 1790 | CONFIG_ZLIB_INFLATE=y |
1788 | CONFIG_ZLIB_DEFLATE=m | 1791 | CONFIG_ZLIB_DEFLATE=m |
1789 | CONFIG_DECOMPRESS_GZIP=y | 1792 | CONFIG_DECOMPRESS_GZIP=y |
1793 | CONFIG_GENERIC_ALLOCATOR=y | ||
1790 | CONFIG_HAS_IOMEM=y | 1794 | CONFIG_HAS_IOMEM=y |
1791 | CONFIG_HAS_IOPORT=y | 1795 | CONFIG_HAS_IOPORT=y |
1792 | CONFIG_HAS_DMA=y | 1796 | CONFIG_HAS_DMA=y |