at91: add bootstrap support
Subsystems (5)
cover at91: add bootstrap support
Hi,
This patch serie introduce a common bootstrap code aka xloder for TI and at91bootstrap for Atmel to barebox
As I do not have with me right now a TI platform I did not switch it to the new generic bootstrap code.
On at91 add it on the calao usb-a9263 test on nand and spi This patch serie depends on the previous at91 patch series
The following changes since commit 9f7f67ca887b26a4488edf5fa171a78e142e0a5b:
at91: drop AT91_BASE_PIOx for soc specific one for none boot code (2012-12-29 01:37:47 +0800)
are available in the git repository at:
git://git.jcrosoft.org/barebox.git delivery/at91_bootstrap
for you to fetch changes up to 44bfbedb17c35a99aa0f9a2a16330d2928b9ba31:
at91: usb_a9263: add bootstrap version (2012-12-29 17:56:45 +0800)
----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (7):
at91: add test commamd to emulate bootrom boot
at91sam926x: lowlevel add external boot support
at91: sam926x: switch lowlevel param to c code
at91: usb-a9263 add lowlevel init introduce common bootstrap code
at91: add bootstrap version
at91: usb_a9263: add bootstrap version
arch/arm/boards/at91sam9263ek/Makefile | 5 ++ arch/arm/boards/at91sam9263ek/config.h | 87 ------------------------------- arch/arm/boards/at91sam9263ek/lowlevel_init.c | 104 +++++++++++++++++++++++++++++++++++++ arch/arm/boards/mmccpu/Makefile | 5 ++ arch/arm/boards/mmccpu/config.h | 118 ------------------------------------------ arch/arm/boards/mmccpu/lowlevel_init.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boards/pm9261/Makefile | 5 ++ arch/arm/boards/pm9261/config.h | 87 ------------------------------- arch/arm/boards/pm9261/lowlevel_init.c | 102 ++++++++++++++++++++++++++++++++++++ arch/arm/boards/pm9263/Makefile | 5 ++ arch/arm/boards/pm9263/config.h | 103 ------------------------------------ arch/arm/boards/usb-a926x/Makefile | 9 ++++ arch/arm/boards/usb-a926x/config.h | 97 ++++++++++++++++++++++++++++++++++ arch/arm/boards/usb-a926x/usb_a9263_bootstrap.c | 16 ++++++ arch/arm/boards/usb-a926x/usb_a9263_lowlevel_init.c | 111 +++++++++++++++++++++++++++++++++++++++ arch/arm/configs/usb_a9263_128mib_bootstrap_defconfig | 24 +++++++++ arch/arm/configs/usb_a9263_bootstrap_defconfig | 23 +++++++++ arch/arm/mach-at91/Kconfig | 7 +++ arch/arm/mach-at91/Makefile | 2 + arch/arm/mach-at91/at91sam926x_lowlevel_init.c | 84 +++++++++++++++++++++--------- arch/arm/mach-at91/boot_test_cmd.c | 97 ++++++++++++++++++++++++++++++++++ arch/arm/mach-at91/bootstrap.c | 86 ++++++++++++++++++++++++++++++ arch/arm/mach-at91/include/mach/at91_lowlevel_init.h | 33 ++++++++++++ arch/arm/mach-at91/include/mach/bootstrap.h | 28 ++++++++++ include/bootstrap.h | 34 ++++++++++++ lib/Kconfig | 2 + lib/Makefile | 1 + lib/bootstrap/Kconfig | 13 +++++ lib/bootstrap/Makefile | 3 ++ lib/bootstrap/common.c | 21 ++++++++ lib/bootstrap/devfs.c | 98 +++++++++++++++++++++++++++++++++++ lib/bootstrap/disk.c | 36 +++++++++++++ 32 files changed, 1161 insertions(+), 420 deletions(-) create mode 100644 arch/arm/boards/at91sam9263ek/lowlevel_init.c create mode 100644 arch/arm/boards/mmccpu/lowlevel_init.c create mode 100644 arch/arm/boards/pm9261/lowlevel_init.c create mode 100644 arch/arm/boards/usb-a926x/usb_a9263_bootstrap.c create mode 100644 arch/arm/boards/usb-a926x/usb_a9263_lowlevel_init.c create mode 100644 arch/arm/configs/usb_a9263_128mib_bootstrap_defconfig create mode 100644 arch/arm/configs/usb_a9263_bootstrap_defconfig create mode 100644 arch/arm/mach-at91/boot_test_cmd.c create mode 100644 arch/arm/mach-at91/bootstrap.c create mode 100644 arch/arm/mach-at91/include/mach/at91_lowlevel_init.h create mode 100644 arch/arm/mach-at91/include/mach/bootstrap.h create mode 100644 include/bootstrap.h create mode 100644 lib/bootstrap/Kconfig create mode 100644 lib/bootstrap/Makefile create mode 100644 lib/bootstrap/common.c create mode 100644 lib/bootstrap/devfs.c create mode 100644 lib/bootstrap/disk.c
Best Regards,
J.
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
PATCH 1/7 at91: add test commamd to emulate bootrom boot
--- arch/arm/mach-at91/Kconfig | 5 ++ arch/arm/mach-at91/Makefile | 1 + arch/arm/mach-at91/boot_test_cmd.c | 97 ++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+) create mode 100644 arch/arm/mach-at91/boot_test_cmd.c
arch/arm/mach-at91/Kconfig +5 -0
@@ -483,4 +483,9 @@ config CMD_AT91MUX bool "at91mux dump command" default y +config CONFIG_CMD_AT91_BOOT_TEST + bool "at91_boot_test" + help + allow to upload a boot binary to sram and execute it + endif
arch/arm/mach-at91/Makefile +1 -0
@@ -1,4 +1,5 @@ obj-y += setup.o clock.o gpio.o +obj-$(CONFIG_CMD_AT91_BOOT_TEST) += boot_test_cmd.o lowlevel_init-y = at91sam926x_lowlevel_init.o lowlevel_init-$(CONFIG_ARCH_AT91RM9200) = at91rm9200_lowlevel_init.o
arch/arm/mach-at91/boot_test_cmd.c new file +97 -0
97 lines not on this page · raw message
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 2/7 at91sam926x: lowlevel add external boot support
--- arch/arm/mach-at91/at91sam926x_lowlevel_init.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
arch/arm/mach-at91/at91sam926x_lowlevel_init.c +18 -2
@@ -36,10 +36,19 @@ static void inline pmc_check_mckrdy(void) }while (!(r &AT91_PMC_MCKRDY )); } +static int inline running_in_sram (void ) +{ +u32 addr =get_pc (); + + addr >>=28 ; +return addr ==0 ; +} + void __naked __bare_init reset(void) {u32 r;int i; +int in_sram =running_in_sram ();common_reset ();
@@ -74,7 +83,7 @@ void __naked __bare_init reset(void)* PMC Check if the PLL is already initialized */ r =at91_pmc_read (AT91_PMC_MCKR ); -if (r &AT91_PMC_CSS ) +if (r &AT91_PMC_CSS && !in_sram) goto end;/*
@@ -117,7 +126,7 @@ void __naked __bare_init reset(void)* SDRAMC Check if Refresh Timer Counter is already initialized */ r =at91_sys_read (AT91_SDRAMC_TR ); -if (r) +if (r && !in_sram) goto end;/* SDRAMC_MR : Normal Mode */
@@ -170,6 +179,13 @@ void __naked __bare_init reset(void)/* MATRIX_MCFG - REMAP all masters */ at91_sys_write (AT91_MATRIX_MCFG0 ,0x1FF );#endif +/* +* When boot from external boot +* we need to enable mck and ohter clock +* so enable all of them +* We will shutdown what we don't need later +*/ +at91_pmc_write (AT91_PMC_PCER ,0xffffffff ); end:board_init_lowlevel_return ();
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 3/7 at91: sam926x: switch lowlevel param to c code
In reply to Jean-Christophe PLAGNIOL-VILLARDInstead of hardcode define use a struct that the board fill
--- arch/arm/boards/at91sam9263ek/Makefile | 5 + arch/arm/boards/at91sam9263ek/config.h | 87 ------------- arch/arm/boards/at91sam9263ek/lowlevel_init.c | 104 +++++++++++++++ arch/arm/boards/mmccpu/Makefile | 5 + arch/arm/boards/mmccpu/config.h | 118 ----------------- arch/arm/boards/mmccpu/lowlevel_init.c | 135 ++++++++++++++++++++ arch/arm/boards/pm9261/Makefile | 5 + arch/arm/boards/pm9261/config.h | 87 ------------- arch/arm/boards/pm9261/lowlevel_init.c | 102 +++++++++++++++ arch/arm/boards/pm9263/Makefile | 5 + arch/arm/boards/pm9263/config.h | 103 --------------- arch/arm/mach-at91/at91sam926x_lowlevel_init.c | 64 ++++++---- .../mach-at91/include/mach/at91_lowlevel_init.h | 33 +++++ 13 files changed, 435 insertions(+), 418 deletions(-) create mode 100644 arch/arm/boards/at91sam9263ek/lowlevel_init.c create mode 100644 arch/arm/boards/mmccpu/lowlevel_init.c create mode 100644 arch/arm/boards/pm9261/lowlevel_init.c create mode 100644 arch/arm/mach-at91/include/mach/at91_lowlevel_init.h
arch/arm/boards/at91sam9263ek/Makefile +5 -0
@@ -1 +1,6 @@ obj-y += init.o + +lowlevel_init-y = lowlevel_init.o +obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y) + +pbl-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y)
arch/arm/boards/at91sam9263ek/config.h +0 -87
91 lines not on this page · raw message
arch/arm/boards/at91sam9263ek/lowlevel_init.c new file +104 -0
104 lines not on this page · raw message
arch/arm/boards/mmccpu/Makefile +5 -0
@@ -1 +1,6 @@ obj-y += init.o + +lowlevel_init-y = lowlevel_init.o +obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y) + +pbl-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y)
arch/arm/boards/mmccpu/config.h +0 -118
122 lines not on this page · raw message
arch/arm/boards/mmccpu/lowlevel_init.c new file +135 -0
135 lines not on this page · raw message
arch/arm/boards/pm9261/Makefile +5 -0
@@ -1 +1,6 @@ obj-y += init.o + +lowlevel_init-y = lowlevel_init.o +obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y) + +pbl-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y)
arch/arm/boards/pm9261/config.h +0 -87
91 lines not on this page · raw message
arch/arm/boards/pm9261/lowlevel_init.c new file +102 -0
102 lines not on this page · raw message
arch/arm/boards/pm9263/Makefile +5 -0
@@ -1 +1,6 @@ obj-y += init.o + +lowlevel_init-y = lowlevel_init.o +obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y) + +pbl-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y)
arch/arm/boards/pm9263/config.h +0 -103
107 lines not on this page · raw message
arch/arm/mach-at91/at91sam926x_lowlevel_init.c +41 -23
146 lines not on this page · raw message
arch/arm/mach-at91/include/mach/at91_lowlevel_init.h new file +33 -0
@@ -0,0 +1,33 @@ +/* +* Copyright (C) 2009-2011 Jean-Christophe PLAGNIOL-VILLARD <[email protected]> +* +* Under GPLv2 +*/ + +#ifndef __AT91_LOWLEVEL_INIT_H__ +#define __AT91_LOWLEVEL_INIT_H__ + +struct at91sam926x_lowlevel_cfg { +u32 wdt_mr; +u32 ebi_pio_pdr; +u32 ebi_pio_ppudr; +u32 ebi_csa; +u32 smc_cs; +u32 smc_mode; +u32 smc_cycle; +u32 smc_pulse; +u32 smc_setup; +u32 pmc_mor; +u32 pmc_pllar; +u32 pmc_mckr1; +u32 pmc_mckr2; +u32 sdrc_cr; +u32 sdrc_tr1; +u32 sdrc_mdr; +u32 sdrc_tr2; +u32 rstc_rmr; +}; + +void at91sam926x_lowlevel_board_config (struct at91sam926x_lowlevel_cfg *cfg); + +#endif /* __AT91_LOWLEVEL_INIT_H__ */
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 3/7] at91: sam926x: switch lowlevel param to c code
Quoted 457 lines · Jean-Christophe PLAGNIOL-VILLARD
Instead of hardcode define use a struct that the board fill
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- arch/arm/boards/at91sam9263ek/Makefile | 5 + arch/arm/boards/at91sam9263ek/config.h | 87 ------------- arch/arm/boards/at91sam9263ek/lowlevel_init.c | 104 +++++++++++++++ arch/arm/boards/mmccpu/Makefile | 5 + arch/arm/boards/mmccpu/config.h | 118 ----------------- arch/arm/boards/mmccpu/lowlevel_init.c | 135 ++++++++++++++++++++ arch/arm/boards/pm9261/Makefile | 5 + arch/arm/boards/pm9261/config.h | 87 ------------- arch/arm/boards/pm9261/lowlevel_init.c | 102 +++++++++++++++ arch/arm/boards/pm9263/Makefile | 5 + arch/arm/boards/pm9263/config.h | 103 --------------- arch/arm/mach-at91/at91sam926x_lowlevel_init.c | 64 ++++++---- .../mach-at91/include/mach/at91_lowlevel_init.h | 33 +++++ 13 files changed, 435 insertions(+), 418 deletions(-) create mode 100644 arch/arm/boards/at91sam9263ek/lowlevel_init.c create mode 100644 arch/arm/boards/mmccpu/lowlevel_init.c create mode 100644 arch/arm/boards/pm9261/lowlevel_init.c create mode 100644 arch/arm/mach-at91/include/mach/at91_lowlevel_init.harch/arm/boards/at91sam9263ek/Makefile +5
-0@@ -1 +1,6 @@ obj-y += init.o + +lowlevel_init-y = lowlevel_init.o +obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y) + +pbl-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y)arch/arm/boards/at91sam9263ek/config.h +0
-87@@ -3,91 +3,4 @@#define AT91_MAIN_CLOCK 16367660/* 16.367 MHz crystal */ -#define MASTER_PLL_MUL 171 -#define MASTER_PLL_DIV 14 - -/* clocks */ -#define CONFIG_SYS_MOR_VAL \ - (AT91_PMC_MOSCEN | \ - (255 << 8))/* Main Oscillator Start-up Time */ -#define CONFIG_SYS_PLLAR_VAL \ - (AT91_PMC_PLLA_WR_ERRATA |/* Bit 29 must be 1 when prog */ \ - AT91_PMC_OUT | \ - AT91_PMC_PLLCOUNT | /* PLL Counter */ \ - (2 << 28) | /* PLL Clock Frequency Range */ \ - ((MASTER_PLL_MUL - 1) << 16) | (MASTER_PLL_DIV)) - -/* PCK/2 = MCK Master Clock from PLLA */ -#define CONFIG_SYS_MCKR1_VAL \ - (AT91_PMC_CSS_SLOW | \ - AT91_PMC_PRES_1 | \ - AT91SAM9_PMC_MDIV_2 | \ - AT91_PMC_PDIV_1) -/* PCK/2 = MCK Master Clock from PLLA */ -#define CONFIG_SYS_MCKR2_VAL \ - (AT91_PMC_CSS_PLLA | \ - AT91_PMC_PRES_1 | \ - AT91SAM9_PMC_MDIV_2 | \ - AT91_PMC_PDIV_1) - -/* define PDC[31:16] as DATA[31:16] */ -#define CONFIG_SYS_PIOD_PDR_VAL1 0xFFFF0000 -/* no pull-up for D[31:16] */ -#define CONFIG_SYS_PIOD_PPUDR_VAL 0xFFFF0000 -/* EBI0_CSA, CS1 SDRAM, CS3 NAND Flash, 3.3V memories */ -#define CONFIG_SYS_MATRIX_EBI0CSA_VAL \ - (AT91_MATRIX_EBI0_DBPUC | AT91_MATRIX_EBI0_VDDIOMSEL_3_3V | \ - AT91_MATRIX_EBI0_CS1A_SDRAMC) - -/* SDRAM */ -/* SDRAMC_TR - Refresh Timer register */ -#define CONFIG_SYS_SDRC_TR_VAL1 0x13C -/* SDRAMC_CR - Configuration register*/ -#define CONFIG_SYS_SDRC_CR_VAL \ - (AT91_SDRAMC_NC_9 | \ - AT91_SDRAMC_NR_13 | \ - AT91_SDRAMC_NB_4 | \ - AT91_SDRAMC_CAS_3 | \ - AT91_SDRAMC_DBW_32 | \ - (1 << 8) |/* Write Recovery Delay */ \ - (7 << 12) | /* Row Cycle Delay */ \ - (2 << 16) | /* Row Precharge Delay */ \ - (2 << 20) | /* Row to Column Delay */ \ - (5 << 24) | /* Active to Precharge Delay */ \ - (1 << 28)) /* Exit Self Refresh to Active Delay */ - -/* Memory Device Register -> SDRAM */ -#define CONFIG_SYS_SDRC_MDR_VAL AT91_SDRAMC_MD_SDRAM -#define CONFIG_SYS_SDRC_TR_VAL2 1200/* SDRAM_TR */ - -/* setup SMC0, CS0 (NOR Flash) - 16-bit, 15 WS */ -#define CONFIG_SYS_SMC_CS 0 -#define CONFIG_SYS_SMC_SETUP_VAL \ - (AT91_SMC_NWESETUP_(10) | AT91_SMC_NCS_WRSETUP_(10) | \ - AT91_SMC_NRDSETUP_(10) | AT91_SMC_NCS_RDSETUP_(10)) -#define CONFIG_SYS_SMC_PULSE_VAL \ - (AT91_SMC_NWEPULSE_(11) | AT91_SMC_NCS_WRPULSE_(11) | \ - AT91_SMC_NRDPULSE_(11) | AT91_SMC_NCS_RDPULSE_(11)) -#define CONFIG_SYS_SMC_CYCLE_VAL \ - (AT91_SMC_NWECYCLE_(22) | AT91_SMC_NRDCYCLE_(22)) -#define CONFIG_SYS_SMC_MODE_VAL \ - (AT91_SMC_READMODE | AT91_SMC_WRITEMODE | \ - AT91_SMC_DBW_16 | \ - AT91_SMC_TDFMODE | \ - AT91_SMC_TDF_(6)) - -/* user reset enable */ -#define CONFIG_SYS_RSTC_RMR_VAL \ - (AT91_RSTC_KEY | \ - AT91_RSTC_PROCRST | \ - AT91_RSTC_RSTTYP_WAKEUP | \ - AT91_RSTC_RSTTYP_WATCHDOG) - -/* Disable Watchdog */ -#define CONFIG_SYS_WDTC_WDMR_VAL \ - (AT91_WDT_WDIDLEHLT | AT91_WDT_WDDBGHLT | \ - AT91_WDT_WDV | \ - AT91_WDT_WDDIS | \ - AT91_WDT_WDD) -#endif /* __CONFIG_H */ arch/arm/boards/at91sam9263ek/lowlevel_init.c new file +104
-0@@ -0,0 +1,104 @@ +/* +* Copyright (C) 2009-2011 Jean-Christophe PLAGNIOL-VILLARD <[email protected]> +* +* Under GPLv2 +*/ + +#include <common.h> +#include <init.h> +#include <mach/hardware.h> +#include <mach/at91_rstc.h> +#include <mach/at91_wdt.h> +#include <mach/at91_pmc.h> +#include <mach/at91sam9_smc.h> +#include <mach/at91sam9_sdramc.h> +#include <mach/at91sam9_matrix.h> +#include <mach/at91_lowlevel_init.h> + +#define MASTER_PLL_MUL 171 +#define MASTER_PLL_DIV 14 + +void __bare_init at91sam926x_lowlevel_board_config(struct at91sam926x_lowlevel_cfg *cfg) +{ +/* Disable Watchdog */ + cfg->wdt_mr = +AT91_WDT_WDIDLEHLT |AT91_WDT_WDDBGHLT | +AT91_WDT_WDV | +AT91_WDT_WDDIS | +AT91_WDT_WDD ; + +/* define PDC[31:16] as DATA[31:16] */ + cfg->ebi_pio_pdr =0xFFFF0000 ; +/* no pull-up for D[31:16] */ + cfg->ebi_pio_ppudr =0xFFFF0000 ; +/* EBI0_CSA, CS1 SDRAM, CS3 NAND Flash, 3.3V memories */ + cfg->ebi_csa = +AT91_MATRIX_EBI0_DBPUC |AT91_MATRIX_EBI0_VDDIOMSEL_3_3V | +AT91_MATRIX_EBI0_CS1A_SDRAMC ; + + cfg->smc_cs =0 ; + cfg->smc_mode = +AT91_SMC_READMODE |AT91_SMC_WRITEMODE | +AT91_SMC_DBW_16 | +AT91_SMC_TDFMODE | +AT91_SMC_TDF_ (6 ); + cfg->smc_cycle = +AT91_SMC_NWECYCLE_ (22 ) |AT91_SMC_NRDCYCLE_ (22 ); + cfg->smc_pulse = +AT91_SMC_NWEPULSE_ (11 ) |AT91_SMC_NCS_WRPULSE_ (11 ) | +AT91_SMC_NRDPULSE_ (11 ) |AT91_SMC_NCS_RDPULSE_ (11 ); + cfg->smc_setup = +AT91_SMC_NWESETUP_ (10 ) |AT91_SMC_NCS_WRSETUP_ (10 ) | +AT91_SMC_NRDSETUP_ (10 ) |AT91_SMC_NCS_RDSETUP_ (10 ); + + cfg->pmc_mor = +AT91_PMC_MOSCEN | + (255 <<8 );/* Main Oscillator Start-up Time */ + cfg->pmc_pllar = +AT91_PMC_PLLA_WR_ERRATA |/* Bit 29 must be 1 when prog */ +AT91_PMC_OUT | +AT91_PMC_PLLCOUNT |/* PLL Counter */ + (2 <<28 ) |/* PLL Clock Frequency Range */ + ((MASTER_PLL_MUL -1 ) <<16 ) | (MASTER_PLL_DIV ); +/* PCK/2 = MCK Master Clock from PLLA */ + cfg->pmc_mckr1 = +AT91_PMC_CSS_SLOW | +AT91_PMC_PRES_1 | +AT91SAM9_PMC_MDIV_2 | +AT91_PMC_PDIV_1 ; +/* PCK/2 = MCK Master Clock from PLLA */ + cfg->pmc_mckr2 = +AT91_PMC_CSS_PLLA | +AT91_PMC_PRES_1 | +AT91SAM9_PMC_MDIV_2 | +AT91_PMC_PDIV_1 ; + +/* SDRAM */ +/* SDRAMC_TR - Refresh Timer register */ + cfg->sdrc_tr1 =0x13C ; +/* SDRAMC_CR - Configuration register*/ + cfg->sdrc_cr = +AT91_SDRAMC_NC_9 | +AT91_SDRAMC_NR_13 | +AT91_SDRAMC_NB_4 | +AT91_SDRAMC_CAS_3 | +AT91_SDRAMC_DBW_32 | + (1 <<8 ) |/* Write Recovery Delay */ + (7 <<12 ) |/* Row Cycle Delay */ + (2 <<16 ) |/* Row Precharge Delay */ + (2 <<20 ) |/* Row to Column Delay */ + (5 <<24 ) |/* Active to Precharge Delay */ + (1 <<28 );/* Exit Self Refresh to Active Delay */ + +/* Memory Device Register -> SDRAM */ + cfg->sdrc_mdr =AT91_SDRAMC_MD_SDRAM ; +/* SDRAM_TR */ + cfg->sdrc_tr2 =1200 ; + +/* user reset enable */ + cfg->rstc_rmr = +AT91_RSTC_KEY | +AT91_RSTC_PROCRST | +AT91_RSTC_RSTTYP_WAKEUP | +AT91_RSTC_RSTTYP_WATCHDOG ; +}arch/arm/boards/mmccpu/Makefile +5
-0@@ -1 +1,6 @@ obj-y += init.o + +lowlevel_init-y = lowlevel_init.o +obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y) + +pbl-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y)arch/arm/boards/mmccpu/config.h +0
-118@@ -3,122 +3,4 @@#define AT91_MAIN_CLOCK 18432000 -/* values */ -#define MASTER_PLL_MUL 54 -#define MASTER_PLL_DIV 4 - -/* clocks */ -#define CONFIG_SYS_MOR_VAL \ - (AT91_PMC_MOSCEN | \ - (255 << 8))/* Main Oscillator Start-up Time */ -#define CONFIG_SYS_PLLAR_VAL \ - (AT91_PMC_PLLA_WR_ERRATA |/* Bit 29 must be 1 when prog */ \ - AT91_PMC_OUT | \ - AT91_PMC_PLLCOUNT | /* PLL Counter */ \ - (2 << 28) | /* PLL Clock Frequency Range */ \ - ((MASTER_PLL_MUL - 1) << 16) | (MASTER_PLL_DIV)) - -/* PCK/2 = MCK Master Clock from PLLA */ -#define CONFIG_SYS_MCKR1_VAL \ - (AT91_PMC_CSS_SLOW | \ - AT91_PMC_PRES_1 | \ - AT91SAM9_PMC_MDIV_2 | \ - AT91_PMC_PDIV_1) -/* PCK/2 = MCK Master Clock from PLLA */ -#define CONFIG_SYS_MCKR2_VAL \ - (AT91_PMC_CSS_PLLA | \ - AT91_PMC_PRES_1 | \ - AT91SAM9_PMC_MDIV_2 | \ - AT91_PMC_PDIV_1) - -/* define PDC[31:16] as DATA[31:16] */ -#define CONFIG_SYS_PIOD_PDR_VAL1 0xFFFF0000 -/* no pull-up for D[31:16] */ -#define CONFIG_SYS_PIOD_PPUDR_VAL 0xFFFF0000 -/* EBI0_CSA, CS1 SDRAM, CS3 NAND Flash, 1.8V memories */ -#define CONFIG_SYS_MATRIX_EBI0CSA_VAL \ - (AT91_MATRIX_EBI0_DBPUC | AT91_MATRIX_EBI0_VDDIOMSEL_1_8V | \ - AT91_MATRIX_EBI0_CS1A_SDRAMC | AT91_MATRIX_EBI0_CS3A_SMC_SMARTMEDIA) - -/* SDRAM */ -/* SDRAMC_TR - Refresh Timer register */ -#define CONFIG_SYS_SDRC_TR_VAL1 0x13c -/* SDRAMC_CR - Configuration register*/ -#define CONFIG_SYS_SDRC_CR_VAL \ - (AT91_SDRAMC_NC_9 | \ - AT91_SDRAMC_NR_13 | \ - AT91_SDRAMC_NB_4 | \ - AT91_SDRAMC_CAS_3 | \ - AT91_SDRAMC_DBW_32 | \ - (2 << 8) |/* tWR - Write Recovery Delay */ \ - (8 << 12) | /* tRC - Row Cycle Delay */ \ - (2 << 16) | /* tRP - Row Precharge Delay */ \ - (2 << 20) | /* tRCD - Row to Column Delay */ \ - (5 << 24) | /* tRAS - Active to Precharge Delay */ \ - (12 << 28)) /* tXSR - Exit Self Refresh to Active Delay */ - -/* Memory Device Register -> SDRAM */ -#define CONFIG_SYS_SDRC_MDR_VAL AT91_SDRAMC_MD_SDRAM -#define CONFIG_SYS_SDRC_TR_VAL2 780/* SDRAM_TR */ - -/* setup CS0 (NOR Flash) - 16-bit */ -#define CONFIG_SYS_SMC_CS 0 -#if 1 -#define CONFIG_SYS_SMC_SETUP_VAL \ - (AT91_SMC_NWESETUP_(3) | AT91_SMC_NCS_WRSETUP_(2) | \ - AT91_SMC_NRDSETUP_(8) | AT91_SMC_NCS_RDSETUP_(0)) -#define CONFIG_SYS_SMC_PULSE_VAL \ - (AT91_SMC_NWEPULSE_(5) | AT91_SMC_NCS_WRPULSE_(7) | \ - AT91_SMC_NRDPULSE_(5) | AT91_SMC_NCS_RDPULSE_(13)) -#define CONFIG_SYS_SMC_CYCLE_VAL \ - (AT91_SMC_NWECYCLE_(16) | AT91_SMC_NRDCYCLE_(16)) -#define CONFIG_SYS_SMC_MODE_VAL \ - (AT91_SMC_READMODE | AT91_SMC_WRITEMODE | \ - AT91_SMC_DBW_16 | \ - AT91_SMC_TDFMODE | \ - AT91_SMC_TDF_(6)) -#elif 0 /* slow setup */ -#define CONFIG_SYS_SMC_SETUP_VAL \ - (AT91_SMC_NWESETUP_(3) | AT91_SMC_NCS_WRSETUP_(2) | \ - AT91_SMC_NRDSETUP_(8) | AT91_SMC_NCS_RDSETUP_(0)) -#define CONFIG_SYS_SMC_PULSE_VAL \ - (AT91_SMC_NWEPULSE_(5) | AT91_SMC_NCS_WRPULSE_(7) | \ - AT91_SMC_NRDPULSE_(5) | AT91_SMC_NCS_RDPULSE_(13)) -#define CONFIG_SYS_SMC_CYCLE_VAL \ - (AT91_SMC_NWECYCLE_(0xd00) | AT91_SMC_NRDCYCLE_(0xd00)) -#define CONFIG_SYS_SMC_MODE_VAL \ - (AT91_SMC_READMODE | AT91_SMC_WRITEMODE | \ - AT91_SMC_DBW_16 | \ - AT91_SMC_TDFMODE | \ - AT91_SMC_TDF_(1)) -#else /* RONETIX' original values */ -#define CONFIG_SYS_SMC_SETUP_VAL \ - (AT91_SMC_NWESETUP_(10) | AT91_SMC_NCS_WRSETUP_(10) | \ - AT91_SMC_NRDSETUP_(10) | AT91_SMC_NCS_RDSETUP_(10)) -#define CONFIG_SYS_SMC_PULSE_VAL \ - (AT91_SMC_NWEPULSE_(11) | AT91_SMC_NCS_WRPULSE_(11) | \ - AT91_SMC_NRDPULSE_(11) | AT91_SMC_NCS_RDPULSE_(11)) -#define CONFIG_SYS_SMC_CYCLE_VAL \ - (AT91_SMC_NWECYCLE_(22) | AT91_SMC_NRDCYCLE_(22)) -#define CONFIG_SYS_SMC_MODE_VAL \ - (AT91_SMC_READMODE | AT91_SMC_WRITEMODE | \ - AT91_SMC_DBW_16 | \ - AT91_SMC_TDFMODE | \ - AT91_SMC_TDF_(6)) -#endif - -/* user reset enable */ -#define CONFIG_SYS_RSTC_RMR_VAL \ - (AT91_RSTC_KEY | \ - AT91_RSTC_PROCRST | \ - AT91_RSTC_RSTTYP_WAKEUP | \ - AT91_RSTC_RSTTYP_WATCHDOG) - -/* Disable Watchdog */ -#define CONFIG_SYS_WDTC_WDMR_VAL \ - (AT91_WDT_WDIDLEHLT | AT91_WDT_WDDBGHLT | \ - AT91_WDT_WDV | \ - AT91_WDT_WDDIS | \ - AT91_WDT_WDD) -#endif /* __CONFIG_H */ arch/arm/boards/mmccpu/lowlevel_init.c new file +73
-0@@ -0,0 +1,135 @@ +/* +* Copyright (C) 2009-2011 Jean-Christophe PLAGNIOL-VILLARD <[email protected]> +* +* Under GPLv2 +*/ + +#include <common.h> +#include <init.h> +#include <mach/hardware.h> +#include <mach/at91_rstc.h> +#include <mach/at91_wdt.h> +#include <mach/at91_pmc.h> +#include <mach/at91sam9_smc.h> +#include <mach/at91sam9_sdramc.h> +#include <mach/at91sam9_matrix.h> +#include <mach/at91_lowlevel_init.h> + +#define MASTER_PLL_MUL 54 +#define MASTER_PLL_DIV 4 + +void __bare_init at91sam926x_lowlevel_board_config(struct at91sam926x_lowlevel_cfg *cfg) +{ +/* Disable Watchdog */ + cfg->wdt_mr = +AT91_WDT_WDIDLEHLT |AT91_WDT_WDDBGHLT | +AT91_WDT_WDV | +AT91_WDT_WDDIS | +AT91_WDT_WDD ; + +/* define PDC[31:16] as DATA[31:16] */ + cfg->ebi_pio_pdr =0xFFFF0000 ; +/* no pull-up for D[31:16] */ + cfg->ebi_pio_ppudr =0xFFFF0000 ; +/* EBI0_CSA, CS1 SDRAM, CS3 NAND Flash, 3.3V memories */ + cfg->ebi_csa = +AT91_MATRIX_EBI0_DBPUC |AT91_MATRIX_EBI0_VDDIOMSEL_1_8V | +AT91_MATRIX_EBI0_CS1A_SDRAMC | +AT91_MATRIX_EBI0_CS3A_SMC_SMARTMEDIA ; + + cfg->smc_cs =0 ; +#if 1 + cfg->smc_mode = +AT91_SMC_READMODE |AT91_SMC_WRITEMODE | +AT91_SMC_DBW_16 | +AT91_SMC_TDFMODE | +AT91_SMC_TDF_ (6 ); + cfg->smc_cycle = +AT91_SMC_NWECYCLE_ (16 ) |AT91_SMC_NRDCYCLE_ (16 ); + cfg->smc_pulse = +AT91_SMC_NWEPULSE_ (5 ) |AT91_SMC_NCS_WRPULSE_ (7 ) | +AT91_SMC_NRDPULSE_ (5 ) |AT91_SMC_NCS_RDPULSE_ (13 ); + cfg->smc_setup = +AT91_SMC_NWESETUP_ (3 ) |AT91_SMC_NCS_WRSETUP_ (2 ) | +AT91_SMC_NRDSETUP_ (8 ) |AT91_SMC_NCS_RDSETUP_ (0 ); +#elif 0 + cfg->smc_mode = +AT91_SMC_READMODE |AT91_SMC_WRITEMODE | +AT91_SMC_DBW_16 | +AT91_SMC_TDFMODE | +AT91_SMC_TDF_ (1 ); + cfg->smc_cycle = +AT91_SMC_NWECYCLE_ (0xd00 ) |AT91_SMC_NRDCYCLE_ (0xd00 ); + cfg->smc_pulse = +AT91_SMC_NWEPULSE_ (5 ) |AT91_SMC_NCS_WRPULSE_ (7 ) | +AT91_SMC_NRDPULSE_ (5 ) |AT91_SMC_NCS_RDPULSE_ (13 ); + cfg->smc_setup = +AT91_SMC_NWESETUP_ (3 ) |AT91_SMC_NCS_WRSETUP_ (2 ) | +AT91_SMC_NRDSETUP_ (8 ) |AT91_SMC_NCS_RDSETUP_ (0 ); +#else + cfg->smc_mode = +AT91_SMC_READMODE |AT91_SMC_WRITEMODE | +AT91_SMC_DBW_16 | + AT91_SMC_TDFMODE |
arch/arm/boards/mmccpu/lowlevel_init.c line 83
Quoted 10 lines
arch/arm/boards/mmccpu/lowlevel_init.c new file +10
-0+AT91_SMC_TDF_ (6 ); + cfg->smc_cycle = +AT91_SMC_NWECYCLE_ (22 ) |AT91_SMC_NRDCYCLE_ (22 ); + cfg->smc_pulse = +AT91_SMC_NWEPULSE_ (11 ) |AT91_SMC_NCS_WRPULSE_ (11 ) | +AT91_SMC_NRDPULSE_ (11 ) |AT91_SMC_NCS_RDPULSE_ (11 ); + cfg->smc_setup = +AT91_SMC_NWESETUP_ (10 ) |AT91_SMC_NCS_WRSETUP_ (10 ) | +AT91_SMC_NRDSETUP_ (10 ) |AT91_SMC_NCS_RDSETUP_ (10 ); +#endif
Please keep the comments from the original code (slow, Ronetix original), or (preferred), just drop the unused code.
arch/arm/boards/mmccpu/lowlevel_init.c line 85
Quoted 2 lines
arch/arm/boards/mmccpu/lowlevel_init.c new file +2
-0+ + cfg->pmc_mor =
Trailing whitespace (some more in this patch)
Sascha
Signature · 9 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 4/7 at91: usb-a9263 add lowlevel init
In reply to Jean-Christophe PLAGNIOL-VILLARD--- arch/arm/boards/usb-a926x/Makefile | 6 ++ arch/arm/boards/usb-a926x/config.h | 97 +++++++++++++++++ .../arm/boards/usb-a926x/usb_a9263_lowlevel_init.c | 111 ++++++++++++++++++++ arch/arm/mach-at91/Kconfig | 1 + 4 files changed, 215 insertions(+) create mode 100644 arch/arm/boards/usb-a926x/usb_a9263_lowlevel_init.c
arch/arm/boards/usb-a926x/Makefile +6 -0
@@ -1 +1,7 @@ obj-y += init.o + +lowlevel_init-$(CONFIG_MACH_USB_A9263) = usb_a9263_lowlevel_init.o + +obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y) + +pbl-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y)
arch/arm/boards/usb-a926x/config.h +97 -0
101 lines not on this page · raw message
arch/arm/boards/usb-a926x/usb_a9263_lowlevel_init.c new file +111 -0
111 lines not on this page · raw message
arch/arm/mach-at91/Kconfig +1 -0
@@ -357,6 +357,7 @@ config MACH_TNY_A9263 config MACH_USB_A9263 bool "CALAO USB-A9263" + select MACH_HAS_LOWLEVEL_INIT help Select this if you are using a Calao Systems USB-A9263. <http://www.calao-systems.com>
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 5/7 introduce common bootstrap code
In reply to Jean-Christophe PLAGNIOL-VILLARDThis will allow to have a generic code to create different bootstrap
As example
Barebox as TI Xloader
Barebox as AT91 Bootstrap
--- include/bootstrap.h | 34 +++++++++++++++++ lib/Kconfig | 2 + lib/Makefile | 1 + lib/bootstrap/Kconfig | 13 +++++++ lib/bootstrap/Makefile | 3 ++ lib/bootstrap/common.c | 21 +++++++++++ lib/bootstrap/devfs.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/bootstrap/disk.c | 36 ++++++++++++++++++ 8 files changed, 208 insertions(+) create mode 100644 include/bootstrap.h create mode 100644 lib/bootstrap/Kconfig create mode 100644 lib/bootstrap/Makefile create mode 100644 lib/bootstrap/common.c create mode 100644 lib/bootstrap/devfs.c create mode 100644 lib/bootstrap/disk.c
include/bootstrap.h new file +34 -0
@@ -0,0 +1,34 @@ +/* +* Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <[email protected]> +* +* Under GPLv2 +*/ + +#ifndef __BOOSTRAP_H__ +#define __BOOSTRAP_H__ + +#define bootstrap_err(fmt, arg...) printf(fmt, ##arg) + +void bootstrap_boot (int (*func)(void ),bool barebox); + +#ifdef CONFIG_BOOTSTRAP_DEVFS +void *bootstrap_read_devfs (char *devname,bool use_bb,int offset, +int default_size,int max_size); +#else +static inline void *bootstrap_read_devfs (char *devname,bool use_bb,int offset, +int default_size,int max_size) +{ +return NULL ; +} +#endif + +#ifdef CONFIG_BOOTSTRAP_DISK +void *bootstrap_read_disk (char *devname); +#else +static inline void *bootstrap_read_disk (char *devname) +{ +return NULL ; +} +#endif + +#endif /* __BOOSTRAP_H__ */
lib/Kconfig +2 -0
@@ -52,4 +52,6 @@ config LIBMTD source lib/gui/Kconfig +source lib/bootstrap/Kconfig + endmenu
lib/Makefile +1 -0
@@ -1,3 +1,4 @@ +obj-$(CONFIG_BOOTSTRAP) += bootstrap/ obj-y += ctype.o obj-y += rbtree.o obj-y += display_options.o
lib/bootstrap/Kconfig new file +13 -0
@@ -0,0 +1,13 @@ +menuconfig BOOTSTRAP + bool "Library bootstrap routines " + depends on SHELL_NONE + +if BOOTSTRAP + +config BOOTSTRAP_DEVFS + bool "devfs support" + +config BOOTSTRAP_DISK + bool "disk support" + +endif
lib/bootstrap/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +obj-y += common.o +obj-$(CONFIG_BOOTSTRAP_DEVFS) += devfs.o +obj-$(CONFIG_BOOTSTRAP_DISK) += disk.o
lib/bootstrap/common.c new file +21 -0
@@ -0,0 +1,21 @@ +/* +* Copyright (C) 2011 Sascha Hauer, Pengutronix +* Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <[email protected]> +* +* Under GPLv2 +*/ + +#include <common.h> +#include <bootstrap.h> +#include <filetype.h> + +void bootstrap_boot (int (*func)(void ),bool barebox) +{ +if (barebox && !is_barebox_arm_head ((void *)func)) +return ; + +shutdown_barebox (); +func (); + +while (1 ); +}
lib/bootstrap/devfs.c new file +98 -0
98 lines not on this page · raw message
lib/bootstrap/disk.c new file +36 -0
@@ -0,0 +1,36 @@ +/* +* Copyright (C) 2011 Sascha Hauer, Pengutronix +* Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <[email protected]> +* +* Under GPLv2 +*/ + +#include <common.h> +#include <fs.h> +#include <fcntl.h> +#include <sizes.h> +#include <errno.h> +#include <malloc.h> + +void *bootstrap_read_disk (char *devname) +{ +int ret; +void *buf; +int len; +char *path ="/" ; + + ret =mount (dev,"fat" , path); +if (ret) { +boot_err ("mounting %s failed with %d\n" , dev, ret); +return NULL ; + } + + buf =read_file ("/barebox.bin" , &len); +if (!buf) { +boot_err ("could not read barebox.bin from %s\n" , dev); +umount (path); +return NULL ; + } + +return buf; +}
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 6/7 at91: add bootstrap version
In reply to Jean-Christophe PLAGNIOL-VILLARDThis will allow to boot from NAND/MMC and others.
This version of bootstrap is a non shell version of barebox compressed by the pbl.
--- arch/arm/mach-at91/Kconfig | 1 + arch/arm/mach-at91/Makefile | 1 + arch/arm/mach-at91/bootstrap.c | 86 +++++++++++++++++++++++++++ arch/arm/mach-at91/include/mach/bootstrap.h | 28 +++++++++ 4 files changed, 116 insertions(+) create mode 100644 arch/arm/mach-at91/bootstrap.c create mode 100644 arch/arm/mach-at91/include/mach/bootstrap.h
arch/arm/mach-at91/Kconfig +1 -0
@@ -92,6 +92,7 @@ config SOC_AT91SAM9263 select HAVE_AT91_DBGU1 select HAS_MACB select AT91SAM9_RESET + select HAVE_NOSHELL config SOC_AT91SAM9G45 bool
arch/arm/mach-at91/Makefile +1 -0
@@ -1,6 +1,7 @@ obj-y += setup.o clock.o gpio.o obj-$(CONFIG_CMD_AT91_BOOT_TEST) += boot_test_cmd.o +obj-$(CONFIG_SHELL_NONE) += bootstrap.o lowlevel_init-y = at91sam926x_lowlevel_init.o lowlevel_init-$(CONFIG_ARCH_AT91RM9200) = at91rm9200_lowlevel_init.o obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y)
arch/arm/mach-at91/bootstrap.c new file +86 -0
86 lines not on this page · raw message
arch/arm/mach-at91/include/mach/bootstrap.h new file +28 -0
@@ -0,0 +1,28 @@ +/* +* Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <[email protected]> +* +* Under GPLv2 +*/ + +#ifndef __MACH_BOOTSTRAP_H__ +#define __MACH_BOOTSTRAP_H__ + +#ifdef CONFIG_MTD_M25P80 +void *bootstrap_board_read_m25p80 (void ); +#else +static inline void *bootstrap_board_read_m25p80 (void ) +{ +return NULL ; +} +#endif + +#ifdef CONFIG_MTD_DATAFLASH +void *bootstrap_board_read_dataflash (void ); +#else +static inline void *bootstrap_board_read_dataflash (void ) +{ +return NULL ; +} +#endif + +#endif /* __MACH_BOOTSTRAP_H__ */
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 6/7] at91: add bootstrap version
Quoted 59 lines · Jean-Christophe PLAGNIOL-VILLARD
arch/arm/mach-at91/bootstrap.c new file +53
-0@@ -0,0 +1,86 @@ +/* +* Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <[email protected]> +* +* Under GPLv2 +*/ + +#include <common.h> +#include <bootstrap.h> +#include <mach/bootstrap.h> +#include <sizes.h> +#include <malloc.h> + +#if defined(CONFIG_MCI_ATMEL ) +#define is_mmc () 1 +#else +#define is_mmc () 0 +#endif + +#ifdef CONFIG_NAND_ATMEL +#define is_nand () 1 +#else +#define is_nand () 0 +#endif + +#ifdef CONFIG_MTD_M25P80 +#define is_m25p80 () 1 +#else +#define is_m25p80 () 0 +#endif + +#ifdef CONFIG_MTD_DATAFLASH +#define is_dataflash () 1 +#else +#define is_dataflash () 0 +#endif + +static void boot_seq (bool is_barebox) +{ +char *name = is_barebox ?"barebox" :"unknown" ; +int (*func)(void ) =NULL ; + +if (is_m25p80 ()) { + func =bootstrap_board_read_m25p80 (); +printf ("Boot %s from m25p80\n" , name); +bootstrap_boot (func, is_barebox); +bootstrap_err ("... failled\n" ); +free (func); + } +if (is_dataflash ()) { +printf ("Boot %s from dataflash\n" , name); + func =bootstrap_board_read_dataflash (); +bootstrap_boot (func, is_barebox); +bootstrap_err ("... failled\n" );
arch/arm/mach-at91/bootstrap.c line 63
Quoted 10 lines
arch/arm/mach-at91/bootstrap.c new file +10
-0+free (func); + } +if (is_nand ()) { +printf ("Boot %s from nand\n" , name); + func =bootstrap_read_devfs ("nand0" , true,SZ_128K ,SZ_256K ,SZ_1M ); +bootstrap_boot (func, is_barebox); +bootstrap_err ("... failled\n" ); +free (func); + } +}
Why can't you use IS_ENABLED(CONFIG_xxx) here?
Signature · 10 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 6/7] at91: add bootstrap version
Quoted 45 lines · Jan Lübbe
Quoted 44 lines · Jean-Christophe PLAGNIOL-VILLARD
arch/arm/mach-at91/bootstrap.c new file +38
-0@@ -0,0 +1,86 @@ +/* +* Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <[email protected]> +* +* Under GPLv2 +*/ + +#include <common.h> +#include <bootstrap.h> +#include <mach/bootstrap.h> +#include <sizes.h> +#include <malloc.h> + +#if defined(CONFIG_MCI_ATMEL ) +#define is_mmc () 1 +#else +#define is_mmc () 0 +#endif + +#ifdef CONFIG_NAND_ATMEL +#define is_nand () 1 +#else +#define is_nand () 0 +#endif + +#ifdef CONFIG_MTD_M25P80 +#define is_m25p80 () 1 +#else +#define is_m25p80 () 0 +#endif + +#ifdef CONFIG_MTD_DATAFLASH +#define is_dataflash () 1 +#else +#define is_dataflash () 0 +#endif + +static void boot_seq (bool is_barebox) +{
Quoted 8 lines
arch/arm/mach-at91/bootstrap.c line 46
Quoted 8 lines
arch/arm/mach-at91/bootstrap.c new file +8
-0+char *name = is_barebox ?"barebox" :"unknown" ; +int (*func)(void ) =NULL ; + +if (is_m25p80 ()) { + func =bootstrap_board_read_m25p80 (); +printf ("Boot %s from m25p80\n" , name); +bootstrap_boot (func, is_barebox); +bootstrap_err ("... failled\n" );
btw:
s/failled/failed/
Quoted 7 lines
arch/arm/mach-at91/bootstrap.c line 53
Quoted 7 lines
arch/arm/mach-at91/bootstrap.c new file +7
-0+free (func); + } +if (is_dataflash ()) { +printf ("Boot %s from dataflash\n" , name); + func =bootstrap_board_read_dataflash (); +bootstrap_boot (func, is_barebox); +bootstrap_err ("... failled\n" );
ditto
Quoted 7 lines
arch/arm/mach-at91/bootstrap.c line 60
Quoted 7 lines
arch/arm/mach-at91/bootstrap.c new file +7
-0+free (func); + } +if (is_nand ()) { +printf ("Boot %s from nand\n" , name); + func =bootstrap_read_devfs ("nand0" , true,SZ_128K ,SZ_256K ,SZ_1M ); +bootstrap_boot (func, is_barebox); +bootstrap_err ("... failled\n" );
ditto
Sascha
Signature · 9 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 7/7 at91: usb_a9263: add bootstrap version
In reply to Jean-Christophe PLAGNIOL-VILLARD--- arch/arm/boards/usb-a926x/Makefile | 3 +++ arch/arm/boards/usb-a926x/usb_a9263_bootstrap.c | 16 +++++++++++++ .../configs/usb_a9263_128mib_bootstrap_defconfig | 24 ++++++++++++++++++++ arch/arm/configs/usb_a9263_bootstrap_defconfig | 23 +++++++++++++++++++ 4 files changed, 66 insertions(+) create mode 100644 arch/arm/boards/usb-a926x/usb_a9263_bootstrap.c create mode 100644 arch/arm/configs/usb_a9263_128mib_bootstrap_defconfig create mode 100644 arch/arm/configs/usb_a9263_bootstrap_defconfig
arch/arm/boards/usb-a926x/Makefile +3 -0
@@ -1,5 +1,8 @@ obj-y += init.o +bootstrap-$(CONFIG_MACH_USB_A9263) = usb_a9263_bootstrap.o +obj-$(CONFIG_BOOTSTRAP) += $(bootstrap-y) + lowlevel_init-$(CONFIG_MACH_USB_A9263) = usb_a9263_lowlevel_init.o obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y)
arch/arm/boards/usb-a926x/usb_a9263_bootstrap.c new file +16 -0
@@ -0,0 +1,16 @@ +/* +* Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <[email protected]> +* +* Under GPLv2 +*/ + +#include <common.h> +#include <bootstrap.h> +#include <mach/bootstrap.h> + +#ifdef CONFIG_MTD_DATAFLASH +void *bootstrap_board_read_dataflash (void ) +{ +return bootstrap_read_devfs ("dataflash0" , false,0xffc0 ,204864 ,204864 ); +} +#endif
arch/arm/configs/usb_a9263_128mib_bootstrap_defconfig new file +24 -0
@@ -0,0 +1,24 @@ +CONFIG_ARCH_AT91SAM9263=y +CONFIG_MACH_USB_A9263=y +CONFIG_AT91_HAVE_SRAM_128M=y +CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x12000 +CONFIG_AEABI=y +# CONFIG_CMD_ARM_CPUINFO is not set +CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y +CONFIG_ENVIRONMENT_VARIABLES=y +CONFIG_PBL_IMAGE=y +CONFIG_MMU=y +CONFIG_MALLOC_DUMMY=y +CONFIG_PROMPT="USB-9263:" +CONFIG_SHELL_NONE=y +# CONFIG_DEFAULT_ENVIRONMENT is not set +# CONFIG_SPI is not set +CONFIG_MTD=y +# CONFIG_MTD_WRITE is not set +# CONFIG_MTD_OOB_DEVICE is not set +CONFIG_NAND=y +# CONFIG_NAND_ECC_HW is not set +# CONFIG_NAND_ECC_HW_SYNDROME is not set +# CONFIG_NAND_ECC_HW_NONE is not set +CONFIG_NAND_ATMEL=y +# CONFIG_FS_RAMFS is not set
arch/arm/configs/usb_a9263_bootstrap_defconfig new file +23 -0
@@ -0,0 +1,23 @@ +CONFIG_ARCH_AT91SAM9263=y +CONFIG_MACH_USB_A9263=y +CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x12000 +CONFIG_AEABI=y +# CONFIG_CMD_ARM_CPUINFO is not set +CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y +CONFIG_ENVIRONMENT_VARIABLES=y +CONFIG_PBL_IMAGE=y +CONFIG_MMU=y +CONFIG_MALLOC_DUMMY=y +CONFIG_PROMPT="USB-9263:" +CONFIG_SHELL_NONE=y +# CONFIG_DEFAULT_ENVIRONMENT is not set +# CONFIG_SPI is not set +CONFIG_MTD=y +# CONFIG_MTD_WRITE is not set +# CONFIG_MTD_OOB_DEVICE is not set +CONFIG_NAND=y +# CONFIG_NAND_ECC_HW is not set +# CONFIG_NAND_ECC_HW_SYNDROME is not set +# CONFIG_NAND_ECC_HW_NONE is not set +CONFIG_NAND_ATMEL=y +# CONFIG_FS_RAMFS is not set
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 1/7] at91: add test commamd to emulate bootrom boot
In reply to Jean-Christophe PLAGNIOL-VILLARDQuoted 13 lines · Jean-Christophe PLAGNIOL-VILLARD
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- arch/arm/mach-at91/Kconfig | 5 ++ arch/arm/mach-at91/Makefile | 1 + arch/arm/mach-at91/boot_test_cmd.c | 97 ++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+) create mode 100644 arch/arm/mach-at91/boot_test_cmd.carch/arm/mach-at91/Kconfig +0
-0
arch/arm/mach-at91/Kconfig config CMD_AT91MUX · line 489
Quoted 7 lines
arch/arm/mach-at91/Kconfig +4
-0@@ -483,4 +483,9 @@ config CMD_AT91MUX bool "at91mux dump command" default y +config CONFIG_CMD_AT91_BOOT_TEST + bool "at91_boot_test" + help + allow to upload a boot binary to sram and execute it
You should mention here that this is for debugging/testing the bootstrap support.
arch/arm/mach-at91/Kconfig config CMD_AT91MUX
Quoted 8 lines
arch/arm/mach-at91/Kconfig +8
-0+ while ((opt = getopt(argc, argv, "j:s:")) > 0) { + switch (opt) { + case 'j': + jump = simple_strtoul(optarg, NULL, 0); + break; + case 's': + sram = optarg; + break;
default: return COMMAND_ERROR_USAGE;
Sascha
Signature · 9 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox