]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
at91: unify nor boot support
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Sat, 13 Jun 2009 10:50:04 +0000 (12:50 +0200)
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Sun, 21 Jun 2009 14:18:12 +0000 (16:18 +0200)
the lowlevel init sequence is the same so unify it

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
board/atmel/at91sam9263ek/Makefile
board/atmel/at91sam9263ek/lowlevel_init.S [deleted file]
board/ronetix/pm9261/Makefile
board/ronetix/pm9261/lowlevel_init.S [deleted file]
board/ronetix/pm9263/Makefile
cpu/arm926ejs/at91/Makefile
cpu/arm926ejs/at91/lowlevel_init.S [moved from board/ronetix/pm9263/lowlevel_init.S with 92% similarity]
include/asm-arm/arch-at91/at91sam9_matrix.h [new file with mode: 0644]

index 19a354b6e1c222c5e3d54a44b41dc5d5f7aa7929..79ec45fd9f95447653261a0a80f08992d09e237b 100644 (file)
@@ -32,9 +32,6 @@ LIB   = $(obj)lib$(BOARD).a
 COBJS-y += at91sam9263ek.o
 COBJS-y += led.o
 COBJS-$(CONFIG_HAS_DATAFLASH) += partition.o
-ifndef CONFIG_SKIP_LOWLEVEL_INIT
-SOBJS-y += lowlevel_init.o
-endif
 
 SRCS   := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS-y))
diff --git a/board/atmel/at91sam9263ek/lowlevel_init.S b/board/atmel/at91sam9263ek/lowlevel_init.S
deleted file mode 100644 (file)
index 3a95777..0000000
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Memory Setup stuff - taken from blob memsetup.S
- *
- * Copyright (C) 1999 2000 2001 Erik Mouw (J.A.K.Mouw@its.tudelft.nl) and
- *                    Jan-Derk Bakker (J.D.Bakker@its.tudelft.nl)
- *
- * Copyright (C) 2008 Ronetix Ilko Iliev (www.ronetix.at)
- * Copyright (C) 2009 Jean-Christopher PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <config.h>
-#include <version.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_pio.h>
-#include <asm/arch/at91_rstc.h>
-#include <asm/arch/at91_wdt.h>
-#include <asm/arch/at91sam9_sdramc.h>
-#include <asm/arch/at91sam9_smc.h>
-#include <asm/arch/at91sam9263_matrix.h>
-
-_TEXT_BASE:
-       .word   TEXT_BASE
-
-.globl lowlevel_init
-.type lowlevel_init,function
-lowlevel_init:
-
-       mov     r5, pc          /* r5 = POS1 + 4 current */
-POS1:
-       ldr     r0, =POS1       /* r0 = POS1 compile */
-       ldr     r2, _TEXT_BASE
-       sub     r0, r0, r2      /* r0 = POS1-_TEXT_BASE (POS1 relative) */
-       sub     r5, r5, r0      /* r0 = TEXT_BASE-1 */
-       sub     r5, r5, #4      /* r1 = text base - current */
-
-       /* memory control configuration 1 */
-       ldr     r0, =SMRDATA
-       ldr     r2, =SMRDATA1
-       ldr     r1, _TEXT_BASE
-       sub     r0, r0, r1
-       sub     r2, r2, r1
-       add     r0, r0, r5
-       add     r2, r2, r5
-0:
-       /* the address */
-       ldr     r1, [r0], #4
-       /* the value */
-       ldr     r3, [r0], #4
-       str     r3, [r1]
-       cmp     r2, r0
-       bne     0b
-
-/* ----------------------------------------------------------------------------
- * PMC Init Step 1.
- * ----------------------------------------------------------------------------
- * - Check if the PLL is already initialized
- * ----------------------------------------------------------------------------
- */
-       ldr     r1, =(AT91_BASE_SYS + AT91_PMC_MCKR)
-       ldr     r0, [r1]
-       and     r0, r0, #3
-       cmp     r0, #0
-       bne     PLL_setup_end
-
-/* ---------------------------------------------------------------------------
- * - Enable the Main Oscillator
- * ---------------------------------------------------------------------------
- */
-       ldr     r1, =(AT91_BASE_SYS + AT91_CKGR_MOR)
-       ldr     r2, =(AT91_BASE_SYS + AT91_PMC_SR)
-       ldr     r0, =CONFIG_SYS_MOR_VAL
-       str     r0, [r1]        /* Enable main oscillator, OSCOUNT = 0xFF */
-
-       /* Reading the PMC Status to detect when the Main Oscillator is enabled */
-       mov     r4, #AT91_PMC_MOSCS
-MOSCS_Loop:
-       ldr     r3, [r2]
-       and     r3, r4, r3
-       cmp     r3, #AT91_PMC_MOSCS
-       bne     MOSCS_Loop
-
-/* ----------------------------------------------------------------------------
- * PMC Init Step 2.
- * ----------------------------------------------------------------------------
- * Setup PLLA
- * ----------------------------------------------------------------------------
- */
-       ldr     r1, =(AT91_BASE_SYS + AT91_CKGR_PLLAR)
-       ldr     r0, =CONFIG_SYS_PLLAR_VAL
-       str     r0, [r1]
-
-       /* Reading the PMC Status register to detect when the PLLA is locked */
-       mov     r4, #AT91_PMC_LOCKA
-MOSCS_Loop1:
-       ldr     r3, [r2]
-       and     r3, r4, r3
-       cmp     r3, #AT91_PMC_LOCKA
-       bne     MOSCS_Loop1
-
-/* ----------------------------------------------------------------------------
- * PMC Init Step 3.
- * ----------------------------------------------------------------------------
- * - Switch on the Main Oscillator 16.367 MHz
- * ----------------------------------------------------------------------------
- */
-       ldr     r1, =(AT91_BASE_SYS + AT91_PMC_MCKR)
-
-       /* -Master Clock Controller register PMC_MCKR */
-       ldr     r0, =CONFIG_SYS_MCKR1_VAL
-       str     r0, [r1]
-
-       /* Reading the PMC Status to detect when the Master clock is ready */
-       mov     r4, #AT91_PMC_MCKRDY
-MCKRDY_Loop:
-       ldr     r3, [r2]
-       and     r3, r4, r3
-       cmp     r3, #AT91_PMC_MCKRDY
-       bne     MCKRDY_Loop
-
-       ldr     r0, =CONFIG_SYS_MCKR2_VAL
-       str     r0, [r1]
-
-       /* Reading the PMC Status to detect when the Master clock is ready */
-       mov     r4, #AT91_PMC_MCKRDY
-MCKRDY_Loop1:
-       ldr     r3, [r2]
-       and     r3, r4, r3
-       cmp     r3, #AT91_PMC_MCKRDY
-       bne     MCKRDY_Loop1
-
-PLL_setup_end:
-
-/* ----------------------------------------------------------------------------
- * - memory control configuration 2
- * ----------------------------------------------------------------------------
- */
-       ldr     r0, =(AT91_BASE_SYS + AT91_SDRAMC_TR)
-       ldr     r1, [r0]
-       cmp     r1, #0
-       bne     SDRAM_setup_end
-
-       ldr     r0, =SMRDATA1
-       ldr     r2, =SMRDATA2
-       ldr     r1, _TEXT_BASE
-       sub     r0, r0, r1
-       sub     r2, r2, r1
-       add     r0, r0, r5
-       add     r2, r2, r5
-
-2:
-       /* the address */
-       ldr     r1, [r0], #4
-       /* the value */
-       ldr     r3, [r0], #4
-       str     r3, [r1]
-       cmp     r2, r0
-       bne     2b
-
-SDRAM_setup_end:
-       /* everything is fine now */
-       mov     pc, lr
-
-       .ltorg
-
-SMRDATA:
-       .word (AT91_BASE_SYS + AT91_WDT_MR)
-       .word CONFIG_SYS_WDTC_WDMR_VAL
-
-       .word (AT91_BASE_SYS + AT91_PIOD + PIO_PDR)
-       .word CONFIG_SYS_PIOD_PDR_VAL1
-       .word (AT91_BASE_SYS + AT91_PIOD + PIO_PUDR)
-       .word CONFIG_SYS_PIOD_PPUDR_VAL
-       .word (AT91_BASE_SYS + AT91_PIOD + PIO_ASR)
-       .word CONFIG_SYS_PIOD_PPUDR_VAL
-
-       .word (AT91_BASE_SYS + AT91_MATRIX_EBI0CSA)
-       .word CONFIG_SYS_MATRIX_EBI0CSA_VAL
-
-       /* flash */
-       .word (AT91_BASE_SYS + AT91_SMC_MODE(0))
-       .word CONFIG_SYS_SMC0_MODE0_VAL
-
-       .word (AT91_BASE_SYS + AT91_SMC_CYCLE(0))
-       .word CONFIG_SYS_SMC0_CYCLE0_VAL
-
-       .word (AT91_BASE_SYS + AT91_SMC_PULSE(0))
-       .word CONFIG_SYS_SMC0_PULSE0_VAL
-
-       .word (AT91_BASE_SYS + AT91_SMC_SETUP(0))
-       .word CONFIG_SYS_SMC0_SETUP0_VAL
-
-SMRDATA1:
-       .word (AT91_BASE_SYS + AT91_SDRAMC_MR)
-       .word CONFIG_SYS_SDRC_MR_VAL1
-       .word (AT91_BASE_SYS + AT91_SDRAMC_TR)
-       .word CONFIG_SYS_SDRC_TR_VAL1
-       .word (AT91_BASE_SYS + AT91_SDRAMC_CR)
-       .word CONFIG_SYS_SDRC_CR_VAL
-       .word (AT91_BASE_SYS + AT91_SDRAMC_MDR)
-       .word CONFIG_SYS_SDRC_MDR_VAL
-       .word (AT91_BASE_SYS + AT91_SDRAMC_MR)
-       .word CONFIG_SYS_SDRC_MR_VAL2
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL1
-       .word (AT91_BASE_SYS + AT91_SDRAMC_MR)
-       .word CONFIG_SYS_SDRC_MR_VAL3
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL2
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL3
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL4
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL5
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL6
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL7
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL8
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL9
-       .word (AT91_BASE_SYS + AT91_SDRAMC_MR)
-       .word CONFIG_SYS_SDRC_MR_VAL4
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL10
-       .word (AT91_BASE_SYS + AT91_SDRAMC_MR)
-       .word CONFIG_SYS_SDRC_MR_VAL5
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL11
-       .word (AT91_BASE_SYS + AT91_SDRAMC_TR)
-       .word CONFIG_SYS_SDRC_TR_VAL2
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL12
-       /* User reset enable*/
-       .word (AT91_BASE_SYS + AT91_RSTC_MR)
-       .word CONFIG_SYS_RSTC_RMR_VAL
-#ifdef CONFIG_SYS_MATRIX_MCFG_REMAP
-       /* MATRIX_MCFG - REMAP all masters */
-       .word (AT91_BASE_SYS + AT91_MATRIX_MCFG0)
-       .word 0x1FF
-#endif
-
-SMRDATA2:
-       .word 0
index 1db9de2f85faee9b7221d01e836ff1046d467df8..2e065a2bc9055547daa580970206efd4dcf31866 100644 (file)
@@ -34,10 +34,6 @@ COBJS-y += $(BOARD).o
 COBJS-y += led.o
 COBJS-$(CONFIG_HAS_DATAFLASH) += partition.o
 
-ifndef CONFIG_SKIP_LOWLEVEL_INIT
-SOBJS-y        := lowlevel_init.o
-endif
-
 SRCS   := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS-y) $(SOBJS-y))
 SOBJS  := $(addprefix $(obj),$(SOBJS-y))
diff --git a/board/ronetix/pm9261/lowlevel_init.S b/board/ronetix/pm9261/lowlevel_init.S
deleted file mode 100644 (file)
index 5880a84..0000000
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Memory Setup stuff - taken from blob memsetup.S
- *
- * Copyright (C) 1999 2000 2001 Erik Mouw (J.A.K.Mouw@its.tudelft.nl) and
- *                    Jan-Derk Bakker (J.D.Bakker@its.tudelft.nl)
- *
- * Copyright (C) 2008 Ronetix Ilko Iliev (www.ronetix.at)
- * Copyright (C) 2009 Jean-Christopher PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <config.h>
-#include <version.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_pio.h>
-#include <asm/arch/at91_rstc.h>
-#include <asm/arch/at91_wdt.h>
-#include <asm/arch/at91sam9_sdramc.h>
-#include <asm/arch/at91sam9_smc.h>
-#include <asm/arch/at91sam9261_matrix.h>
-
-_TEXT_BASE:
-       .word   TEXT_BASE
-
-.globl lowlevel_init
-.type lowlevel_init,function
-lowlevel_init:
-
-       mov     r5, pc          /* r5 = POS1 + 4 current */
-POS1:
-       ldr     r0, =POS1       /* r0 = POS1 compile */
-       ldr     r2, _TEXT_BASE
-       sub     r0, r0, r2      /* r0 = POS1-_TEXT_BASE (POS1 relative) */
-       sub     r5, r5, r0      /* r0 = TEXT_BASE-1 */
-       sub     r5, r5, #4      /* r1 = text base - current */
-
-       /* memory control configuration 1 */
-       ldr     r0, =SMRDATA
-       ldr     r2, =SMRDATA1
-       ldr     r1, _TEXT_BASE
-       sub     r0, r0, r1
-       sub     r2, r2, r1
-       add     r0, r0, r5
-       add     r2, r2, r5
-0:
-       /* the address */
-       ldr     r1, [r0], #4
-       /* the value */
-       ldr     r3, [r0], #4
-       str     r3, [r1]
-       cmp     r2, r0
-       bne     0b
-
-/* ----------------------------------------------------------------------------
- * PMC Init Step 1.
- * ----------------------------------------------------------------------------
- * - Check if the PLL is already initialized
- * ----------------------------------------------------------------------------
- */
-       ldr     r1, =(AT91_BASE_SYS + AT91_PMC_MCKR)
-       ldr     r0, [r1]
-       and     r0, r0, #3
-       cmp     r0, #0
-       bne     PLL_setup_end
-
-/* ---------------------------------------------------------------------------
- * - Enable the Main Oscillator
- * ---------------------------------------------------------------------------
- */
-       ldr     r1, =(AT91_BASE_SYS + AT91_CKGR_MOR)
-       ldr     r2, =(AT91_BASE_SYS + AT91_PMC_SR)
-       /* Main oscillator Enable register PMC_MOR: */
-       /* Enable main oscillator, OSCOUNT = 0xFF */
-       ldr     r0, =CONFIG_SYS_MOR_VAL
-       str     r0, [r1]
-
-       /* Reading the PMC Status to detect when the Main Oscillator is enabled */
-       mov     r4, #AT91_PMC_MOSCS
-MOSCS_Loop:
-       ldr     r3, [r2]
-       and     r3, r4, r3
-       cmp     r3, #AT91_PMC_MOSCS
-       bne     MOSCS_Loop
-
-/* ----------------------------------------------------------------------------
- * PMC Init Step 2.
- * ----------------------------------------------------------------------------
- * Setup PLLA
- * ----------------------------------------------------------------------------
- */
-       ldr     r1, =(AT91_BASE_SYS + AT91_CKGR_PLLAR)
-       ldr     r0, =CONFIG_SYS_PLLAR_VAL
-       str     r0, [r1]
-
-       /* Reading the PMC Status register to detect when the PLLA is locked */
-       mov     r4, #AT91_PMC_LOCKA
-MOSCS_Loop1:
-       ldr     r3, [r2]
-       and     r3, r4, r3
-       cmp     r3, #AT91_PMC_LOCKA
-       bne     MOSCS_Loop1
-
-/* ----------------------------------------------------------------------------
- * PMC Init Step 3.
- * ----------------------------------------------------------------------------
- * - Switch on the Main Oscillator 18.432 MHz
- * ----------------------------------------------------------------------------
- */
-       ldr     r1, =(AT91_BASE_SYS + AT91_PMC_MCKR)
-
-       /* -Master Clock Controller register PMC_MCKR */
-       ldr     r0, =CONFIG_SYS_MCKR1_VAL
-       str     r0, [r1]
-
-       /* Reading the PMC Status to detect when the Master clock is ready */
-       mov     r4, #AT91_PMC_MCKRDY
-MCKRDY_Loop:
-       ldr     r3, [r2]
-       and     r3, r4, r3
-       cmp     r3, #AT91_PMC_MCKRDY
-       bne     MCKRDY_Loop
-
-       ldr     r0, =CONFIG_SYS_MCKR2_VAL
-       str     r0, [r1]
-
-       /* Reading the PMC Status to detect when the Master clock is ready */
-       mov     r4, #AT91_PMC_MCKRDY
-MCKRDY_Loop1:
-       ldr     r3, [r2]
-       and     r3, r4, r3
-       cmp     r3, #AT91_PMC_MCKRDY
-       bne     MCKRDY_Loop1
-
-PLL_setup_end:
-
-/* ----------------------------------------------------------------------------
- * - memory control configuration 2
- * ----------------------------------------------------------------------------
- */
-       ldr     r0, =(AT91_BASE_SYS + AT91_SDRAMC_TR)
-       ldr     r1, [r0]
-       cmp     r1, #0
-       bne     SDRAM_setup_end
-
-       ldr     r0, =SMRDATA1
-       ldr     r2, =SMRDATA2
-       ldr     r1, _TEXT_BASE
-       sub     r0, r0, r1
-       sub     r2, r2, r1
-       add     r0, r0, r5
-       add     r2, r2, r5
-
-2:
-       /* the address */
-       ldr     r1, [r0], #4
-       /* the value */
-       ldr     r3, [r0], #4
-       str     r3, [r1]
-       cmp     r2, r0
-       bne     2b
-
-SDRAM_setup_end:
-       /* everything is fine now */
-       mov     pc, lr
-
-       .ltorg
-
-SMRDATA:
-       .word (AT91_BASE_SYS + AT91_WDT_MR)
-       .word CONFIG_SYS_WDTC_WDMR_VAL
-
-       .word (AT91_BASE_SYS + AT91_PIOC + PIO_PDR)
-       .word CONFIG_SYS_PIOC_PDR_VAL1
-       .word (AT91_BASE_SYS + AT91_PIOC + PIO_PUDR)
-       .word CONFIG_SYS_PIOC_PPUDR_VAL
-
-       .word (AT91_BASE_SYS + AT91_MATRIX_EBICSA)
-       .word CONFIG_SYS_MATRIX_EBICSA_VAL
-
-       /* flash */
-       .word (AT91_BASE_SYS + AT91_SMC_MODE(0))
-       .word CONFIG_SYS_SMC0_MODE0_VAL
-
-       .word (AT91_BASE_SYS + AT91_SMC_CYCLE(0))
-       .word CONFIG_SYS_SMC0_CYCLE0_VAL
-
-       .word (AT91_BASE_SYS + AT91_SMC_PULSE(0))
-       .word CONFIG_SYS_SMC0_PULSE0_VAL
-
-       .word (AT91_BASE_SYS + AT91_SMC_SETUP(0))
-       .word CONFIG_SYS_SMC0_SETUP0_VAL
-
-SMRDATA1:
-       .word (AT91_BASE_SYS + AT91_SDRAMC_MR)
-       .word CONFIG_SYS_SDRC_MR_VAL1
-       .word (AT91_BASE_SYS + AT91_SDRAMC_TR)
-       .word CONFIG_SYS_SDRC_TR_VAL1
-       .word (AT91_BASE_SYS + AT91_SDRAMC_CR)
-       .word CONFIG_SYS_SDRC_CR_VAL
-       .word (AT91_BASE_SYS + AT91_SDRAMC_MDR)
-       .word CONFIG_SYS_SDRC_MDR_VAL
-       .word (AT91_BASE_SYS + AT91_SDRAMC_MR)
-       .word CONFIG_SYS_SDRC_MR_VAL2
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL1
-       .word (AT91_BASE_SYS + AT91_SDRAMC_MR)
-       .word CONFIG_SYS_SDRC_MR_VAL3
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL2
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL3
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL4
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL5
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL6
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL7
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL8
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL9
-       .word (AT91_BASE_SYS + AT91_SDRAMC_MR)
-       .word CONFIG_SYS_SDRC_MR_VAL4
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL10
-       .word (AT91_BASE_SYS + AT91_SDRAMC_MR)
-       .word CONFIG_SYS_SDRC_MR_VAL5
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL11
-       .word (AT91_BASE_SYS + AT91_SDRAMC_TR)
-       .word CONFIG_SYS_SDRC_TR_VAL2
-       .word AT91_SDRAM_BASE
-       .word CONFIG_SYS_SDRAM_VAL12
-       /* User reset enable*/
-       .word (AT91_BASE_SYS + AT91_RSTC_MR)
-       .word CONFIG_SYS_RSTC_RMR_VAL
-
-SMRDATA2:
-       .word 0
index 270abd801fedcac2013720ebcd15c3220e06661c..ebc2adfa3dcee3d7bf54ca554bce051961c52b7d 100644 (file)
@@ -34,10 +34,6 @@ COBJS-y += pm9263.o
 COBJS-y += led.o
 COBJS-$(CONFIG_HAS_DATAFLASH) += partition.o
 
-ifndef CONFIG_SKIP_LOWLEVEL_INIT
-SOBJS-y        := lowlevel_init.o
-endif
-
 SRCS   := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS-y) $(SOBJS-y))
 SOBJS  := $(addprefix $(obj),$(SOBJS-y))
index 66eec76ea19c402d0cb8a620cd9bba374812cf46..3da89f4fba9efd81ff952dc87677bd6dc57e9305 100644 (file)
@@ -37,8 +37,12 @@ COBJS-y += cpu.o
 COBJS-y        += reset.o
 COBJS-y        += timer.o
 
-SRCS    := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
-OBJS    := $(addprefix $(obj),$(SOBJS) $(COBJS-y))
+ifndef CONFIG_SKIP_LOWLEVEL_INIT
+SOBJS-y        := lowlevel_init.o
+endif
+
+SRCS    := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS    := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
 
 all:   $(obj).depend $(LIB)
 
similarity index 92%
rename from board/ronetix/pm9263/lowlevel_init.S
rename to cpu/arm926ejs/at91/lowlevel_init.S
index b139c8938963085c6829d5ea1e8fd794efef69a5..5ed518cc2db77db3c50f68d426b60b6bf7aca115 100644 (file)
@@ -33,9 +33,9 @@
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/at91_rstc.h>
 #include <asm/arch/at91_wdt.h>
+#include <asm/arch/at91sam9_matrix.h>
 #include <asm/arch/at91sam9_sdramc.h>
 #include <asm/arch/at91sam9_smc.h>
-#include <asm/arch/at91sam9263_matrix.h>
 
 _TEXT_BASE:
        .word   TEXT_BASE
@@ -87,8 +87,9 @@ POS1:
  */
        ldr     r1, =(AT91_BASE_SYS + AT91_CKGR_MOR)
        ldr     r2, =(AT91_BASE_SYS + AT91_PMC_SR)
+       /* Main oscillator Enable register PMC_MOR: */
        ldr     r0, =CONFIG_SYS_MOR_VAL
-       str     r0, [r1]        /* Enable main oscillator, OSCOUNT = 0xFF */
+       str     r0, [r1]
 
        /* Reading the PMC Status to detect when the Main Oscillator is enabled */
        mov     r4, #AT91_PMC_MOSCS
@@ -119,7 +120,7 @@ MOSCS_Loop1:
 /* ----------------------------------------------------------------------------
  * PMC Init Step 3.
  * ----------------------------------------------------------------------------
- * - Switch on the Main Oscillator 18.432 MHz
+ * - Switch on the Main Oscillator
  * ----------------------------------------------------------------------------
  */
        ldr     r1, =(AT91_BASE_SYS + AT91_PMC_MCKR)
@@ -185,15 +186,28 @@ SMRDATA:
        .word (AT91_BASE_SYS + AT91_WDT_MR)
        .word CONFIG_SYS_WDTC_WDMR_VAL
 
+       /* configure PIOx as EBI0 D[16-31] */
+#if defined(CONFIG_AT91SAM9263)
        .word (AT91_BASE_SYS + AT91_PIOD + PIO_PDR)
        .word CONFIG_SYS_PIOD_PDR_VAL1
        .word (AT91_BASE_SYS + AT91_PIOD + PIO_PUDR)
        .word CONFIG_SYS_PIOD_PPUDR_VAL
        .word (AT91_BASE_SYS + AT91_PIOD + PIO_ASR)
        .word CONFIG_SYS_PIOD_PPUDR_VAL
+#elif defined(CONFIG_AT91SAM9261)
+       .word (AT91_BASE_SYS + AT91_PIOC + PIO_PDR)
+       .word CONFIG_SYS_PIOC_PDR_VAL1
+       .word (AT91_BASE_SYS + AT91_PIOC + PIO_PUDR)
+       .word CONFIG_SYS_PIOC_PPUDR_VAL
+#endif
 
+#if defined(AT91_MATRIX_EBI0CSA)
        .word (AT91_BASE_SYS + AT91_MATRIX_EBI0CSA)
        .word CONFIG_SYS_MATRIX_EBI0CSA_VAL
+#else /* AT91_MATRIX_EBICSA */
+       .word (AT91_BASE_SYS + AT91_MATRIX_EBICSA)
+       .word CONFIG_SYS_MATRIX_EBICSA_VAL
+#endif
 
        /* flash */
        .word (AT91_BASE_SYS + AT91_SMC_MODE(0))
diff --git a/include/asm-arm/arch-at91/at91sam9_matrix.h b/include/asm-arm/arch-at91/at91sam9_matrix.h
new file mode 100644 (file)
index 0000000..913f374
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jrosoft.com>
+ *
+ * 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.
+ *
+ */
+
+#ifndef __ASM_ARCH_AT91SAM9_MATRIX_H
+#define __ASM_ARCH_AT91SAM9_MATRIX_H
+
+#if defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20)
+#include <asm/arch/at91sam9260_matrix.h>
+#elif defined(CONFIG_AT91SAM9261)
+#include <asm/arch/at91sam9261_matrix.h>
+#elif defined(CONFIG_AT91SAM9263)
+#include <asm/arch/at91sam9263_matrix.h>
+#elif defined(CONFIG_AT91SAM9RL)
+#include <asm/arch/at91sam9rl_matrix.h>
+#elif defined(CONFIG_AT91CAP9)
+#include <asm/arch/at91cap9_matrix.h>
+#else
+#error "Unsupported AT91SAM9/CAP9 processor"
+#endif
+
+#endif /* __ASM_ARCH_AT91SAM9_MATRIX_H */