November 2015 - U-Boot

[U-Boot] [PATCH] sf: Fix NULL pointer exception for flashes without lock methods
by Bin Meng 13 Nov '15

13 Nov '15

commit c3c016c "sf: Add SPI NOR protection mechanism" introduced flash_lock()/flash_unlock()/flash_is_locked() methods for SPI flash, but not every flash driver supplies these. We should test these methods against NULL before actually calling them. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- drivers/mtd/spi/sf_ops.c | 18 ++++++++++++------ include/spi_flash.h | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index d832464..384224d 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -268,9 +268,12 @@ int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len) return -1; } - if (flash->flash_is_locked(flash, offset, len) > 0) { - printf("offset 0x%x is protected and cannot be erased\n", offset); - return -EINVAL; + if (flash->flash_is_locked) { + if (flash->flash_is_locked(flash, offset, len) > 0) { + printf("offset 0x%x is protected and cannot be erased\n", + offset); + return -EINVAL; + } } cmd[0] = flash->erase_cmd; @@ -315,9 +318,12 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset, page_size = flash->page_size; - if (flash->flash_is_locked(flash, offset, len) > 0) { - printf("offset 0x%x is protected and cannot be written\n", offset); - return -EINVAL; + if (flash->flash_is_locked) { + if (flash->flash_is_locked(flash, offset, len) > 0) { + printf("offset 0x%x is protected and cannot be written\n", + offset); + return -EINVAL; + } } cmd[0] = flash->write_cmd; diff --git a/include/spi_flash.h b/include/spi_flash.h index 0ae0062..f25b3e7 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -237,7 +237,7 @@ static inline int spi_flash_erase(struct spi_flash *flash, u32 offset, static inline int spi_flash_protect(struct spi_flash *flash, u32 ofs, u32 len, bool prot) { - if (!flash->flash_lock) + if (!flash->flash_lock || !flash->flash_unlock) return -EOPNOTSUPP; if (prot) -- 1.8.2.1

4 4

[U-Boot] [PATCH] rockchip: Turn on CONFIG_DEBUG_LL for firefly
by Ariel D'Alessandro 13 Nov '15

13 Nov '15

CONFIG_DEBUG_UART is enabled in defconfig, but there's no Low-level debugging functions implemented, so build fails because of undefined references to `printch' in common/console.c. In order to fix this, enable CONFIG_DEBUG_LL. Signed-off-by: Ariel D'Alessandro <ariel(a)vanguardiasur.com.ar> --- configs/firefly-rk3288_defconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index edb2db2..446ade9 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -3,9 +3,11 @@ CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ROCKCHIP_RK3288=y CONFIG_TARGET_FIREFLY_RK3288=y +CONFIG_SPL_STACK_R_ADDR=0x80000 +CONFIG_DEBUG_LL=y +CONFIG_DEBUG_UART_PHYS=0xff690000 CONFIG_DEFAULT_DEVICE_TREE="rk3288-firefly" CONFIG_SPL_STACK_R=y -CONFIG_SPL_STACK_R_ADDR=0x80000 # CONFIG_CMD_IMLS is not set # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_PMIC=y -- 2.6.2

2 2

[U-Boot] [PATCH v2] Fix board init code to use a valid C runtime environment
by Albert ARIBAUD 13 Nov '15

13 Nov '15

board_init_f_mem() alters the C runtime environment's stack it ls actually already using. This is not a valid C runtime environment. Split board_init_f_mem into C functions which do not alter their own stack and therefore run in a valid C runtime environment. Signed-off-by: Albert ARIBAUD <albert.u.boot(a)aribaud.net> --- For NIOS2, this patch hopefully contains all manual fixes by Thomas. Changes in v2: - Fix all checkpatch issues - Fix board_init_f_malloc prototype mismatch - Fix board_init_[f_]xxx typo in NIOS2 - Fix aarch64 asm 'sub' syntax error arch/arc/lib/start.S | 20 +++++++++++++--- arch/arm/lib/crt0.S | 10 ++++++-- arch/arm/lib/crt0_64.S | 10 ++++++-- arch/microblaze/cpu/start.S | 4 ++-- arch/nios2/cpu/start.S | 17 ++++++++++++-- arch/powerpc/cpu/ppc4xx/start.S | 18 ++++++++++---- arch/x86/cpu/start.S | 10 ++++++-- arch/x86/lib/fsp/fsp_common.c | 4 ++-- common/init/board_init.c | 31 ++++++++++++++---------- include/common.h | 52 +++++++++++++++++++++++++---------------- 10 files changed, 125 insertions(+), 51 deletions(-) diff --git a/arch/arc/lib/start.S b/arch/arc/lib/start.S index 26a5934..d24d60b 100644 --- a/arch/arc/lib/start.S +++ b/arch/arc/lib/start.S @@ -54,14 +54,28 @@ ENTRY(_start) mov %sp, CONFIG_SYS_INIT_SP_ADDR mov %fp, %sp - /* Allocate and zero GD, update SP */ + /* Allocate GD, update SP */ mov %r0, %sp - bl board_init_f_mem + bl board_init_f_gd_size + /* Update stack- and frame-pointers */ + sub %sp, %sp, %r0 + mov %fp, %sp + + /* Zero GD */ + mov %r0, %sp + bl board_init_f_gd + /* Allocate malloc, update SP */ + mov %r0, %sp + bl board_init_f_malloc_size /* Update stack- and frame-pointers */ - mov %sp, %r0 + sub %sp, %sp, %r0 mov %fp, %sp + /* update GD with malloc base */ + mov %r0, %sp + bl board_init_f_malloc + /* Zero the one and only argument of "board_init_f" */ mov_s %r0, 0 j board_init_f diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index 80548eb..26abab7 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -82,9 +82,15 @@ ENTRY(_main) #else bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ #endif + bl board_init_f_gd_size + sub sp, r0 mov r0, sp - bl board_init_f_mem - mov sp, r0 + mov r9, r0 + bl board_init_f_gd + bl board_init_f_malloc_size + sub sp, r0 + mov r0, sp + bl board_init_f_malloc mov r0, #0 bl board_init_f diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S index cef1c71..00cef36 100644 --- a/arch/arm/lib/crt0_64.S +++ b/arch/arm/lib/crt0_64.S @@ -75,8 +75,14 @@ ENTRY(_main) ldr x0, =(CONFIG_SYS_INIT_SP_ADDR) #endif bic sp, x0, #0xf /* 16-byte alignment for ABI compliance */ - bl board_init_f_mem - mov sp, x0 + bl board_init_f_gd_size + sub sp, sp, x0 + mov x0, sp + bl board_init_f_gd + bl board_init_f_malloc_size + sub sp, sp, x0 + mov x0, sp + bl board_init_f_malloc mov x0, #0 bl board_init_f diff --git a/arch/microblaze/cpu/start.S b/arch/microblaze/cpu/start.S index 14f46a8..206be3e 100644 --- a/arch/microblaze/cpu/start.S +++ b/arch/microblaze/cpu/start.S @@ -25,7 +25,7 @@ _start: addi r8, r0, __end mts rslr, r8 - /* TODO: Redo this code to call board_init_f_mem() */ + /* TODO: Redo this code to call board_init_f_*() */ #if defined(CONFIG_SPL_BUILD) addi r1, r0, CONFIG_SPL_STACK_ADDR mts rshr, r1 @@ -142,7 +142,7 @@ _start: ori r12, r12, 0x1a0 mts rmsr, r12 - /* TODO: Redo this code to call board_init_f_mem() */ + /* TODO: Redo this code to call board_init_f_*() */ clear_bss: /* clear BSS segments */ addi r5, r0, __bss_start diff --git a/arch/nios2/cpu/start.S b/arch/nios2/cpu/start.S index 54787c5..c163ce1 100644 --- a/arch/nios2/cpu/start.S +++ b/arch/nios2/cpu/start.S @@ -107,9 +107,22 @@ _reloc: mov fp, sp /* Allocate and zero GD, update SP */ + movhi r2, %hi(board_init_f_gd_size@h) + ori r2, r2, %lo(board_init_f_gd_size@h) + callr r2 + sub sp, sp, r4 + mov r4, sp + movhi r2, %hi(board_init_f_gd@h) + ori r2, r2, %lo(board_init_f_gd@h) + callr r2 + /* Allocate malloc arena, update SP */ + movhi r2, %hi(board_init_f_malloc_size@h) + ori r2, r2, %lo(board_init_f_malloc_size@h) + callr r2 + sub sp, sp, r4 mov r4, sp - movhi r2, %hi(board_init_f_mem@h) - ori r2, r2, %lo(board_init_f_mem@h) + movhi r2, %hi(board_init_f_malloc@h) + ori r2, r2, %lo(board_init_f_malloc@h) callr r2 /* Update stack- and frame-pointers */ diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S index 77d4040..c827c95 100644 --- a/arch/powerpc/cpu/ppc4xx/start.S +++ b/arch/powerpc/cpu/ppc4xx/start.S @@ -761,9 +761,14 @@ _start: bl cpu_init_f /* run low-level CPU init code (from Flash) */ #ifdef CONFIG_SYS_GENERIC_BOARD + bl board_init_f_gd_size + sub r1, r1, r3 mr r3, r1 - bl board_init_f_mem - mr r1, r3 + bl board_init_f_gd + bl board_init_f_malloc_size + sub r1, r1, r3 + mr r3, r1 + bl board_init_f_malloc li r0,0 stwu r0, -4(r1) stwu r0, -4(r1) @@ -1037,9 +1042,14 @@ _start: bl cpu_init_f /* run low-level CPU init code (from Flash) */ #ifdef CONFIG_SYS_GENERIC_BOARD + bl board_init_f_gd_size + sub r1, r1, r3 + mr r3, r1 + bl board_init_f_gd + bl board_init_f_malloc_size + sub r1, r1, r3 mr r3, r1 - bl board_init_f_mem - mr r1, r3 + bl board_init_f_malloc stwu r0, -4(r1) stwu r0, -4(r1) #endif diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S index 5b4ee79..25ac286 100644 --- a/arch/x86/cpu/start.S +++ b/arch/x86/cpu/start.S @@ -122,9 +122,15 @@ car_init_ret: */ #endif /* Set up global data */ + call board_init_f_gd_size + subl %esp, %eax mov %esp, %eax - call board_init_f_mem - mov %eax, %esp + call board_init_f_gd + /* Set up malloc arena */ + call board_init_f_malloc_size + subl %esp, %eax + mov %esp, %eax + call board_init_f_malloc #ifdef CONFIG_DEBUG_UART call debug_uart_init diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c index c78df94..5249455 100644 --- a/arch/x86/lib/fsp/fsp_common.c +++ b/arch/x86/lib/fsp/fsp_common.c @@ -95,8 +95,8 @@ int x86_fsp_init(void) /* * The second time we enter here, adjust the size of malloc() * pool before relocation. Given gd->malloc_base was adjusted - * after the call to board_init_f_mem() in arch/x86/cpu/start.S, - * we should fix up gd->malloc_limit here. + * after the call to board_init_f_malloc() in arch/x86/cpu/ + * start.S, we should fix up gd->malloc_limit here. */ gd->malloc_limit += CONFIG_FSP_SYS_MALLOC_F_LEN; } diff --git a/common/init/board_init.c b/common/init/board_init.c index e74b63b..8839a4a 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -29,32 +29,39 @@ __weak void arch_setup_gd(struct global_data *gd_ptr) } #endif /* !CONFIG_X86 */ -ulong board_init_f_mem(ulong top) +ulong board_init_f_gd_size(void) +{ + return roundup(sizeof(struct global_data), 16); +} + +void board_init_f_gd(struct global_data *gd_ptr) { - struct global_data *gd_ptr; #ifndef _USE_MEMCPY int *ptr; #endif - /* Leave space for the stack we are running with now */ - top -= 0x40; - - top -= sizeof(struct global_data); - top = ALIGN(top, 16); - gd_ptr = (struct global_data *)top; #ifdef _USE_MEMCPY memset(gd_ptr, '\0', sizeof(*gd)); #else for (ptr = (int *)gd_ptr; ptr < (int *)(gd_ptr + 1); ) *ptr++ = 0; #endif - arch_setup_gd(gd_ptr); +} +ulong board_init_f_malloc_size(void) +{ #if defined(CONFIG_SYS_MALLOC_F) && \ (!defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SYS_SPL_MALLOC_START)) - top -= CONFIG_SYS_MALLOC_F_LEN; - gd->malloc_base = top; + return CONFIG_SYS_MALLOC_F_LEN; +#else + return 0; #endif +} - return top; +void board_init_f_malloc(ulong malloc_base) +{ +#if defined(CONFIG_SYS_MALLOC_F) && \ + (!defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SYS_SPL_MALLOC_START)) + gd->malloc_base = malloc_base; +#endif } diff --git a/include/common.h b/include/common.h index 09a131d..a2d81d9 100644 --- a/include/common.h +++ b/include/common.h @@ -225,32 +225,44 @@ void board_init_f(ulong); void board_init_r(gd_t *, ulong) __attribute__ ((noreturn)); /** - * board_init_f_mem() - Allocate global data and set stack position + * board_init_f_gd_size() - Return the size of the global data * * This function is called by each architecture very early in the start-up - * code to set up the environment for board_init_f(). It allocates space for - * global_data (see include/asm-generic/global_data.h) and places the stack - * below this. + * code to allow the C runtime to reserve space for the GD on the stack. * - * This function requires a stack[1] Normally this is at @top. The function - * starts allocating space from 64 bytes below @top. First it creates space - * for global_data. Then it calls arch_setup_gd() which sets gd to point to - * the global_data space and can reserve additional bytes of space if - * required). Finally it allocates early malloc() memory - * (CONFIG_SYS_MALLOC_F_LEN). The new top of the stack is just below this, - * and it returned by this function. + * @return: GD size + */ +ulong board_init_f_gd_size(void); + +/** + * board_init_f_gd() - Initialize (zero) the global data + * + * This function is called once the C runtime has allocated the GD on + * the stack. It must initialize the GD. + * + * @gd_ptr: the pointer to the GD to initialize + */ +void board_init_f_gd(struct global_data *gd_ptr); + +/** + * board_init_f_malloc_size() - Return the size of the malloc arena + * + * This function is called once the GD is initialized, to allow the C + * runtime to allocate the malloc arena on the stack. + * + * @return: Malloc arena size + */ +ulong board_init_f_malloc_size(void); + +/** + * board_init_f_malloc() - Mark the malloc arena base in the global data * - * [1] Strictly speaking it would be possible to implement this function - * in C on many archs such that it does not require a stack. However this - * does not seem hugely important as only 64 byte are wasted. The 64 bytes - * are used to handle the calling standard which generally requires pushing - * addresses or registers onto the stack. We should be able to get away with - * less if this becomes important. + * This function is called once the malloc arena is allocated on the + * stack. It marks the malloc arena base in the global data. * - * @top: Top of available memory, also normally the top of the stack - * @return: New stack location + * @malloc_base: the base of the malloc arena */ -ulong board_init_f_mem(ulong top); +void board_init_f_malloc(ulong malloc_base); /** * arch_setup_gd() - Set up the global_data pointer -- 2.5.0

3 9

[U-Boot] [PATCH] PCI: fix search for suitable memory region
by Andre Przywara 13 Nov '15

13 Nov '15

Binary ANDing a value with 0 and comparing it against 0 always yields true, I guess that's not intended here. Use the proper mask value for the memory region type bit. Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> --- drivers/pci/pci_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/pci_common.c b/drivers/pci/pci_common.c index 07f1726..b8a9a14 100644 --- a/drivers/pci/pci_common.c +++ b/drivers/pci/pci_common.c @@ -231,7 +231,7 @@ phys_addr_t pci_hose_bus_to_phys(struct pci_controller *hose, * if PCI_REGION_MEM is set we do a two pass search with preference * on matches that don't have PCI_REGION_SYS_MEMORY set */ - if ((flags & PCI_REGION_MEM) == PCI_REGION_MEM) { + if ((flags & PCI_REGION_TYPE) == PCI_REGION_MEM) { ret = __pci_hose_bus_to_phys(hose, bus_addr, flags, PCI_REGION_SYS_MEMORY, &phys_addr); if (!ret) -- 2.5.1

2 2

[U-Boot] [PATCH v2 00/12] sparc: Updates to SPARC architecture in preperation for generic board
by Francois Retief 13 Nov '15

13 Nov '15

This patch series is a backlog of preparation work for upcomming generic board changes. I first want to get these reviewed and submitted to mainline before sending out more patches. Daniel Hellstrom (4): sparc: leon3: Reimplemented AMBA Plug&Play scanning routines. sparc: leon3: Added memory controller initialization using new AMBA PnP routines. sparc: leon3: Moved GRLIB core header files to common include/grlib directory sparc: ambapp: Removed warning and unnecessary printout. Francois Retief (8): sparc: Fix broken files during license changes sparc: Update the maintainer for SPARC architecture sparc: Add -mcpu= compiler flags for LEON2/LEON3 sparc: Update LEON serial drivers to use readl/writel macros sparc: Update GRSIM board with memory settings for TSIM eval sparc: Update startup code to take PIC mode into account sparc: Kconfig: Move the CMD_AMBAPP command to Kconfig sparc: leon3: Add debug_uart support to LEON3 serial driver. MAINTAINERS | 2 +- arch/sparc/config.mk | 14 +- arch/sparc/cpu/leon2/serial.c | 125 +++--- arch/sparc/cpu/leon2/start.S | 60 ++- arch/sparc/cpu/leon3/Makefile | 3 +- arch/sparc/cpu/leon3/ambapp.c | 545 ++++++++++++------------ arch/sparc/cpu/leon3/ambapp_low.S | 784 +++++++++++++++++++++++++++++++++++ arch/sparc/cpu/leon3/ambapp_low_c.S | 113 +++++ arch/sparc/cpu/leon3/cpu_init.c | 199 +++------ arch/sparc/cpu/leon3/interrupts.c | 7 +- arch/sparc/cpu/leon3/memcfg.c | 237 +++++++++++ arch/sparc/cpu/leon3/memcfg.h | 90 ++++ arch/sparc/cpu/leon3/memcfg_low.S | 253 +++++++++++ arch/sparc/cpu/leon3/prom.c | 12 +- arch/sparc/cpu/leon3/serial.c | 130 ++++-- arch/sparc/cpu/leon3/start.S | 102 ++++- arch/sparc/cpu/leon3/usb_uhci.c | 4 +- arch/sparc/include/asm/global_data.h | 1 + arch/sparc/include/asm/io.h | 64 +-- arch/sparc/include/asm/winmacro.h | 127 ------ common/Kconfig | 14 + common/board_r.c | 21 + common/cmd_ambapp.c | 559 +++++++++++++++++++------ configs/grsim_defconfig | 6 + doc/git-mailrc | 2 +- drivers/net/greth.c | 17 +- drivers/serial/Kconfig | 8 + include/ambapp.h | 488 ++++++++-------------- include/ambapp_ids.h | 250 +++++++++++ include/config_cmd_all.h | 1 - include/configs/gr_cpci_ax2000.h | 35 +- include/configs/gr_ep2s60.h | 40 +- include/configs/gr_xc3s_1500.h | 31 +- include/configs/grsim.h | 88 ++-- include/configs/grsim_leon2.h | 5 - include/grlib/apbuart.h | 47 +++ include/grlib/gptimer.h | 34 ++ include/grlib/greth.h | 87 ++++ include/grlib/irqmp.h | 23 + 39 files changed, 3355 insertions(+), 1273 deletions(-) create mode 100644 arch/sparc/cpu/leon3/ambapp_low.S create mode 100644 arch/sparc/cpu/leon3/ambapp_low_c.S create mode 100644 arch/sparc/cpu/leon3/memcfg.c create mode 100644 arch/sparc/cpu/leon3/memcfg.h create mode 100644 arch/sparc/cpu/leon3/memcfg_low.S create mode 100644 include/ambapp_ids.h create mode 100644 include/grlib/apbuart.h create mode 100644 include/grlib/gptimer.h create mode 100644 include/grlib/greth.h create mode 100644 include/grlib/irqmp.h -- 2.4.3 ________________________________ Disclaimer and confidentiality note – refer to our website for further details: www.spaceteq.co.za <http://www.spaceteq.co.za/home/emaildisclaimer/>

1 12

[U-Boot] [PATCH] arm: socfpga: reset: FIX address of tstscratch register
by Philipp Rosenberger 13 Nov '15

13 Nov '15

The Cyclone V Hard Processor System Technical Reference Manual in the chapter about the Reset Manager Module Address Map stats that the offset of the tstscratch register ist 0x54 not 0x24. Cyclone V Hard Processor System Technical Reference Manual cv_5v4 2015.11.02 page 3-17 Reset Manager Module Address Map Signed-off-by: Philipp Rosenberger <ilu(a)linutronix.de> --- arch/arm/mach-socfpga/include/mach/reset_manager.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-socfpga/include/mach/reset_manager.h b/arch/arm/mach-socfpga/include/mach/reset_manager.h index 8e59578..6eb6011 100644 --- a/arch/arm/mach-socfpga/include/mach/reset_manager.h +++ b/arch/arm/mach-socfpga/include/mach/reset_manager.h @@ -25,6 +25,7 @@ struct socfpga_reset_manager { u32 per2_mod_reset; u32 brg_mod_reset; u32 misc_mod_reset; + u32 padding2[12]; u32 tstscratch; }; -- 2.1.4

3 6

[U-Boot] MPC83xx maintainership
by Dirk Eibach 13 Nov '15

13 Nov '15

Hello York, is Kim Philipps still active as MPC83xx maintainer? Is he active at freescale at all? His mails are bouncing with "User unknown"... Cheers Dirk

3 3

[U-Boot] [PATCH v2] fdt_support: Check for bank size before updating memory node
by Lokesh Vutla 13 Nov '15

13 Nov '15

In case if one of the bank that is passed is of size zero, then u-boot will be updating memory node with a bank of size zero. There is no need to update memory node if size is zero, so check for bank size before updating. Reviewed-by: Tom Rini <trini(a)konsulko.com> Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- Changes since v1: - Fixed a typo in commit message. common/fdt_support.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/fdt_support.c b/common/fdt_support.c index f86365e..0019eef 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -401,6 +401,9 @@ static int fdt_pack_reg(const void *fdt, void *buf, u64 *address, u64 *size, char *p = buf; for (i = 0; i < n; i++) { + if (size[i] == 0) + continue; + if (address_cells == 2) *(fdt64_t *)p = cpu_to_fdt64(address[i]); else -- 2.1.4

3 2

[U-Boot] [PATCH v2] am43xx_evm: Add DFU support for qspi flash
by Vignesh R 13 Nov '15

13 Nov '15

This adds support to update firmware on qspi flash present on am437x-sk-evm and am43xx-epos-evm via DFU. On device: => setenv dfu_alt_info ${dfu_alt_info_qspi} => dfu 0 sf 0:0 On host: $ sudo dfu-util -l $ sudo dfu-util -D u-boot.bin -a u-boot.bin Signed-off-by: Vignesh R <vigneshr(a)ti.com> --- v2: * change u-boot.img to u-boot.bin. Tested on am437x-sk-evm by flashing u-boot.bin and zImage and verified by reading back u-boot.bin and zImage in kernel. QSPI XIP boot itself is broken on u-boot mainline (even w/o this patch), hence cannot verify XIP boot using DFU. include/configs/am43xx_evm.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 67d5c48ddeb6..e3b7817cc3d9 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -165,11 +165,22 @@ "fdt ram 0x80f80000 0x80000;" \ "ramdisk ram 0x81000000 0x4000000\0" +#define CONFIG_DFU_SF +#define DFU_ALT_INFO_QSPI \ + "dfu_alt_info_qspi=" \ + "u-boot.bin raw 0x0 0x080000;" \ + "u-boot.backup raw 0x080000 0x080000;" \ + "u-boot-spl-os raw 0x100000 0x010000;" \ + "u-boot-env raw 0x110000 0x010000;" \ + "u-boot-env.backup raw 0x120000 0x010000;" \ + "kernel raw 0x130000 0x800000\0" + #define DFUARGS \ "dfu_bufsiz=0x10000\0" \ DFU_ALT_INFO_MMC \ DFU_ALT_INFO_EMMC \ - DFU_ALT_INFO_RAM + DFU_ALT_INFO_RAM \ + DFU_ALT_INFO_QSPI #else #define DFUARGS #endif -- 2.6.2

2 3

[U-Boot] [PATCH] spl: Add support for CONFIG_OF_EMBED=y
by Michal Simek 13 Nov '15

13 Nov '15

CONFIG_OF_EMBED=y is the option which is here only for testing purpose and shouldn't be enabled by default as is describe at: "dts: Add a comment about CONFIG_OF_EMBED being for local use" (sha1: 3d3f60cb7a6bb6c338e00a9769fa918a8536096c) But still enabling this option locally shouldn't end up with compilation error when you build SPL. This patch fix it. Compilation error: lib/built-in.o: In function `fdtdec_setup': /mnt/disk/u-boot/lib/fdtdec.c:1246: undefined reference to `__dtb_dt_begin' Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- scripts/Makefile.spl | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index dd235b9d7ad6..8f690eb70c47 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -56,6 +56,7 @@ libs-y += common/init/ libs-$(CONFIG_SPL_LIBCOMMON_SUPPORT) += common/ libs-$(CONFIG_SPL_LIBDISK_SUPPORT) += disk/ libs-y += drivers/ +libs-y += dts/ libs-y += fs/ libs-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/ libs-$(CONFIG_SPL_POST_MEM_SUPPORT) += post/drivers/ -- 2.5.0

3 4