March 2016 - U-Boot

[U-Boot] [PATCH] post: Remove references to scrapped "netta" board.
by Robert P. J. Day 02 Apr '16

02 Apr '16

Given that README.scrapyard shows scrapping of netta boards: netta2 powerpc mpc8xx c51c1c9a 2014-07-07 netta powerpc mpc8xx c51c1c9a 2014-07-07 delete netta example from POST tests. Signed-off-by: Robert P. J. Day <rpjday(a)crashcourse.ca> --- this will slightly conflict with my earlier patch, removing "lwmon" from the post/ Makefile. post/Makefile | 2 +- post/board/netta/Makefile | 8 -------- post/board/netta/codec.c | 29 ----------------------------- post/board/netta/dsp.c | 29 ----------------------------- 4 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 post/board/netta/Makefile delete mode 100644 post/board/netta/codec.c delete mode 100644 post/board/netta/dsp.c diff --git a/post/Makefile b/post/Makefile index 2fa6f8a..4b148ef 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 lwmon lwmon5 pdm360ng,$(BOARD)),) obj-y += board/$(BOARD)/ endif diff --git a/post/board/netta/Makefile b/post/board/netta/Makefile deleted file mode 100644 index 8fc1945..0000000 --- a/post/board/netta/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# (C) Copyright 2002-2006 -# Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += codec.o dsp.o diff --git a/post/board/netta/codec.c b/post/board/netta/codec.c deleted file mode 100644 index 7ff890a..0000000 --- a/post/board/netta/codec.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * (C) Copyright 2004 - * Pantelis Antoniou, Intracom S.A. , panto(a)intracom.gr - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <common.h> - -/* - * CODEC test - * - * This test verifies the connection and performs a memory test - * on any connected codec(s). The meat of the work is done - * in the board specific function. - */ - -#include <post.h> - -#if CONFIG_POST & CONFIG_SYS_POST_CODEC - -extern int board_post_codec(int flags); - -int codec_post_test (int flags) -{ - return board_post_codec(flags); -} - -#endif /* CONFIG_POST & CONFIG_SYS_POST_CODEC */ diff --git a/post/board/netta/dsp.c b/post/board/netta/dsp.c deleted file mode 100644 index f88c379..0000000 --- a/post/board/netta/dsp.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * (C) Copyright 2004 - * Pantelis Antoniou, Intracom S.A. , panto(a)intracom.gr - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <common.h> - -/* - * DSP test - * - * This test verifies the connection and performs a memory test - * on any connected DSP(s). The meat of the work is done - * in the board specific function. - */ - -#include <post.h> - -#if CONFIG_POST & CONFIG_SYS_POST_DSP - -extern int board_post_dsp(int flags); - -int dsp_post_test (int flags) -{ - return board_post_dsp(flags); -} - -#endif /* CONFIG_POST & CONFIG_SYS_POST_DSP */ -- 2.5.5 -- ======================================================================== 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] board: ti: DRA7: Add DP83867 TI phy for rev c
by Dan Murphy 02 Apr '16

02 Apr '16

Enable the TI DP83867 Giga bit phy on the dra7 rev c board. The rx and tx internal delays are need for this board so the usage of RGMII_ID is required. Signed-off-by: Dan Murphy <dmurphy(a)ti.com> --- board/ti/dra7xx/evm.c | 6 ++++++ include/configs/dra7xx_evm.h | 1 + 2 files changed, 7 insertions(+) diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index 25f2031..9bd71d8 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -27,6 +27,7 @@ #include <dwc3-uboot.h> #include <dwc3-omap-uboot.h> #include <ti-usb-phy-uboot.h> +#include <miiphy.h> #include "mux_data.h" #include "../common/board_detect.h" @@ -679,6 +680,11 @@ int board_eth_init(bd_t *bis) if (*omap_si_rev == DRA722_ES1_0) cpsw_data.active_slave = 1; + if (board_is_dra72x_revc_or_later()) { + cpsw_slaves[0].phy_if = PHY_INTERFACE_MODE_RGMII_ID; + cpsw_slaves[1].phy_if = PHY_INTERFACE_MODE_RGMII_ID; + } + ret = cpsw_register(&cpsw_data); if (ret < 0) printf("Error %d registering CPSW switch\n", ret); diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index c0795ab..7734e8d 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -155,6 +155,7 @@ #define CONFIG_MII /* Required in net/eth.c */ #define CONFIG_PHY_GIGE /* per-board part of CPSW */ #define CONFIG_PHYLIB +#define CONFIG_PHY_TI /* SPI */ #undef CONFIG_OMAP3_SPI -- 2.8.0.rc3

3 3

[U-Boot] [PATCH] efi_loader: Always allocate the highest available address
by Alexander Graf 02 Apr '16

02 Apr '16

Some EFI applications (grub2) expect that an allocation always returns the highest available memory address for the given size. Without this, we may run into situations where the initrd gets allocated at a lower address than the kernel. This patch fixes booting in such situations for me. Signed-off-by: Alexander Graf <agraf(a)suse.de> --- lib/efi_loader/efi_memory.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index c82b53f..8a1e249 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -13,6 +13,7 @@ #include <malloc.h> #include <asm/global_data.h> #include <libfdt_env.h> +#include <linux/list_sort.h> #include <inttypes.h> #include <watchdog.h> @@ -27,6 +28,31 @@ struct efi_mem_list { LIST_HEAD(efi_mem); /* + * Sorts the memory list from highest address to lowest address + * + * When allocating memory we should always start from the highest + * address chunk, so sort the memory list such that the first list + * iterator gets the highest address and goes lower from there. + */ +static int efi_mem_cmp(void *priv, struct list_head *a, struct list_head *b) +{ + struct efi_mem_list *mema = list_entry(a, struct efi_mem_list, link); + struct efi_mem_list *memb = list_entry(b, struct efi_mem_list, link); + + if (mema->desc.physical_start == memb->desc.physical_start) + return 0; + else if (mema->desc.physical_start < memb->desc.physical_start) + return 1; + else + return -1; +} + +static void efi_mem_sort(void) +{ + list_sort(NULL, &efi_mem, efi_mem_cmp); +} + +/* * Unmaps all memory occupied by the carve_desc region from the * list entry pointed to by map. * @@ -142,6 +168,9 @@ uint64_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type, /* Add our new map */ list_add_tail(&newlist->link, &efi_mem); + /* And make sure memory is listed in descending order */ + efi_mem_sort(); + return start; } -- 1.8.5.6

2 1

[U-Boot] [PATCH v2 1/7] sniper: Include explicit serial baudrate on bootargs
by Paul Kocialkowski 02 Apr '16

02 Apr '16

This makes the baudrate for the kernel command line explicit. Signed-off-by: Paul Kocialkowski <contact(a)paulk.fr> --- include/configs/sniper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 171a8c4..cb25c0a 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -252,7 +252,7 @@ "recovery_mmc_part=4\0" \ "fdtfile=omap3-sniper.dtb\0" \ "bootfile=/boot/extlinux/extlinux.conf\0" \ - "bootargs=console=ttyO2 vram=5M,0x9FA00000 omapfb.vram=0:5M\0" + "bootargs=console=ttyO2,115200 vram=5M,0x9FA00000 omapfb.vram=0:5M\0" /* * ATAGs -- 2.7.4

2 13

[U-Boot] [PATCH] arm64: booti: add missing unmap_sysmem()
by Masahiro Yamada 02 Apr '16

02 Apr '16

Make sure to call unmap_sysmem() for address allocated by map_sysmem() before leaving the function; however this patch gives no impact on the behavior because map_sysmem()/unmap_sysmem() does nothing except on Sandbox. Sandbox never runs this code because "booti" is a command for booting ARM64 kernel image. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- cmd/bootm.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmd/bootm.c b/cmd/bootm.c index 555ccbc..1bca6fa 100644 --- a/cmd/bootm.c +++ b/cmd/bootm.c @@ -673,6 +673,9 @@ static int booti_setup(bootm_headers_t *images) * correct location and then move the image there. */ dst = gd->bd->bi_dram[0].start + le32_to_cpu(ih->text_offset); + + unmap_sysmem(ih); + if (images->ep != dst) { void *src; @@ -717,6 +720,8 @@ static int booti_start(cmd_tbl_t *cmdtp, int flag, int argc, lmb_reserve(&images->lmb, images->ep, le32_to_cpu(ih->image_size)); + unmap_sysmem(ih); + /* * Handle the BOOTM_STATE_FINDOTHER state ourselves as we do not * have a header that provide this informaiton. -- 1.9.1

3 2

[U-Boot] [PATCH] configs: ti_armv7_keystone2: make SYS_TEXT_BASE configurable at build time
by Vitaly Andrianov 02 Apr '16

02 Apr '16

U-boot for general purpose KS2 devices is loaded to the beginning of the internal memory (0x0c000000). Secure devices uses this memory and CONFIG_SYS_TEXT_BASE has to be different for those devices. This commit make this configurable at build time by giving CONFIG_SYS_TEXT_BASE as a command line definition to make command. Signed-off-by: Vitaly Andrianov <vitalya(a)ti.com> --- include/configs/ti_armv7_keystone2.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index a7206f4..76b901bf 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -20,7 +20,9 @@ /* SoC Configuration */ #define CONFIG_ARCH_CPU_INIT #define CONFIG_SYS_ARCH_TIMER +#ifndef CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_TEXT_BASE 0x0c000000 +#endif #define CONFIG_SPL_TARGET "u-boot-spi.gph" #define CONFIG_SYS_DCACHE_OFF -- 1.9.1

2 3

[U-Boot] [PATCH] arm: spl: Align default board_init_f comment with code
by Andreas Dannenberg 02 Apr '16

02 Apr '16

The default board_init_f() implementation performs a call to board_init_r() as the last step of the sequence. Fix the comment for this function to reflect the actual execution flow. Signed-off-by: Andreas Dannenberg <dannenberg(a)ti.com> --- arch/arm/lib/spl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c index d737a5c..e428868 100644 --- a/arch/arm/lib/spl.c +++ b/arch/arm/lib/spl.c @@ -27,7 +27,7 @@ gd_t gdata __attribute__ ((section(".data"))); /* * In the context of SPL, board_init_f must ensure that any clocks/etc for * DDR are enabled, ensure that the stack pointer is valid, clear the BSS - * and call board_init_f. We provide this version by default but mark it + * and call board_init_r. We provide this version by default but mark it * as __weak to allow for platforms to do this in their own way if needed. */ void __weak board_init_f(ulong dummy) -- 2.7.2

2 1

[U-Boot] [PATCH] common: env_sf: Add exclamation mark
by Peng Fan 02 Apr '16

02 Apr '16

Add exclamation mark to the errmsg, when error and set_default_env. Signed-off-by: Peng Fan <van.freenix(a)gmail.com> Cc: Mario Schuknecht <mario.schuknecht(a)dresearch-fe.de> Cc: Vignesh R <vigneshr(a)ti.com> Cc: Jagan Teki <jteki(a)openedev.com> Cc: Ravi Babu <ravibabu(a)ti.com> Cc: York Sun <york.sun(a)nxp.com> Cc: Tom Rini <trini(a)konsulko.com> --- common/env_sf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/env_sf.c b/common/env_sf.c index 892e6cb..273098c 100644 --- a/common/env_sf.c +++ b/common/env_sf.c @@ -225,7 +225,7 @@ void env_relocate_spec(void) ret = env_import((char *)ep, 0); if (!ret) { error("Cannot import environment: errno = %d\n", errno); - set_default_env("env_import failed"); + set_default_env("!env_import failed"); } err_read: -- 2.6.2

2 2

[U-Boot] [PATCH] jffs2: Fix set but not used warning
by Tom Rini 02 Apr '16

02 Apr '16

We only use 'ofs' in jffs2_sum_scan_sumnode when debugging as it's part of a dbg_summary call. Mark this as __maybe_unused. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- fs/jffs2/jffs2_1pass.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index 64f5542..ba038b1 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -115,6 +115,7 @@ #include <config.h> #include <malloc.h> #include <div64.h> +#include <linux/compiler.h> #include <linux/stat.h> #include <linux/time.h> #include <watchdog.h> @@ -1328,7 +1329,7 @@ int jffs2_sum_scan_sumnode(struct part_info *part, uint32_t offset, struct b_lists *pL) { struct jffs2_unknown_node crcnode; - int ret, ofs; + int ret, __maybe_unused ofs; uint32_t crc; ofs = part->sector_size - sumsize; -- 1.7.9.5

1 1

[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