diff options
author | Magnus Damm <damm@igel.co.jp> | 2007-08-02 21:15:53 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-08-02 21:15:53 -0400 |
commit | a3b3e23015061814bffd733dbd9c4452b81ca6aa (patch) | |
tree | 4cef193f6c6e5df70988df646ebd63c4df406b72 | |
parent | 49dd3ff3a5f39d4300a4bc85e42756e286e28654 (diff) |
sh: update r2d defconfig
- Disable CONFIG_SH_DMA to avoid boot up freeze on R2D-1
- Disable CONFIG_SH_STANDARD_BIOS to support R2D-PLUS boot loaders
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | arch/sh/configs/rts7751r2d_defconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/configs/rts7751r2d_defconfig b/arch/sh/configs/rts7751r2d_defconfig index f1e979b1e495..b64f73b704d6 100644 --- a/arch/sh/configs/rts7751r2d_defconfig +++ b/arch/sh/configs/rts7751r2d_defconfig | |||
@@ -243,8 +243,8 @@ CONFIG_SH_PCLK_FREQ=60000000 | |||
243 | # | 243 | # |
244 | # DMA support | 244 | # DMA support |
245 | # | 245 | # |
246 | CONFIG_SH_DMA=y | 246 | # CONFIG_SH_DMA is not set |
247 | CONFIG_NR_ONCHIP_DMA_CHANNELS=8 | 247 | # CONFIG_NR_ONCHIP_DMA_CHANNELS is not set |
248 | # CONFIG_NR_DMA_CHANNELS_BOOL is not set | 248 | # CONFIG_NR_DMA_CHANNELS_BOOL is not set |
249 | 249 | ||
250 | # | 250 | # |
@@ -280,7 +280,7 @@ CONFIG_ZERO_PAGE_OFFSET=0x00010000 | |||
280 | CONFIG_BOOT_LINK_OFFSET=0x00800000 | 280 | CONFIG_BOOT_LINK_OFFSET=0x00800000 |
281 | # CONFIG_UBC_WAKEUP is not set | 281 | # CONFIG_UBC_WAKEUP is not set |
282 | CONFIG_CMDLINE_BOOL=y | 282 | CONFIG_CMDLINE_BOOL=y |
283 | CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 root=/dev/sda1 earlyprintk=bios" | 283 | CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 root=/dev/sda1 earlyprintk=serial" |
284 | 284 | ||
285 | # | 285 | # |
286 | # Bus options | 286 | # Bus options |
@@ -1323,7 +1323,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1323 | # CONFIG_DEBUG_KERNEL is not set | 1323 | # CONFIG_DEBUG_KERNEL is not set |
1324 | CONFIG_LOG_BUF_SHIFT=14 | 1324 | CONFIG_LOG_BUF_SHIFT=14 |
1325 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1325 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1326 | CONFIG_SH_STANDARD_BIOS=y | 1326 | # CONFIG_SH_STANDARD_BIOS is not set |
1327 | CONFIG_EARLY_SCIF_CONSOLE=y | 1327 | CONFIG_EARLY_SCIF_CONSOLE=y |
1328 | CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe80000 | 1328 | CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe80000 |
1329 | CONFIG_EARLY_PRINTK=y | 1329 | CONFIG_EARLY_PRINTK=y |