diff options
Diffstat (limited to 'arch/blackfin/kernel/setup.c')
| -rw-r--r-- | arch/blackfin/kernel/setup.c | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index 342bb8dd56ac..02dc74301920 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c @@ -33,7 +33,6 @@ #include <linux/seq_file.h> #include <linux/cpu.h> #include <linux/module.h> -#include <linux/console.h> #include <linux/tty.h> #include <linux/ext2_fs.h> @@ -44,6 +43,8 @@ #include <asm/blackfin.h> #include <asm/cplbinit.h> +u16 _bfin_swrst; + unsigned long memory_start, memory_end, physical_mem_end; unsigned long reserved_mem_dcache_on; unsigned long reserved_mem_icache_on; @@ -175,6 +176,9 @@ void __init setup_arch(char **cmdline_p) unsigned long mtd_phys = 0; #endif +#ifdef CONFIG_DUMMY_CONSOLE + conswitchp = &dummy_con; +#endif cclk = get_cclk(); sclk = get_sclk(); @@ -379,37 +383,27 @@ void __init setup_arch(char **cmdline_p) if (l1_length > L1_DATA_A_LENGTH) panic("L1 memory overflow\n"); - bf53x_cache_init(); - -#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) -# if defined(CONFIG_BFIN_SHARED_FLASH_ENET) && defined(CONFIG_BFIN533_STAMP) - /* setup BF533_STAMP CPLD to route AMS3 to Ethernet MAC */ - bfin_write_FIO_DIR(bfin_read_FIO_DIR() | (1 << CONFIG_ENET_FLASH_PIN)); - bfin_write_FIO_FLAG_S(1 << CONFIG_ENET_FLASH_PIN); - SSYNC(); -# endif -# if defined (CONFIG_BFIN561_EZKIT) - bfin_write_FIO0_DIR(bfin_read_FIO0_DIR() | (1 << 12)); - SSYNC(); -# endif /* defined (CONFIG_BFIN561_EZKIT) */ +#ifdef BF561_FAMILY + _bfin_swrst = bfin_read_SICA_SWRST(); +#else + _bfin_swrst = bfin_read_SWRST(); #endif + bf53x_cache_init(); + printk(KERN_INFO "Hardware Trace Enabled\n"); bfin_write_TBUFCTL(0x03); } -#if defined(CONFIG_BF561) -static struct cpu cpu[2]; -#else -static struct cpu cpu[1]; -#endif static int __init topology_init(void) { #if defined (CONFIG_BF561) + static struct cpu cpu[2]; register_cpu(&cpu[0], 0); register_cpu(&cpu[1], 1); return 0; #else + static struct cpu cpu[1]; return register_cpu(cpu, 0); #endif } |
