This is an automated email from Gerrit. Andreas Fritiofson ([email protected]) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/3670
-- gerrit commit cddff63985fcea88e44e9e1947a683251a672872 Author: Andreas Fritiofson <[email protected]> Date: Sun Aug 14 01:34:54 2016 +0200 Remove unused ocl flash driver and associated at91sam7x loader This appears to be some proof-of-concept protocol for flash loaders added by 831d41e7506 in 2008, with the only implementation being for at91sam7x. That chip has a separate flash driver so this code appears obsolete. Change-Id: Ia146dfe2c149205903f40b809439f44a64cc7ce9 Signed-off-by: Andreas Fritiofson <[email protected]> diff --git a/contrib/loaders/flash/at91sam7x/at91sam7x_ocl_flash.script b/contrib/loaders/flash/at91sam7x/at91sam7x_ocl_flash.script deleted file mode 100644 index 85450c1..0000000 --- a/contrib/loaders/flash/at91sam7x/at91sam7x_ocl_flash.script +++ /dev/null @@ -1,4 +0,0 @@ -soft_reset_halt -load_image at91sam7x_ocl.bin 0x200000 -resume 0x200000 -flash probe 0 diff --git a/contrib/loaders/flash/at91sam7x/at91sam7x_ram.ld b/contrib/loaders/flash/at91sam7x/at91sam7x_ram.ld deleted file mode 100644 index ea06931..0000000 --- a/contrib/loaders/flash/at91sam7x/at91sam7x_ram.ld +++ /dev/null @@ -1,132 +0,0 @@ -/**************************************************************************** -* Copyright (c) 2006 by Michael Fischer. All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions -* are met: -* -* 1. Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* 3. Neither the name of the author nor the names of its contributors may -* be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -* THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF -* THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -* SUCH DAMAGE. -* -**************************************************************************** -* -* History: -* -* 30.03.06 mifi First Version -****************************************************************************/ - - -ENTRY(ResetHandler) -SEARCH_DIR(.) - -/* - * Define stack size here - */ -FIQ_STACK_SIZE = 0x0100; -IRQ_STACK_SIZE = 0x0100; -ABT_STACK_SIZE = 0x0100; -UND_STACK_SIZE = 0x0100; -SVC_STACK_SIZE = 0x0100; - - -MEMORY -{ - ram : org = 0x00200000, len = 64k -} - -/* - * Do not change the next code - */ -SECTIONS -{ - .text : - { - *(.vectors); - . = ALIGN(4); - *(.init); - . = ALIGN(4); - *(.text); - . = ALIGN(4); - *(.rodata); - . = ALIGN(4); - *(.rodata*); - . = ALIGN(4); - *(.glue_7t); - . = ALIGN(4); - *(.glue_7); - . = ALIGN(4); - etext = .; - } > ram - - .data : - { - PROVIDE (__data_start = .); - *(.data) - . = ALIGN(4); - edata = .; - _edata = .; - PROVIDE (__data_end = .); - } > ram - - .bss : - { - PROVIDE (__bss_start = .); - *(.bss) - *(COMMON) - . = ALIGN(4); - PROVIDE (__bss_end = .); - - . = ALIGN(256); - - PROVIDE (__stack_start = .); - - PROVIDE (__stack_fiq_start = .); - . += FIQ_STACK_SIZE; - . = ALIGN(4); - PROVIDE (__stack_fiq_end = .); - - PROVIDE (__stack_irq_start = .); - . += IRQ_STACK_SIZE; - . = ALIGN(4); - PROVIDE (__stack_irq_end = .); - - PROVIDE (__stack_abt_start = .); - . += ABT_STACK_SIZE; - . = ALIGN(4); - PROVIDE (__stack_abt_end = .); - - PROVIDE (__stack_und_start = .); - . += UND_STACK_SIZE; - . = ALIGN(4); - PROVIDE (__stack_und_end = .); - - PROVIDE (__stack_svc_start = .); - . += SVC_STACK_SIZE; - . = ALIGN(4); - PROVIDE (__stack_svc_end = .); - PROVIDE (__stack_end = .); - PROVIDE (__heap_start = .); - } > ram - -} -/*** EOF ***/ - diff --git a/contrib/loaders/flash/at91sam7x/crt.s b/contrib/loaders/flash/at91sam7x/crt.s deleted file mode 100644 index 2e434bb..0000000 --- a/contrib/loaders/flash/at91sam7x/crt.s +++ /dev/null @@ -1,223 +0,0 @@ -/**************************************************************************** -* Copyright (c) 2006 by Michael Fischer. All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions -* are met: -* -* 1. Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* 2. Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* 3. Neither the name of the author nor the names of its contributors may -* be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -* THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF -* THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -* SUCH DAMAGE. -* -**************************************************************************** -* -* History: -* -* 18.12.06 mifi First Version -* The hardware initialization is based on the startup file -* crtat91sam7x256_rom.S from NutOS 4.2.1. -* Therefore partial copyright by egnite Software GmbH. -****************************************************************************/ - -/* - * Some defines for the program status registers - */ - ARM_MODE_USER = 0x10 /* Normal User Mode */ - ARM_MODE_FIQ = 0x11 /* FIQ Fast Interrupts Mode */ - ARM_MODE_IRQ = 0x12 /* IRQ Standard Interrupts Mode */ - ARM_MODE_SVC = 0x13 /* Supervisor Interrupts Mode */ - ARM_MODE_ABORT = 0x17 /* Abort Processing memory Faults Mode */ - ARM_MODE_UNDEF = 0x1B /* Undefined Instructions Mode */ - ARM_MODE_SYS = 0x1F /* System Running in Priviledged Operating Mode */ - ARM_MODE_MASK = 0x1F - - I_BIT = 0x80 /* disable IRQ when I bit is set */ - F_BIT = 0x40 /* disable IRQ when I bit is set */ - -/* - * Register Base Address - */ - AIC_BASE = 0xFFFFF000 - AIC_EOICR_OFF = 0x130 - AIC_IDCR_OFF = 0x124 - - RSTC_MR = 0xFFFFFD08 - RSTC_KEY = 0xA5000000 - RSTC_URSTEN = 0x00000001 - - WDT_BASE = 0xFFFFFD40 - WDT_MR_OFF = 0x00000004 - WDT_WDDIS = 0x00008000 - - MC_BASE = 0xFFFFFF00 - MC_FMR_OFF = 0x00000060 - MC_FWS_1FWS = 0x00480100 - - .section .vectors,"ax" - .code 32 - -/****************************************************************************/ -/* Vector table and reset entry */ -/****************************************************************************/ -_vectors: - ldr pc, ResetAddr /* Reset */ - ldr pc, UndefAddr /* Undefined instruction */ - ldr pc, SWIAddr /* Software interrupt */ - ldr pc, PAbortAddr /* Prefetch abort */ - ldr pc, DAbortAddr /* Data abort */ - ldr pc, ReservedAddr /* Reserved */ - ldr pc, IRQAddr /* IRQ interrupt */ - ldr pc, FIQAddr /* FIQ interrupt */ - - -ResetAddr: .word ResetHandler -UndefAddr: .word UndefHandler -SWIAddr: .word SWIHandler -PAbortAddr: .word PAbortHandler -DAbortAddr: .word DAbortHandler -ReservedAddr: .word 0 -IRQAddr: .word IRQHandler -FIQAddr: .word FIQHandler - - .ltorg - - .section .init, "ax" - .code 32 - - .global ResetHandler - .global ExitFunction - .extern main -/****************************************************************************/ -/* Reset handler */ -/****************************************************************************/ -ResetHandler: - /* - * The watchdog is enabled after processor reset. Disable it. - */ - ldr r1, =WDT_BASE - ldr r0, =WDT_WDDIS - str r0, [r1, #WDT_MR_OFF] - - - /* - * Enable user reset: assertion length programmed to 1ms - */ - ldr r0, =(RSTC_KEY | RSTC_URSTEN | (4 << 8)) - ldr r1, =RSTC_MR - str r0, [r1, #0] - - - /* - * Use 2 cycles for flash access. - */ - ldr r1, =MC_BASE - ldr r0, =MC_FWS_1FWS - str r0, [r1, #MC_FMR_OFF] - - - /* - * Disable all interrupts. Useful for debugging w/o target reset. - */ - ldr r1, =AIC_BASE - mvn r0, #0 - str r0, [r1, #AIC_EOICR_OFF] - str r0, [r1, #AIC_IDCR_OFF] - - - /* - * Setup a stack for each mode - */ - msr CPSR_c, #ARM_MODE_UNDEF | I_BIT | F_BIT /* Undefined Instruction Mode */ - ldr sp, =__stack_und_end - - msr CPSR_c, #ARM_MODE_ABORT | I_BIT | F_BIT /* Abort Mode */ - ldr sp, =__stack_abt_end - - msr CPSR_c, #ARM_MODE_FIQ | I_BIT | F_BIT /* FIQ Mode */ - ldr sp, =__stack_fiq_end - - msr CPSR_c, #ARM_MODE_IRQ | I_BIT | F_BIT /* IRQ Mode */ - ldr sp, =__stack_irq_end - - msr CPSR_c, #ARM_MODE_SVC | I_BIT | F_BIT /* Supervisor Mode */ - ldr sp, =__stack_svc_end - - - /* - * Clear .bss section - */ - ldr r1, =__bss_start - ldr r2, =__bss_end - ldr r3, =0 -bss_clear_loop: - cmp r1, r2 - strne r3, [r1], #+4 - bne bss_clear_loop - - - /* - * Jump to main - */ - mrs r0, cpsr - bic r0, r0, #I_BIT | F_BIT /* Enable FIQ and IRQ interrupt */ - msr cpsr, r0 - - mov r0, #0 /* No arguments */ - mov r1, #0 /* No arguments */ - ldr r2, =main - mov lr, pc - bx r2 /* And jump... */ - -ExitFunction: - nop - nop - nop - b ExitFunction - - -/****************************************************************************/ -/* Default interrupt handler */ -/****************************************************************************/ - -UndefHandler: - b UndefHandler - -SWIHandler: - b SWIHandler - -PAbortHandler: - b PAbortHandler - -DAbortHandler: - b DAbortHandler - -IRQHandler: - b IRQHandler - -FIQHandler: - b FIQHandler - - .weak ExitFunction - .weak UndefHandler, PAbortHandler, DAbortHandler - .weak IRQHandler, FIQHandler - - .ltorg -/*** EOF ***/ diff --git a/contrib/loaders/flash/at91sam7x/dcc.c b/contrib/loaders/flash/at91sam7x/dcc.c deleted file mode 100644 index 6ab2417..0000000 --- a/contrib/loaders/flash/at91sam7x/dcc.c +++ /dev/null @@ -1,51 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2007 by Pavel Chromy * - * [email protected] * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ -#include "dcc.h" - - -/* debug channel read (debugger->MCU) */ -uint32 dcc_rd(void) -{ - volatile uint32 dcc_reg; - - do { - asm volatile ("mrc p14, 0, %0, C0, C0" : "=r" (dcc_reg) :); - } while ((dcc_reg&1) == 0); - - asm volatile ("mrc p14, 0, %0, C1, C0" : "=r" (dcc_reg) :); - return dcc_reg; -} - - -/* debug channel write (MCU->debugger) */ -int dcc_wr(uint32 data) -{ - volatile uint32 dcc_reg; - - do { - asm volatile ("mrc p14, 0, %0, C0, C0" : "=r" (dcc_reg) :); - /* operation controled by master, cancel operation - upon reception of data for immediate response */ - if (dcc_reg&1) return -1; - } while (dcc_reg&2); - - asm volatile ("mcr p14, 0, %0, C1, C0" : : "r" (data)); - return 0; -} diff --git a/contrib/loaders/flash/at91sam7x/dcc.h b/contrib/loaders/flash/at91sam7x/dcc.h deleted file mode 100644 index a3c1393..0000000 --- a/contrib/loaders/flash/at91sam7x/dcc.h +++ /dev/null @@ -1,31 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2007 by Pavel Chromy * - * [email protected] * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ -#ifndef dccH -#define dccH - -#include "platform.h" - -/* debug channel read (debugger->MCU) */ -uint32 dcc_rd(void); - -/* debug channel write (MCU->debugger) */ -int dcc_wr(uint32 data); - -#endif diff --git a/contrib/loaders/flash/at91sam7x/main.c b/contrib/loaders/flash/at91sam7x/main.c deleted file mode 100644 index c4b4dcf..0000000 --- a/contrib/loaders/flash/at91sam7x/main.c +++ /dev/null @@ -1,107 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2007 by Pavel Chromy * - * [email protected] * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ -#include "platform.h" - -#include <flash/nor/ocl.h> -#include "dcc.h" -#include "samflash.h" - - -#define BUFSIZE 1024 /* words, i.e. 4 KiB */ -uint32 buffer[1024]; - -void cmd_flash(uint32 cmd) -{ - unsigned int len; - uint32 adr; - uint32 chksum; - unsigned int bi; /* buffer index */ - unsigned int bi_start; /* receive start mark */ - unsigned int bi_end; /* receive end mark */ - unsigned int ofs; - int pagenum; - int result; - - adr = dcc_rd(); - len = cmd&0xffff; - ofs = adr%flash_page_size; - bi_start = ofs/4; - bi_end = (ofs + len + 3)/4; - - if (bi_end > BUFSIZE) { - dcc_wr(OCL_BUFF_OVER); - return; - } - - chksum = OCL_CHKS_INIT; - for (bi = 0; bi < bi_end; bi++) chksum^=buffer[bi]=dcc_rd(); - - if (dcc_rd() != chksum) { - dcc_wr(OCL_CHKS_FAIL); - return; - } - - /* fill in unused positions with unprogrammed values */ - for (bi = 0; bi < bi_start; bi++) buffer[bi]=0xffffffff; - for (bi = bi_end; bi%flash_page_size; bi++) buffer[bi]=0xffffffff; - - result = 0; - pagenum = adr/flash_page_size; - for (bi = 0; bi < bi_end; bi += flash_page_size/4) { - result = flash_page_program(buffer + bi, pagenum++); - if (result) break; - } - - /* verify written data */ - if (!result) result = flash_verify(adr, len, ((uint8 *)buffer) + ofs); - - dcc_wr(OCL_CMD_DONE | result); -} - - -int main (void) -{ - uint32 cmd; - - for (;;) { - cmd = dcc_rd(); - switch (cmd&OCL_CMD_MASK) { - case OCL_PROBE: - dcc_wr(OCL_CMD_DONE | flash_init()); - dcc_wr(0x100000); /* base */ - dcc_wr(flash_page_count*flash_page_size); /* size */ - dcc_wr(1); /* num_sectors */ - dcc_wr(4096 | ((unsigned long) flash_page_size << 16)); /* buflen and bufalign */ - break; - case OCL_ERASE_ALL: - dcc_wr(OCL_CMD_DONE | flash_erase_all()); - break; - case OCL_FLASH_BLOCK: - cmd_flash(cmd); - break; - default: - /* unknown command */ - dcc_wr(OCL_CMD_ERR); - break; - } - } - - return(0); /* we shall never get here, just to supress compiler warning */ -} diff --git a/contrib/loaders/flash/at91sam7x/makefile b/contrib/loaders/flash/at91sam7x/makefile deleted file mode 100644 index c3eaf12..0000000 --- a/contrib/loaders/flash/at91sam7x/makefile +++ /dev/null @@ -1,130 +0,0 @@ -############################################################################################## -# Start of default section -# - -TRGT = arm-elf- -CC = $(TRGT)gcc -CP = $(TRGT)objcopy -AS = $(TRGT)gcc -x assembler-with-cpp -HEX = $(CP) -O ihex -BIN = $(CP) -O binary -OBJDUMP = $(TRGT)objdump - -MCU = arm7tdmi - -# List all default C defines here, like -D_DEBUG=1 -DDEFS = - -# List all default ASM defines here, like -D_DEBUG=1 -DADEFS = - -# List all default directories to look for include files here -DINCDIR = - -# List the default directory to look for the libraries here -DLIBDIR = - -# List all default libraries here -DLIBS = - -# -# End of default section -############################################################################################## - -############################################################################################## -# Start of user section -# - -# Define project name here -PROJECT = at91sam7x_ocl - -# Define linker script file here -LDSCRIPT= at91sam7x_ram.ld - -# List all user C define here, like -D_DEBUG=1 -UDEFS = - -# Define ASM defines here -UADEFS = - -# List C source files here -SRC = main.c dcc.c samflash.c - -# List ASM source files here -ASRC = crt.s - -# List all user directories here -UINCDIR = - -# List the user directory to look for the libraries here -ULIBDIR = - -# List all user libraries here -ULIBS = - -# Define optimisation level here -OPT = -O2 - -# -# End of user defines -############################################################################################## - - -INCDIR = $(patsubst %,-I%,$(DINCDIR) $(UINCDIR)) -LIBDIR = $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR)) -DEFS = $(DDEFS) $(UDEFS) -ADEFS = $(DADEFS) $(UADEFS) -OBJS = $(ASRC:.s=.o) $(SRC:.c=.o) -LIBS = $(DLIBS) $(ULIBS) -MCFLAGS = -mcpu=$(MCU) - -ASFLAGS = $(MCFLAGS) -g -gdwarf-2 -Wa,-amhls=$(<:.s=.lst) $(ADEFS) -CPFLAGS = $(MCFLAGS) $(OPT) -gdwarf-2 -mthumb-interwork -fomit-frame-pointer -Wall -Wstrict-prototypes -fverbose-asm -Wa,-ahlms=$(<:.c=.lst) $(DEFS) -LDFLAGS = $(MCFLAGS) -nostartfiles -T$(LDSCRIPT) -Wl,-Map=$(PROJECT).map,--cref,--no-warn-mismatch $(LIBDIR) - -# Generate dependency information -#CPFLAGS += -MD -MP -MF .dep/$(@F).d - -# -# makefile rules -# - -all: $(OBJS) $(PROJECT).elf $(PROJECT).hex $(PROJECT).bin $(PROJECT).lst - -%o : %c - $(CC) -c $(CPFLAGS) -I . $(INCDIR) $< -o $@ - -%o : %s - $(AS) -c $(ASFLAGS) $< -o $@ - -%elf: $(OBJS) - $(CC) $(OBJS) $(LDFLAGS) $(LIBS) -o $@ - -%hex: %elf - $(HEX) $< $@ - -%bin: %elf - $(BIN) $< $@ - -%.lst: %.elf - $(OBJDUMP) -h -S $< > $@ - -clean: - -rm -f $(OBJS) - -rm -f $(PROJECT).elf - -rm -f $(PROJECT).map - -rm -f $(PROJECT).hex - -rm -f $(PROJECT).bin - -rm -f $(PROJECT).lst - -rm -f $(SRC:.c=.c.bak) - -rm -f $(SRC:.c=.lst) - -rm -f $(ASRC:.s=.s.bak) - -rm -f $(ASRC:.s=.lst) - -rm -fR .dep - -# -# Include the dependency files, should be the last of the makefile -# -#-include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*) - -# *** EOF *** \ No newline at end of file diff --git a/contrib/loaders/flash/at91sam7x/ocl.h b/contrib/loaders/flash/at91sam7x/ocl.h deleted file mode 100644 index 1fe4596..0000000 --- a/contrib/loaders/flash/at91sam7x/ocl.h +++ /dev/null @@ -1,40 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2007 by Pavel Chromy * - * [email protected] * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ -#ifndef OCL_H -#define OCL_H - -/* command/response mask */ -#define OCL_CMD_MASK 0xFFFF0000L - -/* commads */ -#define OCL_FLASH_BLOCK 0x0CFB0000L -#define OCL_ERASE_BLOCK 0x0CEB0000L -#define OCL_ERASE_ALL 0x0CEA0000L -#define OCL_PROBE 0x0CBE0000L - -/* responses */ -#define OCL_CMD_DONE 0x0ACD0000L -#define OCL_CMD_ERR 0x0ACE0000L -#define OCL_CHKS_FAIL 0x0ACF0000L -#define OCL_BUFF_OVER 0x0AB00000L - -#define OCL_CHKS_INIT 0xC100CD0CL - -#endif /* OCL_H */ diff --git a/contrib/loaders/flash/at91sam7x/platform.h b/contrib/loaders/flash/at91sam7x/platform.h deleted file mode 100644 index 2b26e4b..0000000 --- a/contrib/loaders/flash/at91sam7x/platform.h +++ /dev/null @@ -1,46 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2007 by Pavel Chromy * - * [email protected] * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ -#ifndef platformH -#define platformH - -#include "samregs.h" - - -#define outb(_reg, _val) (*((volatile unsigned char *)(_reg)) = (_val)) -#define outw(_reg, _val) (*((volatile unsigned short *)(_reg)) = (_val)) -#define outr(_reg, _val) (*((volatile unsigned int *)(_reg)) = (_val)) - -#define inb(_reg) (*((volatile unsigned char *)(_reg))) -#define inw(_reg) (*((volatile unsigned short *)(_reg))) -#define inr(_reg) (*((volatile unsigned int *)(_reg))) - -#define _BV(bit) (1 << (bit)) - - -typedef signed char int8; -typedef unsigned char uint8; - -typedef signed short int16; -typedef unsigned short uint16; - -typedef signed int int32; -typedef unsigned int uint32; - -#endif diff --git a/contrib/loaders/flash/at91sam7x/samflash.c b/contrib/loaders/flash/at91sam7x/samflash.c deleted file mode 100644 index 49c84c8..0000000 --- a/contrib/loaders/flash/at91sam7x/samflash.c +++ /dev/null @@ -1,196 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2007 by Pavel Chromy * - * [email protected] * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ -#include "samflash.h" - - -unsigned int flash_page_count = 1024; -unsigned int flash_page_size = 256; - -/* pages per lock bit */ -unsigned int flash_lock_pages = 1024/16; - - -/* detect chip and set loader parameters */ -int flash_init(void) -{ - unsigned int nvpsiz; - - nvpsiz = (inr(DBGU_CIDR) >> 8)&0xf; - - switch (nvpsiz) { - case 3: - /* AT91SAM7x32 */ - flash_page_count = 256; - flash_page_size = 128; - flash_lock_pages = 256/8; - break; - case 5: - /* AT91SAM7x64 */ - flash_page_count = 512; - flash_page_size = 128; - flash_lock_pages = 512/16; - break; - case 7: - /* AT91SAM7x128*/ - flash_page_count = 512; - flash_page_size = 256; - flash_lock_pages = 512/8; - break; - case 9: - /* AT91SAM7x256 */ - flash_page_count = 1024; - flash_page_size = 256; - flash_lock_pages = 1024/16; - break; - case 10: - /* AT91SAM7x512 */ - flash_page_count = 2048; - flash_page_size = 256; - flash_lock_pages = 2048/32; - break; - default: - return FLASH_STAT_INITE; - } - return FLASH_STAT_OK; -} - - -/* program single flash page */ -int flash_page_program(uint32 *data, int page_num) -{ - int i; - int efc_ofs; - - uint32 *flash_ptr; - uint32 *data_ptr; - - /* select proper controller */ - if (page_num >= 1024) efc_ofs = 0x10; - else efc_ofs = 0; - - /* wait until FLASH is ready, just for sure */ - while ((inr(MC_FSR + efc_ofs)&MC_FRDY) == 0); - - /* calculate page address, only lower 8 bits are used to address the latch, - but the upper part of address is needed for writing to proper EFC */ - flash_ptr = (uint32 *)(FLASH_AREA_ADDR + (page_num*flash_page_size)); - data_ptr = data; - - /* copy data to latch */ - for (i = flash_page_size/4; i; i--) { - /* we do not use memcpy to be sure that only 32 bit access is used */ - *(flash_ptr++)=*(data_ptr++); - } - - /* page number and page write command to FCR */ - outr(MC_FCR + efc_ofs, ((page_num&0x3ff) << 8) | MC_KEY | MC_FCMD_WP); - - /* wait until it's done */ - while ((inr(MC_FSR + efc_ofs)&MC_FRDY) == 0); - - /* check for errors */ - if ((inr(MC_FSR + efc_ofs)&MC_PROGE)) return FLASH_STAT_PROGE; - if ((inr(MC_FSR + efc_ofs)&MC_LOCKE)) return FLASH_STAT_LOCKE; - -#if 0 - /* verify written data */ - flash_ptr = (uint32 *)(FLASH_AREA_ADDR + (page_num*flash_page_size)); - data_ptr = data; - - for (i = flash_page_size/4; i; i--) { - if (*(flash_ptr++)!=*(data_ptr++)) return FLASH_STAT_VERIFE; - } -#endif - - return FLASH_STAT_OK; -} - - -int flash_erase_plane(int efc_ofs) -{ - unsigned int lockbits; - int page_num; - - page_num = 0; - lockbits = inr(MC_FSR + efc_ofs) >> 16; - while (lockbits) { - if (lockbits&1) { - - /* wait until FLASH is ready, just for sure */ - while ((inr(MC_FSR + efc_ofs)&MC_FRDY) == 0); - - outr(MC_FCR + efc_ofs, ((page_num&0x3ff) << 8) | 0x5a000004); - - /* wait until it's done */ - while ((inr(MC_FSR + efc_ofs)&MC_FRDY) == 0); - - /* check for errors */ - if ((inr(MC_FSR + efc_ofs)&MC_PROGE)) return FLASH_STAT_PROGE; - if ((inr(MC_FSR + efc_ofs)&MC_LOCKE)) return FLASH_STAT_LOCKE; - - } - if ((page_num += flash_lock_pages) > flash_page_count) break; - lockbits>>=1; - } - - /* wait until FLASH is ready, just for sure */ - while ((inr(MC_FSR + efc_ofs)&MC_FRDY) == 0); - - /* erase all command to FCR */ - outr(MC_FCR + efc_ofs, 0x5a000008); - - /* wait until it's done */ - while ((inr(MC_FSR + efc_ofs)&MC_FRDY) == 0); - - /* check for errors */ - if ((inr(MC_FSR + efc_ofs)&MC_PROGE)) return FLASH_STAT_PROGE; - if ((inr(MC_FSR + efc_ofs)&MC_LOCKE)) return FLASH_STAT_LOCKE; - - /* set no erase before programming */ - outr(MC_FMR + efc_ofs, inr(MC_FMR + efc_ofs) | 0x80); - - return FLASH_STAT_OK; -} - - -/* erase whole chip */ -int flash_erase_all(void) -{ - int result; - - if ((result = flash_erase_plane(0)) != FLASH_STAT_OK) return result; - - /* the second flash controller, if any */ - if (flash_page_count > 1024) result = flash_erase_plane(0x10); - - return result; -} - - -int flash_verify(uint32 adr, unsigned int len, uint8 *src) -{ - unsigned char *flash_ptr; - - flash_ptr = (uint8 *)FLASH_AREA_ADDR + adr; - for (;len; len--) { - if (*(flash_ptr++)!=*(src++)) return FLASH_STAT_VERIFE; - } - return FLASH_STAT_OK; -} diff --git a/contrib/loaders/flash/at91sam7x/samflash.h b/contrib/loaders/flash/at91sam7x/samflash.h deleted file mode 100644 index 1de02ae..0000000 --- a/contrib/loaders/flash/at91sam7x/samflash.h +++ /dev/null @@ -1,48 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2007 by Pavel Chromy * - * [email protected] * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ -#ifndef samflashH -#define samflashH - -#include "platform.h" - -#define FLASH_AREA_ADDR 0x100000 - -#define FLASH_STAT_OK 0 -#define FLASH_STAT_PROGE 1 -#define FLASH_STAT_LOCKE 2 -#define FLASH_STAT_VERIFE 3 -#define FLASH_STAT_INITE 4 - -extern unsigned int flash_page_count; -extern unsigned int flash_page_size; /* words */ - -/* detect chip and set loader parameters */ -int flash_init(void); - -/* program single flash page */ -int flash_page_program(uint32 *data, int page_num); - -/* erase whole chip */ -int flash_erase_all(void); - -/* verify written data */ -int flash_verify(uint32 adr, unsigned int len, uint8 *src); - -#endif diff --git a/contrib/loaders/flash/at91sam7x/samregs.h b/contrib/loaders/flash/at91sam7x/samregs.h deleted file mode 100644 index b206fd2..0000000 --- a/contrib/loaders/flash/at91sam7x/samregs.h +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (C) 2005-2006 by egnite Software GmbH. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY EGNITE SOFTWARE GMBH AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL EGNITE - * SOFTWARE GMBH OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF - * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * For additional information see http://www.ethernut.de/ - */ - - -#ifndef samregsH -#define samregsH - - -/* - * Register definitions below copied from NutOS - */ - -#define DBGU_BASE 0xFFFFF200 /*!< \brief DBGU base address. */ - -#define DBGU_CIDR_OFF 0x00000040 /*!< \brief DBGU chip ID register offset. */ -#define DBGU_CIDR (DBGU_BASE + DBGU_CIDR_OFF) /*!< \brief DBGU chip ID register. */ - - -#define MC_BASE 0xFFFFFF00 /*!< \brief Memory controller base. */ - -#define MC_FMR_OFF 0x00000060 /*!< \brief MC flash mode register offset. */ -#define MC_FMR (MC_BASE + MC_FMR_OFF) /*!< \brief MC flash mode register address. */ -#define MC_FRDY 0x00000001 /*!< \brief Flash ready. */ -#define MC_LOCKE 0x00000004 /*!< \brief Lock error. */ -#define MC_PROGE 0x00000008 /*!< \brief Programming error. */ -#define MC_NEBP 0x00000080 /*!< \brief No erase before programming. */ -#define MC_FWS_MASK 0x00000300 /*!< \brief Flash wait state mask. */ -#define MC_FWS_1R2W 0x00000000 /*!< \brief 1 cycle for read, 2 for write operations. */ -#define MC_FWS_2R3W 0x00000100 /*!< \brief 2 cycles for read, 3 for write operations. */ -#define MC_FWS_3R4W 0x00000200 /*!< \brief 3 cycles for read, 4 for write operations. */ -#define MC_FWS_4R4W 0x00000300 /*!< \brief 4 cycles for read and write operations. */ -#define MC_FMCN_MASK 0x00FF0000 /*!< \brief Flash microsecond cycle number mask. */ - -#define MC_FCR_OFF 0x00000064 /*!< \brief MC flash command register offset. */ -#define MC_FCR (MC_BASE + MC_FCR_OFF) /*!< \brief MC flash command register address. */ -#define MC_FCMD_MASK 0x0000000F /*!< \brief Flash command mask. */ -#define MC_FCMD_NOP 0x00000000 /*!< \brief No command. */ -#define MC_FCMD_WP 0x00000001 /*!< \brief Write page. */ -#define MC_FCMD_SLB 0x00000002 /*!< \brief Set lock bit. */ -#define MC_FCMD_WPL 0x00000003 /*!< \brief Write page and lock. */ -#define MC_FCMD_CLB 0x00000004 /*!< \brief Clear lock bit. */ -#define MC_FCMD_EA 0x00000008 /*!< \brief Erase all. */ -#define MC_FCMD_SGPB 0x0000000B /*!< \brief Set general purpose NVM bit. */ -#define MC_FCMD_CGPB 0x0000000D /*!< \brief Clear general purpose NVM bit. */ -#define MC_FCMD_SSB 0x0000000F /*!< \brief Set security bit. */ -#define MC_PAGEN_MASK 0x0003FF00 /*!< \brief Page number mask. */ -#define MC_KEY 0x5A000000 /*!< \brief Writing protect key. */ - -#define MC_FSR_OFF 0x00000068 /*!< \brief MC flash status register offset. */ -#define MC_FSR (MC_BASE + MC_FSR_OFF) /*!< \brief MC flash status register address. */ -#define MC_SECURITY 0x00000010 /*!< \brief Security bit status. */ - - -#endif diff --git a/doc/manual/target/notarm.txt b/doc/manual/target/notarm.txt index 5d5be78..a095b65 100644 --- a/doc/manual/target/notarm.txt +++ b/doc/manual/target/notarm.txt @@ -10,12 +10,11 @@ to execute code on the target. This needs to be handled in some CPU independent manner. -The ocl and ecos flash drivers compile the flash +The ecos flash drivers compile the flash driver code to run on the target on the developer machine. -The ocl and ecos flash drivers should be unified -and instructions should be written on how to +Instructions should be written on how to compile the target flash drivers. Perhaps using automake? diff --git a/doc/openocd.texi b/doc/openocd.texi index 983ce3c..796a302 100644 --- a/doc/openocd.texi +++ b/doc/openocd.texi @@ -5650,20 +5650,6 @@ code. @end deffn -@deffn {Flash Driver} ocl -This driver is an implementation of the ``on chip flash loader'' -protocol proposed by Pavel Chromy. - -It is a minimalistic command-response protocol intended to be used -over a DCC when communicating with an internal or external flash -loader running from RAM. An example implementation for AT91SAM7x is -available in @file{contrib/loaders/flash/at91sam7x/}. - -@example -flash bank $_FLASHNAME ocl 0 0 0 0 $_TARGETNAME -@end example -@end deffn - @deffn {Flash Driver} pic32mx The PIC32MX microcontrollers are based on the MIPS 4K cores, and integrate flash memory. diff --git a/src/flash/nor/Makefile.am b/src/flash/nor/Makefile.am index c167e8f..5df0979 100644 --- a/src/flash/nor/Makefile.am +++ b/src/flash/nor/Makefile.am @@ -38,7 +38,6 @@ NOR_DRIVERS = \ non_cfi.c \ nrf51.c \ numicro.c \ - ocl.c \ pic32mx.c \ psoc4.c \ sim3x.c \ @@ -63,7 +62,6 @@ noinst_HEADERS = \ driver.h \ imp.h \ non_cfi.h \ - ocl.h \ spi.h MAINTAINERCLEANFILES = $(srcdir)/Makefile.in diff --git a/src/flash/nor/drivers.c b/src/flash/nor/drivers.c index 56a5cb2..b09725e 100644 --- a/src/flash/nor/drivers.c +++ b/src/flash/nor/drivers.c @@ -49,7 +49,6 @@ extern struct flash_driver mrvlqspi_flash; extern struct flash_driver niietcm4_flash; extern struct flash_driver nrf51_flash; extern struct flash_driver numicro_flash; -extern struct flash_driver ocl_flash; extern struct flash_driver pic32mx_flash; extern struct flash_driver psoc4_flash; extern struct flash_driver sim3x_flash; @@ -101,7 +100,6 @@ static struct flash_driver *flash_drivers[] = { &niietcm4_flash, &nrf51_flash, &numicro_flash, - &ocl_flash, &pic32mx_flash, &psoc4_flash, &sim3x_flash, diff --git a/src/flash/nor/ocl.c b/src/flash/nor/ocl.c deleted file mode 100644 index 4ae5652..0000000 --- a/src/flash/nor/ocl.c +++ /dev/null @@ -1,343 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2007 by Pavel Chromy * - * [email protected] * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - ***************************************************************************/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "imp.h" -#include "ocl.h" -#include <target/embeddedice.h> - -struct ocl_priv { - struct arm_jtag *jtag_info; - unsigned int buflen; - unsigned int bufalign; -}; - -static int ocl_erase_check(struct flash_bank *bank) -{ - return ERROR_OK; -} - -static int ocl_protect_check(struct flash_bank *bank) -{ - return ERROR_OK; -} - -/* flash_bank ocl 0 0 0 0 <target#> */ -FLASH_BANK_COMMAND_HANDLER(ocl_flash_bank_command) -{ - struct arm7_9_common *arm7_9; - struct ocl_priv *ocl; - - if (CMD_ARGC < 6) - return ERROR_COMMAND_SYNTAX_ERROR; - - arm7_9 = target_to_arm7_9(bank->target); - if (!is_arm7_9(arm7_9)) - return ERROR_TARGET_INVALID; - - ocl = bank->driver_priv = malloc(sizeof(struct ocl_priv)); - ocl->jtag_info = &arm7_9->jtag_info; - ocl->buflen = 0; - ocl->bufalign = 1; - - return ERROR_OK; -} - -static int ocl_erase(struct flash_bank *bank, int first, int last) -{ - struct ocl_priv *ocl = bank->driver_priv; - int retval; - uint32_t dcc_buffer[3]; - - /* check preconditions */ - if (bank->num_sectors == 0) - return ERROR_FLASH_BANK_NOT_PROBED; - - if (bank->target->state != TARGET_RUNNING) { - LOG_ERROR("target has to be running to communicate with the loader"); - return ERROR_TARGET_NOT_RUNNING; - } - - if ((first == 0) && (last == bank->num_sectors - 1)) { - dcc_buffer[0] = OCL_ERASE_ALL; - retval = embeddedice_send(ocl->jtag_info, dcc_buffer, 1); - if (retval != ERROR_OK) - return retval; - } else { - dcc_buffer[0] = OCL_ERASE_BLOCK; - dcc_buffer[1] = first; - dcc_buffer[2] = last; - retval = embeddedice_send(ocl->jtag_info, dcc_buffer, 3); - if (retval != ERROR_OK) - return retval; - } - - /* wait for response, fixed timeout of 1 s */ - retval = embeddedice_handshake(ocl->jtag_info, EICE_COMM_CTRL_WBIT, 1000); - if (retval != ERROR_OK) - return retval; - - /* receive response */ - retval = embeddedice_receive(ocl->jtag_info, dcc_buffer + 1, 1); - if (retval != ERROR_OK) - return retval; - - if (dcc_buffer[1] != OCL_CMD_DONE) { - if (dcc_buffer[0] == OCL_ERASE_ALL) - LOG_ERROR("loader response to OCL_ERASE_ALL 0x%08" PRIx32 "", dcc_buffer[1]); - else - LOG_ERROR("loader response to OCL_ERASE_BLOCK 0x%08" PRIx32 "", dcc_buffer[1]); - return ERROR_FLASH_OPERATION_FAILED; - } - - return ERROR_OK; -} - -static int ocl_protect(struct flash_bank *bank, int set, int first, int last) -{ - return ERROR_OK; -} - -static int ocl_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t offset, uint32_t count) -{ - struct ocl_priv *ocl = bank->driver_priv; - int retval; - uint32_t *dcc_buffer; - uint32_t *dcc_bufptr; - int byteofs; - int runlen; - uint32_t chksum; - - int i; - - /* check preconditions */ - if (ocl->buflen == 0 || ocl->bufalign == 0) - return ERROR_FLASH_BANK_NOT_PROBED; - - if (bank->target->state != TARGET_RUNNING) { - LOG_ERROR("target has to be running to communicate with the loader"); - return ERROR_TARGET_NOT_RUNNING; - } - - /* allocate buffer for max. ocl buffer + overhead */ - dcc_buffer = malloc(sizeof(uint32_t)*(ocl->buflen/4 + 3)); - - while (count) { - if (count + (offset % ocl->bufalign) > ocl->buflen) - runlen = ocl->buflen - (offset % ocl->bufalign); - else - runlen = count; - - dcc_buffer[0] = OCL_FLASH_BLOCK | runlen; - dcc_buffer[1] = offset; - dcc_bufptr = &dcc_buffer[2]; - - *dcc_bufptr = 0xffffffff; - byteofs = (offset % ocl->bufalign) % 4; - chksum = OCL_CHKS_INIT; - - /* copy data to DCC buffer in proper byte order and properly aligned */ - for (i = 0; i < runlen; i++) { - switch (byteofs++) { - case 0: - *dcc_bufptr &= *(buffer++) | 0xffffff00; - break; - case 1: - *dcc_bufptr &= ((*(buffer++)) << 8) | 0xffff00ff; - break; - case 2: - *dcc_bufptr &= ((*(buffer++)) << 16) | 0xff00ffff; - break; - case 3: - *dcc_bufptr &= ((*(buffer++)) << 24) | 0x00ffffff; - chksum ^= *(dcc_bufptr++); - *dcc_bufptr = 0xffffffff; - byteofs = 0; - break; - } - } - - /* add the remaining word to checksum */ - if (byteofs) - chksum ^= *(dcc_bufptr++); - - *(dcc_bufptr++) = chksum; - - /* send the data */ - retval = embeddedice_send(ocl->jtag_info, dcc_buffer, dcc_bufptr-dcc_buffer); - if (retval != ERROR_OK) { - free(dcc_buffer); - return retval; - } - - /* wait for response, fixed timeout of 1 s */ - retval = embeddedice_handshake(ocl->jtag_info, EICE_COMM_CTRL_WBIT, 1000); - if (retval != ERROR_OK) { - free(dcc_buffer); - return retval; - } - - /* receive response */ - retval = embeddedice_receive(ocl->jtag_info, dcc_buffer, 1); - if (retval != ERROR_OK) { - free(dcc_buffer); - return retval; - } - - if (dcc_buffer[0] != OCL_CMD_DONE) { - LOG_ERROR("loader response to OCL_FLASH_BLOCK 0x%08" PRIx32 "", dcc_buffer[0]); - free(dcc_buffer); - return ERROR_FLASH_OPERATION_FAILED; - } - - count -= runlen; - offset += runlen; - } - - free(dcc_buffer); - return ERROR_OK; -} - -static int ocl_probe(struct flash_bank *bank) -{ - struct ocl_priv *ocl = bank->driver_priv; - int retval; - uint32_t dcc_buffer[1]; - int sectsize; - int i; - - /* purge pending data in DCC */ - embeddedice_receive(ocl->jtag_info, dcc_buffer, 1); - - dcc_buffer[0] = OCL_PROBE; - retval = embeddedice_send(ocl->jtag_info, dcc_buffer, 1); - if (retval != ERROR_OK) - return retval; - - /* wait for response, fixed timeout of 1 s */ - retval = embeddedice_handshake(ocl->jtag_info, EICE_COMM_CTRL_WBIT, 1000); - if (retval != ERROR_OK) - return retval; - - /* receive response */ - retval = embeddedice_receive(ocl->jtag_info, dcc_buffer, 1); - if (retval != ERROR_OK) - return retval; - - if (dcc_buffer[0] != OCL_CMD_DONE) { - LOG_ERROR("loader response to OCL_PROBE 0x%08" PRIx32 "", dcc_buffer[0]); - return ERROR_FLASH_OPERATION_FAILED; - } - - /* receive and fill in parameters, detection of loader is important, receive it one by one */ - retval = embeddedice_handshake(ocl->jtag_info, EICE_COMM_CTRL_WBIT, 0); - if (retval != ERROR_OK) - return retval; - retval = embeddedice_receive(ocl->jtag_info, dcc_buffer, 1); - if (retval != ERROR_OK) - return retval; - bank->base = dcc_buffer[0]; - - retval = embeddedice_handshake(ocl->jtag_info, EICE_COMM_CTRL_WBIT, 0); - if (retval != ERROR_OK) - return retval; - retval = embeddedice_receive(ocl->jtag_info, dcc_buffer, 1); - if (retval != ERROR_OK) - return retval; - bank->size = dcc_buffer[0]; - - retval = embeddedice_handshake(ocl->jtag_info, EICE_COMM_CTRL_WBIT, 0); - if (retval != ERROR_OK) - return retval; - retval = embeddedice_receive(ocl->jtag_info, dcc_buffer, 1); - if (retval != ERROR_OK) - return retval; - bank->num_sectors = dcc_buffer[0]; - - retval = embeddedice_handshake(ocl->jtag_info, EICE_COMM_CTRL_WBIT, 0); - if (retval != ERROR_OK) - return retval; - retval = embeddedice_receive(ocl->jtag_info, dcc_buffer, 1); - if (retval != ERROR_OK) - return retval; - ocl->buflen = dcc_buffer[0] & 0xffff; - ocl->bufalign = dcc_buffer[0] >> 16; - - bank->sectors = realloc(bank->sectors, sizeof(struct flash_sector)*bank->num_sectors); - if (bank->num_sectors == 0) { - LOG_ERROR("number of sectors shall be non zero value"); - return ERROR_FLASH_BANK_INVALID; - } - if (bank->size % bank->num_sectors) { - LOG_ERROR("bank size not divisible by number of sectors"); - return ERROR_FLASH_BANK_INVALID; - } - sectsize = bank->size / bank->num_sectors; - for (i = 0; i < bank->num_sectors; i++) { - bank->sectors[i].offset = i * sectsize; - bank->sectors[i].size = sectsize; - bank->sectors[i].is_erased = -1; - bank->sectors[i].is_protected = -1; - } - - if (ocl->bufalign == 0) - ocl->bufalign = 1; - - if (ocl->buflen == 0) { - LOG_ERROR("buflen shall be non zero value"); - return ERROR_FLASH_BANK_INVALID; - } - - if ((ocl->bufalign > ocl->buflen) || (ocl->buflen % ocl->bufalign)) { - LOG_ERROR("buflen is not multiple of bufalign"); - return ERROR_FLASH_BANK_INVALID; - } - - if (ocl->buflen % 4) { - LOG_ERROR("buflen shall be divisible by 4"); - return ERROR_FLASH_BANK_INVALID; - } - - return ERROR_OK; -} - -static int ocl_auto_probe(struct flash_bank *bank) -{ - struct ocl_priv *ocl = bank->driver_priv; - - if (ocl->buflen == 0 || ocl->bufalign == 0) - return ERROR_FLASH_BANK_NOT_PROBED; - - return ERROR_OK; -} - -struct flash_driver ocl_flash = { - .name = "ocl", - .flash_bank_command = ocl_flash_bank_command, - .erase = ocl_erase, - .protect = ocl_protect, - .write = ocl_write, - .read = default_flash_read, - .probe = ocl_probe, - .erase_check = ocl_erase_check, - .protect_check = ocl_protect_check, - .auto_probe = ocl_auto_probe, -}; diff --git a/src/flash/nor/ocl.h b/src/flash/nor/ocl.h deleted file mode 100644 index 3e83f76..0000000 --- a/src/flash/nor/ocl.h +++ /dev/null @@ -1,39 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2007 by Pavel Chromy * - * [email protected] * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - ***************************************************************************/ - -#ifndef OPENOCD_FLASH_NOR_OCL_H -#define OPENOCD_FLASH_NOR_OCL_H - -/* command/response mask */ -#define OCL_CMD_MASK 0xFFFF0000L - -/* commads */ -#define OCL_FLASH_BLOCK 0x0CFB0000L -#define OCL_ERASE_BLOCK 0x0CEB0000L -#define OCL_ERASE_ALL 0x0CEA0000L -#define OCL_PROBE 0x0CBE0000L - -/* responses */ -#define OCL_CMD_DONE 0x0ACD0000L -#define OCL_CMD_ERR 0x0ACE0000L -#define OCL_CHKS_FAIL 0x0ACF0000L -#define OCL_BUFF_OVER 0x0AB00000L - -#define OCL_CHKS_INIT 0xC100CD0CL - -#endif /* OPENOCD_FLASH_NOR_OCL_H */ -- ------------------------------------------------------------------------------ What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic patterns at an interface-level. Reveals which users, apps, and protocols are consuming the most bandwidth. Provides multi-vendor support for NetFlow, J-Flow, sFlow and other flows. Make informed decisions using capacity planning reports. http://sdm.link/zohodev2dev _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
