September 2015 - U-Boot

[U-Boot] Please pull u-boot-sunxi master
by Hans de Goede 12 Sep '15

12 Sep '15

Hi Tom, Here is another sunxi pull-req for v2015.10, highlights: -Add support for 5 new boards -Misc fixes The following changes since commit efde6a579fe3c172d214fb3047b02c827779738a: Prepare v2015.10-rc3 (2015-09-07 08:56:35 -0400) are available in the git repository at: http://git.denx.de/u-boot-sunxi.git master for you to fetch changes up to cc19722f040fe326b1622dd1e2699179def7e45d: sunxi_nand_spl: Add config parameter for 4KiB page sized NAND devices (2015-09-10 20:20:45 +0200) ---------------------------------------------------------------- Hans de Goede (4): sun4i: Add defconfig and dts for the pov protab2-ips9 tablet sun4i: Add defconfig and dts for inet9f-rev03 based tablets sun4i: Add dts and defconfig for iNet-1 based tablets sun5i: Add q8_a13_tablet defconfig and dts Jelle van der Waa (1): sun5i: Add A10s-Wobo-i5 defconfig and dts Siarhei Siamashka (2): sunxi: Fix wrong serial console setup in Forfun Q88DB tablet sunxi: Ensure that 'mksunxiboot' tool produces deterministic output Stefan Roese (1): sunxi_nand_spl: Add config parameter for 4KiB page sized NAND devices arch/arm/dts/Makefile | 7 +- arch/arm/dts/sun4i-a10-inet1.dts | 226 ++++++++++++++++++++++++++++ arch/arm/dts/sun4i-a10-inet9f-rev03.dts | 219 +++++++++++++++++++++++++++ arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts | 209 +++++++++++++++++++++++++ arch/arm/dts/sun5i-a10s-wobo-i5.dts | 224 +++++++++++++++++++++++++++ arch/arm/dts/sun5i-a10s.dtsi | 11 ++ arch/arm/dts/sun5i-a13-q8-tablet.dts | 60 ++++++++ arch/arm/dts/sun5i-q8-common.dtsi | 170 +++++++++++++++++++++ arch/arm/dts/sunxi-q8-common.dtsi | 77 ++++++++++ board/sunxi/MAINTAINERS | 6 + configs/A10s-Wobo-i5_defconfig | 14 ++ configs/forfun_q88db_defconfig | 2 +- configs/inet1_defconfig | 22 +++ configs/inet9f_rev03_defconfig | 20 +++ configs/pov_protab2_ips9_defconfig | 21 +++ configs/q8_a13_tablet_defconfig | 22 +++ drivers/mtd/nand/sunxi_nand_spl.c | 1 + tools/mksunxiboot.c | 2 +- 18 files changed, 1310 insertions(+), 3 deletions(-) create mode 100644 arch/arm/dts/sun4i-a10-inet1.dts create mode 100644 arch/arm/dts/sun4i-a10-inet9f-rev03.dts create mode 100644 arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts create mode 100644 arch/arm/dts/sun5i-a10s-wobo-i5.dts create mode 100644 arch/arm/dts/sun5i-a13-q8-tablet.dts create mode 100644 arch/arm/dts/sun5i-q8-common.dtsi create mode 100644 arch/arm/dts/sunxi-q8-common.dtsi create mode 100644 configs/A10s-Wobo-i5_defconfig create mode 100644 configs/inet1_defconfig create mode 100644 configs/inet9f_rev03_defconfig create mode 100644 configs/pov_protab2_ips9_defconfig create mode 100644 configs/q8_a13_tablet_defconfig Regards, Hans

2 1

[U-Boot] [PATCH] sunxi: Rename A10s-Wobo-i5_defconfig to Wobo_i5_defconfig
by Hans de Goede 12 Sep '15

12 Sep '15

We only prefix the board defconfig name with the SoC if the SoC is part of the official board-name, such as with Olimex OLinuxIno boards, for the Wobo i5 this is not the case so remove the A10s prefix from the defconfig filename. Also fix the double listing of A10s-OLinuXino-M_defconfig in MAINTAINERS which the original Wobo i5 addition commit introduced. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- board/sunxi/MAINTAINERS | 3 +-- configs/{A10s-Wobo-i5_defconfig => Wobo_i5_defconfig} | 0 2 files changed, 1 insertion(+), 2 deletions(-) rename configs/{A10s-Wobo-i5_defconfig => Wobo_i5_defconfig} (100%) diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index 8f95867..4f5fd44 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -20,8 +20,6 @@ F: configs/mk802ii_defconfig F: configs/pov_protab2_ips9_defconfig F: include/configs/sun5i.h F: configs/A10s-OLinuXino-M_defconfig -F: configs/A10s-OLinuXino-M_defconfig -F: configs/A10s-Wobo-i5_defconfig F: configs/A13-OLinuXino_defconfig F: configs/A13-OLinuXinoM_defconfig F: configs/Auxtek-T003_defconfig @@ -35,6 +33,7 @@ F: include/configs/sun6i.h F: configs/CSQ_CS908_defconfig F: configs/Mele_A1000G_quad_defconfig F: configs/Mele_M9_defconfig +F: configs/Wobo_i5_defconfig F: include/configs/sun7i.h F: configs/A20-OLinuXino_MICRO_defconfig F: configs/Bananapi_defconfig diff --git a/configs/A10s-Wobo-i5_defconfig b/configs/Wobo_i5_defconfig similarity index 100% rename from configs/A10s-Wobo-i5_defconfig rename to configs/Wobo_i5_defconfig -- 2.4.3

2 1

[U-Boot] [PATCH v6] arm: support Thumb-1 with CONFIG_SYS_THUMB_BUILD
by Stefan Roese 12 Sep '15

12 Sep '15

From: Albert ARIBAUD <albert.u.boot(a)aribaud.net> When building a Thumb-1-only target with CONFIG_SYS_THUMB_BUILD, some files fail to build, most of the time because they include mcr instructions, which only exist for Thumb-2. This patch introduces a Kconfig option CONFIG_THUMB2 and uses it to select between Thumb-2 and ARM mode for the aforementioned files. Signed-off-by: Albert ARIBAUD <albert.u.boot(a)aribaud.net> Signed-off-by: Stefan Roese <sr(a)denx.de --- This patch is necessary for the SPEAr600 x600 U-Boot port to fit into the onboard NOR flash again. Reducing the size by about 200KiB. So, if nothing is really missing here, then please let's apply it after the v2015.10 release. Thanks, Stefan Here the original comment from Albert, from v5: This patch has been build-tested and run-tested on ED Mini V2, above the "edmini: switch to SPL" patch, and found to reduce U-Boot size by 25% and SPL size by 14%... and to run fine. This patch has also been tested against side effects on the non-Thumb wireless_space target. The binaries produced with and without this patch were found to differ only by their version string. Changes in v6 (by Stefan): - Rebased on top of current mainline U-Boot Changes in v5: None Changes in v4: None Changes in v3: - added arch/arm/lib/mem{set,cpy}.S to the list of modules which should always be built in ARM state. - Selected HAS_THUMB2 for CPU_V7M. - Fixed invalidate_l2_cache() when building for Thumb-1. Changes in v2: - fixed a typo in the commit message - added file arch/arm/thumb1/include/asm/proc-armv/system.h, which overrides arch/arm/include/asm/proc-armv/system.h when building for Thumb-1 and provides non-functional but Thumb-compilable IRQ and FIQ related macros and functions. Makefile | 2 + arch/arm/Kconfig | 5 ++ arch/arm/cpu/arm926ejs/Makefile | 11 ++++ arch/arm/cpu/arm926ejs/cache.c | 5 ++ arch/arm/include/asm/cache.h | 4 ++ arch/arm/lib/Makefile | 24 +++++++++ arch/arm/lib/cache.c | 11 ++++ arch/arm/lib/memcpy.S | 4 +- arch/arm/lib/memset.S | 2 +- arch/arm/mach-orion5x/Makefile | 10 ++++ arch/arm/thumb1/include/asm/proc-armv/system.h | 69 ++++++++++++++++++++++++++ examples/standalone/Makefile | 10 ++++ 12 files changed, 154 insertions(+), 3 deletions(-) create mode 100644 arch/arm/thumb1/include/asm/proc-armv/system.h diff --git a/Makefile b/Makefile index 4fe1d88..4393e41 100644 --- a/Makefile +++ b/Makefile @@ -605,6 +605,8 @@ KBUILD_CFLAGS += $(KCFLAGS) UBOOTINCLUDE := \ -Iinclude \ $(if $(KBUILD_SRC), -I$(srctree)/include) \ + $(if $(CONFIG_SYS_THUMB_BUILD), $(if $(CONFIG_HAS_THUMB2),, \ + -I$(srctree)/arch/$(ARCH)/thumb1/include),) \ -I$(srctree)/arch/$(ARCH)/include \ -include $(srctree)/include/linux/kconfig.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index cd88df4..0753fcf 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -10,6 +10,9 @@ config ARM64 config HAS_VBAR bool +config HAS_THUMB2 + bool + config CPU_ARM720T bool @@ -32,9 +35,11 @@ config CPU_ARM1176 config CPU_V7 bool select HAS_VBAR + select HAS_THUMB2 config CPU_V7M bool + select HAS_THUMB2 config CPU_PXA bool diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index 63fa159..fe78922 100644 --- a/arch/arm/cpu/arm926ejs/Makefile +++ b/arch/arm/cpu/arm926ejs/Makefile @@ -20,3 +20,14 @@ obj-$(CONFIG_MX25) += mx25/ obj-$(CONFIG_MX27) += mx27/ obj-$(if $(filter mxs,$(SOC)),y) += mxs/ obj-$(if $(filter spear,$(SOC)),y) += spear/ + +# some files can only build in ARM or THUMB2, not THUMB1 + +ifdef CONFIG_SYS_THUMB_BUILD +ifndef CONFIG_HAS_THUMB2 + +CFLAGS_cpu.o := -marm +CFLAGS_cache.o := -marm + +endif +endif diff --git a/arch/arm/cpu/arm926ejs/cache.c b/arch/arm/cpu/arm926ejs/cache.c index e5c1a6a..2839c86 100644 --- a/arch/arm/cpu/arm926ejs/cache.c +++ b/arch/arm/cpu/arm926ejs/cache.c @@ -82,4 +82,9 @@ void flush_dcache_all(void) /* * Stub implementations for l2 cache operations */ + __weak void l2_cache_disable(void) {} + +#if defined CONFIG_SYS_THUMB_BUILD +__weak void invalidate_l2_cache(void) {} +#endif diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h index a836e9f..1f63127 100644 --- a/arch/arm/include/asm/cache.h +++ b/arch/arm/include/asm/cache.h @@ -16,6 +16,9 @@ /* * Invalidate L2 Cache using co-proc instruction */ +#ifdef CONFIG_SYS_THUMB_BUILD +void invalidate_l2_cache(void); +#else static inline void invalidate_l2_cache(void) { unsigned int val=0; @@ -24,6 +27,7 @@ static inline void invalidate_l2_cache(void) : : "r" (val) : "cc"); isb(); } +#endif void l2_cache_enable(void); void l2_cache_disable(void); diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 31a5c8d..4c7e3f9 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -60,3 +60,27 @@ obj-$(CONFIG_DEBUG_LL) += debug.o ifneq (,$(findstring -mabi=aapcs-linux,$(PLATFORM_CPPFLAGS))) extra-y += eabi_compat.o endif + +# some files can only build in ARM or THUMB2, not THUMB1 + +ifdef CONFIG_SYS_THUMB_BUILD +ifndef CONFIG_HAS_THUMB2 + +# for C files, just apend -marm, which will override previous -mthumb* + +CFLAGS_cache.o := -marm +CFLAGS_cache-cp15.o := -marm + +# For .S, drop -mthumb* and other thumb-related options. +# CFLAGS_REMOVE_* would not have an effet, so AFLAGS_REMOVE_* +# was implemented and is used here. +# Also, define ${target}_NO_THUMB_BUILD for these two targets +# so that the code knows it should not use Thumb. + +AFLAGS_REMOVE_memset.o := -mthumb -mthumb-interwork +AFLAGS_REMOVE_memcpy.o := -mthumb -mthumb-interwork +AFLAGS_memset.o := -DMEMSET_NO_THUMB_BUILD +AFLAGS_memcpy.o := -DMEMCPY_NO_THUMB_BUILD + +endif +endif diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c index cd13db3..3bd8710 100644 --- a/arch/arm/lib/cache.c +++ b/arch/arm/lib/cache.c @@ -88,3 +88,14 @@ phys_addr_t noncached_alloc(size_t size, size_t align) return next; } #endif /* CONFIG_SYS_NONCACHED_MEMORY */ + +#if defined(CONFIG_SYS_THUMB_BUILD) +void invalidate_l2_cache(void) +{ + unsigned int val = 0; + + asm volatile("mcr p15, 1, %0, c15, c11, 0 @ invl l2 cache" + : : "r" (val) : "cc"); + isb(); +} +#endif diff --git a/arch/arm/lib/memcpy.S b/arch/arm/lib/memcpy.S index eeaf003..7d9fc0f 100644 --- a/arch/arm/lib/memcpy.S +++ b/arch/arm/lib/memcpy.S @@ -13,7 +13,7 @@ #include <linux/linkage.h> #include <asm/assembler.h> -#ifdef CONFIG_SYS_THUMB_BUILD +#if defined(CONFIG_SYS_THUMB_BUILD) && !defined(MEMCPY_NO_THUMB_BUILD) #define W(instr) instr.w #else #define W(instr) instr @@ -62,7 +62,7 @@ /* Prototype: void *memcpy(void *dest, const void *src, size_t n); */ .syntax unified -#ifdef CONFIG_SYS_THUMB_BUILD +#if defined(CONFIG_SYS_THUMB_BUILD) && !defined(MEMCPY_NO_THUMB_BUILD) .thumb .thumb_func #endif diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S index 7208f20..df053a3 100644 --- a/arch/arm/lib/memset.S +++ b/arch/arm/lib/memset.S @@ -16,7 +16,7 @@ .align 5 .syntax unified -#ifdef CONFIG_SYS_THUMB_BUILD +#if defined(CONFIG_SYS_THUMB_BUILD) && !defined(MEMSET_NO_THUMB_BUILD) .thumb .thumb_func #endif diff --git a/arch/arm/mach-orion5x/Makefile b/arch/arm/mach-orion5x/Makefile index 546ebcb..33dcad4 100644 --- a/arch/arm/mach-orion5x/Makefile +++ b/arch/arm/mach-orion5x/Makefile @@ -16,3 +16,13 @@ obj-y += timer.o ifndef CONFIG_SKIP_LOWLEVEL_INIT obj-y += lowlevel_init.o endif + +# some files can only build in ARM or THUMB2, not THUMB1 + +ifdef CONFIG_SYS_THUMB_BUILD +ifndef CONFIG_HAS_THUMB2 + +CFLAGS_cpu.o := -marm + +endif +endif diff --git a/arch/arm/thumb1/include/asm/proc-armv/system.h b/arch/arm/thumb1/include/asm/proc-armv/system.h new file mode 100644 index 0000000..7dfbf3d --- /dev/null +++ b/arch/arm/thumb1/include/asm/proc-armv/system.h @@ -0,0 +1,69 @@ +/* + * Thumb-1 drop-in for the linux/include/asm-arm/proc-armv/system.h + * + * (C) Copyright 2015 + * Albert ARIBAUD <albert.u.boot(a)aribaud.net> + * + * The original file does not build in Thumb mode. However, in U-Boot + * we don't use interrupt context, so we can redefine these as empty + * memory barriers, which makes Thumb-1 compiler happy. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/* + * Use the same macro name as linux/include/asm-arm/proc-armv/system.h + * here, so that if the original ever gets included after us, it won't + * try to re-redefine anything. + */ + +#ifndef __ASM_PROC_SYSTEM_H +#define __ASM_PROC_SYSTEM_H + +/* + * Redefine all original macros with static inline functions containing + * a simple memory barrier, so that they produce the same instruction + * ordering constraints as their original counterparts. + * We use static inline functions rather than macros so that we can tell + * the compiler to not complain about unused arguments. + */ + +static inline void local_irq_save( + unsigned long flags __attribute__((unused))) +{ + __asm__ __volatile__ ("" : : : "memory"); +} + +static inline void local_irq_enable(void) +{ + __asm__ __volatile__ ("" : : : "memory"); +} + +static inline void local_irq_disable(void) +{ + __asm__ __volatile__ ("" : : : "memory"); +} + +static inline void __stf(void) +{ + __asm__ __volatile__ ("" : : : "memory"); +} + +static inline void __clf(void) +{ + __asm__ __volatile__ ("" : : : "memory"); +} + +static inline void local_save_flags( + unsigned long flags __attribute__((unused))) +{ + __asm__ __volatile__ ("" : : : "memory"); +} + +static inline void local_irq_restore( + unsigned long flags __attribute__((unused))) +{ + __asm__ __volatile__ ("" : : : "memory"); +} + +#endif /* __ASM_PROC_SYSTEM_H */ diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile index 0863a8c..5a6ae00 100644 --- a/examples/standalone/Makefile +++ b/examples/standalone/Makefile @@ -73,3 +73,13 @@ $(obj)/%.srec: $(obj)/% FORCE $(obj)/%.bin: OBJCOPYFLAGS := -O binary $(obj)/%.bin: $(obj)/% FORCE $(call if_changed,objcopy) + +# some files can only build in ARM or THUMB2, not THUMB1 + +ifdef CONFIG_SYS_THUMB_BUILD +ifndef CONFIG_HAS_THUMB2 + +CFLAGS_stubs.o := -marm + +endif +endif -- 2.5.1

2 3

[U-Boot] [PATCH] arm/asm: Data types defined for 64 bit Physical Address
by Gong Qianyu 12 Sep '15

12 Sep '15

From: Aneesh Bansal <aneesh.bansal(a)freescale.com> Data types and I/O functions have been defined for 64 bit addresses in ARM. Signed-off-by: Aneesh Bansal <aneesh.bansal(a)freescale.com> Signed-off-by: Gong Qianyu <Qianyu.Gong(a)freescale.com> --- arch/arm/include/asm/io.h | 4 +++- arch/arm/include/asm/types.h | 13 ++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index bfbe0a0..44fd273 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -59,7 +59,7 @@ static inline void unmap_physmem(void *vaddr, unsigned long flags) static inline phys_addr_t virt_to_phys(void * vaddr) { - return (phys_addr_t)(vaddr); + return (phys_addr_t)((unsigned long)vaddr); } /* @@ -183,9 +183,11 @@ static inline void __raw_readsl(unsigned long addr, void *data, int longlen) #define in_le32(a) in_arch(l,le32,a) #define in_le16(a) in_arch(w,le16,a) +#define out_be64(a,v) out_arch(q,be64,a,v) #define out_be32(a,v) out_arch(l,be32,a,v) #define out_be16(a,v) out_arch(w,be16,a,v) +#define in_be64(a) in_arch(q,be64,a) #define in_be32(a) in_arch(l,be32,a) #define in_be16(a) in_arch(w,be16,a) diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h index ee77c41..d87f955 100644 --- a/arch/arm/include/asm/types.h +++ b/arch/arm/include/asm/types.h @@ -45,12 +45,15 @@ typedef unsigned long long u64; #define BITS_PER_LONG 32 #endif /* CONFIG_ARM64 */ -/* Dma addresses are 32-bits wide. */ - +#ifdef CONFIG_PHYS_64BIT +typedef u64 dma_addr_t; +typedef u64 phys_addr_t; +typedef u64 phys_size_t; +#else typedef u32 dma_addr_t; - -typedef unsigned long phys_addr_t; -typedef unsigned long phys_size_t; +typedef u32 phys_addr_t; +typedef u32 phys_size_t; +#endif #endif /* __KERNEL__ */ -- 2.1.0.27.g96db324

2 1

[U-Boot] [PATCH] arm: armv8 correct value passed to __asm_dcache_all
by Peng Fan 12 Sep '15

12 Sep '15

>From source code comments: "x0: 0 flush & invalidate, 1 invalidate only" Current value 0xffff can make invalidate work, since we only judge whether input value is 0 or not, see following code: " tbz w1, #0, 1f dc isw, x9 b 2f 1: dc cisw, x9 /* clean & invalidate by set/way */ 2: subs x6, x6, #1 /* decrement the way */ " Later we may add "2 clean only" support. So following the comments, correct value from 0xffff to 1. Signed-off-by: Peng Fan <Peng.Fan(a)freescale.com> Cc: York Sun <yorksun(a)freescale.com> Cc: Albert Aribaud <albert.u.boot(a)aribaud.net> --- Note: The patch was done when I was reading the source code. Since I do not have a board support armv8, I do not test this patch on real board. arch/arm/cpu/armv8/cache.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/cache.S b/arch/arm/cpu/armv8/cache.S index d846236..ab8c089 100644 --- a/arch/arm/cpu/armv8/cache.S +++ b/arch/arm/cpu/armv8/cache.S @@ -112,7 +112,7 @@ ENDPROC(__asm_flush_dcache_all) ENTRY(__asm_invalidate_dcache_all) mov x16, lr - mov x0, #0xffff + mov x0, #0x1 bl __asm_dcache_all mov lr, x16 ret -- 1.8.4

2 1

[U-Boot] [PATCH] arm: Correct comments in crt0.S for the recent SPL improvements
by Simon Glass 12 Sep '15

12 Sep '15

The current comments need a bit of tweaking since we now support stack and global_data relocation in SPL. Also add a reference to the README. For AArch64 this is not implemented, so leave a TODO for this. Signed-off-by: Simon Glass <sjg(a)chromium.org> Reported-by: Tim Harvey <tharvey(a)gateworks.com> --- arch/arm/lib/crt0.S | 26 ++++++++++++++++---------- arch/arm/lib/crt0_64.S | 30 ++++++++++++++++++++---------- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index afd4f10..4c3a94a 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -25,7 +25,8 @@ * the GD ('global data') structure, both located in some readily * available RAM (SRAM, locked cache...). In this context, VARIABLE * global data, initialized or not (BSS), are UNAVAILABLE; only - * CONSTANT initialized data are available. + * CONSTANT initialized data are available. GD should be zeroed + * before board_init_f() is called. * * 2. Call board_init_f(). This function prepares the hardware for * execution from system RAM (DRAM, DDR...) As system RAM may not @@ -34,24 +35,29 @@ * data include the relocation destination, the future stack, and * the future GD location. * - * (the following applies only to non-SPL builds) - * * 3. Set up intermediate environment where the stack and GD are the * ones allocated by board_init_f() in system RAM, but BSS and * initialized non-const data are still not available. * - * 4. Call relocate_code(). This function relocates U-Boot from its - * current location into the relocation destination computed by - * board_init_f(). + * 4a.For U-Boot proper (not SPL), call relocate_code(). This function + * relocates U-Boot from its current location into the relocation + * destination computed by board_init_f(). + * + * 4b.For SPL, board_init_f() just returns (to crt0). There is no + * code relocation in SPL. * * 5. Set up final environment for calling board_init_r(). This * environment has BSS (initialized to 0), initialized non-const * data (initialized to their intended value), and stack in system - * RAM. GD has retained values set by board_init_f(). Some CPUs - * have some work left to do at this point regarding memory, so - * call c_runtime_cpu_setup. + * RAM (for SPL moving the stack and GD into RAM is optional - see + * CONFIG_SPL_STACK_R). GD has retained values set by board_init_f(). + * + * 6. For U-Boot proper (not SPL), some CPUs have some work left to do + * at this point regarding memory, so call c_runtime_cpu_setup. + * + * 7. Branch to board_init_r(). * - * 6. Branch to board_init_r(). + * For more information see 'Board Initialisation Flow in README. */ /* diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S index 98a906e..8b34e04 100644 --- a/arch/arm/lib/crt0_64.S +++ b/arch/arm/lib/crt0_64.S @@ -27,7 +27,8 @@ * the GD ('global data') structure, both located in some readily * available RAM (SRAM, locked cache...). In this context, VARIABLE * global data, initialized or not (BSS), are UNAVAILABLE; only - * CONSTANT initialized data are available. + * CONSTANT initialized data are available. GD should be zeroed + * before board_init_f() is called. * * 2. Call board_init_f(). This function prepares the hardware for * execution from system RAM (DRAM, DDR...) As system RAM may not @@ -36,24 +37,31 @@ * data include the relocation destination, the future stack, and * the future GD location. * - * (the following applies only to non-SPL builds) - * * 3. Set up intermediate environment where the stack and GD are the * ones allocated by board_init_f() in system RAM, but BSS and * initialized non-const data are still not available. * - * 4. Call relocate_code(). This function relocates U-Boot from its - * current location into the relocation destination computed by - * board_init_f(). + * 4a.For U-Boot proper (not SPL), call relocate_code(). This function + * relocates U-Boot from its current location into the relocation + * destination computed by board_init_f(). + * + * 4b.For SPL, board_init_f() just returns (to crt0). There is no + * code relocation in SPL. * * 5. Set up final environment for calling board_init_r(). This * environment has BSS (initialized to 0), initialized non-const * data (initialized to their intended value), and stack in system - * RAM. GD has retained values set by board_init_f(). Some CPUs - * have some work left to do at this point regarding memory, so - * call c_runtime_cpu_setup. + * RAM (for SPL moving the stack and GD into RAM is optional - see + * CONFIG_SPL_STACK_R). GD has retained values set by board_init_f(). + * + * TODO: For SPL, implement stack relocation on AArch64. * - * 6. Branch to board_init_r(). + * 6. For U-Boot proper (not SPL), some CPUs have some work left to do + * at this point regarding memory, so call c_runtime_cpu_setup. + * + * 7. Branch to board_init_r(). + * + * For more information see 'Board Initialisation Flow in README. */ ENTRY(_main) @@ -106,6 +114,8 @@ relocation_return: */ bl c_runtime_cpu_setup /* still call old routine */ +/* TODO: For SPL, call spl_relocate_stack_gd() to alloc stack relocation */ + /* * Clear BSS section */ -- 2.5.0.rc2.392.g76e840b

2 1

[U-Boot] U-boot roadmap?
by Blibbet 12 Sep '15

12 Sep '15

Hi, First post on list.I'm mostly UEFI-centric, currently trying to learn u-boot... Is there any roadmap/plan for upcoming architectural changes to U-Boot? I recently saw the below comment on a Debian ARM list. I'm hoping u-boot has something like that, but more detailed, for newbies like me to understand upcoming feature changes better. Discussion on driver models, in particular. On 09/11/2015 11:13 AM, Karsten Merker wrote: > Mainline u-boot is currently in the process of slowly converting > a large number of drivers and boards to the new driver model, > which allows deriving platform configuration from device-trees. > Whether and how it might be possible to adapt the kernel > overlay model for u-boot as well is still open; work on > u-boot in that area depends on the kernel side being settled > first. PS: BTW, nice to see the "U-Boot Verified Boot" feature! Thanks, Lee Fisher RSS: http://firmwareescurity.com/feed

2 2

[U-Boot] [PATCH v4 11/16] common/env_flags.c: Add function to validate a MAC address
by Codrin Ciubotariu 11 Sep '15

11 Sep '15

The code that checks if a string has the format of a MAC address has been moved to a separate function called eth_validate_ethaddr_str(). This has been done to allow other components (such as vsc9953 driver) to validate a MAC address. Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu(a)freescale.com> --- Changes for v3: - none, new patch; Changes for v4: - function eth_validate_ethaddr_str() has been moved to common/env_flags.c and its header to include/env_flags.h; - patch desription updated; common/env_flags.c | 40 +++++++++++++++++++++++++++------------- include/env_flags.h | 7 +++++++ 2 files changed, 34 insertions(+), 13 deletions(-) diff --git a/common/env_flags.c b/common/env_flags.c index 5189f5b..e682d85 100644 --- a/common/env_flags.c +++ b/common/env_flags.c @@ -187,6 +187,31 @@ static void skip_num(int hex, const char *value, const char **end, *end = value; } +#ifdef CONFIG_CMD_NET +int eth_validate_ethaddr_str(const char *addr) +{ + const char *end; + const char *cur; + int i; + + cur = addr; + for (i = 0; i < 6; i++) { + skip_num(1, cur, &end, 2); + if (cur == end) + return -1; + if (cur + 2 == end && is_hex_prefix(cur)) + return -1; + if (i != 5 && *end != ':') + return -1; + if (i == 5 && *end != '\0') + return -1; + cur = end + 1; + } + + return 0; +} +#endif + /* * Based on the declared type enum, validate that the value string complies * with that format @@ -239,19 +264,8 @@ static int _env_flags_validate_type(const char *value, } break; case env_flags_vartype_macaddr: - cur = value; - for (i = 0; i < 6; i++) { - skip_num(1, cur, &end, 2); - if (cur == end) - return -1; - if (cur + 2 == end && is_hex_prefix(cur)) - return -1; - if (i != 5 && *end != ':') - return -1; - if (i == 5 && *end != '\0') - return -1; - cur = end + 1; - } + if (eth_validate_ethaddr_str(value)) + return -1; break; #endif case env_flags_vartype_end: diff --git a/include/env_flags.h b/include/env_flags.h index 2d2de88..8823fb9 100644 --- a/include/env_flags.h +++ b/include/env_flags.h @@ -109,6 +109,13 @@ enum env_flags_varaccess env_flags_parse_varaccess(const char *flags); */ enum env_flags_varaccess env_flags_parse_varaccess_from_binflags(int binflags); +#ifdef CONFIG_CMD_NET +/* + * Check if a string has the format of an Ethernet MAC address + */ +int eth_validate_ethaddr_str(const char *addr); +#endif + #ifdef USE_HOSTCC /* * Look up the type of a variable directly from the .flags var. -- 1.9.3

2 3

[U-Boot] Condition in bootcmd to run bootz else bootm
by DaveKucharczyk 11 Sep '15

11 Sep '15

Hi, I'd like to set a condition in bootcmd to run uImage from flash if it can't find zImage on the filesystem. Here is our zImage bootcmd... mmc dev 0; ext2load mmc 0:1 ${loadaddr} /opt/common/var/zImage; ext2load mmc 0:1 0x71000000 /opt/common/var/dtb; bootz ${loadaddr} - 0x71000000 Here is our uImage bootcmd... mmc read ${loadaddr} 0x800 0x1600; bootm So I tried adding || like so, but it doesn't work... mmc dev 0; ext2load mmc 0:1 ${loadaddr} /opt/common/var/zImage; ext2load mmc 0:1 0x71000000 /opt/common/var/dtb; bootz ${loadaddr} - 0x71000000 || mmc read ${loadaddr} 0x800 0x1600; bootm They work individually from command line, but when I add the || to boot uImage it just errors out like so... ** File not found /opt/common/var/zImage.tls4xx ** 30463 bytes read in 200 ms (148.4 KiB/s) Bad Linux ARM zImage magic! <--- this is correct since it can't find zImage Wrong Image Format for bootm command <---- it tried bootm here so maybe my || needs to be more strategically placed? ERROR: can't get kernel image! SYS42> -- View this message in context: http://u-boot.10912.n7.nabble.com/Condition-in-bootcmd-to-run-bootz-else-bo… Sent from the U-Boot mailing list archive at Nabble.com.

1 1

[U-Boot] [PATCH 1/2] tqma6_mba6: Fix the error handling in board_eth_init()
by Fabio Estevam 11 Sep '15

11 Sep '15

From: Fabio Estevam <fabio.estevam(a)freescale.com> We should not return 0 on failure, so return a negative error code instead. Also centralize the error path so that is easier to follow. Cc: Markus Niebel <Markus.Niebel(a)tq-group.com> Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- board/tqc/tqma6/tqma6_mba6.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/board/tqc/tqma6/tqma6_mba6.c b/board/tqc/tqma6/tqma6_mba6.c index 6f4cffd..e58b714 100644 --- a/board/tqc/tqma6/tqma6_mba6.c +++ b/board/tqc/tqma6/tqma6_mba6.c @@ -309,24 +309,26 @@ int board_eth_init(bd_t *bis) bus = fec_get_miibus(base, -1); if (!bus) - return 0; + return -EINVAL; /* scan phy */ phydev = phy_find_by_mask(bus, (0xf << CONFIG_FEC_MXC_PHYADDR), PHY_INTERFACE_MODE_RGMII); if (!phydev) { - free(bus); - puts("No phy found\n"); - return 0; + ret = -EINVAL; + goto free_bus; } ret = fec_probe(bis, -1, base, bus, phydev); - if (ret) { - puts("FEC MXC: probe failed\n"); - free(phydev); - free(bus); - } + if (ret) + goto free_phydev; return 0; + +free_phydev: + free(phydev); +free_bus: + free(bus); + return ret; } int tqma6_bb_board_early_init_f(void) -- 1.9.1

1 1