MX31: NAND boot for PDK boards.
Subsystems (2)
v3 cover MX31: NAND boot for PDK boards.
Hi all,
This is the latest set of patches that introduces NAND boot support for the i.MX31 CPU in general and the PDK board especially.
The patches apply on u-boot next and u-boot-arm next.
I've taken care of all comments received (at least I think so) and changes from the previous version include:
* Moved init of i.MX31 UART+SPI to a devices.c file which other boards can use as well
* Included JC's macros.h file which contains macros to be used by assembly code
* Renamed nand_boot_mx31.c to nand_boot_fsl_nfc.c since it's probable that this can be used by other SoCs as well (e.g. mx27?)
* The nand_boot_fsl_nfc.c uses a struct for the NFC and read/write operations without volatile.
* Made the lowlevel_init.S somewhat easier to understand.
The code boots on i.MX31 PDK board using large page NAND, it should work for small page NAND as well but that has not been tested.
Regards, Magnus Lilja
Jean-Christophe PLAGNIOL-VILLARD (1):
ARM: Add macros.h to be used in assembler file.
Magnus Lilja (5):
ARM1136: Introduce CONFIG_PRELOADER macro.
MX31: Add NAND SPL for i.MX31.
i.MX31: Create a common device file.
MX31: Add basic support for Freescale i.MX31 PDK board.
MX31: Add NAND SPL boot support to i.MX31 PDK board.
MAINTAINERS | 4 + MAKEALL | 2 + Makefile | 13 ++- README | 5 + board/freescale/mx31pdk/Makefile | 52 ++++++ board/freescale/mx31pdk/config.mk | 5 + board/freescale/mx31pdk/lowlevel_init.S | 114 ++++++++++++ board/freescale/mx31pdk/mx31pdk.c | 63 +++++++ cpu/arm1136/mx31/Makefile | 1 + cpu/arm1136/mx31/devices.c | 56 ++++++ cpu/arm1136/start.S | 33 ++-- include/asm-arm/arch-mx31/mx31-regs.h | 61 ++++++ include/asm-arm/arch-mx31/mx31.h | 3 + include/asm-arm/macro.h | 57 ++++++ include/configs/mx31pdk.h | 176 ++++++++++++++++++ include/fsl_nfc.h | 109 +++++++++++ nand_spl/board/freescale/mx31pdk/Makefile | 54 ++++++ nand_spl/board/freescale/mx31pdk/config.mk | 5 + nand_spl/board/freescale/mx31pdk/u-boot.lds | 36 ++++ nand_spl/nand_boot_fsl_nfc.c | 263 +++++++++++++++++++++++++++ onenand_ipl/board/apollon/Makefile | 4 +- 21 files changed, 1099 insertions(+), 17 deletions(-) create mode 100644 board/freescale/mx31pdk/Makefile create mode 100644 board/freescale/mx31pdk/config.mk create mode 100644 board/freescale/mx31pdk/lowlevel_init.S create mode 100644 board/freescale/mx31pdk/mx31pdk.c create mode 100644 cpu/arm1136/mx31/devices.c create mode 100644 include/asm-arm/macro.h create mode 100644 include/configs/mx31pdk.h create mode 100644 include/fsl_nfc.h create mode 100644 nand_spl/board/freescale/mx31pdk/Makefile create mode 100644 nand_spl/board/freescale/mx31pdk/config.mk create mode 100644 nand_spl/board/freescale/mx31pdk/u-boot.lds create mode 100644 nand_spl/nand_boot_fsl_nfc.c
PATCH v3 1/6 ARM1136: Introduce CONFIG_PRELOADER macro.
Currently CONFIG_ONENAND_IPL is used in a number of #ifdef's in start.S. In preparation for adding support for NAND SPL the macro CONFIG_PRELOADER is introducted and replaces the CONFIG_ONENAND_IPL in start.S.
--- README | 5 +++++ cpu/arm1136/start.S | 24 ++++++++++++------------ onenand_ipl/board/apollon/Makefile | 4 ++-- 3 files changed, 19 insertions(+), 14 deletions(-)
README +5 -0
@@ -2702,6 +2702,11 @@ Low Level (hardware related) configuration options: some other boot loader or by a debugger which performs these initializations itself. +- CONFIG_PRELOADER + + [ARM only] Modifies the behaviour of start.S when + compiling a loader that is executed before the actual + U-Boot. E.g. when compiling a NAND SPL. Building the Software: ======================
cpu/arm1136/start.S +12 -12
@@ -32,7 +32,7 @@ #include <version.h> .globl _start _start: b reset -#ifdef CONFIG_ONENAND_IPL +#ifdef CONFIG_PRELOADER ldr pc, _hang ldr pc, _hang ldr pc, _hang
@@ -67,7 +67,7 @@ _not_used: .word not_used _irq: .word irq _fiq: .word fiq _pad: .word 0x12345678 /* now 16*4=64 */ -#endif /* CONFIG_ONENAND_IPL */ +#endif /* CONFIG_PRELOADER */ .global _end_vect _end_vect:
@@ -156,9 +156,9 @@ relocate: /* relocate U-Boot to RAM */ adr r0, _start /* r0 <- current position of code */ ldr r1, _TEXT_BASE /* test if we run from flash or RAM */ cmp r0, r1 /* don't reloc during debug */ -#ifndef CONFIG_ONENAND_IPL +#ifndef CONFIG_PRELOADER beq stack_setup -#endif /* CONFIG_ONENAND_IPL */ +#endif /* CONFIG_PRELOADER */ ldr r2, _armboot_start ldr r3, _bss_start
@@ -175,7 +175,7 @@ copy_loop: /* Set up the stack */ stack_setup: ldr r0, _TEXT_BASE /* upper 128 KiB: relocated uboot */ -#ifdef CONFIG_ONENAND_IPL +#ifdef CONFIG_PRELOADER sub sp, r0, #128 /* leave 32 words for abort-stack */ #else sub r0, r0, #CONFIG_SYS_MALLOC_LEN /* malloc area */
@@ -184,14 +184,14 @@ stack_setup: sub r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ) #endif sub sp, r0, #12 /* leave 3 words for abort-stack */ -#endif /* CONFIG_ONENAND_IPL */ +#endif /* CONFIG_PRELOADER */ clear_bss: ldr r0, _bss_start /* find start of bss segment */ ldr r1, _bss_end /* stop here */ mov r2, #0x00000000 /* clear */ -#ifndef CONFIG_ONENAND_IPL +#ifndef CONFIG_PRELOADER clbss_l:str r2, [r0] /* clear loop... */ add r0, r0, #4 cmp r0, r1
@@ -244,7 +244,7 @@ cpu_init_crit: mov lr, ip /* restore link */ mov pc, lr /* back to my caller */ -#ifndef CONFIG_ONENAND_IPL +#ifndef CONFIG_PRELOADER /* ************************************************************************* *
@@ -357,17 +357,17 @@ cpu_init_crit: .macro get_fiq_stack @ setup FIQ stack ldr sp, FIQ_STACK_START .endm -#endif /* CONFIG_ONENAND_IPL */ +#endif /* CONFIG_PRELOADER */ /* * exception handlers */ -#ifdef CONFIG_ONENAND_IPL +#ifdef CONFIG_PRELOADER .align 5 do_hang: ldr sp, _TEXT_BASE /* use 32 words about stack */ bl hang /* hang and never return */ -#else /* !CONFIG_ONENAND IPL */ +#else /* !CONFIG_PRELOADER */ .align 5 undefined_instruction: get_bad_stack
@@ -435,4 +435,4 @@ fiq: arm1136_cache_flush: mcr p15, 0, r1, c7, c5, 0 @ invalidate I cache mov pc, lr @ back to caller -#endif /* CONFIG_ONENAND_IPL */ +#endif /* CONFIG_PRELOADER */
onenand_ipl/board/apollon/Makefile +2 -2
@@ -4,8 +4,8 @@ include $(TOPDIR)/onenand_ipl/board/$(BOARDDIR)/config.mk LDSCRIPT= $(TOPDIR)/onenand_ipl/board/$(BOARDDIR)/u-boot.onenand.lds LDFLAGS = -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS) -AFLAGS += -DCONFIG_ONENAND_IPL -CFLAGS += -DCONFIG_ONENAND_IPL +AFLAGS += -DCONFIG_PRELOADER -DCONFIG_ONENAND_IPL +CFLAGS += -DCONFIG_PRELOADER -DCONFIG_ONENAND_IPL OBJCLFAGS += --gap-fill=0x00 SOBJS := low_levelinit.o
Signature · 1 line
1.5.6
PATCH v3 2/6 MX31: Add NAND SPL for i.MX31.
This patch adds the NAND SPL framework needed to boot i.MX31 boards from NAND.
It has been tested on a i.MX31 PDK board with large page NAND. Small page NANDs should work as well, but this has not been tested.
Note: The i.MX31 NFC uses a non-standard layout for large page NANDs, whether this is compatible with a particular setup depends on how the NAND device is programmed by the flash programmer (e.g. JTAG debugger).
The patch is based on the work by Maxim Artamonov.
--- cpu/arm1136/start.S | 9 +- include/asm-arm/arch-mx31/mx31-regs.h | 5 + include/fsl_nfc.h | 109 ++++++++++++++ nand_spl/nand_boot_fsl_nfc.c | 263 +++++++++++++++++++++++++++++++++ 4 files changed, 384 insertions(+), 2 deletions(-) create mode 100644 include/fsl_nfc.h create mode 100644 nand_spl/nand_boot_fsl_nfc.c
cpu/arm1136/start.S +7 -2
@@ -200,12 +200,15 @@ clbss_l:str r2, [r0] /* clear loop... */ ldr pc, _start_armboot +#ifdef CONFIG_NAND_SPL +_start_armboot: .word nand_boot +#else #ifdef CONFIG_ONENAND_IPL _start_armboot: .word start_oneboot #else _start_armboot: .word start_armboot -#endif - +#endif /* CONFIG_ONENAND_IPL */ +#endif /* CONFIG_NAND_SPL */ /* *************************************************************************
@@ -217,6 +220,7 @@ _start_armboot: .word start_armboot * ************************************************************************* */ +#ifndef CONFIG_SKIP_LOWLEVEL_INIT cpu_init_crit: /* * flush v4 I/D caches
@@ -243,6 +247,7 @@ cpu_init_crit: bl lowlevel_init /* go setup pll,mux,memory */ mov lr, ip /* restore link */ mov pc, lr /* back to my caller */ +#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ #ifndef CONFIG_PRELOADER /*
include/asm-arm/arch-mx31/mx31-regs.h +5 -0
@@ -194,4 +194,9 @@#define CS5_BASE 0xB6000000#define PCMCIA_MEM_BASE 0xC0000000 +/* +* NAND controller +*/ +#define NFC_BASE_ADDR 0xB8000000 +#endif /* __ASM_ARCH_MX31_REGS_H */
include/fsl_nfc.h new file +109 -0
109 lines not on this page · raw message
nand_spl/nand_boot_fsl_nfc.c new file +263 -0
263 lines not on this page · raw message
Signature · 1 line
1.5.6
PATCH v3 3/6 ARM: Add macros.h to be used in assembler file.
From: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
--- include/asm-arm/macro.h | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) create mode 100644 include/asm-arm/macro.h
include/asm-arm/macro.h new file +57 -0
@@ -0,0 +1,57 @@ +/* +* include/asm-arm/macro.h +* +* Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <[email protected]> +* +* 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 +*/ + +#ifndef __ASM_ARM_MACRO_H__ +#define __ASM_ARM_MACRO_H__ +#ifdef __ASSEMBLY__ + +.macro write32, addr, data + ldr r4, =\addr + ldr r5, =\data + str r5, [r4] +.endm + +.macro write16, addr, data + ldr r4, =\addr + ldrh r5, =\data + strh r5, [r4] +.endm + +.macro write8, addr, data + ldr r4, =\addr + ldrb r5, =\data + strb r5, [r4] +.endm + +.macro wait_timer, time + ldr r4, =\time +1: + nop + subs r4, r4, #1 + bcs 1b +.endm + +#endif /* __ASSEMBLY__ */ +#endif /* __ASM_ARM_MACRO_H__ */
Signature · 1 line
1.5.6
PATCH v3 4/6 i.MX31: Create a common device file.
--- cpu/arm1136/mx31/Makefile | 1 + cpu/arm1136/mx31/devices.c | 56 ++++++++++++++++++++++++++++++++++++++ include/asm-arm/arch-mx31/mx31.h | 3 ++ 3 files changed, 60 insertions(+), 0 deletions(-) create mode 100644 cpu/arm1136/mx31/devices.c
cpu/arm1136/mx31/Makefile +1 -0
@@ -27,6 +27,7 @@ LIB = $(obj)lib$(SOC).a COBJS += generic.o COBJS += timer.o +COBJS += devices.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
cpu/arm1136/mx31/devices.c new file +56 -0
56 lines not on this page · raw message
include/asm-arm/arch-mx31/mx31.h +3 -0
@@ -47,4 +47,7 @@ static inline void mx31_gpio_set(unsigned int gpio, unsigned int value) }#endif +void mx31_uart1_hw_init (void ); +void mx31_spi2_hw_init (void ); +#endif /* __ASM_ARCH_MX31_H */
Signature · 1 line
1.5.6
PATCH v3 5/6 MX31: Add basic support for Freescale i.MX31 PDK board.
Add support for Freescale's i.MX31 PDK board (a.k.a. 3 stack board).
This patch assumes that some other program performs the actual NAND boot.
--- MAINTAINERS | 4 + MAKEALL | 1 + Makefile | 3 + board/freescale/mx31pdk/Makefile | 52 +++++++++++ board/freescale/mx31pdk/config.mk | 1 + board/freescale/mx31pdk/mx31pdk.c | 63 +++++++++++++ include/asm-arm/arch-mx31/mx31-regs.h | 2 + include/configs/mx31pdk.h | 161 +++++++++++++++++++++++++++++++++ 8 files changed, 287 insertions(+), 0 deletions(-) create mode 100644 board/freescale/mx31pdk/Makefile create mode 100644 board/freescale/mx31pdk/config.mk create mode 100644 board/freescale/mx31pdk/mx31pdk.c create mode 100644 include/configs/mx31pdk.h
MAINTAINERS +4 -0
@@ -527,6 +527,10 @@ Thomas Elste <[email protected]> modnet50 ARM720T (NET+50) +Fabio Estevam <[email protected]> + + mx31pdk i.MX31 + Peter Figuli <[email protected]> wepep250 xscale
MAKEALL +1 -0
@@ -551,6 +551,7 @@ LIST_ARM11=" \ imx31_phycore \ imx31_phycore_eet \ mx31ads \ + mx31pdk \ qong \ smdk6400 \ "
Makefile +3 -0
@@ -3112,6 +3112,9 @@ imx31_phycore_config : unconfig mx31ads_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm1136 mx31ads freescale mx31 +mx31pdk_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm1136 mx31pdk freescale mx31 + omap2420h4_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4 NULL omap24xx
board/freescale/mx31pdk/Makefile new file +52 -0
52 lines not on this page · raw message
board/freescale/mx31pdk/config.mk new file +1 -0
@@ -0,0 +1 @@ +TEXT_BASE = 0x87f00000
board/freescale/mx31pdk/mx31pdk.c new file +63 -0
63 lines not on this page · raw message
include/asm-arm/arch-mx31/mx31-regs.h +2 -0
@@ -84,6 +84,8 @@#define IPU_CONF_IC_EN (1<<1)#define IPU_CONF_SCI_EN (1<<0) +#define ARM_PPMRR 0x40000015 +#define WDOG_BASE 0x53FDC000/*
include/configs/mx31pdk.h new file +161 -0
161 lines not on this page · raw message
Signature · 1 line
1.5.6
PATCH v3 6/6 MX31: Add NAND SPL boot support to i.MX31 PDK board.
--- MAKEALL | 1 + Makefile | 14 +++- board/freescale/mx31pdk/config.mk | 4 + board/freescale/mx31pdk/lowlevel_init.S | 114 +++++++++++++++++++++++++++ include/asm-arm/arch-mx31/mx31-regs.h | 54 +++++++++++++ include/configs/mx31pdk.h | 21 ++++- nand_spl/board/freescale/mx31pdk/Makefile | 54 +++++++++++++ nand_spl/board/freescale/mx31pdk/config.mk | 5 + nand_spl/board/freescale/mx31pdk/u-boot.lds | 36 +++++++++ 9 files changed, 297 insertions(+), 6 deletions(-) create mode 100644 board/freescale/mx31pdk/lowlevel_init.S create mode 100644 nand_spl/board/freescale/mx31pdk/Makefile create mode 100644 nand_spl/board/freescale/mx31pdk/config.mk create mode 100644 nand_spl/board/freescale/mx31pdk/u-boot.lds
MAKEALL +1 -0
@@ -552,6 +552,7 @@ LIST_ARM11=" \ imx31_phycore_eet \ mx31ads \ mx31pdk \ + mx31pdk_nand \ qong \ smdk6400 \ "
Makefile +11 -3
@@ -376,7 +376,7 @@ $(LDSCRIPT): depend $(NAND_SPL): $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk $(MAKE) -C nand_spl/board/$(BOARDDIR) all -$(U_BOOT_NAND): $(NAND_SPL) $(obj)u-boot.bin +$(U_BOOT_NAND): $(NAND_SPL) $(obj)u-boot.bin $(obj)include/autoconf.mk cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin $(ONENAND_IPL): $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk
@@ -3112,8 +3112,16 @@ imx31_phycore_config : unconfig mx31ads_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm1136 mx31ads freescale mx31 -mx31pdk_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm1136 mx31pdk freescale mx31 +mx31pdk_config \ +mx31pdk_nand_config : unconfig + @mkdir -p $(obj)include + @if [ -n "$(findstring _nand_,$@)" ]; then \ + echo "#define CONFIG_NAND_U_BOOT" >> $(obj)include/config.h; \ + else \ + echo "#define CONFIG_SKIP_LOWLEVEL_INIT" >> $(obj)include/config.h; \ + echo "#define CONFIG_SKIP_RELOCATE_UBOOT" >> $(obj)include/config.h; \ + fi + @$(MKCONFIG) -a mx31pdk arm arm1136 mx31pdk freescale mx31 omap2420h4_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4 NULL omap24xx
board/freescale/mx31pdk/config.mk +4 -0
@@ -1 +1,5 @@ +ifdef CONFIG_NAND_SPL +TEXT_BASE = 0x87ec0000 +else TEXT_BASE = 0x87f00000 +endif
board/freescale/mx31pdk/lowlevel_init.S new file +114 -0
114 lines not on this page · raw message
include/asm-arm/arch-mx31/mx31-regs.h +54 -0
66 lines not on this page · raw message
include/configs/mx31pdk.h +18 -3
@@ -43,10 +43,10 @@#define CONFIG_SETUP_MEMORY_TAGS 1#define CONFIG_INITRD_TAG 1 -/* No support for NAND boot for i.MX31 PDK yet, so we rely on some other -* program to initialize the SDRAM. -*/ +#if defined(CONFIG_NAND_U_BOOT ) && !defined(CONFIG_NAND_SPL )#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_RELOCATE_UBOOT +#endif /* * Size of malloc() pool
@@ -158,4 +158,19 @@#define CONFIG_ENV_SIZE (128 * 1024) +/* NAND configuration for the NAND_SPL */ + +/* Start copying real U-boot from the second page */ +#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x800 +#define CONFIG_SYS_NAND_U_BOOT_SIZE 0x30000 +/* Load U-Boot to this address */ +#define CONFIG_SYS_NAND_U_BOOT_DST 0x87f00000 +#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_NAND_U_BOOT_DST + +#define CONFIG_SYS_NAND_PAGE_SIZE 0x800 +#define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) +#define CONFIG_SYS_NAND_PAGE_COUNT 64 +#define CONFIG_SYS_NAND_SIZE (256 * 1024 * 1024) +#define CONFIG_SYS_NAND_BAD_BLOCK_POS 0 +#endif /* __CONFIG_H */
nand_spl/board/freescale/mx31pdk/Makefile new file +54 -0
54 lines not on this page · raw message
nand_spl/board/freescale/mx31pdk/config.mk new file +5 -0
@@ -0,0 +1,5 @@ +PAD_TO := 2048 + +ifeq ($(debug),1) +PLATFORM_CPPFLAGS += -DDEBUG +endif
nand_spl/board/freescale/mx31pdk/u-boot.lds new file +36 -0
@@ -0,0 +1,36 @@ +OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + . = 0x00000000; + + . = ALIGN(4); + .text : + { + start.o (.text) + lowlevel_init.o (.text) + nand_boot_fsl_nfc.o (.text) + *(.text) + . = 2K; + } + + . = ALIGN(4); + .rodata : { *(.rodata) } + + . = ALIGN(4); + .data : { *(.data) } + + . = ALIGN(4); + .got : { *(.got) } + + . = .; + __u_boot_cmd_start = .; + .u_boot_cmd : { *(.u_boot_cmd) } + __u_boot_cmd_end = .; + + . = ALIGN(4); + __bss_start = .; + .bss : { *(.bss) } + _end = .; +}
Signature · 1 line
1.5.6
PATCH v3 1/6 ARM1136: Introduce CONFIG_PRELOADER macro.
In reply to Magnus LiljaDear Magnus,
Quoted 17 lines · In message <bef59ad70a27ef8496f88b85510f8d2c236e8cd9.1244572159.git.lilja.magnu…
Currently
CONFIG_ONENAND_IPLis used in a number of #ifdef's instart.S. In preparation for adding support for NAND SPL the macroCONFIG_PRELOADERis introducted and replaces theCONFIG_ONENAND_IPLinstart.S.Signed-off-by Magnus Lilja <[email protected]>--- README | 5 +++++ cpu/arm1136/start.S | 24 ++++++++++++------------ onenand_ipl/board/apollon/Makefile | 4 ++-- 3 files changed, 19 insertions(+), 14 deletions(-)README +0
-0
README Low Level (hardware related) configuration options: · line 2709
Quoted 8 lines
README +5
-0@@ -2702,6 +2702,11 @@ Low Level (hardware related) configuration options: some other boot loader or by a debugger which performs these initializations itself. +- CONFIG_PRELOADER + + [ARM only] Modifies the behaviour of start.S when + compiling a loader that is executed before the actual + U-Boot. E.g. when compiling a NAND SPL.
Is there a special reason for making this ARM only?
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de You humans have that emotional need to express gratitude. "You're welcome," I believe, is the correct response. -- Spock, "Bread and Circuses", stardate 4041.2
PATCH v3 1/6 ARM1136: Introduce CONFIG_PRELOADER macro.
Dear Wolfgang,
2009/6/9 Wolfgang Denk <[email protected]>:
Quoted 23 lines
Dear Magnus,
Quoted 20 lines · In message <bef59ad70a27ef8496f88b85510f8d2c236e8cd9.1244572159.git.lilja.magnu…
Currently
CONFIG_ONENAND_IPLis used in a number of #ifdef's instart.S. In preparation for adding support for NAND SPL the macroCONFIG_PRELOADERis introducted and replaces theCONFIG_ONENAND_IPLinstart.S.Signed-off-by Magnus Lilja <[email protected]>---
?README ? ? ? ? ? ? ? ? ? ? ? ? ? ? | ? ?5 +++++ ?cpu/arm1136/start.S ? ? ? ? ? ? ? ?| ? 24 ++++++++++++------------ ?onenand_ipl/board/apollon/Makefile | ? ?4 ++--?3 files changed, 19 insertions(+), 14 deletions(-)
README +0
-0@@ -2702,6 +2702,11 @@ Low Level (hardware related) configuration options:? ? ? ? ? ? ? some other boot loader or by a debugger which ? ? ? ? ? ? ? performs these initializations itself.
Quoted 7 lines
Quoted 5 lines
+-
CONFIG_PRELOADER
+
+ ? ? ? ? ? ? [ARM only] Modifies the behaviour ofstart.Swhen
+ ? ? ? ? ? ? compiling a loader that is executed before the actual
+ ? ? ? ? ? ? U-Boot. E.g. when compiling a NAND SPL.Is there a special reason for making this ARM only?
No, but it's only used on ARM so far.
/Magnus
PATCH v3 3/6 ARM: Add macros.h to be used in assembler file.
In reply to Magnus LiljaDear Magnus Lilja,
Quoted 7 lines · In message <bc809a4b4bb1a5d47ff874ac44f8777845366196.1244572159.git.lilja.magnu…
From: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- include/asm-arm/macro.h | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) create mode 100644 include/asm-arm/macro.h
I'm missing documentation what these macros are supposed to be used for?
Are they restricted to addresses in system RAM? Or intended to access device registers? are they universal across all existing ARM systems, i. e. are there not any configurations that might require any kind of memory barriers or sync or considerations about caching?
Best regards,
Wolfgang Denk
Signature · 8 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "No proper program contains an indication which as an operator- applied occurrence identifies an operator-defining occurrence which as an indication-applied occurrence identifies an indication-defining occurrence different from the one identified by the given indication as an indication-applied occurrence." - ALGOL 68 Report
PATCH v3 1/6 ARM1136: Introduce CONFIG_PRELOADER macro.
In reply to Magnus LiljaDear Magnus Lilja,
Quoted 2 lines · In message <[email protected]> you…
Quoted 2 lines
Quoted 2 lines
=A0README =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 | =A0 =
Unrelated note: I see an increasing number of mails where plain simple sequences of space characters get converted into this stupid 0xA0 characters.
Can anybody explain to me why that is happening, or how it can be prevented.
Quoted 9 lines
Quoted 7 lines
README Low Level (hardware related) configuration options: · line 2709
Quoted 5 lines
+-
CONFIG_PRELOADERREADME +4
-0+ + [ARM only] Modifies the behaviour of start.S w> hen + compiling a loader that is executed before the> actual + U-Boot. E.g. when compiling a NAND SPL.Is there a special reason for making this ARM only?
No, but it's only used on ARM so far.
Then please remove that comment. Thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
What about WRITING it first and rationalizing it afterwords? :-)
- Larry Wall in <[email protected]>PATCH v3 1/6 ARM1136: Introduce CONFIG_PRELOADER macro.
Wolfgang,
2009/6/9 Wolfgang Denk <[email protected]>:
Quoted 4 lines
Dear Magnus Lilja,
Quoted 1 line · In message <[email protected]> you…
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
=A0README =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 | =A0 =
Unrelated note: I see an increasing number of mails where plain simple sequences of space characters get converted into this stupid
0xA0characters.Can anybody explain to me why that is happening, or how it can be prevented.
Were those A0's present in my original mail or only in the followup I did to your comment? I used git to send the series and followups are done using gmail's web interface.
Regards, Magnus
PATCH v3 2/6 MX31: Add NAND SPL for i.MX31.
In reply to Magnus LiljaDear Magnus Lilja,
Quoted 15 lines · In message <15c41c2e93fb138829871cd901fc20cda3b433d8.1244572159.git.lilja.magnu…
This patch adds the NAND SPL framework needed to boot i.MX31 boards from NAND.
It has been tested on a i.MX31 PDK board with large page NAND. Small page NANDs should work as well, but this has not been tested.
Note: The i.MX31 NFC uses a non-standard layout for large page NANDs, whether this is compatible with a particular setup depends on how the NAND device is programmed by the flash programmer (e.g. JTAG debugger).
The patch is based on the work by Maxim Artamonov.
Signed-off-by Maxim Artamonov <[email protected]>Signed-off-by Magnus Lilja <[email protected]>
...
nand_spl/nand_boot_fsl_nfc.c line 152
Quoted 8 lines
nand_spl/nand_boot_fsl_nfc.c new file +8
-0+static int is_badblock (int pagenumber) +{ +int page = pagenumber; +int maxpagecheck =CONFIG_SYS_NAND_PAGE_SIZE ==0x800 ?2 :1 ; +u32 badblock; +u32 *src; + +// todo shall we check both or only one of them?
Please do not use C++ comments.
Quoted 10 lines
nand_spl/nand_boot_fsl_nfc.c new file +10
-0+void nand_boot (void ) +{ + __attribute__((noreturn))void (*uboot)(void ); + + nfc = (void *)NFC_BASE_ADDR ; + +/* +* CONFIG_SYS_NAND_U_BOOT_OFFS and CONFIG_SYS_NAND_U_BOOT_SIZE must +* be aligned to full pages +*/
nand_spl/nand_boot_fsl_nfc.c line 251
Quoted 10 lines
nand_spl/nand_boot_fsl_nfc.c new file +10
-0+if (!nand_load (CONFIG_SYS_NAND_U_BOOT_OFFS ,CONFIG_SYS_NAND_U_BOOT_SIZE , + (uchar *)CONFIG_SYS_NAND_U_BOOT_DST )) { +/* Copy from NAND successful, start U-boot */ + uboot = (void *)CONFIG_SYS_NAND_U_BOOT_START ; +uboot (); + }else { +/* Unrecoverable error when copying from NAND */ +while (1 ) { +/* Loop forever */ + }
No braces needed for single line constructs. And why don't you simply call hang() here (which might be doing additional things on some boards. like flashing some LED or so)?
nand_spl/nand_boot_fsl_nfc.c line 262
Quoted 10 lines
nand_spl/nand_boot_fsl_nfc.c new file +10
-0+} + +/* +* Called from start.S in case of an exception. +*/ +void hang (void ) +{ +while (1 ) { +/* Loop forever */ + }
No braces needed for single line constructs. And I think some (older) compilers might complain about a missing ';'.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Documentation is like sex: when it is good, it is very, very good; and when it is bad, it is better than nothing. - Dick Brandon
PATCH v3 5/6 MX31: Add basic support for Freescale i.MX31 PDK board.
In reply to Magnus LiljaDear Magnus Lilja,
Quoted 7 lines · In message <ed0be9732183579c15279ba61413d3f3dc7155f8.1244572159.git.lilja.magnu…
Add support for Freescale's i.MX31 PDK board (a.k.a. 3 stack board).
This patch assumes that some other program performs the actual NAND boot.
Signed-off-by Magnus Lilja <[email protected]>---
...
MAINTAINERS Thomas Elste <[email protected]> · line 534
Quoted 11 lines
MAINTAINERS +4
-0@@ -527,6 +527,10 @@ Thomas Elste <[email protected]> modnet50 ARM720T (NET+50) +Fabio Estevam <[email protected]> + + mx31pdk i.MX31 + Peter Figuli <[email protected]>
Is this correct? It's quite unusal that somebody becomes maintainer of a port who seems to have not been involved with it at all - at least I cannot see his name in any of the Signed-off-by lines nor in any (C) lines or anywhere else?
Fabio, do you agree?
...
MAINTAINERS Thomas Elste <[email protected]>
Quoted 12 lines
MAINTAINERS +12
-0+int board_init(void) +{ + /* CS5: CPLD incl. network controller */ + __REG(CSCR_U(5)) = 0x0000d843; + __REG(CSCR_L(5)) = 0x22252521; + __REG(CSCR_A(5)) = 0x22220a00; + + /* Setup UART1 and SPI2 pins */ + mx31_uart1_hw_init(); + mx31_spi2_hw_init(); + + gd->bd->bi_arch_number = MACH_TYPE_MX31_3DS; /* board id for linux */
Hm... that's the MACH ID for the Freescale MX31_3DS board. You are talking about PDK instead. Are these two really the same?
MAINTAINERS
Quoted 8 lines
MAINTAINERS +8
-0+ gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; + + return 0; +} + +int checkboard(void) +{ + printf("Board: i.MX31 MAX PDK (3DS)\n");
It seems they are the same?
Quoted 3 lines
+/* Disabled due to compilation errors in
cmd_bootm.c(IMLS seems to require
+ * thatCFG_NO_FLASHis undefined).
+ */
Incorrect multiline comment style.
Quoted 1 line
+#define
CONFIG_ENV_IS_NOWHERE1
Why don't you put the environment in NAND?
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Life. Don't talk to me about life. - Marvin the Paranoid Android
PATCH v3 1/6 ARM1136: Introduce CONFIG_PRELOADER macro.
In reply to Magnus LiljaDear Magnus Lilja,
Quoted 7 lines · In message <[email protected]> you…
Quoted 7 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
=A0README =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 | =A0 =
Unrelated note: I see an increasing number of mails where plain simple sequences of space characters get converted into this stupid
0xA0characters.
Quoted 6 lines
Quoted 2 lines
Can anybody explain to me why that is happening, or how it can be prevented.
Were those A0's present in my original mail or only in the followup I did to your comment? I used git to send the series and followups are done using gmail's web interface.
Only in your followup. The original mail contained plain space characters (0x20 ASCII) there.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Intel's new motto: United we stand. Divided we fall!
PATCH v3 3/6 ARM: Add macros.h to be used in assemblerfile.
In reply to Magnus LiljaMagnus
Please ensure when writing ARM macros that any architecture
specific instructions are
restricted to the correct architecture.
This patch should be OK, this is just a heads up for any budding macro writers on the list
Regards
Peter
Quoted 89 lines
-----Original Message-----
From: u-boot-bounces at lists.denx.de [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Magnus Lilja
Sent: 09 June 2009 19:38
To: u-boot at lists.denx.de
Subject: [U-Boot] [PATCH v3 3/6] ARM: Addmacros.hto be used in assemblerfile.From: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD
<[email protected]>--- include/asm-arm/macro.h | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) createmode 100644
include/asm-arm/macro.h(quoted diff) +0
-0
b/include/asm-arm/macro.hnew file mode 100644 index 0000000..a598776include/asm-arm/macro.h new file +58
-1@@ -0,0 +1,57 @@ +/* +* include/asm-arm/macro.h +* +* Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD +<[email protected]> +* +* 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 +*/ + +#ifndef __ASM_ARM_MACRO_H__ +#define __ASM_ARM_MACRO_H__ +#ifdef __ASSEMBLY__ + +.macro write32, addr, data + ldr r4, =\addr + ldr r5, =\data + str r5, [r4] +.endm + +.macro write16, addr, data + ldr r4, =\addr + ldrh r5, =\data + strh r5, [r4] +.endm + +.macro write8, addr, data + ldr r4, =\addr + ldrb r5, =\data + strb r5, [r4] +.endm + +.macro wait_timer, time + ldr r4, =\time +1: + nop + subs r4, r4, #1 + bcs 1b +.endm + +#endif /* __ASSEMBLY__ */ +#endif /* __ASM_ARM_MACRO_H__ */ --1.5.6
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
PATCH v3 2/6 MX31: Add NAND SPL for i.MX31.
In reply to Wolfgang DenkWolfang,
2009/6/9 Wolfgang Denk <[email protected]>:
Quoted 19 lines
Dear Magnus Lilja,
Quoted 15 lines · In message <15c41c2e93fb138829871cd901fc20cda3b433d8.1244572159.git.lilja.magnu…
This patch adds the NAND SPL framework needed to boot i.MX31 boards from NAND.
It has been tested on a i.MX31 PDK board with large page NAND. Small page NANDs should work as well, but this has not been tested.
Note: The i.MX31 NFC uses a non-standard layout for large page NANDs, whether this is compatible with a particular setup depends on how the NAND device is programmed by the flash programmer (e.g. JTAG debugger).
The patch is based on the work by Maxim Artamonov.
Signed-off-by Maxim Artamonov <[email protected]>Signed-off-by Magnus Lilja <[email protected]>...
Quoted 10 lines
Review
Quoted 8 lines
(quoted diff) +8
-0+static int is_badblock(int pagenumber) +{ + ? ? int page = pagenumber; + ? ? int maxpagecheck = CONFIG_SYS_NAND_PAGE_SIZE == 0x800 ? 2 : 1; + ? ? u32 badblock; + ? ? u32 *src; + + ? ? // todo shall we check both or only one of them?Please do not use C++ comments.
Thought I had searched for all // and todo's but obviously missed one, thanks.
Quoted 17 lines
Quoted 17 lines
(quoted diff) +16
-0+void nand_boot(void) +{ + ? ? __attribute__((noreturn)) void (*uboot)(void); + + ? ? nfc = (void *)NFC_BASE_ADDR; + + ? ? /* + ? ? ?* CONFIG_SYS_NAND_U_BOOT_OFFS and CONFIG_SYS_NAND_U_BOOT_SIZE must + ? ? ?* be aligned to full pages + ? ? ?*/ + ? ? if (!nand_load(CONFIG_SYS_NAND_U_BOOT_OFFS, CONFIG_SYS_NAND_U_BOOT_SIZE, + ? ? ? ? ? ? ? ? ? ?(uchar *)CONFIG_SYS_NAND_U_BOOT_DST)) { + ? ? ? ? ? ? /* Copy from NAND successful, start U-boot */ + ? ? ? ? ? ? uboot = (void *)CONFIG_SYS_NAND_U_BOOT_START; + ? ? ? ? ? ? uboot(); + ? ? } else {
Quoted 8 lines
Quoted 4 lines
+ ? ? ? ? ? ? /* Unrecoverable error when copying from NAND */
+ ? ? ? ? ? ? while (1) {
+ ? ? ? ? ? ? ? ? ? ? /* Loop forever */
+ ? ? ? ? ? ? }No braces needed for single line constructs. And why don't you simply call
hang()here (which might be ?doing ?additional ?things ?on ?some boards. like flashing some LED or so)?
I'll call hang().
Quoted 5 lines
Quoted 5 lines
nand_spl/nand_boot_fsl_nfc.c new file +5
-0+} + +/* +* Called from start.S in case of an exception. +*/
Quoted 8 lines
Review
Quoted 5 lines
(quoted diff) +5
-0+void hang(void) +{ + ? ? while (1) { + ? ? ? ? ? ? /* Loop forever */ + ? ? }No braces needed for single line constructs. And I think some (older) compilers might complain about a missing ';'.
OK, will fix.
Thanks, Magnus
PATCH v3 3/6 ARM: Add macros.h to be used in assembler file.
In reply to Wolfgang DenkWolfgang,
2009/6/9 Wolfgang Denk <[email protected]>:
Quoted 11 lines
Dear Magnus Lilja,
Quoted 7 lines · In message <bc809a4b4bb1a5d47ff874ac44f8777845366196.1244572159.git.lilja.magnu…
From: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>---
?include/asm-arm/macro.h | ? 57 +++++++++++++++++++++++++++++++++++++++++++++++ ?1 files changed, 57 insertions(+), 0 deletions(-)
?create mode 100644include/asm-arm/macro.h
Quoted 7 lines
I'm missing documentation what these macros are supposed to be used for?
Are they restricted to addresses in system RAM? Or intended to access device registers? are they universal across all existing ARM systems, i. e. are there not any configurations that might require any kind of memory barriers or sync or considerations about caching?
I'll add some documentation.
Thanks, Magnus
PATCH v3 3/6 ARM: Add macros.h to be used in assemblerfile.
In reply to Peter PearsePeter,
2009/6/10 Peter Pearse <[email protected]>:
Quoted 9 lines
Magnus
? ? ? ?Please ensure when writing ARM macros that any ?architecture specific instructions are
restricted to the correct architecture.
This patch should be OK, this is just a heads up for any budding macro writers on the list
Thanks for the input.
/Magnus