June 2016 - U-Boot

[U-Boot] Please pull u-boot-sunxi master
by Hans de Goede 21 Jun '16

21 Jun '16

Hi Tom, Here is the third sunxi pull-req for v2016.07, it contains a few misc. fixes, 2 new boards and the conversion of the PSCI code to C-code. The following changes since commit 46fd625dfee9ef69cd183f0cd11e09309a71a4e2: Prepare v2016.07-rc2 (2016-06-20 11:14:12 -0400) are available in the git repository at: http://git.denx.de/u-boot-sunxi.git master for you to fetch changes up to 4257f5f8f631147803cdc6693b5046deb1a57be6: sunxi: Add PSCI implementation in C (2016-06-20 22:44:00 +0200) ---------------------------------------------------------------- Chen-Yu Tsai (11): ARM: PSCI: use only r0 and r3 in psci_get_cpu_stack_top() ARM: PSCI: save and restore clobbered registers in v7_flush_dcache_all ARM: PSCI: export common PSCI function declarations for C code ARM: allocate extra space for PSCI stack in secure section during link phase sunxi: Make CPUCFG_BASE macro names the same across families sunxi: Add packed attribute to struct sunxi_prcm_reg sunxi: Add missing linux/types.h header for cpucfg_sun6i.h sunxi: Group cpu core related controls together sunxi: Add CPUCFG debug lock and sun7i cpu power controls sunxi: Add base address for GIC sunxi: Add PSCI implementation in C Hans de Goede (5): tinyprintf: Add vprintf implementation sunxi: Select USE_TINY_PRINTF sunxi: Add defconfig and dts file for Polaroid MID2407PXE03 tablet sunxi: Add defconfig and dts file for inet86dz board sunxi: Revert "sunxi: make SoC variant choice mandatory" arch/arm/Kconfig | 1 + arch/arm/cpu/armv7/psci.S | 20 +- arch/arm/cpu/armv7/sunxi/Makefile | 7 +- arch/arm/cpu/armv7/sunxi/psci.c | 273 +++++++++++++++++++ arch/arm/cpu/armv7/sunxi/psci_head.S | 66 +++++ arch/arm/cpu/armv7/sunxi/psci_sun6i.S | 262 ------------------ arch/arm/cpu/armv7/sunxi/psci_sun7i.S | 237 ----------------- arch/arm/cpu/u-boot.lds | 7 + arch/arm/dts/Makefile | 2 + arch/arm/dts/axp22x.dtsi | 10 + arch/arm/dts/sun8i-a23-inet86dz.dts | 293 +++++++++++++++++++++ arch/arm/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 292 ++++++++++++++++++++ arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 17 +- .../asm/arch-sunxi/{cpucfg_sun6i.h => cpucfg.h} | 41 +-- arch/arm/include/asm/arch-sunxi/prcm.h | 10 +- arch/arm/include/asm/psci.h | 7 + board/sunxi/Kconfig | 1 + board/sunxi/MAINTAINERS | 2 + configs/inet86dz_defconfig | 24 ++ configs/polaroid_mid2407pxe03_defconfig | 24 ++ lib/tiny-printf.c | 5 + 21 files changed, 1061 insertions(+), 540 deletions(-) create mode 100644 arch/arm/cpu/armv7/sunxi/psci.c create mode 100644 arch/arm/cpu/armv7/sunxi/psci_head.S delete mode 100644 arch/arm/cpu/armv7/sunxi/psci_sun6i.S delete mode 100644 arch/arm/cpu/armv7/sunxi/psci_sun7i.S create mode 100644 arch/arm/dts/sun8i-a23-inet86dz.dts create mode 100644 arch/arm/dts/sun8i-a23-polaroid-mid2407pxe03.dts rename arch/arm/include/asm/arch-sunxi/{cpucfg_sun6i.h => cpucfg.h} (67%) create mode 100644 configs/inet86dz_defconfig create mode 100644 configs/polaroid_mid2407pxe03_defconfig Regards, Hans

2 1

[U-Boot] [ANN] U-Boot v2016.07-rc2 released
by Tom Rini 21 Jun '16

21 Jun '16

Hey all, It's release day and v2016.07-rc2 is out and on time. I expect to do -rc3 in another two weeks. I've updated git and the tarballs are also up now. We've gotten a number of PRs in with the sort of changes that should go in, in. Going forward now changes really should be of the bug fix variety. Or Kconfig changes since we now have a test for tbot to confirm migration doesn't change the outputs (thanks Heiko!), I'm happy to see patches to migrate things where people have confirmed moveconfig.py does the right thing and verified their changes. I'm even OK running the moveconfig.py part myself. To me, the big highlight here is that AUTOBOOT has moved to Kconfig and while this exposed some problems, it also got tools improved and the overall process made better. I do wish it wasn't so bumpy, but I think we've got it all in hand now. Thanks all! -- Tom

3 4

[U-Boot] Auto-detecting touchscreen controller and dealing with hw configuration differences on q8 tablets
by Hans de Goede 20 Jun '16

20 Jun '16

<resend with Pantelis' email address fixed> Hi All, The sunxi support in the kernel supports (amongst many other devices) the quite popular low cost q8 form factor 7" tablets. These are all based on the same case, with an allwinner SoC inside (there are non allwinner versions, but those are out of scope) and typically all based on the same reference design. Currently we support any such tablet with 4 u-boot defconfigs / 4 dts files: q8_a13_tablet q8_a23_tablet_800x480 q8_a33_tablet_800x480 q8_a33_tablet_1026x600 So all the user needs to know to get mainline running on these is which SoC his tablet is using and which resolution his lcd has. However the reference design gets completed by the manufacturers with whatever accelerometer, wifi chip and touchscreen controller are cheapest for the batch being produced that week. The plan is (was ?) to use auto-detection to figure out which components are used and adjust the dts using e.g. overlays. Recently I've been working together with some students from my local university to get a driver for the gsl1680 touchscreen controller used in most of these tablets upstream. So now I've been testing the touschscreen on all q8 tablets I own and unfortunately things are not so easy. The gsl1680 is quite flexible, it features a number of capacitive sense pins and these can be routed in random order to sense lines in the display, during init the controller gets feed a configuration data file with which pins go where and various lookup tables. Here is a table of all tablets I've tested: a13-94v-0: a082 a23-tj-a23-q88-v4.0_20140815/GSL1680E_700_FW.fw 1024x600 inverted-x a13-tzx-713b-v2.1: a082 a23-tj-a23-q88-v4.0_20140815/GSL1680E_700_FW.fw 1024x600 a23-q8h-v3: a082 a23-tj-a23-q88-v4.0_20140815/GSL1688_A70_FW.fw 800x480 swapped-x-y a23-tj-a23-q88-v4.0: a082 a23-tj-a23-q88-v4.0_20140815/GSL1680E_700_FW.fw 1024x600 a23-ippo-q8h-v1.2: a082 a23-tj-a23-q88-v4.0_20140815/GSL1688_A70_FW.fw 800x480 swapped-x-y a33-ippo-q8h-v1.2: a082 a23-tj-a23-q88-v4.0_20140815/GSL1688_A70_FW.fw 800x480 swapped-x-y a33-tzx-723q4: b482 a33-Q8_V2.4_1118/GSL1680_FW_D702.fw 960x480 inverted-x a33-q8-v2.4-1118: b482 a33-Q8_V2.4_1118/GSL1680_FW_D702.fw 960x480 a33-q8h-v1.5: b482 a33-q8h-v1.5/GSL1688_A70_FW.fw 960x480 The first column is <soc>-<pcb-marking>, the second is the chip-id from the gsl1680 (this can be read via i2c), the third column is the configdata file used for testing, the directory-name it is prefixed with is from which board's android image the firmware file was extracted. The 4th column shows the resolution of the reported coordinates and any necessary flags. Note that the resolution and if we need swapped-x-y actually is fixed for a given fw file, so we need to keep this information paired. So as you can see which fw file to use, and whether x is inverted or not vary from board to board. This leaves us with 2 options: 1) Move to 1 dts file per PCB variant solution, of ALL the q8 tablets I've seen I've only ever had 2 with identical PCB-s and those were from the same batch, so this seems unmaintainable. Which leaves us with: 2) Give the user some way to override the dts settings. Which after a somewhat long intro brings me to the actual purpose of this thread, discuss how to best deal with this. I again see 2 options: 1) Put a disabled gsl1680 node in the dts file, have a q8_autodetect.c in u-boot which probes i2c and if it finds the gsl1680 nodes enables it, and patches in a best-effort default for which fw file to use. Allow the user to set a touchscreen_fw u-boot env variable which will override this. Also allow the user to set a touchscreen_inverted_x env variable to add inverted-x to the dt node for the gsl1680. 2) Write an in kernel overlay manager which does auto-detect as described by 1, and loads an overlay for the detected touchscreen controller, with module options to allow specifying the fw-file, x-inversion, etc. One things which worries me about 2. is that we would need to have 2 overlay files per fw-file, one regular config, one inverted-x, or is it possible for the overlay manager to modify an overlay before applying it ? I tend towards doing the auto-detect in u-boot, since that will give the greatest flexibility (the dtb is fully read-writable in u-boot) and I can easily access things like i2c-busses, soc id/version register, etc. there. But before sinking a lot of time in either one of these I first wanted to discuss this, if the consensus is that an in kernel overlay manager is the way to go I will take a shot at that instead. Regards, Hans

5 9

[U-Boot] [PATCH V2 1/5] mailbox: rename headers
by Stephen Warren 20 Jun '16

20 Jun '16

From: Stephen Warren <swarren(a)nvidia.com> Rename mailbox*.h to match the naming convention requested during review of the new reset subsystem. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- v2: New patch. --- drivers/mailbox/mailbox-uclass.c | 4 ++-- drivers/mailbox/sandbox-mbox-test.c | 2 +- drivers/mailbox/sandbox-mbox.c | 2 +- include/{mailbox_uclass.h => mailbox-uclass.h} | 4 ++-- include/{mailbox_client.h => mailbox.h} | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) rename include/{mailbox_uclass.h => mailbox-uclass.h} (96%) rename include/{mailbox_client.h => mailbox.h} (98%) diff --git a/drivers/mailbox/mailbox-uclass.c b/drivers/mailbox/mailbox-uclass.c index 73fa32874a5f..40f851d91549 100644 --- a/drivers/mailbox/mailbox-uclass.c +++ b/drivers/mailbox/mailbox-uclass.c @@ -7,8 +7,8 @@ #include <common.h> #include <dm.h> #include <fdtdec.h> -#include <mailbox_client.h> -#include <mailbox_uclass.h> +#include <mailbox.h> +#include <mailbox-uclass.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/mailbox/sandbox-mbox-test.c b/drivers/mailbox/sandbox-mbox-test.c index 02d161aada33..8351522bd4d5 100644 --- a/drivers/mailbox/sandbox-mbox-test.c +++ b/drivers/mailbox/sandbox-mbox-test.c @@ -6,7 +6,7 @@ #include <common.h> #include <dm.h> -#include <mailbox_client.h> +#include <mailbox.h> #include <asm/io.h> struct sandbox_mbox_test { diff --git a/drivers/mailbox/sandbox-mbox.c b/drivers/mailbox/sandbox-mbox.c index 1b7ac231cb7c..530c62c029c8 100644 --- a/drivers/mailbox/sandbox-mbox.c +++ b/drivers/mailbox/sandbox-mbox.c @@ -6,7 +6,7 @@ #include <common.h> #include <dm.h> -#include <mailbox_uclass.h> +#include <mailbox-uclass.h> #include <asm/io.h> #include <asm/mbox.h> diff --git a/include/mailbox_uclass.h b/include/mailbox-uclass.h similarity index 96% rename from include/mailbox_uclass.h rename to include/mailbox-uclass.h index 6a2994c34cea..6ec62e5a0ee3 100644 --- a/include/mailbox_uclass.h +++ b/include/mailbox-uclass.h @@ -7,9 +7,9 @@ #ifndef _MAILBOX_UCLASS_H #define _MAILBOX_UCLASS_H -/* See mailbox_client.h for background documentation. */ +/* See mailbox.h for background documentation. */ -#include <mailbox_client.h> +#include <mailbox.h> struct udevice; diff --git a/include/mailbox_client.h b/include/mailbox.h similarity index 98% rename from include/mailbox_client.h rename to include/mailbox.h index 8345ea0bf1fb..a92a1a590dfe 100644 --- a/include/mailbox_client.h +++ b/include/mailbox.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: GPL-2.0 */ -#ifndef _MAILBOX_CLIENT_H -#define _MAILBOX_CLIENT_H +#ifndef _MAILBOX_H +#define _MAILBOX_H /** * A mailbox is a hardware mechanism for transferring small fixed-size messages @@ -26,7 +26,7 @@ * * A driver that implements UCLASS_MAILBOX is a mailbox provider. A provider * will often implement multiple separate mailbox channels, since the hardware - * it manages often has this capability. mailbox_uclass.h describes the + * it manages often has this capability. mailbox-uclass.h describes the * interface which mailbox providers must implement. * * Mailbox consumers/clients generate and send, or receive and process, -- 2.9.0

3 12

[U-Boot] [PATCH V2 1/2] ehci: mx7: fix usbnc_regs
by Peng Fan 20 Jun '16

20 Jun '16

There is a 4 bytes hole between phy_cfg2 and phy_status, fix the usbnc_regs structure to include the hole. Signed-off-by: Ye Li <ye.li(a)nxp.com> Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- V2: Split from V1 to a single patch. drivers/usb/host/ehci-mx6.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index bb48d0d..cc3b11c 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -194,8 +194,9 @@ struct usbnc_regs { u32 reserve1[10]; u32 phy_cfg1; u32 phy_cfg2; + u32 reserve2; u32 phy_status; - u32 reserve2[4]; + u32 reserve3[4]; u32 adp_cfg1; u32 adp_cfg2; u32 adp_status; -- 2.6.2

2 3

[U-Boot] s5pv210 smdkv210
by Andrew Barnes 20 Jun '16

20 Jun '16

Hi Lukasz, I hope you may be able to offer me some advice. I have a small project to update a tbs2900, tbs moi. which is a DVB-S2 network/iptv device. The device is based on smdkv210, with the s5pv210 soc. I understand that in terms of the kernel this is well supported. However, no support appears to have been successfully up-streamed. Can you shed any further light on u-boot status for this board? Perhaps if you are familiar, you may also recognise this source here: https://code.google.com/archive/p/x210ii/source/default/source The device as per OEM, boots with: --- -Boot 1.3.4 (Mar 7 2013 - 16:38:41) for MOI2900 CPU: S5PV210@1000MHz(OK) APLL = 1000MHz, HclkMsys = 200MHz, PclkMsys = 100MHz MPLL = 667MHz, EPLL = 80MHz HclkDsys = 166MHz, PclkDsys = 83MHz HclkPsys = 133MHz, PclkPsys = 66MHz SCLKA2M = 200MHz Serial = CLKUART Board: MOI2900 I2C: i2c1_init GPD1CON ready DRAM: 512 MB Flash: 8 MB SD/MMC: 3781MB NAND: 256 MB bdinfo arch_number = 0x00000998 env_t = 0x00000000 boot_params = 0x30000100 DRAM bank = 0x00000000 -> start = 0x30000000 -> size = 0x10000000 DRAM bank = 0x00000001 -> start = 0x40000000 -> size = 0x10000000 ethaddr = 00:22:DE:AD:BE:EF ip_addr = 192.168.0.20 baudrate = 115200 bps --- I believe 1.3.4 dates back to 2008, I think it was patched heavily from up-stream before making any s5pv210 specific work - so I don't know how representative the version number is. Again, if you do know anything that could help me - please let me know. Many thanks, Andy.

2 1

[U-Boot] [PATCH v3] autoboot: add CONFIG_AUTOBOOT to allow to not compile autoboot.c
by Masahiro Yamada 20 Jun '16

20 Jun '16

Since commit bb597c0eeb7e ("common: bootdelay: move CONFIG_BOOTDELAY into a Kconfig option"), CONFIG_BOOTDELAY is defined for all boards. Prior to that commit, it was allowed to unset CONFIG_BOOTDELAY to not compile common/autoboot.c, as described in common/Makefile: # This option is not just y/n - it can have a numeric value ifdef CONFIG_BOOTDELAY obj-y += autoboot.o endif It was a bit odd to enable/disable code with an integer type option, but it was how this option worked before that commit, and several boards actually unset it to opt out of the autoboot feature. This commit adds a new bool option, CONFIG_AUTOBOOT, and makes CONFIG_BOOTDELAY depend on it. I chose "default y" for this option because most boards use the autoboot. I added "# CONFIG_AUTOBOOT is not set" for the boards that had not set CONFIG_BOOTDELAY prior to the bad commit. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- Hi Tom, The problem of BOOTDELAY migration has not been fixed completely. This is the last portion of the migration fixes. Changes in v3: - Rebase onto 7c8ef0feb97586d35b0296b48903daef8c06ab21 cmd/Kconfig | 6 ++++++ common/Kconfig | 1 + common/Makefile | 5 +---- configs/10m50_defconfig | 1 + configs/3c120_defconfig | 1 + configs/M5249EVB_defconfig | 1 + configs/am335x_sl50_defconfig | 1 + configs/bcm11130_defconfig | 1 + configs/bcm11130_nand_defconfig | 1 + configs/bcm28155_ap_defconfig | 1 + configs/bcm28155_w1d_defconfig | 1 + configs/bcm911360_entphn-ns_defconfig | 1 + configs/bcm911360_entphn_defconfig | 1 + configs/bcm911360k_defconfig | 1 + configs/bcm958300k-ns_defconfig | 1 + configs/bcm958300k_defconfig | 1 + configs/bcm958305k_defconfig | 1 + configs/bcm958622hr_defconfig | 1 + configs/bf506f-ezkit_defconfig | 1 + configs/dnp5370_defconfig | 1 + configs/espresso7420_defconfig | 1 + configs/malta64_defconfig | 1 + configs/malta64el_defconfig | 1 + configs/malta_defconfig | 1 + configs/maltael_defconfig | 1 + configs/mpr2_defconfig | 1 + configs/ms7720se_defconfig | 1 + configs/openrisc-generic_defconfig | 1 + configs/rsk7203_defconfig | 1 + configs/s5p_goni_defconfig | 1 + configs/shmin_defconfig | 1 + include/autoboot.h | 2 +- 32 files changed, 37 insertions(+), 5 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index d51645c..42e0e39 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -38,6 +38,12 @@ config SYS_PROMPT menu "Autoboot options" +config AUTOBOOT + bool "Autoboot" + default y + help + This enables the autoboot. See doc/README.autoboot for detail. + config AUTOBOOT_KEYED bool "Stop autobooting via specific input key / string" default n diff --git a/common/Kconfig b/common/Kconfig index e691145..ada4ddb 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -100,6 +100,7 @@ endmenu config BOOTDELAY int "delay in seconds before automatically booting" default 2 + depends on AUTOBOOT help Delay before automatically running bootcmd; set to -1 to disable autoboot. diff --git a/common/Makefile b/common/Makefile index 97c59fe..34cb898 100644 --- a/common/Makefile +++ b/common/Makefile @@ -15,10 +15,7 @@ ifdef CONFIG_SYS_HUSH_PARSER obj-y += cli_hush.o endif -# This option is not just y/n - it can have a numeric value -ifdef CONFIG_BOOTDELAY -obj-y += autoboot.o -endif +obj-$(CONFIG_AUTOBOOT) += autoboot.o # This option is not just y/n - it can have a numeric value ifdef CONFIG_BOOT_RETRY_TIME diff --git a/configs/10m50_defconfig b/configs/10m50_defconfig index 4f85c22..15952af 100644 --- a/configs/10m50_defconfig +++ b/configs/10m50_defconfig @@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="10m50_devboard" CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_HUSH_PARSER=y +# CONFIG_AUTOBOOT is not set CONFIG_CMD_CPU=y # CONFIG_CMD_BOOTD is not set # CONFIG_CMD_IMLS is not set diff --git a/configs/3c120_defconfig b/configs/3c120_defconfig index c145caf..b19c956 100644 --- a/configs/3c120_defconfig +++ b/configs/3c120_defconfig @@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="3c120_devboard" CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_HUSH_PARSER=y +# CONFIG_AUTOBOOT is not set CONFIG_CMD_CPU=y # CONFIG_CMD_BOOTD is not set # CONFIG_CMD_IMLS is not set diff --git a/configs/M5249EVB_defconfig b/configs/M5249EVB_defconfig index f06379f..1588c52 100644 --- a/configs/M5249EVB_defconfig +++ b/configs/M5249EVB_defconfig @@ -1,6 +1,7 @@ CONFIG_M68K=y CONFIG_TARGET_M5249EVB=y CONFIG_SYS_TEXT_BASE=0xffe00000 +# CONFIG_AUTOBOOT is not set CONFIG_LOOPW=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig index c227ef4..01c1eeb 100644 --- a/configs/am335x_sl50_defconfig +++ b/configs/am335x_sl50_defconfig @@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT" CONFIG_HUSH_PARSER=y +# CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y diff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig index 2716868..d2a3b73 100644 --- a/configs/bcm11130_defconfig +++ b/configs/bcm11130_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_BCM28155_AP=y CONFIG_SYS_EXTRA_OPTIONS="SYS_MMC_ENV_DEV=0" CONFIG_HUSH_PARSER=y +# CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y diff --git a/configs/bcm11130_nand_defconfig b/configs/bcm11130_nand_defconfig index 8e01c52..5fc501f 100644 --- a/configs/bcm11130_nand_defconfig +++ b/configs/bcm11130_nand_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_BCM28155_AP=y CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_HUSH_PARSER=y +# CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig index 4c0f3b3..70eb44a 100644 --- a/configs/bcm28155_ap_defconfig +++ b/configs/bcm28155_ap_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y CONFIG_TARGET_BCM28155_AP=y CONFIG_HUSH_PARSER=y +# CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y diff --git a/configs/bcm28155_w1d_defconfig b/configs/bcm28155_w1d_defconfig index e9d13b9..b849074 100644 --- a/configs/bcm28155_w1d_defconfig +++ b/configs/bcm28155_w1d_defconfig @@ -3,6 +3,7 @@ CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y CONFIG_TARGET_BCM28155_AP=y CONFIG_SYS_EXTRA_OPTIONS="BCM_SF2_ETH,BCM_SF2_ETH_GMAC" CONFIG_HUSH_PARSER=y +# CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y diff --git a/configs/bcm911360_entphn-ns_defconfig b/configs/bcm911360_entphn-ns_defconfig index d8a30d1..a9403a8 100644 --- a/configs/bcm911360_entphn-ns_defconfig +++ b/configs/bcm911360_entphn-ns_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_BCMCYGNUS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x20000000,ARMV7_NONSEC" CONFIG_HUSH_PARSER=y +# CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y diff --git a/configs/bcm911360_entphn_defconfig b/configs/bcm911360_entphn_defconfig index 205db1e..aee2e2e 100644 --- a/configs/bcm911360_entphn_defconfig +++ b/configs/bcm911360_entphn_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_BCMCYGNUS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x20000000" CONFIG_HUSH_PARSER=y +# CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y diff --git a/configs/bcm911360k_defconfig b/configs/bcm911360k_defconfig index bcb24b4..df76dac 100644 --- a/configs/bcm911360k_defconfig +++ b/configs/bcm911360k_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_BCMCYGNUS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000" CONFIG_HUSH_PARSER=y +# CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y diff --git a/configs/bcm958300k-ns_defconfig b/configs/bcm958300k-ns_defconfig index 527f4a5..0b00ce3 100644 --- a/configs/bcm958300k-ns_defconfig +++ b/configs/bcm958300k-ns_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_BCMCYGNUS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000,ARMV7_NONSEC" CONFIG_HUSH_PARSER=y +# CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y diff --git a/configs/bcm958300k_defconfig b/configs/bcm958300k_defconfig index bcb24b4..df76dac 100644 --- a/configs/bcm958300k_defconfig +++ b/configs/bcm958300k_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_BCMCYGNUS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000" CONFIG_HUSH_PARSER=y +# CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y diff --git a/configs/bcm958305k_defconfig b/configs/bcm958305k_defconfig index bcb24b4..df76dac 100644 --- a/configs/bcm958305k_defconfig +++ b/configs/bcm958305k_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_BCMCYGNUS=y CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000" CONFIG_HUSH_PARSER=y +# CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y diff --git a/configs/bcm958622hr_defconfig b/configs/bcm958622hr_defconfig index 6d06b4e..99e5452 100644 --- a/configs/bcm958622hr_defconfig +++ b/configs/bcm958622hr_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_BCMNSP=y CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x01000000" CONFIG_HUSH_PARSER=y +# CONFIG_AUTOBOOT is not set CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y diff --git a/configs/bf506f-ezkit_defconfig b/configs/bf506f-ezkit_defconfig index 0decb53..c36fc5f 100644 --- a/configs/bf506f-ezkit_defconfig +++ b/configs/bf506f-ezkit_defconfig @@ -1,5 +1,6 @@ CONFIG_BLACKFIN=y CONFIG_TARGET_BF506F_EZKIT=y +# CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/dnp5370_defconfig b/configs/dnp5370_defconfig index b6d3b74..782cc88 100644 --- a/configs/dnp5370_defconfig +++ b/configs/dnp5370_defconfig @@ -1,5 +1,6 @@ CONFIG_BLACKFIN=y CONFIG_TARGET_DNP5370=y +# CONFIG_AUTOBOOT is not set CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_MII=y diff --git a/configs/espresso7420_defconfig b/configs/espresso7420_defconfig index 8d0bace..c50da0c 100644 --- a/configs/espresso7420_defconfig +++ b/configs/espresso7420_defconfig @@ -4,5 +4,6 @@ CONFIG_ARCH_EXYNOS7=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_DEFAULT_DEVICE_TREE="exynos7420-espresso7420" CONFIG_SYS_PROMPT="ESPRESSO7420 # " +# CONFIG_AUTOBOOT is not set # CONFIG_CMD_IMLS is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/malta64_defconfig b/configs/malta64_defconfig index 590f9b5..fcce6c7 100644 --- a/configs/malta64_defconfig +++ b/configs/malta64_defconfig @@ -4,6 +4,7 @@ CONFIG_CPU_MIPS64_R2=y CONFIG_DEFAULT_DEVICE_TREE="mti,malta" CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="malta # " +# CONFIG_AUTOBOOT is not set # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set diff --git a/configs/malta64el_defconfig b/configs/malta64el_defconfig index ff93931..002633b 100644 --- a/configs/malta64el_defconfig +++ b/configs/malta64el_defconfig @@ -5,6 +5,7 @@ CONFIG_CPU_MIPS64_R2=y CONFIG_DEFAULT_DEVICE_TREE="mti,malta" CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="maltael # " +# CONFIG_AUTOBOOT is not set # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set diff --git a/configs/malta_defconfig b/configs/malta_defconfig index 3a87586..e74f23d 100644 --- a/configs/malta_defconfig +++ b/configs/malta_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_MALTA=y CONFIG_DEFAULT_DEVICE_TREE="mti,malta" CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="malta # " +# CONFIG_AUTOBOOT is not set # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set diff --git a/configs/maltael_defconfig b/configs/maltael_defconfig index 11ff259..3c4c1fe 100644 --- a/configs/maltael_defconfig +++ b/configs/maltael_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_LITTLE_ENDIAN=y CONFIG_DEFAULT_DEVICE_TREE="mti,malta" CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="maltael # " +# CONFIG_AUTOBOOT is not set # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set diff --git a/configs/mpr2_defconfig b/configs/mpr2_defconfig index a8dbfc5..606b942 100644 --- a/configs/mpr2_defconfig +++ b/configs/mpr2_defconfig @@ -1,5 +1,6 @@ CONFIG_SH=y CONFIG_TARGET_MPR2=y +# CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/ms7720se_defconfig b/configs/ms7720se_defconfig index 2ef3105..537ea7c 100644 --- a/configs/ms7720se_defconfig +++ b/configs/ms7720se_defconfig @@ -1,5 +1,6 @@ CONFIG_SH=y CONFIG_TARGET_MS7720SE=y +# CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/openrisc-generic_defconfig b/configs/openrisc-generic_defconfig index a476ba7..14923c0 100644 --- a/configs/openrisc-generic_defconfig +++ b/configs/openrisc-generic_defconfig @@ -7,3 +7,4 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_SYS_NS16550=y +# CONFIG_AUTOBOOT is not set diff --git a/configs/rsk7203_defconfig b/configs/rsk7203_defconfig index b63ad4e..f2e9deb 100644 --- a/configs/rsk7203_defconfig +++ b/configs/rsk7203_defconfig @@ -1,5 +1,6 @@ CONFIG_SH=y CONFIG_TARGET_RSK7203=y +# CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig index c35287d..b381e21 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_S5P_GONI=y CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-goni" CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Goni # " +# CONFIG_AUTOBOOT is not set # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/shmin_defconfig b/configs/shmin_defconfig index 1749f13..65b4525 100644 --- a/configs/shmin_defconfig +++ b/configs/shmin_defconfig @@ -1,5 +1,6 @@ CONFIG_SH=y CONFIG_TARGET_SHMIN=y +# CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/include/autoboot.h b/include/autoboot.h index 3a9059a..c175f91c 100644 --- a/include/autoboot.h +++ b/include/autoboot.h @@ -12,7 +12,7 @@ #ifndef __AUTOBOOT_H #define __AUTOBOOT_H -#ifdef CONFIG_BOOTDELAY +#ifdef CONFIG_AUTOBOOT /** * bootdelay_process() - process the bootd delay * -- 1.9.1

2 1

[U-Boot] Pull request: nand flash
by Scott Wood 20 Jun '16

20 Jun '16

The following changes since commit 667067faa18334f1e28c01b47530b5cce1b6182f: nand: fix nand torture to use changed mtd api (2016-06-03 20:29:05 -0500) are available in the git repository at: git://git.denx.de/u-boot-nand-flash.git for you to fetch changes up to 30780f948346436f9974fd6eae89aa2eb841b436: mtd: nand: Patch remaining places where nand_to_mtd() should be used (2016-06-19 19:28:38 -0500) ---------------------------------------------------------------- Boris Brezillon (8): spl: nand: sunxi: remove support for so-called 'syndrome' mode spl: nand: rework SYS_NAND_U_BOOT_OFFS Kconfig option dependency spl: nand: support redundant u-boot image spl: nand: sunxi: stop guessing the redundant u-boot offset spl: nand: sunxi: rework status polling loop spl: nand: sunxi: split 'load page' and 'read page' logic spl: nand: sunxi: add support for NAND config auto-detection mtd: nand: Patch remaining places where nand_to_mtd() should be used Fabian Mewes (1): nand: doc: fix example ecc scheme calculation Max Krummenacher (2): nand: nand torture: follow sync with linux v4.6 nand: extend nand torture Sergey Kubushyn (1): common: fb_nand: won't compile cmd/nand.c | 41 ++- common/fb_nand.c | 2 +- common/spl/spl_nand.c | 7 + doc/README.nand | 10 +- drivers/mtd/nand/Kconfig | 21 +- drivers/mtd/nand/am335x_spl_bch.c | 2 +- drivers/mtd/nand/atmel_nand.c | 2 +- drivers/mtd/nand/lpc32xx_nand_mlc.c | 2 +- drivers/mtd/nand/mxs_nand_spl.c | 2 +- drivers/mtd/nand/nand_spl_simple.c | 2 +- drivers/mtd/nand/nand_util.c | 2 +- drivers/mtd/nand/sunxi_nand_spl.c | 480 +++++++++++++++++++++++------------- 12 files changed, 383 insertions(+), 190 deletions(-)

2 1

[U-Boot] [PATCH] mmc: add MMC_VERSION_5_1
by Stefan Wahren 20 Jun '16

20 Jun '16

Signed-off-by: Stefan Wahren <stefan.wahren(a)i2se.com> --- drivers/mmc/mmc.c | 3 +++ include/mmc.h | 1 + 2 files changed, 4 insertions(+) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 7586558..aabfc71 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1227,6 +1227,9 @@ static int mmc_startup(struct mmc *mmc) case 7: mmc->version = MMC_VERSION_5_0; break; + case 8: + mmc->version = MMC_VERSION_5_1; + break; } /* The partition data may be non-zero but it is only diff --git a/include/mmc.h b/include/mmc.h index 7fdfc32..f383925 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -49,6 +49,7 @@ #define MMC_VERSION_4_41 MAKE_MMC_VERSION(4, 4, 1) #define MMC_VERSION_4_5 MAKE_MMC_VERSION(4, 5, 0) #define MMC_VERSION_5_0 MAKE_MMC_VERSION(5, 0, 0) +#define MMC_VERSION_5_1 MAKE_MMC_VERSION(5, 1, 0) #define MMC_MODE_HS (1 << 0) #define MMC_MODE_HS_52MHz (1 << 1) -- 1.7.9.5

2 1

[U-Boot] [PATCH] dragonboard410c: Increase default environment size.
by Mateusz Kulikowski 20 Jun '16

20 Jun '16

Due to changes in distro environment, ENV_SIZE limit was reached on Dragonboard. This patch increases environment size to 8KiB. Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski(a)gmail.com> --- Hi all, I'm back after a short break (sorry for that). This patch fixes environment for dragonboard - it grew during my absence beyond limit (0x1000). This caused rather nasty isuses: <log> U-Boot 2016.07-rc1-00222-g9ab165d (Jun 19 2016 - 22:59:30 +0200) [...] *** Error - default environment is too large [...] dragonboard410c => print Environment size: 1/4092 bytes </log> There are still 2 issues pending for dragonboard: - BOOTDELAY migration - I have to catch up with all the mails, but I assume this will be fixed "globally" - non-working MMC - will investigate that, and post patch in next days. Of course patch was target tested. Thanks, Mateusz include/configs/dragonboard410c.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index d32889d..4b00922 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -129,7 +129,7 @@ REFLASH(dragonboard/u-boot.img, 8)\ BOOTENV #define CONFIG_ENV_IS_NOWHERE -#define CONFIG_ENV_SIZE 0x1000 +#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_SYS_NO_FLASH -- 2.7.4

2 1