|
@@ -1,851 +0,0 @@
|
|
|
-From 74796655212d321f50ab89e8c5570245901f4cba Mon Sep 17 00:00:00 2001
|
|
|
-From: Gregory Hermant <gregory.hermant@calao-systems.com>
|
|
|
-Date: Thu, 5 Jul 2012 18:44:07 +0200
|
|
|
-Subject: [PATCH] Add support for the Calao-systems USB-A9263
|
|
|
-
|
|
|
-
|
|
|
-Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
|
|
|
----
|
|
|
- board/usb_a9263/dataflash/Makefile | 115 +++++++++++++
|
|
|
- board/usb_a9263/dataflash/usb-a9263.h | 97 +++++++++++
|
|
|
- board/usb_a9263/nandflash/Makefile | 117 ++++++++++++++
|
|
|
- board/usb_a9263/nandflash/usb-a9263.h | 116 +++++++++++++
|
|
|
- board/usb_a9263/usb_a9263.c | 285 +++++++++++++++++++++++++++++++++
|
|
|
- crt0_gnu.S | 7 +
|
|
|
- driver/dataflash.c | 6 +-
|
|
|
- include/part.h | 6 +-
|
|
|
- 8 files changed, 745 insertions(+), 4 deletions(-)
|
|
|
- create mode 100644 board/usb_a9263/dataflash/Makefile
|
|
|
- create mode 100644 board/usb_a9263/dataflash/usb-a9263.h
|
|
|
- create mode 100644 board/usb_a9263/nandflash/Makefile
|
|
|
- create mode 100644 board/usb_a9263/nandflash/usb-a9263.h
|
|
|
- create mode 100644 board/usb_a9263/usb_a9263.c
|
|
|
-
|
|
|
-diff --git a/board/usb_a9263/dataflash/Makefile b/board/usb_a9263/dataflash/Makefile
|
|
|
-new file mode 100644
|
|
|
-index 0000000..332685e
|
|
|
---- /dev/null
|
|
|
-+++ b/board/usb_a9263/dataflash/Makefile
|
|
|
-@@ -0,0 +1,115 @@
|
|
|
-+# TODO: set this appropriately for your local toolchain
|
|
|
-+#SHELL=C:\CYGWIN_REP\dwn_071004\bin\BASH.exe
|
|
|
-+CROSS_COMPILE=arm-elf-
|
|
|
-+#CROSS_COMPILE = arm-softfloat-linux-gnu-
|
|
|
-+
|
|
|
-+TOOLCHAIN=gcc
|
|
|
-+
|
|
|
-+BOOTSTRAP_PATH=../../..
|
|
|
-+
|
|
|
-+# DataFlashBoot Configuration for USB-A9263
|
|
|
-+
|
|
|
-+# Target name (case sensitive!!!)
|
|
|
-+TARGET=AT91SAM9263
|
|
|
-+# Board name (case sensitive!!!)
|
|
|
-+BOARD=usb_a9263
|
|
|
-+# Link Address and Top_of_Memory
|
|
|
-+LINK_ADDR=0x300000
|
|
|
-+TOP_OF_MEMORY=0x314000
|
|
|
-+# Name of current directory
|
|
|
-+PROJECT=dataflash
|
|
|
-+
|
|
|
-+ifndef BOOT_NAME
|
|
|
-+BOOT_NAME=$(PROJECT)_$(BOARD)
|
|
|
-+endif
|
|
|
-+
|
|
|
-+INCL=./$(BOOTSTRAP_PATH)/board/$(BOARD)/$(PROJECT)
|
|
|
-+
|
|
|
-+ifeq ($(TOOLCHAIN), gcc)
|
|
|
-+
|
|
|
-+AS=$(CROSS_COMPILE)gcc
|
|
|
-+CC=$(CROSS_COMPILE)gcc
|
|
|
-+LD=$(CROSS_COMPILE)gcc
|
|
|
-+NM= $(CROSS_COMPILE)nm
|
|
|
-+SIZE=$(CROSS_COMPILE)size
|
|
|
-+OBJCOPY=$(CROSS_COMPILE)objcopy
|
|
|
-+OBJDUMP=$(CROSS_COMPILE)objdump
|
|
|
-+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL)
|
|
|
-+ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY)
|
|
|
-+
|
|
|
-+# Linker flags.
|
|
|
-+# -Wl,...: tell GCC to pass this to linker.
|
|
|
-+# -Map: create map file
|
|
|
-+# --cref: add cross reference to map file
|
|
|
-+LDFLAGS+=-nostartfiles -nostdlib -Wl,-Map=$(BOOT_NAME).map,--cref
|
|
|
-+LDFLAGS+=-T $(BOOTSTRAP_PATH)/elf32-littlearm.lds -Ttext $(LINK_ADDR)
|
|
|
-+OBJS=crt0_gnu.o
|
|
|
-+
|
|
|
-+endif
|
|
|
-+
|
|
|
-+OBJS+=\
|
|
|
-+ $(BOARD).o \
|
|
|
-+ main.o \
|
|
|
-+ gpio.o \
|
|
|
-+ pmc.o \
|
|
|
-+ debug.o \
|
|
|
-+ sdramc.o \
|
|
|
-+ dataflash.o \
|
|
|
-+ _udivsi3.o \
|
|
|
-+ _umodsi3.o \
|
|
|
-+ div0.o \
|
|
|
-+ udiv.o \
|
|
|
-+ string.o
|
|
|
-+
|
|
|
-+rebuild: clean all
|
|
|
-+
|
|
|
-+all: $(BOOT_NAME)
|
|
|
-+
|
|
|
-+ifeq ($(TOOLCHAIN), gcc)
|
|
|
-+$(BOOT_NAME): $(OBJS)
|
|
|
-+ $(LD) $(LDFLAGS) -n -o $(BOOT_NAME).elf $(OBJS)
|
|
|
-+ $(OBJCOPY) --strip-debug --strip-unneeded $(BOOT_NAME).elf -O binary $(BOOT_NAME).bin
|
|
|
-+endif
|
|
|
-+
|
|
|
-+
|
|
|
-+$(BOARD).o: $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c -o $(BOARD).o
|
|
|
-+
|
|
|
-+main.o: $(BOOTSTRAP_PATH)/main.c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/main.c -o main.o
|
|
|
-+
|
|
|
-+gpio.o: $(BOOTSTRAP_PATH)/driver/gpio.c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/gpio.c -o gpio.o
|
|
|
-+
|
|
|
-+pmc.o: $(BOOTSTRAP_PATH)/driver/pmc.c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/pmc.c -o pmc.o
|
|
|
-+
|
|
|
-+debug.o: $(BOOTSTRAP_PATH)/driver/debug.c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/debug.c -o debug.o
|
|
|
-+
|
|
|
-+sdramc.o: $(BOOTSTRAP_PATH)/driver/sdramc.c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/sdramc.c -o sdramc.o
|
|
|
-+
|
|
|
-+dataflash.o: $(BOOTSTRAP_PATH)/driver/dataflash.c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/dataflash.c -o dataflash.o
|
|
|
-+
|
|
|
-+crt0_gnu.o: $(BOOTSTRAP_PATH)/crt0_gnu.S
|
|
|
-+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/crt0_gnu.S -o crt0_gnu.o
|
|
|
-+
|
|
|
-+div0.o: $(BOOTSTRAP_PATH)/lib/div0.c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/div0.c -o div0.o
|
|
|
-+
|
|
|
-+string.o: $(BOOTSTRAP_PATH)/lib/string.c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/string.c -o string.o
|
|
|
-+
|
|
|
-+udiv.o: $(BOOTSTRAP_PATH)/lib/udiv.c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/udiv.c -o udiv.o
|
|
|
-+
|
|
|
-+_udivsi3.o: $(BOOTSTRAP_PATH)/lib/_udivsi3.S
|
|
|
-+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_udivsi3.S -o _udivsi3.o
|
|
|
-+
|
|
|
-+_umodsi3.o: $(BOOTSTRAP_PATH)/lib/_umodsi3.S
|
|
|
-+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_umodsi3.S -o _umodsi3.o
|
|
|
-+
|
|
|
-+clean:
|
|
|
-+ rm -f *.o *.bin *.elf *.map
|
|
|
-diff --git a/board/usb_a9263/dataflash/usb-a9263.h b/board/usb_a9263/dataflash/usb-a9263.h
|
|
|
-new file mode 100644
|
|
|
-index 0000000..40a3af8
|
|
|
---- /dev/null
|
|
|
-+++ b/board/usb_a9263/dataflash/usb-a9263.h
|
|
|
-@@ -0,0 +1,97 @@
|
|
|
-+/* ----------------------------------------------------------------------------
|
|
|
-+ * ATMEL Microcontroller Software Support - ROUSSET -
|
|
|
-+ * ----------------------------------------------------------------------------
|
|
|
-+ * Copyright (c) 2006, Atmel Corporation
|
|
|
-+
|
|
|
-+ * All rights reserved.
|
|
|
-+ *
|
|
|
-+ * Redistribution and use in source and binary forms, with or without
|
|
|
-+ * modification, are permitted provided that the following conditions are met:
|
|
|
-+ *
|
|
|
-+ * - Redistributions of source code must retain the above copyright notice,
|
|
|
-+ * this list of conditions and the disclaimer below.
|
|
|
-+ *
|
|
|
-+ * Atmel's name may not be used to endorse or promote products derived from
|
|
|
-+ * this software without specific prior written permission.
|
|
|
-+ *
|
|
|
-+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
|
|
|
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
|
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
|
|
|
-+ * DISCLAIMED. IN NO EVENT SHALL ATMEL 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.
|
|
|
-+ * ----------------------------------------------------------------------------
|
|
|
-+ * File Name : usb-a9263.h
|
|
|
-+ * Object :
|
|
|
-+ * Creation : GH Jun 28th 2012
|
|
|
-+ *-----------------------------------------------------------------------------
|
|
|
-+ */
|
|
|
-+#ifndef _USB_A9263_H
|
|
|
-+#define _USB_A9263_H
|
|
|
-+
|
|
|
-+/* ******************************************************************* */
|
|
|
-+/* PMC Settings */
|
|
|
-+/* */
|
|
|
-+/* The main oscillator is enabled as soon as possible in the c_startup */
|
|
|
-+/* and MCK is switched on the main oscillator. */
|
|
|
-+/* PLL initialization is done later in the hw_init() function */
|
|
|
-+/* ******************************************************************* */
|
|
|
-+#define MASTER_CLOCK (180000000/2)
|
|
|
-+#define PLL_LOCK_TIMEOUT 1000000
|
|
|
-+
|
|
|
-+#define PLLA_SETTINGS 0x20593F06
|
|
|
-+#define PLLB_SETTINGS 0x10483F0E
|
|
|
-+
|
|
|
-+/* Switch MCK on PLLA output PCK = PLLA = 2 * MCK */
|
|
|
-+#define MCKR_SETTINGS (AT91C_PMC_PRES_CLK | AT91C_PMC_MDIV_2)
|
|
|
-+#define MCKR_CSS_SETTINGS (AT91C_PMC_CSS_PLLA_CLK | MCKR_SETTINGS)
|
|
|
-+
|
|
|
-+/* ******************************************************************* */
|
|
|
-+/* DataFlash Settings */
|
|
|
-+/* */
|
|
|
-+/* ******************************************************************* */
|
|
|
-+#define AT91C_BASE_SPI AT91C_BASE_SPI0
|
|
|
-+#define AT91C_ID_SPI AT91C_ID_SPI0
|
|
|
-+
|
|
|
-+/* SPI CLOCK */
|
|
|
-+#define AT91C_SPI_CLK 8000000
|
|
|
-+/* AC characteristics */
|
|
|
-+/* DLYBS = tCSS= 250ns min and DLYBCT = tCSH = 250ns */
|
|
|
-+#define DATAFLASH_TCSS (0x1a << 16) /* 250ns min (tCSS) <=> 12/48000000 = 250ns */
|
|
|
-+#define DATAFLASH_TCHS (0x1 << 24) /* 250ns min (tCSH) <=> (64*1+SCBR)/(2*48000000) */
|
|
|
-+
|
|
|
-+#define DF_CS_SETTINGS (AT91C_SPI_NCPHA | (AT91C_SPI_DLYBS & DATAFLASH_TCSS) | (AT91C_SPI_DLYBCT & DATAFLASH_TCHS) | ((MASTER_CLOCK / AT91C_SPI_CLK) << 8))
|
|
|
-+
|
|
|
-+/* ******************************************************************* */
|
|
|
-+/* SDRAMC Settings */
|
|
|
-+/* */
|
|
|
-+/* ******************************************************************* */
|
|
|
-+#define AT91C_BASE_SDRAMC AT91C_BASE_SDRAMC0
|
|
|
-+#define AT91C_EBI_SDRAM AT91C_EBI0_SDRAM
|
|
|
-+
|
|
|
-+/* ******************************************************************* */
|
|
|
-+/* BootStrap Settings */
|
|
|
-+/* */
|
|
|
-+/* ******************************************************************* */
|
|
|
-+#define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */
|
|
|
-+
|
|
|
-+#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */
|
|
|
-+#define IMG_SIZE 0x40000 /* Image Size in DataFlash */
|
|
|
-+
|
|
|
-+#define MACH_TYPE 0x6AE /* USB-A9263 */
|
|
|
-+#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
|
|
|
-+
|
|
|
-+/* ******************************************************************* */
|
|
|
-+/* Application Settings */
|
|
|
-+/* ******************************************************************* */
|
|
|
-+#define CFG_HW_INIT
|
|
|
-+#define CFG_SDRAM
|
|
|
-+#undef CFG_DEBUG
|
|
|
-+
|
|
|
-+#define CFG_DATAFLASH
|
|
|
-+
|
|
|
-+#endif /* _USB_A9263_H */
|
|
|
-diff --git a/board/usb_a9263/nandflash/Makefile b/board/usb_a9263/nandflash/Makefile
|
|
|
-new file mode 100644
|
|
|
-index 0000000..c453098
|
|
|
---- /dev/null
|
|
|
-+++ b/board/usb_a9263/nandflash/Makefile
|
|
|
-@@ -0,0 +1,117 @@
|
|
|
-+# TODO: set this appropriately for your local toolchain
|
|
|
-+#SHELL=C:\CYGWIN_REP\dwn_071004\bin\BASH.exe
|
|
|
-+CROSS_COMPILE=arm-elf-
|
|
|
-+
|
|
|
-+TOOLCHAIN=gcc
|
|
|
-+
|
|
|
-+BOOTSTRAP_PATH=../../..
|
|
|
-+
|
|
|
-+# NandFlashBoot Configuration for USB-A9263
|
|
|
-+
|
|
|
-+# Target name (case sensitive!!!)
|
|
|
-+TARGET=AT91SAM9263
|
|
|
-+# Board name (case sensitive!!!)
|
|
|
-+BOARD=usb_a9263
|
|
|
-+# Link Address and Top_of_Memory
|
|
|
-+LINK_ADDR=0x300000
|
|
|
-+TOP_OF_MEMORY=0x314000
|
|
|
-+# Name of current directory
|
|
|
-+PROJECT=nandflash
|
|
|
-+
|
|
|
-+ifndef BOOT_NAME
|
|
|
-+BOOT_NAME=$(PROJECT)_$(BOARD)
|
|
|
-+endif
|
|
|
-+
|
|
|
-+INCL=./$(BOOTSTRAP_PATH)/board/$(BOARD)/$(PROJECT)
|
|
|
-+
|
|
|
-+ifeq ($(TOOLCHAIN), gcc)
|
|
|
-+
|
|
|
-+AS=$(CROSS_COMPILE)gcc
|
|
|
-+CC=$(CROSS_COMPILE)gcc
|
|
|
-+LD=$(CROSS_COMPILE)gcc
|
|
|
-+NM= $(CROSS_COMPILE)nm
|
|
|
-+SIZE=$(CROSS_COMPILE)size
|
|
|
-+OBJCOPY=$(CROSS_COMPILE)objcopy
|
|
|
-+OBJDUMP=$(CROSS_COMPILE)objdump
|
|
|
-+CCFLAGS=-g -mcpu=arm9 -O0 -Wall -D$(TARGET) -D$(BOARD) -I$(INCL)
|
|
|
-+ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY)
|
|
|
-+
|
|
|
-+# Linker flags.
|
|
|
-+# -Wl,...: tell GCC to pass this to linker.
|
|
|
-+# -Map: create map file
|
|
|
-+# --cref: add cross reference to map file
|
|
|
-+LDFLAGS+=-nostartfiles -nostdlib -Wl,-Map=$(BOOT_NAME).map,--cref
|
|
|
-+LDFLAGS+=-T $(BOOTSTRAP_PATH)/elf32-littlearm.lds -Ttext $(LINK_ADDR)
|
|
|
-+OBJS=crt0_gnu.o
|
|
|
-+
|
|
|
-+endif
|
|
|
-+
|
|
|
-+OBJS+=\
|
|
|
-+ $(BOARD).o \
|
|
|
-+ main.o \
|
|
|
-+ gpio.o \
|
|
|
-+ pmc.o \
|
|
|
-+ debug.o \
|
|
|
-+ sdramc.o \
|
|
|
-+ nandflash.o \
|
|
|
-+ _udivsi3.o \
|
|
|
-+ _umodsi3.o \
|
|
|
-+ div0.o \
|
|
|
-+ udiv.o \
|
|
|
-+ string.o
|
|
|
-+
|
|
|
-+rebuild: clean all
|
|
|
-+
|
|
|
-+all: $(BOOT_NAME)
|
|
|
-+
|
|
|
-+ifeq ($(TOOLCHAIN), gcc)
|
|
|
-+$(BOOT_NAME): $(OBJS)
|
|
|
-+ $(LD) $(LDFLAGS) -n -o $(BOOT_NAME).elf $(OBJS)
|
|
|
-+ $(OBJCOPY) --strip-debug --strip-unneeded $(BOOT_NAME).elf -O binary $(BOOT_NAME).bin
|
|
|
-+endif
|
|
|
-+
|
|
|
-+
|
|
|
-+$(BOARD).o: $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c -o $(BOARD).o
|
|
|
-+
|
|
|
-+main.o: $(BOOTSTRAP_PATH)/main.c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/main.c -o main.o
|
|
|
-+
|
|
|
-+gpio.o: $(BOOTSTRAP_PATH)/driver/gpio.c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/gpio.c -o gpio.o
|
|
|
-+
|
|
|
-+pmc.o: $(BOOTSTRAP_PATH)/driver/pmc.c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/pmc.c -o pmc.o
|
|
|
-+
|
|
|
-+debug.o: $(BOOTSTRAP_PATH)/driver/debug.c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/debug.c -o debug.o
|
|
|
-+
|
|
|
-+sdramc.o: $(BOOTSTRAP_PATH)/driver/sdramc.c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/sdramc.c -o sdramc.o
|
|
|
-+
|
|
|
-+dataflash.o: $(BOOTSTRAP_PATH)/driver/dataflash.c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/dataflash.c -o dataflash.o
|
|
|
-+
|
|
|
-+nandflash.o: $(BOOTSTRAP_PATH)/driver/nandflash.c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/nandflash.c -o nandflash.o
|
|
|
-+
|
|
|
-+crt0_gnu.o: $(BOOTSTRAP_PATH)/crt0_gnu.S
|
|
|
-+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/crt0_gnu.S -o crt0_gnu.o
|
|
|
-+
|
|
|
-+div0.o: $(BOOTSTRAP_PATH)/lib/div0.c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/div0.c -o div0.o
|
|
|
-+
|
|
|
-+string.o: $(BOOTSTRAP_PATH)/lib/string.c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/string.c -o string.o
|
|
|
-+
|
|
|
-+udiv.o: $(BOOTSTRAP_PATH)/lib/udiv.c
|
|
|
-+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/udiv.c -o udiv.o
|
|
|
-+
|
|
|
-+_udivsi3.o: $(BOOTSTRAP_PATH)/lib/_udivsi3.S
|
|
|
-+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_udivsi3.S -o _udivsi3.o
|
|
|
-+
|
|
|
-+_umodsi3.o: $(BOOTSTRAP_PATH)/lib/_umodsi3.S
|
|
|
-+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_umodsi3.S -o _umodsi3.o
|
|
|
-+
|
|
|
-+clean:
|
|
|
-+ rm -f *.o *.bin *.elf *.map
|
|
|
-diff --git a/board/usb_a9263/nandflash/usb-a9263.h b/board/usb_a9263/nandflash/usb-a9263.h
|
|
|
-new file mode 100644
|
|
|
-index 0000000..24e2cf1
|
|
|
---- /dev/null
|
|
|
-+++ b/board/usb_a9263/nandflash/usb-a9263.h
|
|
|
-@@ -0,0 +1,116 @@
|
|
|
-+/* ----------------------------------------------------------------------------
|
|
|
-+ * ATMEL Microcontroller Software Support - ROUSSET -
|
|
|
-+ * ----------------------------------------------------------------------------
|
|
|
-+ * Copyright (c) 2006, Atmel Corporation
|
|
|
-+
|
|
|
-+ * All rights reserved.
|
|
|
-+ *
|
|
|
-+ * Redistribution and use in source and binary forms, with or without
|
|
|
-+ * modification, are permitted provided that the following conditions are met:
|
|
|
-+ *
|
|
|
-+ * - Redistributions of source code must retain the above copyright notice,
|
|
|
-+ * this list of conditions and the disclaimer below.
|
|
|
-+ *
|
|
|
-+ * Atmel's name may not be used to endorse or promote products derived from
|
|
|
-+ * this software without specific prior written permission.
|
|
|
-+ *
|
|
|
-+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
|
|
|
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
|
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
|
|
|
-+ * DISCLAIMED. IN NO EVENT SHALL ATMEL 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.
|
|
|
-+ * ----------------------------------------------------------------------------
|
|
|
-+ * File Name : usb-a9263.h
|
|
|
-+ * Object :
|
|
|
-+ * Creation : GH Jun 28th 2012
|
|
|
-+ *-----------------------------------------------------------------------------
|
|
|
-+ */
|
|
|
-+#ifndef _USB_A9263_H
|
|
|
-+#define _USB_A9263_H
|
|
|
-+
|
|
|
-+/* ******************************************************************* */
|
|
|
-+/* PMC Settings */
|
|
|
-+/* */
|
|
|
-+/* The main oscillator is enabled as soon as possible in the c_startup */
|
|
|
-+/* and MCK is switched on the main oscillator. */
|
|
|
-+/* PLL initialization is done later in the hw_init() function */
|
|
|
-+/* ******************************************************************* */
|
|
|
-+#define MASTER_CLOCK (180000000/2)
|
|
|
-+#define PLL_LOCK_TIMEOUT 1000000
|
|
|
-+
|
|
|
-+#define PLLA_SETTINGS 0x20593F06
|
|
|
-+#define PLLB_SETTINGS 0x10483F0E
|
|
|
-+
|
|
|
-+/* Switch MCK on PLLA output PCK = PLLA = 2 * MCK */
|
|
|
-+#define MCKR_SETTINGS (AT91C_PMC_PRES_CLK | AT91C_PMC_MDIV_2)
|
|
|
-+#define MCKR_CSS_SETTINGS (AT91C_PMC_CSS_PLLA_CLK | MCKR_SETTINGS)
|
|
|
-+
|
|
|
-+/* ******************************************************************* */
|
|
|
-+/* NandFlash Settings */
|
|
|
-+/* */
|
|
|
-+/* ******************************************************************* */
|
|
|
-+#define AT91C_SMARTMEDIA_BASE 0x40000000
|
|
|
-+
|
|
|
-+#define AT91_SMART_MEDIA_ALE (1 << 21) /* our ALE is AD21 */
|
|
|
-+#define AT91_SMART_MEDIA_CLE (1 << 22) /* our CLE is AD22 */
|
|
|
-+
|
|
|
-+#define NAND_DISABLE_CE() do { *(volatile unsigned int *)AT91C_PIOD_SODR = AT91C_PIO_PD15;} while(0)
|
|
|
-+#define NAND_ENABLE_CE() do { *(volatile unsigned int *)AT91C_PIOD_CODR = AT91C_PIO_PD15;} while(0)
|
|
|
-+#define NAND_WAIT_READY() while (!(*(volatile unsigned int *)AT91C_PIOA_PDSR & AT91C_PIO_PA22))
|
|
|
-+
|
|
|
-+/* ******************************************************************* */
|
|
|
-+/* SDRAMC Settings */
|
|
|
-+/* */
|
|
|
-+/* ******************************************************************* */
|
|
|
-+#define AT91C_BASE_SDRAMC AT91C_BASE_SDRAMC0
|
|
|
-+#define AT91C_EBI_SDRAM AT91C_EBI0_SDRAM
|
|
|
-+
|
|
|
-+/* ******************************************************************** */
|
|
|
-+/* SMC Chip Select 3 Timings for NandFlash for MASTER_CLOCK = 90000000. */
|
|
|
-+/* Please refer to SMC section in AT91SAM9x datasheet to learn how */
|
|
|
-+/* to generate these values. */
|
|
|
-+/* ******************************************************************** */
|
|
|
-+#define AT91C_SM_NWE_SETUP (1 << 0)
|
|
|
-+#define AT91C_SM_NCS_WR_SETUP (0 << 8)
|
|
|
-+#define AT91C_SM_NRD_SETUP (1 << 16)
|
|
|
-+#define AT91C_SM_NCS_RD_SETUP (0 << 24)
|
|
|
-+
|
|
|
-+#define AT91C_SM_NWE_PULSE (3 << 0)
|
|
|
-+#define AT91C_SM_NCS_WR_PULSE (3 << 8)
|
|
|
-+#define AT91C_SM_NRD_PULSE (3 << 16)
|
|
|
-+#define AT91C_SM_NCS_RD_PULSE (3 << 24)
|
|
|
-+
|
|
|
-+#define AT91C_SM_NWE_CYCLE (5 << 0)
|
|
|
-+#define AT91C_SM_NRD_CYCLE (5 << 16)
|
|
|
-+
|
|
|
-+#define AT91C_SM_TDF (2 << 16)
|
|
|
-+
|
|
|
-+/* ******************************************************************* */
|
|
|
-+/* BootStrap Settings */
|
|
|
-+/* */
|
|
|
-+/* ******************************************************************* */
|
|
|
-+#define IMG_ADDRESS 0x20000 /* Image Address in NandFlash */
|
|
|
-+#define IMG_SIZE 0x40000 /* Image Size in NandFlash */
|
|
|
-+
|
|
|
-+#define MACH_TYPE 0x6AE /* USB-A9263 */
|
|
|
-+#define JUMP_ADDR 0x23F00000 /* Final Jump Address */
|
|
|
-+
|
|
|
-+/* ******************************************************************* */
|
|
|
-+/* Application Settings */
|
|
|
-+/* ******************************************************************* */
|
|
|
-+#undef CFG_DEBUG
|
|
|
-+#undef CFG_DATAFLASH
|
|
|
-+
|
|
|
-+#define CFG_NANDFLASH
|
|
|
-+#undef NANDFLASH_SMALL_BLOCKS /* NANDFLASH_LARGE_BLOCKS used instead */
|
|
|
-+
|
|
|
-+#define CFG_HW_INIT
|
|
|
-+#define CFG_SDRAM
|
|
|
-+
|
|
|
-+
|
|
|
-+#endif /* _USB_A9263_H */
|
|
|
-diff --git a/board/usb_a9263/usb_a9263.c b/board/usb_a9263/usb_a9263.c
|
|
|
-new file mode 100644
|
|
|
-index 0000000..5630f99
|
|
|
---- /dev/null
|
|
|
-+++ b/board/usb_a9263/usb_a9263.c
|
|
|
-@@ -0,0 +1,285 @@
|
|
|
-+/* ----------------------------------------------------------------------------
|
|
|
-+ * ATMEL Microcontroller Software Support - ROUSSET -
|
|
|
-+ * ----------------------------------------------------------------------------
|
|
|
-+ * Copyright (c) 2006, Atmel Corporation
|
|
|
-+
|
|
|
-+ * All rights reserved.
|
|
|
-+ *
|
|
|
-+ * Redistribution and use in source and binary forms, with or without
|
|
|
-+ * modification, are permitted provided that the following conditions are met:
|
|
|
-+ *
|
|
|
-+ * - Redistributions of source code must retain the above copyright notice,
|
|
|
-+ * this list of conditions and the disclaiimer below.
|
|
|
-+ *
|
|
|
-+ * Atmel's name may not be used to endorse or promote products derived from
|
|
|
-+ * this software without specific prior written permission.
|
|
|
-+ *
|
|
|
-+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
|
|
|
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
|
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
|
|
|
-+ * DISCLAIMED. IN NO EVENT SHALL ATMEL 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.
|
|
|
-+ * ----------------------------------------------------------------------------
|
|
|
-+ * File Name : usb_a9263.c
|
|
|
-+ * Object :
|
|
|
-+ * Creation : GH Jun 28th 2012
|
|
|
-+ *-----------------------------------------------------------------------------
|
|
|
-+ */
|
|
|
-+#include "../../include/part.h"
|
|
|
-+#include "../../include/gpio.h"
|
|
|
-+#include "../../include/pmc.h"
|
|
|
-+#include "../../include/debug.h"
|
|
|
-+#include "../../include/sdramc.h"
|
|
|
-+#include "../../include/main.h"
|
|
|
-+#ifdef CFG_NANDFLASH
|
|
|
-+#include "../../include/nandflash.h"
|
|
|
-+#endif
|
|
|
-+#ifdef CFG_DATAFLASH
|
|
|
-+#include "../../include/dataflash.h"
|
|
|
-+#endif
|
|
|
-+
|
|
|
-+static inline unsigned int get_cp15(void)
|
|
|
-+{
|
|
|
-+ unsigned int value;
|
|
|
-+ __asm__("mrc p15, 0, %0, c1, c0, 0" : "=r" (value));
|
|
|
-+ return value;
|
|
|
-+}
|
|
|
-+
|
|
|
-+static inline void set_cp15(unsigned int value)
|
|
|
-+{
|
|
|
-+ __asm__("mcr p15, 0, %0, c1, c0, 0" : : "r" (value));
|
|
|
-+}
|
|
|
-+
|
|
|
-+
|
|
|
-+#ifdef CFG_HW_INIT
|
|
|
-+/*---------------------------------------------------------------------------- */
|
|
|
-+/* \fn hw_init */
|
|
|
-+/* \brief This function performs very low level HW initialization */
|
|
|
-+/* This function is invoked as soon as possible during the c_startup */
|
|
|
-+/* The bss segment must be initialized */
|
|
|
-+/*---------------------------------------------------------------------------- */
|
|
|
-+void hw_init(void)
|
|
|
-+{
|
|
|
-+ /* Configure PIOs */
|
|
|
-+ const struct pio_desc hw_pio[] = {
|
|
|
-+#ifdef CFG_DEBUG
|
|
|
-+ {"RXD", AT91C_PIN_PC(30), 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ {"TXD", AT91C_PIN_PC(31), 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+#endif
|
|
|
-+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ };
|
|
|
-+
|
|
|
-+ /* Disable watchdog */
|
|
|
-+ writel(AT91C_WDTC_WDDIS, AT91C_BASE_WDTC + WDTC_WDMR);
|
|
|
-+
|
|
|
-+ /* At this stage the main oscillator is supposed to be enabled
|
|
|
-+ * PCK = MCK = MOSC */
|
|
|
-+
|
|
|
-+ /* Configure PLLA = MOSC * (PLL_MULA + 1) / PLL_DIVA */
|
|
|
-+ pmc_cfg_plla(PLLA_SETTINGS, PLL_LOCK_TIMEOUT);
|
|
|
-+
|
|
|
-+ /* PCK = PLLA = 2 * MCK */
|
|
|
-+ pmc_cfg_mck(MCKR_SETTINGS, PLL_LOCK_TIMEOUT);
|
|
|
-+ /* Switch MCK on PLLA output */
|
|
|
-+ pmc_cfg_mck(MCKR_CSS_SETTINGS, PLL_LOCK_TIMEOUT);
|
|
|
-+
|
|
|
-+
|
|
|
-+ /* Configure PLLB */
|
|
|
-+ pmc_cfg_pllb(PLLB_SETTINGS, PLL_LOCK_TIMEOUT);
|
|
|
-+
|
|
|
-+ /* Configure the PIO controller to output PCK0 */
|
|
|
-+ pio_setup(hw_pio);
|
|
|
-+
|
|
|
-+ /* Configure the EBI0 Slave Slot Cycle to 64 */
|
|
|
-+ writel( (readl((AT91C_BASE_MATRIX + MATRIX_SCFG4)) & ~0xFF) | 0x40, (AT91C_BASE_MATRIX + MATRIX_SCFG4));
|
|
|
-+
|
|
|
-+#ifdef CFG_DEBUG
|
|
|
-+ /* Enable Debug messages on the DBGU */
|
|
|
-+ dbg_init(BAUDRATE(MASTER_CLOCK, 115200));
|
|
|
-+ dbg_print("Start AT91Bootstrap...\n\r");
|
|
|
-+#endif /* CFG_DEBUG */
|
|
|
-+
|
|
|
-+#ifdef CFG_SDRAM
|
|
|
-+ /* Initialize the matrix */
|
|
|
-+ /* VDDIOMSEL = 1 -> Memories are 3.3V powered */
|
|
|
-+ writel(readl(AT91C_BASE_CCFG + CCFG_EBI0CSA) | (1 << 16) | AT91C_EBI_CS1A_SDRAMC, AT91C_BASE_CCFG + CCFG_EBI0CSA);
|
|
|
-+
|
|
|
-+ /* Configure SDRAM Controller */
|
|
|
-+ sdram_init( AT91C_SDRAMC_NC_9 |
|
|
|
-+ AT91C_SDRAMC_NR_13 |
|
|
|
-+ AT91C_SDRAMC_CAS_2 |
|
|
|
-+ AT91C_SDRAMC_NB_4_BANKS |
|
|
|
-+ AT91C_SDRAMC_DBW_32_BITS |
|
|
|
-+ AT91C_SDRAMC_TWR_2 |
|
|
|
-+ AT91C_SDRAMC_TRC_7 |
|
|
|
-+ AT91C_SDRAMC_TRP_2 |
|
|
|
-+ AT91C_SDRAMC_TRCD_2 |
|
|
|
-+ AT91C_SDRAMC_TRAS_5 |
|
|
|
-+ AT91C_SDRAMC_TXSR_8, /* Control Register */
|
|
|
-+ (MASTER_CLOCK * 7)/1000000, /* Refresh Timer Register */
|
|
|
-+ AT91C_SDRAMC_MD_SDRAM); /* SDRAM (no low power) */
|
|
|
-+#endif /* CFG_SDRAM */
|
|
|
-+}
|
|
|
-+#endif /* CFG_HW_INIT */
|
|
|
-+
|
|
|
-+
|
|
|
-+#ifdef CFG_SDRAM
|
|
|
-+//*----------------------------------------------------------------------------
|
|
|
-+//* \fn sdramc_hw_init
|
|
|
-+//* \brief This function performs SDRAMC HW initialization
|
|
|
-+//*----------------------------------------------------------------------------*/
|
|
|
-+void sdramc_hw_init(void)
|
|
|
-+{
|
|
|
-+ /* Configure PIOs */
|
|
|
-+ const struct pio_desc sdramc_pio[] = {
|
|
|
-+ {"D16", AT91C_PIN_PD(16), 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ {"D17", AT91C_PIN_PD(17), 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ {"D18", AT91C_PIN_PD(18), 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ {"D19", AT91C_PIN_PD(19), 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ {"D20", AT91C_PIN_PD(20), 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ {"D21", AT91C_PIN_PD(21), 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ {"D22", AT91C_PIN_PD(22), 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ {"D23", AT91C_PIN_PD(23), 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ {"D24", AT91C_PIN_PD(24), 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ {"D25", AT91C_PIN_PD(25), 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ {"D26", AT91C_PIN_PD(26), 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ {"D27", AT91C_PIN_PD(27), 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ {"D28", AT91C_PIN_PD(28), 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ {"D29", AT91C_PIN_PD(29), 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ {"D30", AT91C_PIN_PD(30), 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ {"D31", AT91C_PIN_PD(31), 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ };
|
|
|
-+
|
|
|
-+ /* Configure the SDRAMC PIO controller */
|
|
|
-+ pio_setup(sdramc_pio);
|
|
|
-+}
|
|
|
-+#endif
|
|
|
-+
|
|
|
-+#ifdef CFG_DATAFLASH
|
|
|
-+/*------------------------------------------------------------------------------*/
|
|
|
-+/* \fn df_recovery */
|
|
|
-+/* \brief This function erases DataFlash Page 0 if USER PB is pressed */
|
|
|
-+/* during boot sequence */
|
|
|
-+/*------------------------------------------------------------------------------*/
|
|
|
-+void df_recovery(AT91PS_DF pDf)
|
|
|
-+{
|
|
|
-+#if (AT91C_SPI_PCS_DATAFLASH == AT91C_SPI_PCS0_DATAFLASH)
|
|
|
-+ /* Configure PIOs */
|
|
|
-+ const struct pio_desc usrpb_pio[] = {
|
|
|
-+ {"USRPB", AT91C_PIN_PB(10), 0, PIO_PULLUP, PIO_INPUT},
|
|
|
-+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ };
|
|
|
-+
|
|
|
-+ /* Configure the PIO controller */
|
|
|
-+ writel((1 << AT91C_ID_PIOB), PMC_PCER + AT91C_BASE_PMC);
|
|
|
-+ pio_setup(usrpb_pio);
|
|
|
-+
|
|
|
-+ /* If USER PB is pressed during Boot sequence */
|
|
|
-+ /* Erase NandFlash block 0*/
|
|
|
-+ if ( !pio_get_value(AT91C_PIN_PB(10)) )
|
|
|
-+ df_page_erase(pDf, 0);
|
|
|
-+#endif
|
|
|
-+}
|
|
|
-+/*------------------------------------------------------------------------------*/
|
|
|
-+/* \fn df_hw_init */
|
|
|
-+/* \brief This function performs DataFlash HW initialization */
|
|
|
-+/*------------------------------------------------------------------------------*/
|
|
|
-+void df_hw_init(void)
|
|
|
-+{
|
|
|
-+ /* Configure PIOs */
|
|
|
-+ const struct pio_desc df_pio[] = {
|
|
|
-+ {"MISO", AT91C_PIN_PA(0), 0, PIO_DEFAULT, PIO_PERIPH_B},
|
|
|
-+ {"MOSI", AT91C_PIN_PA(1), 0, PIO_DEFAULT, PIO_PERIPH_B},
|
|
|
-+ {"SPCK", AT91C_PIN_PA(2), 0, PIO_DEFAULT, PIO_PERIPH_B},
|
|
|
-+ {"NPCS0", AT91C_PIN_PA(5), 0, PIO_DEFAULT, PIO_PERIPH_B},
|
|
|
-+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ };
|
|
|
-+
|
|
|
-+ /* Configure the PIO controller */
|
|
|
-+ pio_setup(df_pio);
|
|
|
-+}
|
|
|
-+#endif /* CFG_DATAFLASH */
|
|
|
-+
|
|
|
-+
|
|
|
-+#ifdef CFG_NANDFLASH
|
|
|
-+/*------------------------------------------------------------------------------*/
|
|
|
-+/* \fn nand_recovery */
|
|
|
-+/* \brief This function erases NandFlash Block 0 if USER PB is pressed */
|
|
|
-+/* during boot sequence */
|
|
|
-+/*------------------------------------------------------------------------------*/
|
|
|
-+static void nand_recovery(void)
|
|
|
-+{
|
|
|
-+ /* Configure PIOs */
|
|
|
-+ const struct pio_desc usrpb_pio[] = {
|
|
|
-+ {"USRPB", AT91C_PIN_PB(10), 0, PIO_PULLUP, PIO_INPUT},
|
|
|
-+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ };
|
|
|
-+
|
|
|
-+ /* Configure the PIO controller */
|
|
|
-+ writel((1 << AT91C_ID_PIOB), PMC_PCER + AT91C_BASE_PMC);
|
|
|
-+ pio_setup(usrpb_pio);
|
|
|
-+
|
|
|
-+ /* If USER PB is pressed during Boot sequence */
|
|
|
-+ /* Erase NandFlash block 0*/
|
|
|
-+ if (!pio_get_value(AT91C_PIN_PB(10)) )
|
|
|
-+ AT91F_NandEraseBlock0();
|
|
|
-+}
|
|
|
-+/*------------------------------------------------------------------------------*/
|
|
|
-+/* \fn nandflash_hw_init */
|
|
|
-+/* \brief NandFlash HW init */
|
|
|
-+/*------------------------------------------------------------------------------*/
|
|
|
-+void nandflash_hw_init(void)
|
|
|
-+{
|
|
|
-+ /* Configure PIOs */
|
|
|
-+ const struct pio_desc nand_pio[] = {
|
|
|
-+ {"RDY_BSY", AT91C_PIN_PA(22), 0, PIO_PULLUP, PIO_INPUT},
|
|
|
-+ {"NANDCS", AT91C_PIN_PD(15), 0, PIO_PULLUP, PIO_OUTPUT},
|
|
|
-+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
|
|
|
-+ };
|
|
|
-+
|
|
|
-+ /* Setup Smart Media, first enable the address range of CS3 in HMATRIX user interface */
|
|
|
-+ writel(readl(AT91C_BASE_CCFG + CCFG_EBI0CSA) | AT91C_EBI_CS3A_SM, AT91C_BASE_CCFG + CCFG_EBI0CSA);
|
|
|
-+
|
|
|
-+ /* Configure SMC CS3 */
|
|
|
-+ writel((AT91C_SM_NWE_SETUP | AT91C_SM_NCS_WR_SETUP | AT91C_SM_NRD_SETUP | AT91C_SM_NCS_RD_SETUP), AT91C_BASE_SMC0 + SMC_SETUP3);
|
|
|
-+ writel((AT91C_SM_NWE_PULSE | AT91C_SM_NCS_WR_PULSE | AT91C_SM_NRD_PULSE | AT91C_SM_NCS_RD_PULSE), AT91C_BASE_SMC0 + SMC_PULSE3);
|
|
|
-+ writel((AT91C_SM_NWE_CYCLE | AT91C_SM_NRD_CYCLE) , AT91C_BASE_SMC0 + SMC_CYCLE3);
|
|
|
-+ writel((AT91C_SMC_READMODE | AT91C_SMC_WRITEMODE | AT91C_SMC_NWAITM_NWAIT_DISABLE |
|
|
|
-+ AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS | AT91C_SM_TDF) , AT91C_BASE_SMC0 + SMC_CTRL3);
|
|
|
-+
|
|
|
-+ /* Configure the PIO controller */
|
|
|
-+ writel((1 << AT91C_ID_PIOA), PMC_PCER + AT91C_BASE_PMC);
|
|
|
-+ writel((1 << AT91C_ID_PIOCDE), PMC_PCER + AT91C_BASE_PMC);
|
|
|
-+
|
|
|
-+ pio_setup(nand_pio);
|
|
|
-+
|
|
|
-+ nand_recovery();
|
|
|
-+}
|
|
|
-+
|
|
|
-+/*------------------------------------------------------------------------------*/
|
|
|
-+/* \fn nandflash_cfg_16bits_dbw_init */
|
|
|
-+/* \brief Configure SMC in 16 bits mode */
|
|
|
-+/*------------------------------------------------------------------------------*/
|
|
|
-+void nandflash_cfg_16bits_dbw_init(void)
|
|
|
-+{
|
|
|
-+ writel(readl(AT91C_BASE_SMC0 + SMC_CTRL3) | AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS, AT91C_BASE_SMC0 + SMC_CTRL3);
|
|
|
-+}
|
|
|
-+
|
|
|
-+/*------------------------------------------------------------------------------*/
|
|
|
-+/* \fn nandflash_cfg_8bits_dbw_init */
|
|
|
-+/* \brief Configure SMC in 8 bits mode */
|
|
|
-+/*------------------------------------------------------------------------------*/
|
|
|
-+void nandflash_cfg_8bits_dbw_init(void)
|
|
|
-+{
|
|
|
-+ writel((readl(AT91C_BASE_SMC0 + SMC_CTRL3) & ~(AT91C_SMC_DBW)) | AT91C_SMC_DBW_WIDTH_EIGTH_BITS, AT91C_BASE_SMC0 + SMC_CTRL3);
|
|
|
-+}
|
|
|
-+
|
|
|
-+#endif /* #ifdef CFG_NANDFLASH */
|
|
|
-+
|
|
|
-+
|
|
|
-diff --git a/crt0_gnu.S b/crt0_gnu.S
|
|
|
-index 042b617..002feef 100644
|
|
|
---- a/crt0_gnu.S
|
|
|
-+++ b/crt0_gnu.S
|
|
|
-@@ -106,6 +106,13 @@ _relocate_to_sram:
|
|
|
- #endif /* CFG_NORFLASH */
|
|
|
-
|
|
|
- _setup_clocks:
|
|
|
-+/* Test if main osc is bypassed */
|
|
|
-+ ldr r0,=AT91C_PMC_MOR
|
|
|
-+ ldr r1, [r0]
|
|
|
-+ ldr r2,=AT91C_CKGR_OSCBYPASS
|
|
|
-+ ands r1, r1, r2
|
|
|
-+ bne _init_data /* branch if OSCBYPASS=1 */
|
|
|
-+
|
|
|
- /* Test if main oscillator is enabled */
|
|
|
- ldr r0,=AT91C_PMC_SR
|
|
|
- ldr r1, [r0]
|
|
|
-diff --git a/driver/dataflash.c b/driver/dataflash.c
|
|
|
-index e28e49e..4de295a 100644
|
|
|
---- a/driver/dataflash.c
|
|
|
-+++ b/driver/dataflash.c
|
|
|
-@@ -293,14 +293,14 @@ static int df_init (AT91PS_DF pDf)
|
|
|
- pDf->dfDescription.pages_size = 264;
|
|
|
- pDf->dfDescription.page_offset = 9;
|
|
|
- break;
|
|
|
--
|
|
|
-+*/
|
|
|
- case AT45DB021B:
|
|
|
- pDf->dfDescription.pages_number = 1024;
|
|
|
- pDf->dfDescription.pages_size = 264;
|
|
|
- pDf->dfDescription.page_offset = 9;
|
|
|
- break;
|
|
|
-
|
|
|
-- case AT45DB041B:
|
|
|
-+/* case AT45DB041B:
|
|
|
- pDf->dfDescription.pages_number = 2048;
|
|
|
- pDf->dfDescription.pages_size = 264;
|
|
|
- pDf->dfDescription.page_offset = 9;
|
|
|
-@@ -373,7 +373,7 @@ int load_df(unsigned int pcs, unsigned int img_addr, unsigned int img_size, unsi
|
|
|
- if (!df_init(pDf))
|
|
|
- return -1;
|
|
|
-
|
|
|
--#if defined(AT91SAM9260) || defined(AT91SAM9XE) || defined(AT91SAM9G20)
|
|
|
-+#if defined(AT91SAM9260) || defined(AT91SAM9263) || defined(AT91SAM9XE) || defined(AT91SAM9G20)
|
|
|
- /* Test if a button has been pressed or not */
|
|
|
- /* Erase Page 0 to avoid infinite loop */
|
|
|
- df_recovery(pDf);
|
|
|
-diff --git a/include/part.h b/include/part.h
|
|
|
-index ba5985a..a1863d0 100644
|
|
|
---- a/include/part.h
|
|
|
-+++ b/include/part.h
|
|
|
-@@ -61,7 +61,11 @@
|
|
|
-
|
|
|
- #ifdef AT91SAM9263
|
|
|
- #include "AT91SAM9263_inc.h"
|
|
|
--#include "at91sam9263ek.h"
|
|
|
-+ #ifdef at91sam9263ek
|
|
|
-+ #include "at91sam9263ek.h"
|
|
|
-+ #elif usb_a9263
|
|
|
-+ #include "usb-a9263.h"
|
|
|
-+ #endif
|
|
|
- #endif
|
|
|
-
|
|
|
- #ifdef AT91CAP9
|
|
|
---
|
|
|
-1.5.6.3
|
|
|
-
|