April 2016 - U-Boot

[U-Boot] [PATCH] lib/physmem.c: Switch to __weak for arch_phys_memset
by Tom Rini 02 Apr '16

02 Apr '16

We normally use __weak rather than calling it out directly as an alias. Update this function to the normal method. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- lib/physmem.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/physmem.c b/lib/physmem.c index 0f035ed..f21ac24 100644 --- a/lib/physmem.c +++ b/lib/physmem.c @@ -10,8 +10,9 @@ #include <common.h> #include <physmem.h> +#include <linux/compiler.h> -static phys_addr_t __arch_phys_memset(phys_addr_t s, int c, phys_size_t n) +phys_addr_t __weak arch_phys_memset(phys_addr_t s, int c, phys_size_t n) { void *s_ptr = (void *)(uintptr_t)s; @@ -19,6 +20,3 @@ static phys_addr_t __arch_phys_memset(phys_addr_t s, int c, phys_size_t n) assert(((phys_addr_t)(uintptr_t)(s + n)) == s + n); return (phys_addr_t)(uintptr_t)memset(s_ptr, c, n); } - -phys_addr_t arch_phys_memset(phys_addr_t s, int c, phys_size_t n) - __attribute__((weak, alias("__arch_phys_memset"))); -- 1.7.9.5

1 1

[U-Boot] [PATCH] post: Delete unnecessary bitmask of POST_MANUAL from POST_ALWAYS
by Robert P. J. Day 02 Apr '16

02 Apr '16

Since POST_ALWAYS is defined as: #define POST_ALWAYS (POST_NORMAL | \ POST_SLOWTEST | \ POST_MANUAL | \ POST_POWERON ) there is no need to redundantly bitmask it with POST_MANUAL. Signed-off-by: Robert P. J. Day <rpjday(a)crashcourse.ca> --- diff --git a/post/tests.c b/post/tests.c index a4d4165..d8ac54e 100644 --- a/post/tests.c +++ b/post/tests.c @@ -173,7 +173,7 @@ struct post_test post_list[] = "ETHERNET test", "ethernet", "This test verifies the ETHERNET operation.", - POST_RAM | POST_ALWAYS | POST_MANUAL, + POST_RAM | POST_ALWAYS, &ether_post_test, NULL, NULL, @@ -185,7 +185,7 @@ struct post_test post_list[] = "SPI test", "spi", "This test verifies the SPI operation.", - POST_RAM | POST_ALWAYS | POST_MANUAL, + POST_RAM | POST_ALWAYS, &spi_post_test, NULL, NULL, @@ -197,7 +197,7 @@ struct post_test post_list[] = "USB test", "usb", "This test verifies the USB operation.", - POST_RAM | POST_ALWAYS | POST_MANUAL, + POST_RAM | POST_ALWAYS, &usb_post_test, NULL, NULL, @@ -233,7 +233,7 @@ struct post_test post_list[] = "DSP test", "dsp", "This test checks any connected DSP(s).", - POST_RAM | POST_ALWAYS | POST_MANUAL, + POST_RAM | POST_ALWAYS, &dsp_post_test, NULL, NULL, -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ========================================================================

2 1

[U-Boot] [PATCH] post: Remove reference to deleted "lwmon" board from Makefile
by Robert P. J. Day 02 Apr '16

02 Apr '16

POST support for sample lwmon board was removed in commit e5d3078622. Signed-off-by: Robert P. J. Day <rpjday(a)crashcourse.ca>B --- diff --git a/post/Makefile b/post/Makefile index 2fa6f8a..92024e1 100644 --- a/post/Makefile +++ b/post/Makefile @@ -13,6 +13,6 @@ obj-$(CONFIG_PPC) += lib_powerpc/ obj-$(CONFIG_MPC83xx) += cpu/mpc83xx/ obj-$(CONFIG_8xx) += cpu/mpc8xx/ obj-$(CONFIG_4xx) += cpu/ppc4xx/ -ifneq ($(filter lwmon lwmon5 netta pdm360ng,$(BOARD)),) +ifneq ($(filter lwmon5 netta pdm360ng,$(BOARD)),) obj-y += board/$(BOARD)/ endif -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ========================================================================

2 1

[U-Boot] [PATCH] Common: SPL: spl_nand: Fixed debug correct NAND ECC type.
by Ahmed Samir Khalil 02 Apr '16

02 Apr '16

In case of #define DEBUG 1 (fordebugging SPL). A bug in spl_nand_load_image() will be triggered, because it prints using hw ecc regardless of soft ecc configurations and initializations. Signed-off-by: Ahmed Samir <engkhalil86(a)gmail.com> --- common/spl/spl_nand.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index 3e2c074..79388ff 100644 --- a/common/spl/spl_nand.c +++ b/common/spl/spl_nand.c @@ -44,7 +44,11 @@ int spl_nand_load_image(void) int *src __attribute__((unused)); int *dst __attribute__((unused)); +#ifdef CONFIG_SPL_NAND_SOFTECC + debug("spl: nand - using sw ecc\n"); +#else debug("spl: nand - using hw ecc\n"); +#endif nand_init(); /*use CONFIG_SYS_TEXT_BASE as temporary storage area */ -- 2.5.0

2 2

[U-Boot] [PATCH V2 1/5] ARM: bcm2835: move CONFIG_BCM283* to Kconfig
by Stephen Warren 02 Apr '16

02 Apr '16

Signed-off-by: Stephen Warren <swarren(a)wwwdotorg.org> --- v2: No change. This series depends on: * My series beginning with "ARM: bcm283x: don't always define CONFIG_BCM2835" * My patch "serial: add BCM283x mini UART driver". * Alexander Graf's arm64 page table/cache series starting with "arm64: Add 32bit arm compatible dcache definitions". --- arch/arm/mach-bcm283x/Kconfig | 12 +++++++++++- include/configs/rpi.h | 1 - include/configs/rpi_2.h | 1 - 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig index 1a7baf69e590..dc6770437ec6 100644 --- a/arch/arm/mach-bcm283x/Kconfig +++ b/arch/arm/mach-bcm283x/Kconfig @@ -1,3 +1,11 @@ +config BCM2835 + bool "Broadcom BCM2835 SoC support" + depends on ARCH_BCM283X + +config BCM2836 + bool "Broadcom BCM2836 SoC support" + depends on ARCH_BCM283X + menu "Broadcom BCM283X family" depends on ARCH_BCM283X @@ -7,12 +15,14 @@ choice config TARGET_RPI bool "Raspberry Pi" + select BCM2835 select CPU_ARM1176 config TARGET_RPI_2 bool "Raspberry Pi 2" - select CPU_V7 select ARMV7_LPAE + select BCM2836 + select CPU_V7 endchoice diff --git a/include/configs/rpi.h b/include/configs/rpi.h index a788ce42e44c..86422e390da2 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -7,7 +7,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_BCM2835 #define CONFIG_SYS_CACHELINE_SIZE 32 #include "rpi-common.h" diff --git a/include/configs/rpi_2.h b/include/configs/rpi_2.h index 13dc8de14315..0917e8650864 100644 --- a/include/configs/rpi_2.h +++ b/include/configs/rpi_2.h @@ -8,7 +8,6 @@ #define __CONFIG_H #define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_BCM2836 #define CONFIG_SYS_CACHELINE_SIZE 64 #include "rpi-common.h" -- 2.7.3

2 14

[U-Boot] [PATCH] doc: clarify openssl-based key and certificate generation process
by Andreas Dannenberg 02 Apr '16

02 Apr '16

Add some basic clarification that the dev.key file generated by OpenSSL contains both the public and private key, and further highlight that the certificate generated here contains the public key only. Signed-off-by: Andreas Dannenberg <dannenberg(a)ti.com> --- doc/uImage.FIT/signature.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/uImage.FIT/signature.txt b/doc/uImage.FIT/signature.txt index b2f89fc..e487401 100644 --- a/doc/uImage.FIT/signature.txt +++ b/doc/uImage.FIT/signature.txt @@ -62,14 +62,14 @@ placed alongside rsa.c, and its functions added to the table in image-sig.c also. -Creating an RSA key and certificate ------------------------------------ -To create a new public key, size 2048 bits: +Creating an RSA key pair and certificate +---------------------------------------- +To create a new public/private key pair, size 2048 bits: $ openssl genpkey -algorithm RSA -out keys/dev.key \ -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_keygen_pubexp:65537 -To create a certificate for this: +To create a certificate for this containing the public key: $ openssl req -batch -new -x509 -key keys/dev.key -out keys/dev.crt -- 2.6.4

2 1

[U-Boot] [PATCH] doc: fix file extension for flattened image tree blob
by Andreas Dannenberg 02 Apr '16

02 Apr '16

Different sections in the document suggest flattened image tree blob files have a file name extension of .itb. Fix the list of file extensions to reflect that. Signed-off-by: Andreas Dannenberg <dannenberg(a)ti.com> --- doc/uImage.FIT/source_file_format.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/uImage.FIT/source_file_format.txt b/doc/uImage.FIT/source_file_format.txt index 029f481..5d8cda4 100644 --- a/doc/uImage.FIT/source_file_format.txt +++ b/doc/uImage.FIT/source_file_format.txt @@ -55,7 +55,7 @@ FIT is formally a flattened device tree (in the libfdt meaning), which conforms to bindings defined in this document. .its - image tree source -.fit - flattened image tree blob +.itb - flattened image tree blob c) Image building procedure -- 2.6.4

2 1

[U-Boot] [PATCH] README: Specify the full path for README.displaying-bmps
by Fabio Estevam 02 Apr '16

02 Apr '16

From: Fabio Estevam <fabio.estevam(a)nxp.com> It is clearer to specify the full path to access the doc/README.displaying-bmps file. Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 523941f..1fb8f88 100644 --- a/README +++ b/README @@ -1908,7 +1908,7 @@ CBFS (Coreboot Filesystem) support If this option is set, then U-Boot will prevent the environment variable "splashimage" from being set to a problematic address - (see README.displaying-bmps). + (see doc/README.displaying-bmps). This option is useful for targets where, due to alignment restrictions, an improperly aligned BMP image will cause a data abort. If you think you will not have problems with unaligned -- 1.9.1

2 1

[U-Boot] [PATCH 0/2] ARM: keystone2: Fix missing privilege ID
by Nishanth Menon 02 Apr '16

02 Apr '16

Looks like Keystone2 platform may have quite a few missing configurations for various SoC variants. We need mark each of these id as shared in corresponding registers as well, without doing this, drivers fail inexplicably since the drivers seem to expect SoC wide coherency capability - which needs to be configured explicitly. Bootlog: k2g: http://pastebin.ubuntu.com/15480089/ k2hk: http://pastebin.ubuntu.com/15480090/ also tested on an slightly older bootloader on K2E/K2L as well: k2g: http://pastebin.ubuntu.com/15475588/ k2hk: http://pastebin.ubuntu.com/15475589/ k2l: http://pastebin.ubuntu.com/15478358/ k2e: http://pastebin.ubuntu.com/15478332/ This series is based on: master 0764f24ae6bc net: Move CONFIG_RTL8169 to Kconfig NOTE: K2G still requires additional patches for fixing NAND to prevent data abort being registered early in the boot by u-boot wrong access to GPMC. (testing was performed using out-of-tree solution for this) Nishanth Menon (2): ARM: keystone2: Refactor MSMC macros to avoid #ifdeffery ARM: keystone2: Add missing privilege ID settings arch/arm/mach-keystone/include/mach/hardware-k2e.h | 3 - arch/arm/mach-keystone/include/mach/hardware-k2l.h | 3 - arch/arm/mach-keystone/include/mach/hardware.h | 50 ++++++++++++--- arch/arm/mach-keystone/init.c | 73 +++++++++++++++++++--- 4 files changed, 106 insertions(+), 23 deletions(-) -- 2.8.0.rc3

3 8

[U-Boot] [PATCH] smsc95xx: fix operation on 64-bit systems
by Stephen Warren 02 Apr '16

02 Apr '16

smsc95xx_read_reg() should calculate sizeof(*data) not sizeof(data) since data is a pointer, and the value pointed at is being transferred over USB, not the value of the pointer. This fixes operation of the driver in 64-bit builds, such as the Raspberry Pi 3. Reported-by: Eric Anholt <eric(a)anholt.net> Signed-off-by: Stephen Warren <swarren(a)wwwdotorg.org> --- drivers/usb/eth/smsc95xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c index 3099bf4fd4e5..08eaed5c2e03 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -188,10 +188,10 @@ static int smsc95xx_read_reg(struct usb_device *udev, u32 index, u32 *data) len = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), USB_VENDOR_REQUEST_READ_REGISTER, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - 0, index, tmpbuf, sizeof(data), + 0, index, tmpbuf, sizeof(*data), USB_CTRL_GET_TIMEOUT); *data = tmpbuf[0]; - if (len != sizeof(data)) { + if (len != sizeof(*data)) { debug("smsc95xx_read_reg failed: index=%d, len=%d", index, len); return -EIO; -- 2.7.3

4 3