November 2015 - U-Boot

[U-Boot] U-boot for AM5728
by chandrashekar p 21 Nov '15

21 Nov '15

Hello, I'm using AM5728 EVM board, to use u-boot boot loader i tried by downloading the u-boot from other google link. Their i didn't find the config file for AM5728. https://eewiki.net/display/linuxonarm/BeagleBoard-X15#BeagleBoard-X15-Bootl… I tried with the below link, it didn't get succeed, got the error. PLease go through the error file & suggest me how i can come out of this issue. Please send the link to download where i can get the latest u-boot boot loader which support for AM5728 EVM board. Looking forward your reply. Thanks & Regards, Chandrashekar

2 1

[U-Boot] [PATCH v6 1/2] Fix board init code to respect the C runtime environment
by Albert ARIBAUD 21 Nov '15

21 Nov '15

board_init_f_mem() alters the C runtime environment's stack it is actually already using. This is not a valid behaviour within a C runtime environment. Split board_init_f_mem into C functions which do not alter their own stack and always behave properly with respect to their C runtime environment. Signed-off-by: Albert ARIBAUD <albert.u.boot(a)aribaud.net> --- Copying custodians for all architectures which this patch affects. This patch has been build-tested for all affected architectures except NIOS2, and run-tested on ARM OpenRD Client. For NIOS2, this patch contains all manual v1 and v2 fixes by Thomas. For x86, this patch contains all manual v2 fixes by Bin. Changes in v6: - Switch from size- to address-based reservation - Add comments on gdp_tr vs gd use wrt arch_setup_gd. - Clarify that this is about the *early* malloc arena Changes in v5: - Reword commit message (including summary/subject) - Reword comments in ARC code Changes in v4: - Add comments on reserving GD at the lowest location - Add comments on post-incrementing base for each "chunk" Changes in v3: - Rebase after commit 9ac4fc82 - Simplify malloc conditional as per commit 9ac4fc82 - Fix NIOS2 return value register (r2, not r4) - Fix x86 subl argument inversion - Group allocations in a single function - Group initializations in a single function 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 | 12 +++-- arch/arm/lib/crt0.S | 3 +- arch/arm/lib/crt0_64.S | 4 +- arch/microblaze/cpu/start.S | 4 +- arch/nios2/cpu/start.S | 14 ++++-- arch/powerpc/cpu/ppc4xx/start.S | 6 ++- arch/x86/cpu/start.S | 3 +- arch/x86/lib/fsp/fsp_common.c | 4 +- common/init/board_init.c | 109 ++++++++++++++++++++++++++++++++++++---- include/common.h | 34 ++++++------- 10 files changed, 144 insertions(+), 49 deletions(-) diff --git a/arch/arc/lib/start.S b/arch/arc/lib/start.S index 26a5934..90ee7e0 100644 --- a/arch/arc/lib/start.S +++ b/arch/arc/lib/start.S @@ -50,18 +50,20 @@ ENTRY(_start) 1: #endif - /* Setup stack- and frame-pointers */ + /* Establish C runtime stack and frame */ mov %sp, CONFIG_SYS_INIT_SP_ADDR mov %fp, %sp - /* Allocate and zero GD, update SP */ + /* Allocate reserved area from current top of stack */ mov %r0, %sp - bl board_init_f_mem - - /* Update stack- and frame-pointers */ + bl board_init_f_alloc_reserve + /* Set stack below reserved area, adjust frame pointer accordingly */ mov %sp, %r0 mov %fp, %sp + /* Initialize reserved area - note: r0 already contains address */ + bl board_init_f_init_reserve + /* 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..4f2a712 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -83,8 +83,9 @@ ENTRY(_main) bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ #endif mov r0, sp - bl board_init_f_mem + bl board_init_f_alloc_reserve mov sp, r0 + bl board_init_f_init_reserve 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..b4fc760 100644 --- a/arch/arm/lib/crt0_64.S +++ b/arch/arm/lib/crt0_64.S @@ -75,8 +75,10 @@ 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 x0, sp + bl board_init_f_alloc_reserve mov sp, x0 + bl board_init_f_init_reserve 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..204d0cd 100644 --- a/arch/nios2/cpu/start.S +++ b/arch/nios2/cpu/start.S @@ -106,14 +106,18 @@ _reloc: stw r0, 4(sp) mov fp, sp - /* Allocate and zero GD, update SP */ + /* Allocate and initialize reserved area, update SP */ 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_alloc_reserve@h) + ori r2, r2, %lo(board_init_f_alloc_reserve@h) callr r2 - - /* Update stack- and frame-pointers */ mov sp, r2 + mov r4, sp + movhi r2, %hi(board_init_f_init_reserve@h) + ori r2, r2, %lo(board_init_f_init_reserve@h) + callr r2 + + /* Update frame-pointer */ mov fp, sp /* Call board_init_f -- never returns */ diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S index 77d4040..cb63ab1 100644 --- a/arch/powerpc/cpu/ppc4xx/start.S +++ b/arch/powerpc/cpu/ppc4xx/start.S @@ -762,8 +762,9 @@ _start: bl cpu_init_f /* run low-level CPU init code (from Flash) */ #ifdef CONFIG_SYS_GENERIC_BOARD mr r3, r1 - bl board_init_f_mem + bl board_init_f_alloc_reserve mr r1, r3 + bl board_init_f_init_reserve li r0,0 stwu r0, -4(r1) stwu r0, -4(r1) @@ -1038,8 +1039,9 @@ _start: bl cpu_init_f /* run low-level CPU init code (from Flash) */ #ifdef CONFIG_SYS_GENERIC_BOARD mr r3, r1 - bl board_init_f_mem + bl board_init_f_alloc_reserve mr r1, r3 + bl board_init_f_init_reserve 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..485868f 100644 --- a/arch/x86/cpu/start.S +++ b/arch/x86/cpu/start.S @@ -123,8 +123,9 @@ car_init_ret: #endif /* Set up global data */ mov %esp, %eax - call board_init_f_mem + call board_init_f_alloc_reserve mov %eax, %esp + call board_init_f_init_reserve #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..72c458f 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_init_reserve() 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 1c6126d..e649e07 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -29,31 +29,120 @@ __weak void arch_setup_gd(struct global_data *gd_ptr) } #endif /* !CONFIG_X86 */ -ulong board_init_f_mem(ulong top) +/* + * Allocate reserved space for use as 'globals' from 'top' address and + * return 'bottom' address of allocated space + * + * Notes: + * + * Actual reservation cannot be done from within this function as + * it requires altering the C stack pointer, so this will be done by + * the caller upon return from this function. + * + * IMPORTANT: + * + * Alignment constraints may differ for each 'chunk' allocated. For now: + * + * - GD is aligned down on a 16-byte boundary + * + * - the early malloc arena is not aligned, therefore it follows the stack + * alignment constraint of the architecture for which we are bulding. + * + * - GD is allocated last, so that the return value of this functions is + * both the bottom of the reserved area and the address of GD, should + * the calling context need it. + */ + +ulong board_init_f_alloc_reserve(ulong top) +{ + /* Reserve early malloc arena */ +#if defined(CONFIG_SYS_MALLOC_F) + top -= CONFIG_SYS_MALLOC_F_LEN; +#endif + /* LAST : reserve GD (rounded up to a multiple of 16 bytes) */ + top = rounddown(top-sizeof(struct global_data), 16); + + return top; +} + +/* + * Initialize reserved space (which has been safely allocated on the C + * stack from the C runtime environment handling code). + * + * Notes: + * + * Actual reservation was done by the caller; the locations from base + * to base+size-1 (where 'size' is the value returned by the allocation + * function above) can be accessed freely without risk of corrupting the + * C runtime environment. + * + * IMPORTANT: + * + * Upon return from the allocation function above, on some architectures + * the caller will set gd to the lowest reserved location. Therefore, in + * this initialization function, the global data MUST be placed at base. + * + * ALSO IMPORTANT: + * + * On some architectures, gd will already be good when entering this + * function. On others, it will only be good once arch_setup_gd() returns. + * Therefore, global data accesses must be done: + * + * - through gd_ptr if before the call to arch_setup_gd(); + * + * - through gd once arch_setup_gd() has been called. + * + * Do not use 'gd->' until arch_setup_gd() has been called! + * + * IMPORTANT TOO: + * + * Initialization for each "chunk" (GD, early malloc arena...) ends with + * an incrementation line of the form 'base += <some size>'. The last of + * these incrementations seems useless, as base will not be used any + * more after this incrementation; but if/when a new "chunk" is appended, + * this increment will be essential as it will give base right value for + * this new chunk (which will have to end with its own incrementation + * statement). Besides, the compiler's optimizer will silently detect + * and remove the last base incrementation, therefore leaving that last + * (seemingly useless) incrementation causes no code increase. + */ + +void board_init_f_init_reserve(ulong base) { struct global_data *gd_ptr; #ifndef _USE_MEMCPY int *ptr; #endif - /* Leave space for the stack we are running with now */ - top -= 0x40; + /* + * clear GD entirely and set it up. + * Use gd_ptr, as gd may not be properly set yet. + */ - top -= sizeof(struct global_data); - top = ALIGN(top, 16); - gd_ptr = (struct global_data *)top; + gd_ptr = (struct global_data *)base; + /* zero the area */ #ifdef _USE_MEMCPY memset(gd_ptr, '\0', sizeof(*gd)); #else for (ptr = (int *)gd_ptr; ptr < (int *)(gd_ptr + 1); ) *ptr++ = 0; #endif + /* set GD unless architecture did it already */ +#ifndef CONFIG_X86 arch_setup_gd(gd_ptr); +#endif + /* next alloc will be higher by one GD plus 16-byte alignment */ + base += roundup(sizeof(struct global_data), 16); + + /* + * record early malloc arena start. + * Use gd as it is now properly set for all architectures. + */ #if defined(CONFIG_SYS_MALLOC_F) - top -= CONFIG_SYS_MALLOC_F_LEN; - gd->malloc_base = top; + /* go down one 'early malloc arena' */ + gd->malloc_base = base; + /* next alloc will be higher by one 'early malloc arena' size */ + base += CONFIG_SYS_MALLOC_F_LEN; #endif - - return top; } diff --git a/include/common.h b/include/common.h index 09a131d..2f8e828 100644 --- a/include/common.h +++ b/include/common.h @@ -225,32 +225,26 @@ 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 + * ulong board_init_f_alloc_reserve - allocate reserved area * * 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 on the stack for writable + * 'globals' such as GD and the malloc arena. * - * 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. + * @top: top of the reserve area, growing down. + * @return: bottom of reserved area + */ +ulong board_init_f_alloc_reserve(ulong top); + +/** + * board_init_f_init_reserve - initialize the reserved area(s) * - * [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 C runtime has allocated the reserved + * area on the stack. It must initialize the GD at the base of that area. * - * @top: Top of available memory, also normally the top of the stack - * @return: New stack location + * @base: top from which reservation was done */ -ulong board_init_f_mem(ulong top); +void board_init_f_init_reserve(ulong base); /** * arch_setup_gd() - Set up the global_data pointer -- 2.5.0

1 1

[U-Boot] Please pull u-boot-dm
by Simon Glass 20 Nov '15

20 Nov '15

Hi Tom, Here is the conversion of input to driver model, refactoring of USB probing with added tests and a few other things. The following changes since commit 2b24e09c66480f3723b137f434a6c3b0db764817: rockchip: Turn on CONFIG_DEBUG_UART_NS16550 in defconfigs (2015-11-19 17:06:25 -0500) are available in the git repository at: git://git.denx.de/u-boot-dm.git for you to fetch changes up to bff1a71ede3557cd5502afdb74aabe9599d6f96b: dm: test: usb: sandbox: Add keyboard tests for sandbox (2015-11-19 20:27:52 -0700) ---------------------------------------------------------------- Bin Meng (6): input: Save keyboard's LED state to correct place input: Call keyboard's update_leds() method when the LEDs change input: Change LED state bits to conform i8042 compatible keyboard input: Ban digit numbers if 'Num Lock' is not on x86: crownbay: Convert to use driver model keyboard x86: qemu: Convert to use driver model keyboard Daniel Schwierzeck (1): sandbox: cros_ec: fix uninitialized use of len Simon Glass (55): dm: usb: Add support for USB keyboards with driver model dm: input: Create a keyboard uclass input: Add a device pointer to the input config input: Return -ENOSPC when there is not space input: Add the keycode translation tables separately cros_ec: Use udevice instead of cros_ec_dev for keyboard functions dm: stdio: Plumb in the new keyboard uclass dm: tegra: Convert keyboard driver to driver model dm: cros_ec: Convert cros_ec keyboard driver to driver model video: Drop unused console functions i8042: Use functions to handle register access i8042: Adjust kbd_reset() to collect all failures i8042: Adjust keyboard init to assume success input: Correct keycode for Ctrl-Y input: Add a few more keyboard keycodes input: Add a function to add a keycode to the existing set input: Allow repeat filtering to be disabled input: Support the German keymap input: Adjust structure of code in process_modifier() input: Handle caps lock input: Allow updating of keyboard LEDs input: i8042: Convert to use the input library input: Add a Kconfig option for the i8042 keyboard x86: Add an i8042 device for boards that have it Drop CONFIG_ISA_KEYBOARD input: Convert i8042 to driver model i8042: Handle a duplicate power-on-reset response video: input: Clean up after i8042 conversion input: Convert 'keyboard' driver to use input library sandbox: Add a way to skip time delays dm: usb: Avoid time delays in sandbox tests Move console definitions into a new console.h file Drop config.h header from display_options.c Add a circular memory buffer implementation console: Add a console buffer sandbox: Enable console recording and silent console test: Record and silence console in tests usb: Refactor USB tree output code for testing dm: core: Add safe device iteration macros sandbox: usb: Allow dynamic emulated USB device descriptors sandbox: usb: Allow up to 4 emulated devices on a hub sandbox: usb: Allow finding a USB emulator for a device Revert "dm: usb: Rename usb_find_child to usb_find_emul_child" Revert "dm: usb: Use device_unbind_children to clean up usb devs on stop" Revert "dm: Export device_remove_children / device_unbind_children" dm: usb: Deprecate usb_get_dev_index() dm: usb: Remove inactive children after a bus scan dm: test: usb: Add tests for the 'usb tree' command dm: test: usb: Add a test for device reordering usb: Drop unused code in usb_kbd.c usb: Avoid open-coded USB constants in usb_kbd.c usb: sandbox: Add support for interrupt operations usb: sandbox: Add a USB emulation driver sandbox: Enable USB keyboard dm: test: usb: sandbox: Add keyboard tests for sandbox Thomas Chou (2): common/board_f.c: move mark_bootstage after arch_cpu_init_dm sandbox: add a sandbox timer and basic test README | 42 +--- arch/arm/Kconfig | 1 + arch/arm/mach-tegra/Kconfig | 1 + arch/blackfin/lib/cmd_cache_dump.c | 1 + arch/powerpc/cpu/mpc8260/ether_fcc.c | 1 + arch/powerpc/cpu/mpc8260/i2c.c | 1 + arch/powerpc/cpu/mpc8xx/i2c.c | 1 + arch/sandbox/Kconfig | 3 + arch/sandbox/cpu/cpu.c | 5 +- arch/sandbox/cpu/start.c | 8 + arch/sandbox/cpu/state.c | 14 ++ arch/sandbox/dts/sandbox.dts | 4 + arch/sandbox/dts/test.dts | 19 +- arch/sandbox/include/asm/state.h | 20 ++ arch/sandbox/include/asm/test.h | 2 + arch/sh/lib/board.c | 1 + arch/sparc/lib/board.c | 1 + arch/x86/Kconfig | 6 + arch/x86/dts/bayleybay.dts | 1 + arch/x86/dts/chromebook_link.dts | 5 + arch/x86/dts/crownbay.dts | 1 + arch/x86/dts/keyboard.dtsi | 5 + arch/x86/dts/qemu-x86_i440fx.dts | 1 + arch/x86/dts/qemu-x86_q35.dts | 1 + board/Arcturus/ucp1020/spl.c | 1 + board/amcc/yucca/cmd_yucca.c | 1 + board/astro/mcf5373l/fpga.c | 1 + board/cobra5272/flash.c | 1 + board/esd/common/cmd_loadpci.c | 1 + board/esd/cpci405/cpci405.c | 1 + board/esd/pmc405de/pmc405de.c | 1 + board/esd/pmc440/cmd_pmc440.c | 1 + board/esd/pmc440/pmc440.c | 1 + board/esd/vme8349/caddy.c | 1 + board/freescale/b4860qds/spl.c | 1 + board/freescale/c29xpcie/spl.c | 1 + board/freescale/mpc8569mds/mpc8569mds.c | 1 + board/freescale/p1010rdb/spl.c | 1 + board/freescale/p1022ds/spl.c | 1 + board/freescale/p1_p2_rdb_pc/spl.c | 1 + board/freescale/t102xqds/spl.c | 1 + board/freescale/t102xrdb/spl.c | 1 + board/freescale/t104xrdb/spl.c | 1 + board/freescale/t208xqds/spl.c | 1 + board/freescale/t208xrdb/spl.c | 1 + board/freescale/t4qds/spl.c | 1 + board/freescale/t4rdb/spl.c | 1 + board/gdsys/common/cmd_ioloop.c | 1 + board/inka4x0/inkadiag.c | 1 + board/kosagi/novena/novena.c | 1 + board/lwmon5/kbd.c | 1 + board/mpl/common/kbd.c | 1 + board/mpl/pati/pati.c | 1 + board/mpl/pip405/README | 4 - board/renesas/sh7785lcr/selfcheck.c | 1 + board/sandbox/sandbox.c | 2 + board/tqc/tqm5200/cmd_stk52xx.c | 1 + board/tqc/tqm5200/tqm5200.c | 1 + board/xes/xpedite1000/xpedite1000.c | 1 + common/Kconfig | 28 +++ common/autoboot.c | 1 + common/board_f.c | 13 +- common/board_r.c | 11 ++ common/cli.c | 1 + common/cli_hush.c | 1 + common/cli_simple.c | 1 + common/cmd_armflash.c | 1 + common/cmd_bedbug.c | 1 + common/cmd_dcr.c | 1 + common/cmd_dfu.c | 1 + common/cmd_fastboot.c | 1 + common/cmd_fpgad.c | 1 + common/cmd_fuse.c | 1 + common/cmd_i2c.c | 1 + common/cmd_load.c | 1 + common/cmd_mem.c | 2 + common/cmd_misc.c | 1 + common/cmd_mmc.c | 1 + common/cmd_nand.c | 1 + common/cmd_nvedit.c | 1 + common/cmd_otp.c | 1 + common/cmd_pci.c | 1 + common/cmd_usb.c | 71 ++++--- common/cmd_usb_mass_storage.c | 1 + common/command.c | 1 + common/console.c | 51 ++++- common/iomux.c | 1 + common/main.c | 1 + common/stdio.c | 31 ++- common/usb_hub.c | 10 +- common/usb_kbd.c | 83 ++++---- configs/sandbox_defconfig | 7 + doc/device-tree-bindings/input/i8042.txt | 10 + doc/device-tree-bindings/timer/sandbox_timer.txt | 7 + drivers/block/fsl_sata.c | 1 + drivers/core/device-remove.c | 22 ++- drivers/fpga/ACEX1K.c | 1 + drivers/fpga/virtex2.c | 1 + drivers/fpga/zynqpl.c | 1 + drivers/i2c/adi_i2c.c | 1 + drivers/input/Kconfig | 19 ++ drivers/input/Makefile | 4 +- drivers/input/cros_ec_keyb.c | 147 ++++++-------- drivers/input/i8042.c | 647 +++++++++++++++++--------------------------------------------- drivers/input/input.c | 252 ++++++++++++++++++++---- drivers/input/keyboard-uclass.c | 91 +++++++++ drivers/input/keyboard.c | 289 ++++------------------------ drivers/input/tegra-kbc.c | 242 +++++++++++------------ drivers/misc/cbmem_console.c | 2 +- drivers/misc/cros_ec.c | 14 +- drivers/misc/cros_ec_sandbox.c | 1 + drivers/mtd/cfi_flash.c | 1 + drivers/mtd/nand/bfin_nand.c | 1 + drivers/net/e1000_spi.c | 1 + drivers/net/keystone_net.c | 1 + drivers/net/phy/phy.c | 1 + drivers/net/vsc7385.c | 1 + drivers/power/battery/bat_trats.c | 1 + drivers/spi/bfin_spi.c | 1 + drivers/spi/bfin_spi6xx.c | 1 + drivers/spi/sh_qspi.c | 1 + drivers/spi/sh_spi.c | 1 + drivers/timer/Kconfig | 7 + drivers/timer/Makefile | 1 + drivers/timer/sandbox_timer.c | 53 +++++ drivers/usb/emul/Makefile | 1 + drivers/usb/emul/sandbox_flash.c | 48 +++-- drivers/usb/emul/sandbox_hub.c | 2 +- drivers/usb/emul/sandbox_keyb.c | 241 +++++++++++++++++++++++ drivers/usb/emul/usb-emul-uclass.c | 29 ++- drivers/usb/gadget/ether.c | 1 + drivers/usb/gadget/f_mass_storage.c | 1 + drivers/usb/gadget/f_thor.c | 1 + drivers/usb/host/r8a66597-hcd.c | 1 + drivers/usb/host/usb-sandbox.c | 19 ++ drivers/usb/host/usb-uclass.c | 54 ++++-- drivers/usb/musb-new/musb_uboot.c | 1 + drivers/video/cfb_console.c | 82 ++------ examples/standalone/mem_to_mem_idma2intr.c | 1 + examples/standalone/smc911x_eeprom.c | 1 + include/asm-generic/global_data.h | 6 + include/common.h | 17 -- include/configs/MIP405.h | 5 - include/configs/MPC8536DS.h | 1 - include/configs/MPC8544DS.h | 1 - include/configs/MPC8572DS.h | 1 - include/configs/MPC8641HPCN.h | 1 - include/configs/PIP405.h | 5 - include/configs/bayleybay.h | 3 - include/configs/chromebox_panther.h | 2 - include/configs/crownbay.h | 2 +- include/configs/minnowmax.h | 1 - include/configs/qemu-x86.h | 2 +- include/configs/sandbox.h | 5 +- include/configs/x86-chromebook.h | 2 +- include/configs/x86-common.h | 2 +- include/console.h | 52 +++++ include/cros_ec.h | 4 +- include/dm/device-internal.h | 26 --- include/dm/device.h | 12 ++ include/dm/uclass-id.h | 1 + include/dm/uclass.h | 15 ++ include/fdtdec.h | 1 - include/i8042.h | 6 - include/input.h | 69 ++++++- include/keyboard.h | 84 ++++++++ include/linux/usb/ch9.h | 20 ++ include/membuff.h | 246 ++++++++++++++++++++++++ include/usb.h | 29 +++ lib/Makefile | 1 + lib/display_options.c | 2 +- lib/fdtdec.c | 1 - lib/gunzip.c | 1 + lib/membuff.c | 390 +++++++++++++++++++++++++++++++++++++ net/net.c | 1 + test/dm/Makefile | 1 + test/dm/test-main.c | 12 ++ test/dm/timer.c | 27 +++ test/dm/usb.c | 241 +++++++++++++++++++++++ test/ut.c | 4 + 180 files changed, 2832 insertions(+), 1291 deletions(-) create mode 100644 arch/x86/dts/keyboard.dtsi create mode 100644 doc/device-tree-bindings/input/i8042.txt create mode 100644 doc/device-tree-bindings/timer/sandbox_timer.txt create mode 100644 drivers/input/keyboard-uclass.c create mode 100644 drivers/timer/sandbox_timer.c create mode 100644 drivers/usb/emul/sandbox_keyb.c create mode 100644 include/console.h create mode 100644 include/membuff.h create mode 100644 lib/membuff.c create mode 100644 test/dm/timer.c Regards, Simon

2 1

[U-Boot] Hang on Test: dm_test_net_retry Using eth@10004000 device
by Simon Glass 20 Nov '15

20 Nov '15

Hi Joe, This test is hanging for me: $ ./test/dm/test-dm.sh ... Test: dm_test_net_retry Using eth@10004000 device (hangs here) Do you know what might be going on? Regards, Simon

2 2

[U-Boot] socfpga, spl, status
by Jan Viktorin 20 Nov '15

20 Nov '15

Hello Marek and U-Boot community, I am trying to build the U-Boot 2015.10 with SPL for the EBV SoCrates board (Altera SoC FPGA, Cyclone V). It builds, however, I am unable to boot. It does not print any output. I can boot the SoCrates board with an older bootloader generated by the Altera tools. I am able to build & run U-Boot for Altera SoC Development Kit (NOT SoCKit), the SPL works however U-Boot freezes... U-Boot 2015.10 (Nov 20 2015 - 15:43:36 +0100) CPU: Altera SoCFPGA Platform FPGA: Altera Cyclone V, SE/A6 or SX/C6 or ST/D6, version 0x0 BOOT: SD/MMC Internal Transceiver (3.0V) Watchdog enabled I2C: ready DRAM: 1 GiB MMC: SOCFPGA DWMMC: 0 *** Warning - bad CRC, using default environment In: serial Out: serial Err: serial Model: Altera SOCFPGA Cyclone V SoC Development Kit Autoboot in 3 seconds [...frozen here...] So, what is the status of the SPL for SoCFPGA in upstream? Does anybody test all the claimed socfpga platforms? Regards Jan Viktorin -- Jan Viktorin E-mail: Viktorin(a)RehiveTech.com System Architect Web: www.RehiveTech.com RehiveTech Brno, Czech Republic

2 4

[U-Boot] [PATCH] sunxi: clock: Set AHB1 clock frequency to 200MHz on Allwinner H3
by Siarhei Siamashka 20 Nov '15

20 Nov '15

The 3.4 kernel from the Allwinner SDK is clocking AHB1 at 200MHz on Allwinner H3 and using PLL6 as the clock source (PLL6/3). This can be verified by reading the value of the AHB1_APB1_CFG_REG register via /dev/mem. It always reads as 0x3180 regardless of the current cpufreq operating point. So this configuration should be safe for use in U-Boot too. PLL6 also needs to be configured before it is used as the clock source, according to the "CCU / Programming Guidelines" section of the Allwinner manual. The current low AHB1 clock speed is limiting the USB transfer speed when booting via FEL. This patch can increase the FEL USB transfer speed from ~510 KB/s to ~950 KB/s. Signed-off-by: Siarhei Siamashka <siarhei.siamashka(a)gmail.com> --- This is intended to be used together with the Allwinner H3 patches from Jens Kuske: http://lists.denx.de/pipermail/u-boot/2015-November/234589.html Allwinner A83T is likely using the same 200MHz AHB1 setup: https://github.com/allwinner-zh/bootloader/blob/e5ceeca21188/basic_loader/b… I can successfully boot my A31s based tablet with 200MHz AHB1 clock speed too. And this also speeds up FEL USB transfers. However I can't check what kind of AHB1 configuration is used by the Android firmware without rooting it first, which I wouldn't do at the moment. arch/arm/cpu/armv7/sunxi/clock_sun6i.c | 6 ++++-- arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv7/sunxi/clock_sun6i.c b/arch/arm/cpu/armv7/sunxi/clock_sun6i.c index 3ab3b31..916ee48 100644 --- a/arch/arm/cpu/armv7/sunxi/clock_sun6i.c +++ b/arch/arm/cpu/armv7/sunxi/clock_sun6i.c @@ -34,9 +34,11 @@ void clock_init_safe(void) clock_set_pll1(408000000); - writel(AHB1_ABP1_DIV_DEFAULT, &ccm->ahb1_apb1_div); - writel(PLL6_CFG_DEFAULT, &ccm->pll6_cfg); + while (!(readl(&ccm->pll6_cfg) & CCM_PLL6_CTRL_LOCK)) + ; + + writel(AHB1_ABP1_DIV_DEFAULT, &ccm->ahb1_apb1_div); writel(MBUS_CLK_DEFAULT, &ccm->mbus0_clk_cfg); writel(MBUS_CLK_DEFAULT, &ccm->mbus1_clk_cfg); diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h index 584d351..09337a1 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h @@ -201,6 +201,7 @@ struct sunxi_ccm_reg { #define CCM_PLL6_CTRL_N_MASK (0x1f << CCM_PLL6_CTRL_N_SHIFT) #define CCM_PLL6_CTRL_K_SHIFT 4 #define CCM_PLL6_CTRL_K_MASK (0x3 << CCM_PLL6_CTRL_K_SHIFT) +#define CCM_PLL6_CTRL_LOCK (1 << 28) #define CCM_MIPI_PLL_CTRL_M_SHIFT 0 #define CCM_MIPI_PLL_CTRL_M_MASK (0xf << CCM_MIPI_PLL_CTRL_M_SHIFT) @@ -219,7 +220,11 @@ struct sunxi_ccm_reg { #define CCM_PLL11_CTRL_UPD (0x1 << 30) #define CCM_PLL11_CTRL_EN (0x1 << 31) -#define AHB1_ABP1_DIV_DEFAULT 0x00002020 +#if defined CONFIG_MACH_SUN8I_H3 +#define AHB1_ABP1_DIV_DEFAULT 0x00003180 /* AHB1=PLL6/3,APB1=AHB1/2 */ +#else +#define AHB1_ABP1_DIV_DEFAULT 0x00002020 /* AHB1=AXI/4, APB1=AHB1/2 */ +#endif #define AXI_GATE_OFFSET_DRAM 0 -- 2.4.10

3 3

[U-Boot] [PATCH v5] Fix board init code to respect the C runtime environment
by Albert ARIBAUD 20 Nov '15

20 Nov '15

board_init_f_mem() alters the C runtime environment's stack it is actually already using. This is not a valid behaviour within a C runtime environment. Split board_init_f_mem into C functions which do not alter their own stack and always behave properly with respect to their C runtime environment. Signed-off-by: Albert ARIBAUD <albert.u.boot(a)aribaud.net> --- Cc:ing custodians for all architectures which this patch affects. This patch has been build-tested for all there architectures, and run-tested on ARM OpenRD Client. For NIOS2, this patch contains all manual v1 and v2 fixes by Thomas. For x86, this patch contains all manual v2 fixes by Bin. Changes in v5: - Reword commit message (including summary/subject) - Reword comments in ARC code Changes in v4: - Add comments on reserving GD at the lowest location - Add comments on post-incrementing base for each "chunk" Changes in v3: - Rebase after commit 9ac4fc82 - Simplify malloc conditional as per commit 9ac4fc82 - Fix NIOS2 return value register (r2, not r4) - Fix x86 subl argument inversion - Group allocations in a single function - Group initializations in a single function 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 | 16 +++--- arch/arm/lib/crt0.S | 6 ++- arch/arm/lib/crt0_64.S | 6 ++- arch/microblaze/cpu/start.S | 4 +- arch/nios2/cpu/start.S | 13 +++-- arch/powerpc/cpu/ppc4xx/start.S | 10 ++-- arch/x86/cpu/start.S | 5 +- arch/x86/lib/fsp/fsp_common.c | 4 +- common/init/board_init.c | 108 +++++++++++++++++++++++++++++++++++----- include/common.h | 33 +++++------- 10 files changed, 146 insertions(+), 59 deletions(-) diff --git a/arch/arc/lib/start.S b/arch/arc/lib/start.S index 26a5934..fddd536 100644 --- a/arch/arc/lib/start.S +++ b/arch/arc/lib/start.S @@ -50,18 +50,20 @@ ENTRY(_start) 1: #endif - /* Setup stack- and frame-pointers */ + /* Establish C runtime stack and frame */ mov %sp, CONFIG_SYS_INIT_SP_ADDR mov %fp, %sp - /* Allocate and zero GD, update SP */ - mov %r0, %sp - bl board_init_f_mem - - /* Update stack- and frame-pointers */ - mov %sp, %r0 + /* Get reserved area size */ + bl board_init_f_get_reserve_size + /* Allocate reserved size on stack, adjust frame pointer accordingly */ + sub %sp, %sp, %r0 mov %fp, %sp + /* Initialize reserved area */ + mov %r0, %sp + bl board_init_f_init_reserve + /* 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..4ec89a4 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -82,9 +82,11 @@ ENTRY(_main) #else bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ #endif + bl board_init_f_get_reserve_size + sub sp, sp, r0 + mov r9, sp mov r0, sp - bl board_init_f_mem - mov sp, r0 + bl board_init_f_init_reserve 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..2891071 100644 --- a/arch/arm/lib/crt0_64.S +++ b/arch/arm/lib/crt0_64.S @@ -75,8 +75,10 @@ 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_get_reserve_size + sub sp, sp, x0 + mov x0, sp + bl board_init_f_init_reserve 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..45bf0fd 100644 --- a/arch/nios2/cpu/start.S +++ b/arch/nios2/cpu/start.S @@ -106,14 +106,17 @@ _reloc: stw r0, 4(sp) mov fp, sp - /* Allocate and zero GD, update SP */ + /* Allocate and initialize reserved area, update SP */ + movhi r2, %hi(board_init_f_get_reserve_size@h) + ori r2, r2, %lo(board_init_f_get_reserve_size@h) + callr r2 + sub sp, sp, r2 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_init_reserve@h) + ori r2, r2, %lo(board_init_f_init_reserve@h) callr r2 - /* Update stack- and frame-pointers */ - mov sp, r2 + /* Update frame-pointer */ mov fp, sp /* Call board_init_f -- never returns */ diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S index 77d4040..44222d2 100644 --- a/arch/powerpc/cpu/ppc4xx/start.S +++ b/arch/powerpc/cpu/ppc4xx/start.S @@ -761,9 +761,10 @@ _start: bl cpu_init_f /* run low-level CPU init code (from Flash) */ #ifdef CONFIG_SYS_GENERIC_BOARD + bl board_init_f_get_reserve_size + sub r1, r1, r3 mr r3, r1 - bl board_init_f_mem - mr r1, r3 + bl board_init_f_init_reserve li r0,0 stwu r0, -4(r1) stwu r0, -4(r1) @@ -1037,9 +1038,10 @@ _start: bl cpu_init_f /* run low-level CPU init code (from Flash) */ #ifdef CONFIG_SYS_GENERIC_BOARD + bl board_init_f_get_reserve_size + sub r1, r1, r3 mr r3, r1 - bl board_init_f_mem - mr r1, r3 + bl board_init_f_init_reserve 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..932672c 100644 --- a/arch/x86/cpu/start.S +++ b/arch/x86/cpu/start.S @@ -122,9 +122,10 @@ car_init_ret: */ #endif /* Set up global data */ + call board_init_f_get_reserve_size + subl %eax, %esp mov %esp, %eax - call board_init_f_mem - mov %eax, %esp + call board_init_f_init_reserve #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..72c458f 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_init_reserve() 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 1c6126d..db4d9a0 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -21,39 +21,121 @@ DECLARE_GLOBAL_DATA_PTR; #define _USE_MEMCPY #endif -/* Unfortunately x86 can't compile this code as gd cannot be assigned */ -#ifndef CONFIG_X86 +/* Unfortunately x86 or ARM can't compile this code as gd cannot be assigned */ +#if !defined(CONFIG_X86) && !defined(CONFIG_ARM) __weak void arch_setup_gd(struct global_data *gd_ptr) { gd = gd_ptr; } -#endif /* !CONFIG_X86 */ +#endif /* !CONFIG_X86 && !CONFIG_SYS_THUMB_BUILD */ -ulong board_init_f_mem(ulong top) +/* + * Compute size of space to reserve on stack for use as 'globals' + * and return size request for reserved area. + * + * Notes: + * + * Actual reservation cannot be done from within this function as + * it requires altering the C stack pointer, so this will be done by + * the caller upon return from this function. + * + * IMPORTANT: + * + * The return value of this function has two uses: + * - it determines the amount of stack reserved for global data and + * the malloc arena; + * - it determines where the global data will be located, as on some + * architectures the caller will set gd to the base of the reserved + * location. + * + */ + +ulong board_init_f_get_reserve_size(void) +{ + ulong size; + + /* Reserve GD (rounded up to a multiple of 16 bytes) */ + size = roundup(sizeof(struct global_data), 16); + + /* Reserve malloc arena */ +#if defined(CONFIG_SYS_MALLOC_F) + size += CONFIG_SYS_MALLOC_F_LEN; +#endif + + return size; +} + +/* + * Initialize reserved space (which has been safely allocated on the C + * stack from the C runtime environment handling code). + * + * Notes: + * + * Actual reservation was done by the caller; the locations from base + * to base+size-1 (where 'size' is the value returned by the allocation + * function above) can be accessed freely without risk of corrupting the + * C runtime environment. + * + * IMPORTANT: + * + * Upon return from the allocation function above, on some architectures + * the caller will set gd to the lowest reserved location. Therefore, in + * this initialization function, the global data MUST be placed at base. + * + * ALSO IMPORTANT: + * + * On some architectures, gd will only be set once arch_setup_gd() is + * called. Therefore: + * + * Do not use 'gd->' until arch_setup_gd() has been called! + * + * IMPORTANT TOO: + * + * Initialization for each "chunk" (GD, malloc arena...) ends with an + * incrementation line of the form 'base += <some size>'. The last of + * these incrementations seems useless, as base will not be used any + * more after this incrementation; but if/when a new "chunk" is appended, + * this increment will be essential as it will give base right value for + * this new chunk (which will have to end with its own incrementation + * statement). Besides, the compiler's optimizer will silently detect + * and remove the last base incrementation, therefore leaving that last + * (seemingly useless) incrementation causes no code increase. + */ + +void board_init_f_init_reserve(ulong base) { struct global_data *gd_ptr; #ifndef _USE_MEMCPY int *ptr; #endif - /* Leave space for the stack we are running with now */ - top -= 0x40; + /* + * clear GD entirely and set it up + */ - top -= sizeof(struct global_data); - top = ALIGN(top, 16); - gd_ptr = (struct global_data *)top; + gd_ptr = (struct global_data *)base; + /* zero the area */ #ifdef _USE_MEMCPY memset(gd_ptr, '\0', sizeof(*gd)); #else for (ptr = (int *)gd_ptr; ptr < (int *)(gd_ptr + 1); ) *ptr++ = 0; #endif + /* set GD unless architecture did it already */ +#if !defined(CONFIG_X86) && !defined(CONFIG_ARM) arch_setup_gd(gd_ptr); +#endif + /* next alloc will be higher by one GD plus 16-byte alignment */ + base += roundup(sizeof(struct global_data), 16); + + /* + * record malloc arena start + */ #if defined(CONFIG_SYS_MALLOC_F) - top -= CONFIG_SYS_MALLOC_F_LEN; - gd->malloc_base = top; + /* go down one malloc arena */ + gd->malloc_base = base; + /* next alloc will be higher by one malloc arena size */ + base += CONFIG_SYS_MALLOC_F_LEN; #endif - - return top; } diff --git a/include/common.h b/include/common.h index 09a131d..988d67a 100644 --- a/include/common.h +++ b/include/common.h @@ -225,32 +225,25 @@ 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 + * ulong board_init_f_get_reserve_size - return size of reserved area * * 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 on the stack for writable + * 'globals' such as GD and the malloc arena. * - * 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: size of reserved area + */ +ulong board_init_f_get_reserve_size(void); + +/** + * board_init_f_init_reserve - initialize the reserved area(s) * - * [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 C runtime has allocated the reserved + * area on the stack. It must initialize the GD at the base of that area. * - * @top: Top of available memory, also normally the top of the stack - * @return: New stack location + * @base: top from which reservation was done */ -ulong board_init_f_mem(ulong top); +void board_init_f_init_reserve(ulong base); /** * arch_setup_gd() - Set up the global_data pointer -- 2.5.0

3 6

[U-Boot] [PATCH 1/2] sunxi: Add basic H3 support
by Jens Kuske 20 Nov '15

20 Nov '15

Add initial sun8i H3 support, only uart + mmc are supported for now. Signed-off-by: Jens Kuske <jenskuske(a)gmail.com> --- arch/arm/cpu/armv7/sunxi/board.c | 4 ++++ arch/arm/cpu/armv7/sunxi/cpu_info.c | 2 ++ arch/arm/include/asm/arch-sunxi/gpio.h | 1 + board/sunxi/Kconfig | 7 ++++++- drivers/power/Kconfig | 5 +++-- include/configs/sun8i.h | 2 ++ 6 files changed, 18 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c index 4785ac6..7615e50 100644 --- a/arch/arm/cpu/armv7/sunxi/board.c +++ b/arch/arm/cpu/armv7/sunxi/board.c @@ -72,6 +72,10 @@ static int gpio_init(void) sunxi_gpio_set_cfgpin(SUNXI_GPB(0), SUN8I_A33_GPB_UART0); sunxi_gpio_set_cfgpin(SUNXI_GPB(1), SUN8I_A33_GPB_UART0); sunxi_gpio_set_pull(SUNXI_GPB(1), SUNXI_GPIO_PULL_UP); +#elif CONFIG_CONS_INDEX == 1 && defined(CONFIG_MACH_SUN8I_H3) + sunxi_gpio_set_cfgpin(SUNXI_GPA(4), SUN8I_H3_GPA_UART0); + sunxi_gpio_set_cfgpin(SUNXI_GPA(5), SUN8I_H3_GPA_UART0); + sunxi_gpio_set_pull(SUNXI_GPA(5), SUNXI_GPIO_PULL_UP); #elif CONFIG_CONS_INDEX == 1 && defined(CONFIG_MACH_SUN9I) sunxi_gpio_set_cfgpin(SUNXI_GPH(12), SUN9I_GPH_UART0); sunxi_gpio_set_cfgpin(SUNXI_GPH(13), SUN9I_GPH_UART0); diff --git a/arch/arm/cpu/armv7/sunxi/cpu_info.c b/arch/arm/cpu/armv7/sunxi/cpu_info.c index 05fef32..1e73332 100644 --- a/arch/arm/cpu/armv7/sunxi/cpu_info.c +++ b/arch/arm/cpu/armv7/sunxi/cpu_info.c @@ -69,6 +69,8 @@ int print_cpuinfo(void) puts("CPU: Allwinner A23 (SUN8I)\n"); #elif defined CONFIG_MACH_SUN8I_A33 puts("CPU: Allwinner A33 (SUN8I)\n"); +#elif defined CONFIG_MACH_SUN8I_H3 + puts("CPU: Allwinner H3 (SUN8I)\n"); #elif defined CONFIG_MACH_SUN9I puts("CPU: Allwinner A80 (SUN9I)\n"); #else diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h index 8382101..7af5e29 100644 --- a/arch/arm/include/asm/arch-sunxi/gpio.h +++ b/arch/arm/include/asm/arch-sunxi/gpio.h @@ -147,6 +147,7 @@ enum sunxi_gpio_number { #define SUN7I_GPA_GMAC 5 #define SUN6I_GPA_SDC2 5 #define SUN6I_GPA_SDC3 4 +#define SUN8I_H3_GPA_UART0 2 #define SUN4I_GPB_TWI0 2 #define SUN4I_GPB_TWI1 2 diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index f6f2a60..e1f574f 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -68,6 +68,11 @@ config MACH_SUN8I_A33 select SUPPORT_SPL select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT +config MACH_SUN8I_H3 + bool "sun8i (Allwinner H3)" + select CPU_V7 + select SUNXI_GEN_SUN6I + config MACH_SUN9I bool "sun9i (Allwinner A80)" select CPU_V7 @@ -78,7 +83,7 @@ endchoice # The sun8i SoCs share a lot, this helps to avoid a lot of "if A23 || A33" config MACH_SUN8I bool - default y if MACH_SUN8I_A23 || MACH_SUN8I_A33 + default y if MACH_SUN8I_A23 || MACH_SUN8I_A33 || MACH_SUN8I_H3 config DRAM_CLK diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 809f8f1..1936e5f 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -8,7 +8,8 @@ choice prompt "Select Sunxi PMIC Variant" depends on ARCH_SUNXI default AXP209_POWER if MACH_SUN4I || MACH_SUN5I || MACH_SUN7I - default AXP221_POWER if MACH_SUN6I || MACH_SUN8I + default AXP221_POWER if MACH_SUN6I || MACH_SUN8I_A23 || MACH_SUN8I_A33 + default SUNXI_NO_PMIC if MACH_SUN8I_H3 config SUNXI_NO_PMIC boolean "board without a pmic" @@ -31,7 +32,7 @@ config AXP209_POWER config AXP221_POWER boolean "axp221 / axp223 pmic support" - depends on MACH_SUN6I || MACH_SUN8I + depends on MACH_SUN6I || MACH_SUN8I_A23 || MACH_SUN8I_A33 ---help--- Select this to enable support for the axp221/axp223 pmic found on most A23 and A31 boards. diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h index 4fc6365..113e320 100644 --- a/include/configs/sun8i.h +++ b/include/configs/sun8i.h @@ -25,6 +25,8 @@ #define CONFIG_ARMV7_PSCI_NR_CPUS 2 #elif defined(CONFIG_MACH_SUN8I_A33) #define CONFIG_ARMV7_PSCI_NR_CPUS 4 +#elif defined(CONFIG_MACH_SUN8I_H3) +#define CONFIG_ARMV7_PSCI_NR_CPUS 4 #else #error Unsupported sun8i variant #endif -- 2.6.2

2 2

[U-Boot] [PATCH 0/2] Enable DFU for RAM on Allwinner devices
by Siarhei Siamashka 20 Nov '15

20 Nov '15

Hello, DFU allows to transfer large files (such as initrd images) much faster than FEL. Siarhei Siamashka (2): sunxi: Enable DFU for RAM musb: sunxi: Implement dfu_usb_get_reset() drivers/usb/musb-new/sunxi.c | 12 ++++++++++++ include/configs/sunxi-common.h | 30 +++++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 5 deletions(-) -- 2.4.10

6 23

[U-Boot] [PATCH V4 00/13] SPL mmc refactor and alternate boot device feature
by Nikita Kiryanov 20 Nov '15

20 Nov '15

This series has two parts: patches 1-7 perform refactors aimed at reducing the ifdef complexity of SPL mmc code (and some nand as well). This refactor also addresses a few design issues I noticed while working on the refactor. Image size comparison for arm modules can be seen here: http://patchwork.ozlabs.org/patch/534387/ Since the changes in V2 are minimal, the V1 results should still be valid for the V2 as well. The rest of the series introduces a new SPL feature that allows board code to define a list of boot devices that SPL will try before failing (instead of the only one device it attempts now). This feature is useful for implementing fallbacks, as well as reacting to bootROM sequences. For example: On CM-FX6, if boot from the alternate boot device (MMC) fails, the bootROM proceeds to try boot from SPI flash. If the SPI flash boot is succesful, SPL will still try to load U-Boot from MMC, instead of from the actual boot device SPI flash), and probably fail and hang. The alternate boot feature makes it possible for SPL to follow the MMC boot attempt with boot from the SPI flash. The CM-FX6 based miniature PC Utilite depends on this capability for its SPI flash boot to work, since SPI flash boot is only attempted if MMC boot fails. Finally, patch 13 makes SPL look at the specific BOOT_DEVICE_MMCx, and search for the correct mmc device, instead of always going for mmc0. This series was compile tested for arm and powerpc (patches 1-12). Patch 13 compile tested for sunxi. Tested on CM-FX6. Cc: Igor Grinberg <grinberg(a)compulab.co.il> Cc: Tom Rini <trini(a)konsulko.com> Cc: Hans de Goede <hdegoede(a)redhat.com> Cc: Pantelis Antoniou <panto(a)antoniou-consulting.com> Cc: Otavio Salvador <otavio.salvador(a)ossystems.com.br> Changes in V4: - Rebased over current mainline. Rerun compile test for arm and powerpc - Fixed typo in a commit message - Moved announce_boot_device() code to after #ifndef BOOT_DEVICE_NONE - Replaced one puts with printf Changes in V3: - Added documentation for spl_board_load_image(). - Reworked announce_boot_device() to make the code less repititive by utilizing a table of boot_device --> name. Changes in V2: - Per request I went over the changes to see if they should cause documentation updates or board updates, but found none to be necessary. - Slight modification in patch 2 (and consequentially patch 8): removal of hang() in default switch case, and enclosing of default case in #ifdef LIBCONFIG to avoid compiler complaints if LIBCONFIG support not compiled in. - Patch 13 is a new patch which makes SPL look at the value of BOOT_DEVICE_MMCx instead of always working with mmc0. A hack in sunxi boards that attempted to circumvent this issue is thus removed. - Rebased over current mainline. Nikita Kiryanov (13): spl: nand: remove code duplication spl: mmc: add break statements in spl_mmc_load_image() spl: mmc: refactor device location code to its own function spl: mmc: remove #ifdef CONFIG_SPL_OS_BOOT check spl: mmc: get rid of #ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION check spl: mmc: move fs boot into its own function spl: mmc: get rid of emmc boot code duplication spl: change return values of spl_*_load_image() common: spl: move image load to its own function spl: add support for alternative boot device spl: announce boot devices arm: mx6: cm-fx6: define fallback boot devices for spl spl: mmc: add support for BOOT_DEVICE_MMC2 arch/arm/cpu/armv7/sunxi/board.c | 14 +- arch/arm/include/asm/spl.h | 10 +- board/compulab/cm_fx6/spl.c | 19 +-- common/spl/spl.c | 194 +++++++++++++++++++------- common/spl/spl_ext.c | 6 + common/spl/spl_fat.c | 6 + common/spl/spl_mmc.c | 290 ++++++++++++++++++++++++--------------- common/spl/spl_nand.c | 47 ++++--- common/spl/spl_net.c | 9 +- common/spl/spl_nor.c | 6 +- common/spl/spl_onenand.c | 4 +- common/spl/spl_sata.c | 11 +- common/spl/spl_usb.c | 17 ++- common/spl/spl_ymodem.c | 5 +- drivers/mtd/spi/spi_spl_load.c | 17 ++- include/configs/cm_fx6.h | 1 - include/spl.h | 18 +-- 17 files changed, 446 insertions(+), 228 deletions(-) -- 1.9.1

5 36