Merge branch 'next' (32a0454d) · Commits · Dom Sekotill / buildroot

board/calao/qil-a9260/at91bootstrap-1.16-qil-a9260.patch

0 → 100644

+603 −0

Original line number	Diff line number	Diff line
		From a3e08beea8bf5e96e1237eef4a82f4a2fdd5286b Mon Sep 17 00:00:00 2001
		From: Gregory Hermant <gregory.hermant@calao-systems.com>
		Date: Thu, 19 Jul 2012 14:19:59 +0200
		Subject: [PATCH] Add support for the Calao-systems QIL-A9260


		Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
		---
		board/qil_a9260/nandflash/Makefile \| 122 ++++++++++++++
		board/qil_a9260/nandflash/qil-a9260.h \| 109 ++++++++++++
		board/qil_a9260/qil_a9260.c \| 298 +++++++++++++++++++++++++++++++++
		crt0_gnu.S \| 7 +
		include/part.h \| 6 +-
		5 files changed, 541 insertions(+), 1 deletions(-)
		create mode 100644 board/qil_a9260/nandflash/Makefile
		create mode 100644 board/qil_a9260/nandflash/qil-a9260.h
		create mode 100644 board/qil_a9260/qil_a9260.c

		diff --git a/board/qil_a9260/nandflash/Makefile b/board/qil_a9260/nandflash/Makefile
		new file mode 100644
		index 0000000..209a25f
		--- /dev/null
		+++ b/board/qil_a9260/nandflash/Makefile
		@@ -0,0 +1,122 @@
		+# TODO: set this appropriately for your local toolchain
		+ifndef ERASE_FCT
		+ERASE_FCT=rm -f
		+endif
		+ifndef CROSS_COMPILE
		+CROSS_COMPILE=arm-elf-
		+endif
		+
		+TOOLCHAIN=gcc
		+
		+BOOTSTRAP_PATH=../../..
		+
		+# NandFlashBoot Configuration for QIL-A9260
		+
		+# Target name (case sensitive!!!)
		+TARGET=AT91SAM9260
		+# Board name (case sensitive!!!)
		+BOARD=qil_a9260
		+# Link Address and Top_of_Memory
		+LINK_ADDR=0x200000
		+TOP_OF_MEMORY=0x301000
		+# 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=arm926ej-s -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL)
		+ASFLAGS=-g -mcpu=arm926ej-s -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:
		+ $(ERASE_FCT) .o .bin .elf .map
		diff --git a/board/qil_a9260/nandflash/qil-a9260.h b/board/qil_a9260/nandflash/qil-a9260.h
		new file mode 100644
		index 0000000..c87002e
		--- /dev/null
		+++ b/board/qil_a9260/nandflash/qil-a9260.h
		@@ -0,0 +1,109 @@
		+/* ----------------------------------------------------------------------------
		+ * 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 : qil-a9260.h
		+ * Object :
		+ * Creation : GH July 19th 2012
		+ *-----------------------------------------------------------------------------
		+ */
		+#ifndef _QIL_A9260_H
		+#define _QIL_A9260_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_PIOC_SODR = AT91C_PIO_PC14;} while(0)
		+#define NAND_ENABLE_CE() do { (volatile unsigned int )AT91C_PIOC_CODR = AT91C_PIO_PC14;} while(0)
		+
		+#define NAND_WAIT_READY() while (!((volatile unsigned int )AT91C_PIOC_PDSR & AT91C_PIO_PC13))
		+
		+
		+/* ******************************************************************** */
		+/* SMC Chip Select 3 Timings for NandFlash for MASTER_CLOCK = 90000000.*/
		+/* Please refer to SMC section in AT91SAM 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 0x6AF /* QIL-A9260 */
		+#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 /* _QIL_A9260_H */
		diff --git a/board/qil_a9260/qil_a9260.c b/board/qil_a9260/qil_a9260.c
		new file mode 100644
		index 0000000..ae122e7
		--- /dev/null
		+++ b/board/qil_a9260/qil_a9260.c
		@@ -0,0 +1,298 @@
		+/* ----------------------------------------------------------------------------
		+ * 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 : qil_a9260.c
		+ * Object :
		+ * Creation : GH July 19th 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)
		+{
		+ unsigned int cp15;
		+
		+ /* Configure PIOs */
		+ const struct pio_desc hw_pio[] = {
		+#ifdef CFG_DEBUG
		+ {"RXD", AT91C_PIN_PB(14), 0, PIO_DEFAULT, PIO_PERIPH_A},
		+ {"TXD", AT91C_PIN_PB(15), 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 CP15 */
		+ cp15 = get_cp15();
		+ cp15 \|= I_CACHE;
		+ set_cp15(cp15);
		+
		+ /* Configure the PIO controller */
		+ pio_setup(hw_pio);
		+
		+ /* Configure the EBI Slave Slot Cycle to 64 */
		+ writel( (readl((AT91C_BASE_MATRIX + MATRIX_SCFG3)) & ~0xFF) \| 0x40, (AT91C_BASE_MATRIX + MATRIX_SCFG3));
		+
		+#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 */
		+ writel(readl(AT91C_BASE_CCFG + CCFG_EBICSA) \| AT91C_EBI_CS1A_SDRAMC, AT91C_BASE_CCFG + CCFG_EBICSA);
		+
		+ /* 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_PC(16), 0, PIO_DEFAULT, PIO_PERIPH_A},
		+ {"D17", AT91C_PIN_PC(17), 0, PIO_DEFAULT, PIO_PERIPH_A},
		+ {"D18", AT91C_PIN_PC(18), 0, PIO_DEFAULT, PIO_PERIPH_A},
		+ {"D19", AT91C_PIN_PC(19), 0, PIO_DEFAULT, PIO_PERIPH_A},
		+ {"D20", AT91C_PIN_PC(20), 0, PIO_DEFAULT, PIO_PERIPH_A},
		+ {"D21", AT91C_PIN_PC(21), 0, PIO_DEFAULT, PIO_PERIPH_A},
		+ {"D22", AT91C_PIN_PC(22), 0, PIO_DEFAULT, PIO_PERIPH_A},
		+ {"D23", AT91C_PIN_PC(23), 0, PIO_DEFAULT, PIO_PERIPH_A},
		+ {"D24", AT91C_PIN_PC(24), 0, PIO_DEFAULT, PIO_PERIPH_A},
		+ {"D25", AT91C_PIN_PC(25), 0, PIO_DEFAULT, PIO_PERIPH_A},
		+ {"D26", AT91C_PIN_PC(26), 0, PIO_DEFAULT, PIO_PERIPH_A},
		+ {"D27", AT91C_PIN_PC(27), 0, PIO_DEFAULT, PIO_PERIPH_A},
		+ {"D28", AT91C_PIN_PC(28), 0, PIO_DEFAULT, PIO_PERIPH_A},
		+ {"D29", AT91C_PIN_PC(29), 0, PIO_DEFAULT, PIO_PERIPH_A},
		+ {"D30", AT91C_PIN_PC(30), 0, PIO_DEFAULT, PIO_PERIPH_A},
		+ {"D31", AT91C_PIN_PC(31), 0, PIO_DEFAULT, PIO_PERIPH_A},
		+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A},
		+ };
		+*/
		+ /* Configure the SDRAMC PIO controller to output PCK0 */
		+/* pio_setup(sdramc_pio); */
		+
		+ writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_ASR(0));
		+ writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_PDR(0));
		+
		+}
		+#endif /* CFG_SDRAM */
		+
		+#ifdef CFG_DATAFLASH
		+
		+/------------------------------------------------------------------------------/
		+/* \fn df_recovery */
		+/* \brief This function erases DataFlash Page 0 if USR 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 USR PB is pressed during Boot sequence */
		+ /* Erase DataFlash Page 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_A},
		+ {"MOSI", AT91C_PIN_PA(1), 0, PIO_DEFAULT, PIO_PERIPH_A},
		+ {"SPCK", AT91C_PIN_PA(2), 0, PIO_DEFAULT, PIO_PERIPH_A},
		+#if (AT91C_SPI_PCS_DATAFLASH == AT91C_SPI_PCS0_DATAFLASH)
		+ {"NPCS0", AT91C_PIN_PA(3), 0, PIO_DEFAULT, PIO_PERIPH_A},
		+#endif
		+ {(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 USR 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 USR 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_PC(13), 0, PIO_PULLUP, PIO_INPUT},
		+ {"NANDCS", AT91C_PIN_PC(14), 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_EBICSA) \| AT91C_EBI_CS3A_SM, AT91C_BASE_CCFG + CCFG_EBICSA);
		+
		+ /* Configure SMC CS3 */
		+ writel((AT91C_SM_NWE_SETUP \| AT91C_SM_NCS_WR_SETUP \| AT91C_SM_NRD_SETUP \| AT91C_SM_NCS_RD_SETUP), AT91C_BASE_SMC + SMC_SETUP3);
		+ writel((AT91C_SM_NWE_PULSE \| AT91C_SM_NCS_WR_PULSE \| AT91C_SM_NRD_PULSE \| AT91C_SM_NCS_RD_PULSE), AT91C_BASE_SMC + SMC_PULSE3);
		+ writel((AT91C_SM_NWE_CYCLE \| AT91C_SM_NRD_CYCLE) , AT91C_BASE_SMC + 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_SMC + SMC_CTRL3);
		+
		+ /* Configure the PIO controller */
		+ writel((1 << AT91C_ID_PIOC), 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_SMC + SMC_CTRL3) \| AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS, AT91C_BASE_SMC + 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_SMC + SMC_CTRL3) & ~(AT91C_SMC_DBW)) \| AT91C_SMC_DBW_WIDTH_EIGTH_BITS, AT91C_BASE_SMC + 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/include/part.h b/include/part.h
		index ba5985a..bbd33fe 100644
		--- a/include/part.h
		+++ b/include/part.h
		@@ -35,7 +35,11 @@

		#ifdef AT91SAM9260
		#include "AT91SAM9260_inc.h"
		-#include "at91sam9260ek.h"
		+ #ifdef at91sam9260ek
		+ #include "at91sam9260ek.h"
		+ #elif qil_a9260
		+ #include "qil-a9260.h"
		+ #endif
		#endif

		#ifdef AT91SAM9XE
		--
		1.5.6.3

board/calao/qil-a9260/barebox-2012.07.0-qil-a9260.patch

0 → 100644

+36 −0

Original line number	Diff line number	Diff line
		From d076aa6182dc6df6bb311e60bbddb03573b9483b Mon Sep 17 00:00:00 2001
		From: Gregory Hermant <gregory.hermant@calao-systems.com>
		Date: Fri, 3 Aug 2012 11:25:49 +0200
		Subject: [PATCH] Enable pull-up on Rx serial ports for the CALAO MB-QIL-A9260


		Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
		---
		arch/arm/boards/qil-a9260/init.c \| 6 ++++++
		1 files changed, 6 insertions(+), 0 deletions(-)

		diff --git a/arch/arm/boards/qil-a9260/init.c b/arch/arm/boards/qil-a9260/init.c
		index 305d733..b43cace 100644
		--- a/arch/arm/boards/qil-a9260/init.c
		+++ b/arch/arm/boards/qil-a9260/init.c
		@@ -196,11 +196,17 @@ device_initcall(qil_a9260_devices_init);
		static int qil_a9260_console_init(void)
		{
		at91_register_uart(0, 0);
		+ at91_set_A_periph(AT91_PIN_PB14, 1); /* Enable pull-up on DRXD */
		+
		at91_register_uart(1, ATMEL_UART_CTS \| ATMEL_UART_RTS
		\| ATMEL_UART_DTR \| ATMEL_UART_DSR \| ATMEL_UART_DCD
		\| ATMEL_UART_RI);
		+
		at91_register_uart(2, ATMEL_UART_CTS \| ATMEL_UART_RTS);
		+ at91_set_A_periph(AT91_PIN_PB7, 1); /* Enable pull-up on RXD1 */
		+
		at91_register_uart(3, ATMEL_UART_CTS \| ATMEL_UART_RTS);
		+ at91_set_A_periph(AT91_PIN_PB9, 1); /* Enable pull-up on RXD2 */

		return 0;
		}
		--
		1.5.6.3

board/calao/qil-a9260/linux-3.4.7.config

0 → 100644

+111 −0

File added.

Preview size limit exceeded, changes collapsed.

board/calao/qil-a9260/linux-3.4.7.patch

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		From fe6432a9728b62bce3db73c5a4efe026018fd495 Mon Sep 17 00:00:00 2001
		From: Gregory Hermant <gregory.hermant@calao-systems.com>
		Date: Fri, 3 Aug 2012 16:45:37 +0200
		Subject: [PATCH] QIL-A9260: rtc modalias m41t48 renamed to rtc-m41t48


		Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
		---
		arch/arm/mach-at91/board-qil-a9260.c \| 2 +-
		1 files changed, 1 insertions(+), 1 deletions(-)

		diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c
		index bf351e2..c0df05c 100644
		--- a/arch/arm/mach-at91/board-qil-a9260.c
		+++ b/arch/arm/mach-at91/board-qil-a9260.c
		@@ -78,7 +78,7 @@ static struct at91_udc_data __initdata ek_udc_data = {
		static struct spi_board_info ek_spi_devices[] = {
		#if defined(CONFIG_RTC_DRV_M41T94)
		{ /* M41T94 RTC */
		- .modalias = "m41t94",
		+ .modalias = "rtc-m41t94",
		.chip_select = 0,
		.max_speed_hz = 1 * 1000 * 1000,
		.bus_num = 0,
		--
		1.5.6.3

boot/Config.in

+1 −0

Original line number	Diff line number	Diff line
		menu "Bootloaders"

		source "boot/at91bootstrap/Config.in"
		source "boot/at91bootstrap3/Config.in"
		source "boot/at91dataflashboot/Config.in"
		source "boot/barebox/Config.in"
		source "boot/grub/Config.in"