September 2016 - U-Boot

[U-Boot] [PATCH] efi_loader: provide efi_mem_desc version
by Mian Yousaf Kaukab 07 Sep '16

07 Sep '16

Provide version of struct efi_mem_desc in efi_get_memory_map(). EFI_BOOT_SERVICES.GetMemoryMap() in UEFI specification v2.6 defines memory descriptor version to 1. Linux kernel also expects descriptor version to be 1 and prints following warning during boot if its not: Unexpected EFI_MEMORY_DESCRIPTOR version 0 Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab(a)gmail.com> --- include/efi.h | 2 ++ lib/efi_loader/efi_memory.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/include/efi.h b/include/efi.h index 83de2d4..5a3b8cf 100644 --- a/include/efi.h +++ b/include/efi.h @@ -159,6 +159,8 @@ struct efi_mem_desc { u64 attribute; }; +#define EFI_MEMORY_DESCRIPTOR_VERSION 1 + /* Allocation types for calls to boottime->allocate_pages*/ #define EFI_ALLOCATE_ANY_PAGES 0 #define EFI_ALLOCATE_MAX_ADDRESS 1 diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index df3547c..80e4e26 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -339,6 +339,9 @@ efi_status_t efi_get_memory_map(unsigned long *memory_map_size, if (descriptor_size) *descriptor_size = sizeof(struct efi_mem_desc); + if (descriptor_version) + *descriptor_version = EFI_MEMORY_DESCRIPTOR_VERSION; + if (*memory_map_size < map_size) return EFI_BUFFER_TOO_SMALL; -- 2.6.6

2 1

[U-Boot] [PATCH] compiler.h: use system endian macros on OpenBSD
by Jonathan Gray 07 Sep '16

07 Sep '16

The u-boot endian macros map directly to system endian macros on OpenBSD. Signed-off-by: Jonathan Gray <jsg(a)jsg.id.au> --- include/compiler.h | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/include/compiler.h b/include/compiler.h index 47c296e..65b826e 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -15,7 +15,7 @@ defined(__sun__) || \ defined(__APPLE__) # include <inttypes.h> -#elif defined(__linux__) || defined(__WIN32__) || defined(__MINGW32__) +#elif defined(__linux__) || defined(__WIN32__) || defined(__MINGW32__) || defined(__OpenBSD__) # include <stdint.h> #endif @@ -50,6 +50,8 @@ typedef unsigned long ulong; #endif #ifdef __FreeBSD__ # include <sys/endian.h> /* htole32 and friends */ +#elif defined(__OpenBSD__) +# include <endian.h> #endif #include <time.h> @@ -82,7 +84,20 @@ typedef unsigned int uint; # define uswap_64(x) _uswap_64(x, ) #endif -#if __BYTE_ORDER == __LITTLE_ENDIAN +#if defined(__OpenBSD__) +#define cpu_to_le16(x) htole16(x) +#define cpu_to_le32(x) htole32(x) +#define cpu_to_le64(x) htole64(x) +#define le16_to_cpu(x) letoh16(x) +#define le32_to_cpu(x) letoh32(x) +#define le64_to_cpu(x) letoh64(x) +#define cpu_to_be16(x) htobe16(x) +#define cpu_to_be32(x) htobe32(x) +#define cpu_to_be64(x) htobe64(x) +#define be16_to_cpu(x) betoh16(x) +#define be32_to_cpu(x) betoh32(x) +#define be64_to_cpu(x) betoh64(x) +#elif __BYTE_ORDER == __LITTLE_ENDIAN # define cpu_to_le16(x) (x) # define cpu_to_le32(x) (x) # define cpu_to_le64(x) (x) -- 2.9.3

2 1

[U-Boot] [PATCH V2] board: am57xx: Fix missing check for beagle_x15
by Nishanth Menon 07 Sep '16

07 Sep '16

When beagleboard-X15 is booted, we see the following log: Unidentified board claims BBRDX15_ in eeprom header This is because of the missing check for x15 (the default) and reports an error for a valid board configuration. Fix the same. Signed-off-by: Nishanth Menon <nm(a)ti.com> --- Changes since V1: - move the x15 check higher up in the list. V1: https://patchwork.ozlabs.org/patch/665144/ board/ti/am57xx/board.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 927d1364fe46..64de60254136 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -338,7 +338,9 @@ static void setup_board_eeprom_env(void) if (rc) goto invalid_eeprom; - if (board_is_am572x_evm()) + if (board_is_x15()) + name = "beagle_x15"; + else if (board_is_am572x_evm()) name = "am57xx_evm"; else if (board_is_am572x_idk()) name = "am572x_idk"; -- 2.9.1.200.gb1ec08f

3 3

[U-Boot] [PATCH] board: am57xx: MAINTAINERS: Update for current maintainer
by Nishanth Menon 07 Sep '16

07 Sep '16

Felipe Balbi has move on from TI and the current email ID is no longer valid. So, replacing with Lokesh. While at it, update missing config file which was untracked. Signed-off-by: Nishanth Menon <nm(a)ti.com> --- board/ti/am57xx/MAINTAINERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/board/ti/am57xx/MAINTAINERS b/board/ti/am57xx/MAINTAINERS index b8ae0199e36c..500bb7a61277 100644 --- a/board/ti/am57xx/MAINTAINERS +++ b/board/ti/am57xx/MAINTAINERS @@ -1,7 +1,8 @@ AM57XX EVM -M: Felipe Balbi <balbi(a)ti.com> +M: Lokesh Vutla <lokeshvutla(a)ti.com> S: Maintained F: board/ti/am57xx/ F: include/configs/am57xx_evm.h F: configs/am57xx_evm_defconfig F: configs/am57xx_evm_nodt_defconfig +F: configs/am57xx_hs_evm_defconfig -- 2.9.1.200.gb1ec08f

2 2

[U-Boot] [PATCH v2] global_data.h: Standardize tabs and alignment for comments
by Robert P. J. Day 07 Sep '16

07 Sep '16

Line up comments for readibility. Signed-off-by: Robert P. J. Day <rpjday(a)crashcourse.ca> --- missed the last few lines with patch v1, and if i'm going to do it, i might as well do it properly. diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index a6d1d2a..dc4cbdb 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -28,18 +28,18 @@ typedef struct global_data { bd_t *bd; unsigned long flags; unsigned int baudrate; - unsigned long cpu_clk; /* CPU clock in Hz! */ + unsigned long cpu_clk; /* CPU clock in Hz! */ unsigned long bus_clk; /* We cannot bracket this with CONFIG_PCI due to mpc5xxx */ unsigned long pci_clk; unsigned long mem_clk; #if defined(CONFIG_LCD) || defined(CONFIG_VIDEO) - unsigned long fb_base; /* Base address of framebuffer mem */ + unsigned long fb_base; /* Base address of framebuffer mem */ #endif #if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER) - unsigned long post_log_word; /* Record POST activities */ - unsigned long post_log_res; /* success of POST test */ - unsigned long post_init_f_time; /* When post_init_f started */ + unsigned long post_log_word; /* Record POST activities */ + unsigned long post_log_res; /* success of POST test */ + unsigned long post_init_f_time; /* When post_init_f started */ #endif #ifdef CONFIG_BOARD_TYPES unsigned long board_type; @@ -48,14 +48,13 @@ typedef struct global_data { #ifdef CONFIG_PRE_CONSOLE_BUFFER unsigned long precon_buf_idx; /* Pre-Console buffer index */ #endif - unsigned long env_addr; /* Address of Environment struct */ + unsigned long env_addr; /* Address of Environment struct */ unsigned long env_valid; /* Checksum of Environment valid? */ - unsigned long ram_top; /* Top address of RAM used by U-Boot */ - + unsigned long ram_top; /* Top address of RAM used by U-Boot */ unsigned long relocaddr; /* Start address of U-Boot in RAM */ - phys_size_t ram_size; /* RAM size */ - unsigned long mon_len; /* monitor len */ + phys_size_t ram_size; /* RAM size */ + unsigned long mon_len; /* monitor len */ unsigned long irq_sp; /* irq stack pointer */ unsigned long start_addr_sp; /* start_addr_stackpointer */ unsigned long reloc_off; @@ -67,14 +66,14 @@ typedef struct global_data { struct list_head uclass_root; /* Head of core tree */ #endif #ifdef CONFIG_TIMER - struct udevice *timer; /* Timer instance for Driver Model */ + struct udevice *timer; /* Timer instance for Driver Model */ #endif - const void *fdt_blob; /* Our device tree, NULL if none */ - void *new_fdt; /* Relocated FDT */ - unsigned long fdt_size; /* Space reserved for relocated FDT */ + const void *fdt_blob; /* Our device tree, NULL if none */ + void *new_fdt; /* Relocated FDT */ + unsigned long fdt_size; /* Space reserved for relocated FDT */ struct jt_funcs *jt; /* jump table */ - char env_buf[32]; /* buffer for getenv() before reloc. */ + char env_buf[32]; /* buffer for getenv() before reloc. */ #ifdef CONFIG_TRACE void *trace_buff; /* The trace buffer */ #endif @@ -125,8 +124,8 @@ typedef struct global_data { #define GD_FLG_SERIAL_READY 0x00100 /* Pre-reloc serial console ready */ #define GD_FLG_FULL_MALLOC_INIT 0x00200 /* Full malloc() is ready */ #define GD_FLG_SPL_INIT 0x00400 /* spl_init() has been called */ -#define GD_FLG_SKIP_RELOC 0x00800 /* Don't relocate */ -#define GD_FLG_RECORD 0x01000 /* Record console */ -#define GD_FLG_ENV_DEFAULT 0x02000 /* Default variable flag */ +#define GD_FLG_SKIP_RELOC 0x00800 /* Don't relocate */ +#define GD_FLG_RECORD 0x01000 /* Record console */ +#define GD_FLG_ENV_DEFAULT 0x02000 /* Default variable flag */ #endif /* __ASM_GENERIC_GBL_DATA_H */ -- ======================================================================== 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 v3 1/2] pxe: Fix pxe boot with FIT image
by Wenbin song 07 Sep '16

07 Sep '16

From: York Sun <york.sun(a)nxp.com> When FIT image is used, a single image provides kernel, device tree and optionally ramdisk. Argc and argv need to be adjusted to support this. Test cases: 1. Booting with legacy images 2. Booting with legacy images without initrd 3. Booting with FIT image Test commands: 1. pxe get && pxe boot 2. sysboot Signed-off-by: York Sun <york.sun(a)nxp.com> Signed-off-by: Wenbin Song <wenbin.song(a)nxp.com> --- Changes for v2: no change --- cmd/pxe.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/pxe.c b/cmd/pxe.c index 9434a18..0a07f14 100644 --- a/cmd/pxe.c +++ b/cmd/pxe.c @@ -620,7 +620,7 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) char initrd_str[22]; char mac_str[29] = ""; char ip_str[68] = ""; - int bootm_argc = 3; + int bootm_argc = 2; int len = 0; ulong kernel_addr; void *buf; @@ -652,8 +652,6 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) strcpy(bootm_argv[2], getenv("ramdisk_addr_r")); strcat(bootm_argv[2], ":"); strcat(bootm_argv[2], getenv("filesize")); - } else { - bootm_argv[2] = "-"; } if (get_relfile_envaddr(cmdtp, label->kernel, "kernel_addr_r") < 0) { @@ -785,8 +783,11 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) if (!bootm_argv[3]) bootm_argv[3] = getenv("fdt_addr"); - if (bootm_argv[3]) + if (bootm_argv[3]) { + if (!bootm_argv[2]) + bootm_argv[2] = "-"; bootm_argc = 4; + } kernel_addr = genimg_get_kernel_addr(bootm_argv[1]); buf = map_sysmem(kernel_addr, 0); -- 2.1.0.27.g96db324

2 3

[U-Boot] [PATCH] common/Kconfig: Fix various innocuous typos.
by Robert P. J. Day 07 Sep '16

07 Sep '16

Correct a small number of spelling mistakes. Signed-off-by: Robert P. J. Day <rpjday(a)crashcourse.ca> --- noticed one typo in this file so figured i might as well just do the whole thing. diff --git a/common/Kconfig b/common/Kconfig index 46e7173..4494112 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -9,13 +9,13 @@ config BOOTSTAGE give the entry a name with bootstage_mark_name(). You can also record elapsed time in a particular stage using bootstage_start() before starting and bootstage_accum() when finished. Bootstage will - add up all the accumated time and report it. + add up all the accumulated time and report it. Normally, IDs are defined in bootstage.h but a small number of - additional 'user' IDs can be used but passing BOOTSTAGE_ID_ALLOC + additional 'user' IDs can be used by passing BOOTSTAGE_ID_ALLOC as the ID. - Calls to show_boot_progress() wil also result in log entries but + Calls to show_boot_progress() will also result in log entries but these will not have names. config BOOTSTAGE_REPORT @@ -53,7 +53,7 @@ config BOOTSTAGE_FDT Stash the bootstage information in the FDT. A root 'bootstage' node is created with each bootstage id as a child. Each child has a 'name' property and either 'mark' containing the - mark time in microsecond, or 'accum' containing the + mark time in microseconds, or 'accum' containing the accumulated time for that bootstage id in microseconds. For example: @@ -114,7 +114,7 @@ config NAND_BOOT help Enabling this will make a U-Boot binary that is capable of being booted via NAND flash. This is not a must, some SoCs need this, - somes not. + some not. config ONENAND_BOOT bool "Support for booting from ONENAND" @@ -122,7 +122,7 @@ config ONENAND_BOOT help Enabling this will make a U-Boot binary that is capable of being booted via ONENAND. This is not a must, some SoCs need this, - somes not. + some not. config QSPI_BOOT bool "Support for booting from QSPI flash" @@ -130,7 +130,7 @@ config QSPI_BOOT help Enabling this will make a U-Boot binary that is capable of being booted via QSPI flash. This is not a must, some SoCs need this, - somes not. + some not. config SATA_BOOT bool "Support for booting from SATA" @@ -138,7 +138,7 @@ config SATA_BOOT help Enabling this will make a U-Boot binary that is capable of being booted via SATA. This is not a must, some SoCs need this, - somes not. + some not. config SD_BOOT bool "Support for booting from SD/EMMC" @@ -146,7 +146,7 @@ config SD_BOOT help Enabling this will make a U-Boot binary that is capable of being booted via SD/EMMC. This is not a must, some SoCs need this, - somes not. + some not. config SPI_BOOT bool "Support for booting from SPI flash" @@ -154,7 +154,7 @@ config SPI_BOOT help Enabling this will make a U-Boot binary that is capable of being booted via SPI flash. This is not a must, some SoCs need this, - somes not. + some not. endmenu @@ -174,7 +174,7 @@ config CONSOLE_RECORD bool "Console recording" help This provides a way to record console output (and provide console - input) through cirular buffers. This is mostly useful for testing. + input) through circular buffers. This is mostly useful for testing. Console output is recorded even when the console is silent. To enable console recording, call console_record_reset_enable() from your code. -- ======================================================================== 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 0/2] Add support for config_distro_bootcmd to the omap3_pandora target.
by Vagrant Cascadian 07 Sep '16

07 Sep '16

The first patch enables distro bootcmd support. The second patch only sets the bootargs if distro_bootcmd loading failed. This is based on the patch series submitted yesterday fixing the mmc boot syntax for omap3_pandora, though could easily be merged together into a single patch series if that is preferred. Vagrant Cascadian (2): omap3_pandora: Switch to use config_distro_bootcmd. omap3_pandora: Only set bootargs if distro_bootcmd failed to load. include/configs/omap3_pandora.h | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) -- 2.9.3

2 4

[U-Boot] [PATCH] ARM: am335x: select DM_GPIO
by Masahiro Yamada 07 Sep '16

07 Sep '16

We are supposed to not add config entries with only "default y" in board/SoC Kconfig files. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- arch/arm/Kconfig | 1 + board/tcl/sl50/Kconfig | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c871eaf..03eaeda 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -459,6 +459,7 @@ config TARGET_AM335X_SL50 select CPU_V7 select SUPPORT_SPL select DM + select DM_GPIO select DM_SERIAL config TARGET_BAV335X diff --git a/board/tcl/sl50/Kconfig b/board/tcl/sl50/Kconfig index 390a476..d0068d9 100644 --- a/board/tcl/sl50/Kconfig +++ b/board/tcl/sl50/Kconfig @@ -22,10 +22,4 @@ config CONS_INDEX board you may want something other than UART0 as for example the IDK uses UART3 so enter 4 here. -config DM_GPIO - default y - -config DM_SERIAL - default y - endif -- 1.9.1

3 2

[U-Boot] [PATCH 0/2] Fixes and simplification to omap3_pandora boot configuration
by Vagrant Cascadian 07 Sep '16

07 Sep '16

First patch fixes the syntax used for loading a boot script from mmc. The second patch makes use of the "load" command provided by CONFIG_CMD_FS_GENERIC. Vagrant Cascadian (2): omap3_pandora: Fix mmc loading of autoboot script to use correct syntax. omap3_pandora: Switch to using "load" command to load the autoboot script. include/configs/omap3_pandora.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.9.3

3 6