commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=6e8a6fd3211d726b26280d5a37a97aa1827e3d46 branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk
Change default config to enable cache as well. Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Bob Liu <[email protected]> --- arch/blackfin/configs/BF609-EZKIT_defconfig | 2 -- arch/blackfin/kernel/bfin_dma.c | 2 +- arch/blackfin/mach-common/head.S | 7 ------- 3 files changed, 1 insertions(+), 10 deletions(-) diff --git a/arch/blackfin/configs/BF609-EZKIT_defconfig b/arch/blackfin/configs/BF609-EZKIT_defconfig index 4fede27..97051e7 100644 --- a/arch/blackfin/configs/BF609-EZKIT_defconfig +++ b/arch/blackfin/configs/BF609-EZKIT_defconfig @@ -49,8 +49,6 @@ CONFIG_CMDLINE="earlyprintk=serial,uart0,57600 console=ttyBF0,57600" # CONFIG_BFIN_INS_LOWOVERHEAD is not set CONFIG_NOMMU_INITIAL_TRIM_EXCESS=0 CONFIG_DMA_UNCACHED_NONE=y -# CONFIG_BFIN_ICACHE is not set -# CONFIG_BFIN_DCACHE is not set CONFIG_BANK_3=0x99B2 CONFIG_BINFMT_FLAT=y CONFIG_BINFMT_ZFLAT=y diff --git a/arch/blackfin/kernel/bfin_dma.c b/arch/blackfin/kernel/bfin_dma.c index 18fcc09..f115ac3 100644 --- a/arch/blackfin/kernel/bfin_dma.c +++ b/arch/blackfin/kernel/bfin_dma.c @@ -305,7 +305,7 @@ void __init early_dma_memcpy(void *pdst, const void *psrc, size_t size) /* Enable */ DMA_MMR_WRITE(&src_ch->cfg, DMAEN | WDSIZE_32); - DMA_MMR_WRITE(&dst_ch->cfg, WNR | DI_EN_Y | DMAEN | WDSIZE_32); + DMA_MMR_WRITE(&dst_ch->cfg, WNR | DI_EN_X | DMAEN | WDSIZE_32); /* Since we are atomic now, don't use the workaround ssync */ __builtin_bfin_ssync(); diff --git a/arch/blackfin/mach-common/head.S b/arch/blackfin/mach-common/head.S index f5a55f3..31515f0 100644 --- a/arch/blackfin/mach-common/head.S +++ b/arch/blackfin/mach-common/head.S @@ -28,15 +28,10 @@ ENTRY(__init_clear_bss) rts; ENDPROC(__init_clear_bss) -#define CONFIG_NOLOADER_KERNEL_BOOT ENTRY(__start) /* R0: argument of command line string, passed from uboot, save it */ R7 = R0; -#ifdef CONFIG_NOLOADER_KERNEL_BOOT - R7 = 0; -#endif - /* Enable Cycle Counter and Nesting Of Interrupts */ #ifdef CONFIG_BFIN_SCRATCH_REG_CYCLES R0 = SYSCFG_SNEN; @@ -151,10 +146,8 @@ ENTRY(__start) r2.h = ___bss_stop; call __init_clear_bss -#ifndef CONFIG_NOLOADER_KERNEL_BOOT /* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */ call _bfin_relocate_l1_mem; -#endif #ifdef CONFIG_ROMKERNEL call _bfin_relocate_xip_data;
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
