November 2016 - U-Boot

[U-Boot] [PATCH] configs: am43x: hs: Modify SPL load address to fix UART boot issue
by Lokesh Vutla 04 Dec '16

04 Dec '16

From: Madan Srinivas <madans(a)ti.com> An issue in the TI secure image generation tool causes the ROM to load the SPL at a different load address than what is specified by CONFIG_ISW_ENTRY_ADDR while doing a peripheral boot. This causes the SPL to fail on secure devices during peripheral boot. The TI secure image generation tool has been fixed so that the SPL will always be loaded at 0x403018E0 by the ROM code for both peripheral and memory boot modes. am43x hs defconfig file have been updated to reflect this change. Signed-off-by: Madan Srinivas <madans(a)ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- configs/am43xx_hs_evm_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index 1c53877..7d791fe 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_AM43XX=y CONFIG_TI_SECURE_DEVICE=y CONFIG_TARGET_AM43XX_EVM=y -CONFIG_ISW_ENTRY_ADDR=0x40302ae0 +CONFIG_ISW_ENTRY_ADDR=0x403018e0 CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm" -- 2.10.1

2 1

[U-Boot] [RESEND][PATCH 00/24] sh: add generic board support and fixes
by Vladimir Zapolskiy 04 Dec '16

04 Dec '16

This is a combined series of the fixes to SH2/SH3/SH4/SH4A architecture port of U-boot on top of the master branch, there is no functional difference between this series and 3 my series sent in August 2016 for 2016.09, however due to many positive generalization updates to U-boot sources the old unreviewed series can not be cleanly applied anymore: * [PATCH 0/6] sh4: fix and simplify cache manipulation * [PATCH 0/5] sh4: fixes to SH7751 PCI host controller * [PATCH] common: sh: add necessary define bits to board_f * [PATCH 00/12] sh: change arch and boards code to generic board I have to resend the changes, because apparently Nobuhiro Iwamatsu is too busy to maintain SH port and I ask Tom/Simon/Marek and other active U-boot developers to review and apply the changes, it is highly desirable to have a possibility to run modern U-boot on boards powered by SH cores. The changeset implements initial support of relocatable U-Boot code for SH2/SH3/SH4 architectures and boards, as weel as it restores a possibility to boot U-Boot on SH boards, which has not been converted to generic board in time (for more details see commit f41e6088eb1 ("sh: Fix build errors for generic board")). Special attention from maintainers of all touched boards is required, due to inaccessibility of hardware for me it would be a troublesome task. *** CACHE SUPPORT COVER LETTER *** In my tests I experience that sometimes SH4 does not properly fetch instructions after immediate jump to a code loaded by means of rtl8139, the problem is gone if "icache off" is executed after load or if cache invalidation and write-back is used on data load instead of just cache invalidation, which is apparently an improper backbone of flush_dcache_range() function. The changeset contains a couple of bugfixes and a general simplification of the code related to cache manipulation. Note that while caches are found on SH2 and SH3 for long time they were inactive in U-Boot, because I don't have SH2/SH3 hardware for testing I don't spread SH4 cache fixes to those cpus, however generally it should be the same, in that case arch/sh/cpu/sh4/cache.c file can be moved to arch/sh/lib folder *** PCI CONTROLLER CHANGES COVER LETTER *** This series fixes 2 bugs found in SH7751 PCI host controller driver, also it restores r2dplus defconfig and slightly simplifies the code related to the SH7751 PCI controller, more improvements may follow in future. The change is independent on the following conversion to generic board, however it adds some bits to simplify porting of r2dplus board by moving board specific CONFIG_SYS_TEXT_BASE into P1 area, Before the change even if rtl8139 driver is selected in a defconfig the device was unusable due to invalid phys to bus mapping (e.g. test with 'dhcp' command shows it), this most probably was caused by some unnoticed generic change in PCI driver framework, however now it is fixed by the series. *** GENERIC BOARD CHANGES COVER LETTER *** Now code/data initialization and relocation in general resemble the procedure on ARM with minor peculiarities (same one relocation from a storage device if calculated reloc_off == 0, otherwise two relocations), however please note that the change does *not* add PIE support (only PIC), so it may end up that there are persistent pointers to some non-relocated data, this point requires better investion. Only r2dplus board is actually converted to support new architectural changes, the rest of the boards require attention from board maintainers or they will be removed. Board maintainers may pay attention to CONFIG_SYS_MALLOC_CLEAR_ON_INIT, CONFIG_NEEDS_MANUAL_RELOC, CONFIG_SYS_GENERIC_GLOBAL_DATA etc. options. This r2dplus board change allows immediately check the correctness of the series on a r2dplus qemu target, note that the second copy is not avoided in this case, also for simplicity SDRAM area up to text base is large enough to store malloc pool and two copies of loaded code/data. The change was tested on one custom SH4 (SH7551R) board, r2dplus qemu target (see also SH7751 PCI change under review), the rest of the boards are compile tested only. Multiple kudos to Simon for great patience and a decision to not remove the code. Vladimir Zapolskiy (24): sh4: cache: correct dcache flush to invalidate with write-back sh4: cache: correct flush_cache() to writeback and invalidate sh3: remove unused cache.c file from being built sh: cache use jump_to_P2() and back_to_P1() from asm/system.h sh: cache: don't modify CCR from P1 area sh4: cache: move exported cache manipulation functions into cache.c pci: sh7751: fix up PCI I/O space address pci: sh7751: map PCI memory space into SDRAM sh4: remove __io config options from r2dplus and r7780mp boards r2dplus: use P1 area space for text base and PCI system memory r2dplus: select rtl8139 driver in defconfig common: sh: add necessary define bits to board_f sh4: use single u-boot linker script for all boards sh: place board lowlevel_init code in the beginning of .text sh: define entry point and reloc_dst inside a linker script sh: add MEMORY command to a shared linker script sh: remove undefined DEBUG preprocessor token from board config files sh: define CONFIG_DISPLAY_BOARDINFO to print board information sh: add common dram_init() function for all boards sh: add shared relocate_code() function and call board_init_r() sh4: fix start.S by calling board_init_f() after first code relocation sh: share the correct version of start.S among all cpus sh: generate position independent code for all platforms r2dplus: fixup CONFIG_SYS_TEXT_BASE to account arch/sh changes arch/sh/Makefile | 2 +- arch/sh/config.mk | 2 +- arch/sh/cpu/sh2/Makefile | 1 - arch/sh/cpu/sh2/cpu.c | 6 -- arch/sh/cpu/sh3/Makefile | 3 +- arch/sh/cpu/sh3/cache.c | 96 ------------------------------ arch/sh/cpu/sh3/cpu.c | 6 -- arch/sh/cpu/sh3/start.S | 65 -------------------- arch/sh/cpu/sh4/Makefile | 1 - arch/sh/cpu/sh4/cache.c | 88 +++++++++++++-------------- arch/sh/cpu/sh4/cpu.c | 40 ------------- arch/sh/cpu/sh4/start.S | 62 ------------------- arch/sh/cpu/u-boot.lds | 44 +++++++------- arch/sh/include/asm/cache.h | 2 - arch/sh/include/asm/io.h | 10 ---- arch/sh/lib/Makefile | 2 + arch/sh/lib/board.c | 35 +++++++++++ arch/sh/{cpu/sh2 => lib}/start.S | 33 +++++----- board/alphaproject/ap_sh4a_4a/Makefile | 2 +- board/alphaproject/ap_sh4a_4a/ap_sh4a_4a.c | 11 ---- board/espt/Makefile | 2 +- board/espt/espt.c | 10 ---- board/mpr2/Makefile | 2 +- board/mpr2/mpr2.c | 10 ---- board/ms7720se/Makefile | 2 +- board/ms7720se/ms7720se.c | 10 ---- board/ms7722se/Makefile | 2 +- board/ms7722se/ms7722se.c | 10 ---- board/ms7750se/Makefile | 2 +- board/ms7750se/ms7750se.c | 10 ---- board/renesas/MigoR/Makefile | 2 +- board/renesas/MigoR/migo_r.c | 10 ---- board/renesas/ap325rxa/Makefile | 2 +- board/renesas/ap325rxa/ap325rxa.c | 10 ---- board/renesas/ecovec/Makefile | 2 +- board/renesas/ecovec/ecovec.c | 10 ---- board/renesas/r0p7734/Makefile | 2 +- board/renesas/r0p7734/r0p7734.c | 11 ---- board/renesas/r2dplus/Makefile | 2 +- board/renesas/r2dplus/r2dplus.c | 10 ---- board/renesas/r7780mp/Makefile | 2 +- board/renesas/r7780mp/r7780mp.c | 10 ---- board/renesas/rsk7203/Makefile | 2 +- board/renesas/rsk7203/rsk7203.c | 10 ---- board/renesas/rsk7264/Makefile | 2 +- board/renesas/rsk7264/rsk7264.c | 10 ---- board/renesas/rsk7269/Makefile | 2 +- board/renesas/rsk7269/rsk7269.c | 10 ---- board/renesas/sh7752evb/Makefile | 2 +- board/renesas/sh7752evb/sh7752evb.c | 11 ---- board/renesas/sh7752evb/u-boot.lds | 82 ------------------------- board/renesas/sh7753evb/Makefile | 2 +- board/renesas/sh7753evb/sh7753evb.c | 11 ---- board/renesas/sh7753evb/u-boot.lds | 82 ------------------------- board/renesas/sh7757lcr/Makefile | 2 +- board/renesas/sh7757lcr/sh7757lcr.c | 25 -------- board/renesas/sh7757lcr/u-boot.lds | 83 -------------------------- board/renesas/sh7763rdp/Makefile | 2 +- board/renesas/sh7763rdp/sh7763rdp.c | 10 ---- board/renesas/sh7785lcr/Makefile | 2 +- board/renesas/sh7785lcr/sh7785lcr.c | 10 ---- board/shmin/Makefile | 2 +- board/shmin/shmin.c | 10 ---- common/board_f.c | 15 +++-- configs/r2dplus_defconfig | 2 + drivers/pci/pci_sh7751.c | 12 ++-- include/configs/MigoR.h | 2 +- include/configs/ap325rxa.h | 2 +- include/configs/ap_sh4a_4a.h | 2 +- include/configs/ecovec.h | 2 +- include/configs/espt.h | 1 + include/configs/mpr2.h | 2 + include/configs/ms7720se.h | 1 + include/configs/ms7722se.h | 1 + include/configs/ms7750se.h | 2 + include/configs/r0p7734.h | 2 +- include/configs/r2dplus.h | 15 +++-- include/configs/r7780mp.h | 4 +- include/configs/rsk7203.h | 2 +- include/configs/rsk7264.h | 3 +- include/configs/rsk7269.h | 3 +- include/configs/sh7752evb.h | 3 +- include/configs/sh7753evb.h | 3 +- include/configs/sh7757lcr.h | 3 +- include/configs/sh7763rdp.h | 1 + include/configs/sh7785lcr.h | 2 +- include/configs/shmin.h | 1 + 87 files changed, 190 insertions(+), 912 deletions(-) delete mode 100644 arch/sh/cpu/sh3/cache.c delete mode 100644 arch/sh/cpu/sh3/start.S delete mode 100644 arch/sh/cpu/sh4/start.S create mode 100644 arch/sh/lib/board.c rename arch/sh/{cpu/sh2 => lib}/start.S (56%) delete mode 100644 board/renesas/sh7752evb/u-boot.lds delete mode 100644 board/renesas/sh7753evb/u-boot.lds delete mode 100644 board/renesas/sh7757lcr/u-boot.lds -- 2.10.2

3 65

[U-Boot] [PATCH] compiler.h: use u-boot endian macros on OpenBSD
by Jonathan Gray 04 Dec '16

04 Dec '16

When building u-boot on sparc64 and powerpc hosts it became clear that u-boot expects endian conversion defines to be macros: lib/crc32.c:87: error: braced-group within expression allowed only inside a function For OpenBSD switch from using system definitions equivalent to the u-boot ones and define glibc __BYTE_ORDER __BIG_ENDIAN __LITTLE_ENDIAN names, as at least some parts of the non-cross build assumes those names are present (ie crc32.c). Signed-off-by: Jonathan Gray <jsg(a)jsg.id.au> --- include/compiler.h | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/include/compiler.h b/include/compiler.h index 65b826e..a43fb6a 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -52,6 +52,9 @@ typedef unsigned long ulong; # include <sys/endian.h> /* htole32 and friends */ #elif defined(__OpenBSD__) # include <endian.h> +# define __BYTE_ORDER BYTE_ORDER +# define __LITTLE_ENDIAN LITTLE_ENDIAN +# define __BIG_ENDIAN BIG_ENDIAN #endif #include <time.h> @@ -84,20 +87,7 @@ typedef unsigned int uint; # define uswap_64(x) _uswap_64(x, ) #endif -#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 +#if __BYTE_ORDER == __LITTLE_ENDIAN # define cpu_to_le16(x) (x) # define cpu_to_le32(x) (x) # define cpu_to_le64(x) (x) -- 2.10.2

2 1

[U-Boot] [PATCH v3 0/2] ARM: ti: DFU environment consolidation + AM57x DFU
by Sekhar Nori 04 Dec '16

04 Dec '16

This patch series consolidates DFU environment variables into newly created include/environment/ti/dfu.h Then goes on to add DFU support for AM57x GP EVM. Build tested using the following buildman command: $ tools/buildman/buildman -j 16 -b dfu -c 2 -o test am33xx omap v2 -> v3 Rebase against latest master, drop 1/3 in the process. v1 submission here: https://www.mail-archive.com/u-boot@lists.denx.de/msg222838.html Sekhar Nori (2): ARM: ti: consolidate dfu environment variables ARM: am57xx_evm: enable DFU support configs/am57xx_evm_defconfig | 3 ++ configs/am57xx_hs_evm_defconfig | 3 ++ include/configs/am335x_evm.h | 33 +----------------- include/configs/am43xx_evm.h | 34 ++----------------- include/configs/am57xx_evm.h | 8 +++++ include/configs/dra7xx_evm.h | 51 ++-------------------------- include/configs/omap5_uevm.h | 37 ++------------------ include/environment/ti/dfu.h | 75 +++++++++++++++++++++++++++++++++++++++++ 8 files changed, 96 insertions(+), 148 deletions(-) create mode 100644 include/environment/ti/dfu.h -- 2.9.0

2 6

[U-Boot] [PATCH resend v3 0/6] DM conversion of usb ether gadget
by Mugunthan V N 03 Dec '16

03 Dec '16

The previous series didn't land on the mailing list properly, so resending the series as *v3 resend*, sorry for spamming. This patch series adopts driver model for usb ether gadget driver. This series is tested with MUSB driver model conversion on AM335x GP evm and AM335x BBB (logs [1]). Also pushed a branch for testing [2] Changes from v2: * Moved USB ether address from driver hard code to Kconfig entry * Optimized if check in patch 5/6 as mentioned by Marek Vasut. Changes from initial version: * Separated out the usb gadget driver patches from earlier musb series [3] for testing and submitting of dwc3 dm musb patches. [1] - http://pastebin.ubuntu.com/23489333/ [2] - git://git.ti.com/~mugunthanvnm/ti-u-boot/mugunth-ti-u-boot.git dm-musb-v3 [3] - http://lists.denx.de/pipermail/u-boot/2016-February/246827.html Note: ~~~~~ The following checkpatch warning can be ignored as this has to be fixed all over the file which should be a separate patch. CHECK: Avoid CamelCase: <configNr> #297: FILE: drivers/usb/gadget/rndis.c:1157: +int rndis_set_param_dev(u8 configNr, struct eth_device *dev, int mtu, Mugunthan V N (6): drivers: usb: gadget: ether: adopt to usb driver model drivers: usb: gadget: ether: access network_started using local variable drivers: usb: gadget: ether: consolidate global devices to single struct drivers: usb: gadget: ether: use net device priv to pass usb ether priv drivers: usb: gadget: ether: prepare driver for driver model migration drivers: usb: gadget: ether/rndis: convert driver to adopt device driver model drivers/usb/gadget/Kconfig | 4 + drivers/usb/gadget/ether.c | 315 ++++++++++++++++++++++++++++++++++++--------- drivers/usb/gadget/rndis.c | 13 +- drivers/usb/gadget/rndis.h | 19 ++- include/net.h | 7 + 5 files changed, 293 insertions(+), 65 deletions(-) -- 2.11.0.rc2

5 22

[U-Boot] [PATCH v2] cmd: crosec: Move cros_ec_decode_region helper to cmd/cros_ec.c
by Moritz Fischer 03 Dec '16

03 Dec '16

The cros_ec_decode_region() function is only used in combination with the crosec cmds. Move the function to the correct place. Signed-off-by: Moritz Fischer <moritz.fischer(a)ettus.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Masahiro Yamada <yamada.masahiro(a)socionext.com> Cc: u-boot(a)lists.denx.de --- Changes from v1: * make cros_ec_decode_region static * move over the comments * fixed commit message s/crosec/cros_ec/g --- cmd/cros_ec.c | 23 +++++++++++++++++++++++ drivers/misc/cros_ec.c | 16 ---------------- include/cros_ec.h | 9 --------- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c index abf11f0..9d42f87 100644 --- a/cmd/cros_ec.c +++ b/cmd/cros_ec.c @@ -20,6 +20,29 @@ static const char * const ec_current_image_name[] = {"unknown", "RO", "RW"}; DECLARE_GLOBAL_DATA_PTR; /** + * Decode a flash region parameter + * + * @param argc Number of params remaining + * @param argv List of remaining parameters + * @return flash region (EC_FLASH_REGION_...) or -1 on error + */ +static int cros_ec_decode_region(int argc, char * const argv[]) +{ + if (argc > 0) { + if (0 == strcmp(*argv, "rw")) + return EC_FLASH_REGION_RW; + else if (0 == strcmp(*argv, "ro")) + return EC_FLASH_REGION_RO; + + debug("%s: Invalid region '%s'\n", __func__, *argv); + } else { + debug("%s: Missing region parameter\n", __func__); + } + + return -1; +} + +/** * Perform a flash read or write command * * @param dev CROS-EC device to read/write diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c index 8073730..759bb46 100644 --- a/drivers/misc/cros_ec.c +++ b/drivers/misc/cros_ec.c @@ -1024,22 +1024,6 @@ int cros_ec_register(struct udevice *dev) return 0; } -int cros_ec_decode_region(int argc, char * const argv[]) -{ - if (argc > 0) { - if (0 == strcmp(*argv, "rw")) - return EC_FLASH_REGION_RW; - else if (0 == strcmp(*argv, "ro")) - return EC_FLASH_REGION_RO; - - debug("%s: Invalid region '%s'\n", __func__, *argv); - } else { - debug("%s: Missing region parameter\n", __func__); - } - - return -1; -} - int cros_ec_decode_ec_flash(const void *blob, int node, struct fdt_cros_ec *config) { diff --git a/include/cros_ec.h b/include/cros_ec.h index ec7517c..0271f2b 100644 --- a/include/cros_ec.h +++ b/include/cros_ec.h @@ -250,15 +250,6 @@ void cros_ec_dump_data(const char *name, int cmd, const uint8_t *data, int len); */ int cros_ec_calc_checksum(const uint8_t *data, int size); -/** - * Decode a flash region parameter - * - * @param argc Number of params remaining - * @param argv List of remaining parameters - * @return flash region (EC_FLASH_REGION_...) or -1 on error - */ -int cros_ec_decode_region(int argc, char * const argv[]); - int cros_ec_flash_erase(struct cros_ec_dev *dev, uint32_t offset, uint32_t size); -- 2.10.0

2 2

[U-Boot] [PATCH] cmd/fdt: fix uncallable systemsetup command
by Fabien Parent 03 Dec '16

03 Dec '16

The function that is processing the 'fdt' parameters is one big if-else if. In order to be able to type command faster only the first few letter are checked to know which block of code to execute. For systemsetup, the block of code that was executed was always the wrong one and ended up in a failure. } else if (argv[1][0] == 's') { process "fdt set" command } else if (strncmp(argv[1], "sys", 3) == 0) { process "fdt systemsetup" command. } When typing "fdt systemsetup", the code that was executed was the code for "fdt set". This commit fix this issue by moving the "else if" for systemsetup before the else if for "fdt set". This allow us to keep compatibility with any script that make use of "fdt s" to set node values. Signed-off-by: Fabien Parent <fparent(a)baylibre.com> --- cmd/fdt.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/cmd/fdt.c b/cmd/fdt.c index b503357..8bd345a 100644 --- a/cmd/fdt.c +++ b/cmd/fdt.c @@ -206,7 +206,17 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 1; } working_fdt = newaddr; +#ifdef CONFIG_OF_SYSTEM_SETUP + /* Call the board-specific fixup routine */ + } else if (strncmp(argv[1], "sys", 3) == 0) { + int err = ft_system_setup(working_fdt, gd->bd); + if (err) { + printf("Failed to add system information to FDT: %s\n", + fdt_strerror(err)); + return CMD_RET_FAILURE; + } +#endif /* * Make a new node */ @@ -577,18 +587,6 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } } #endif -#ifdef CONFIG_OF_SYSTEM_SETUP - /* Call the board-specific fixup routine */ - else if (strncmp(argv[1], "sys", 3) == 0) { - int err = ft_system_setup(working_fdt, gd->bd); - - if (err) { - printf("Failed to add system information to FDT: %s\n", - fdt_strerror(err)); - return CMD_RET_FAILURE; - } - } -#endif /* Create a chosen node */ else if (strncmp(argv[1], "cho", 3) == 0) { unsigned long initrd_start = 0, initrd_end = 0; -- 2.10.2

2 2

[U-Boot] [PATCH v3] libfdt: replace ARCH_FIXUP_FDT with ARCH_FIXUP_FDT_MEMORY
by Masahiro Yamada 03 Dec '16

03 Dec '16

Commit e2f88dfd2d96 ("libfdt: Introduce new ARCH_FIXUP_FDT option") allows us to skip memory setup of DTB, but a problem for ARM is that spin_table_update_dt() and psci_update_dt() are skipped as well if CONFIG_ARCH_FIXUP_FDT is disabled. This commit allows us to skip only fdt_fixup_memory_banks() instead of the whole of arch_fixup_fdt(). It will be useful when we want to use a memory node from a kernel DTB as is, but need some fixups for Spin-Table/PSCI. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> Acked-by: Alexey Brodkin <abrodkin(a)synopsys.com> Acked-by: Simon Glass <sjg(a)chromium.org> --- Changes in v3: - Add an empty stub to sandbox to fix a build error Changes in v2: - Add empty stub to ARC, PowerPC, Microblaze instead of a weak function common/image-fdt.c Kconfig | 5 ++--- arch/arc/lib/bootm.c | 5 +++++ arch/arm/lib/bootm-fdt.c | 2 -- arch/arm/lib/bootm.c | 2 -- arch/microblaze/lib/bootm.c | 5 +++++ arch/mips/lib/bootm.c | 2 -- arch/powerpc/lib/bootm.c | 5 +++++ arch/sandbox/lib/bootm.c | 5 +++++ common/fdt_support.c | 2 ++ common/image-fdt.c | 2 -- include/fdt_support.h | 8 ++++++++ 11 files changed, 32 insertions(+), 11 deletions(-) diff --git a/Kconfig b/Kconfig index f3a9f73..70347e7 100644 --- a/Kconfig +++ b/Kconfig @@ -325,9 +325,8 @@ config SYS_CLK_FREQ help TODO: Move CONFIG_SYS_CLK_FREQ for all the architecture -config ARCH_FIXUP_FDT - bool "Enable arch_fixup_fdt() call" - depends on ARM || MIPS +config ARCH_FIXUP_FDT_MEMORY + bool "Enable arch_fixup_memory_banks() call" default y help Enable FDT memory map syncup before OS boot. This feature can be diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c index 04d9d9c..5798149 100644 --- a/arch/arc/lib/bootm.c +++ b/arch/arc/lib/bootm.c @@ -37,6 +37,11 @@ void arch_lmb_reserve(struct lmb *lmb) lmb_reserve(lmb, sp, (CONFIG_SYS_SDRAM_BASE + gd->ram_size - sp)); } +int arch_fixup_fdt(void *blob) +{ + return 0; +} + static int cleanup_before_linux(void) { disable_interrupts(); diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c index a517550..4481f9e 100644 --- a/arch/arm/lib/bootm-fdt.c +++ b/arch/arm/lib/bootm-fdt.c @@ -25,7 +25,6 @@ DECLARE_GLOBAL_DATA_PTR; -#ifdef CONFIG_ARCH_FIXUP_FDT int arch_fixup_fdt(void *blob) { bd_t *bd = gd->bd; @@ -61,4 +60,3 @@ int arch_fixup_fdt(void *blob) return 0; } -#endif diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index dedcd1e..638e6d8 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -379,10 +379,8 @@ void boot_prep_vxworks(bootm_headers_t *images) if (images->ft_addr) { off = fdt_path_offset(images->ft_addr, "/memory"); if (off < 0) { -#ifdef CONFIG_ARCH_FIXUP_FDT if (arch_fixup_fdt(images->ft_addr)) puts("## WARNING: fixup memory failed!\n"); -#endif } } #endif diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c index 3eb3440..2732203 100644 --- a/arch/microblaze/lib/bootm.c +++ b/arch/microblaze/lib/bootm.c @@ -17,6 +17,11 @@ DECLARE_GLOBAL_DATA_PTR; +int arch_fixup_fdt(void *blob) +{ + return 0; +} + int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *images) { diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c index 0c6a4ab..aa0475a 100644 --- a/arch/mips/lib/bootm.c +++ b/arch/mips/lib/bootm.c @@ -253,7 +253,6 @@ static int boot_reloc_fdt(bootm_headers_t *images) #endif } -#ifdef CONFIG_ARCH_FIXUP_FDT int arch_fixup_fdt(void *blob) { #if CONFIG_IS_ENABLED(MIPS_BOOT_FDT) && CONFIG_IS_ENABLED(OF_LIBFDT) @@ -265,7 +264,6 @@ int arch_fixup_fdt(void *blob) return 0; #endif } -#endif static int boot_setup_fdt(bootm_headers_t *images) { diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index ef15e7a..17c5ed1 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -38,6 +38,11 @@ static void set_clocks_in_mhz (bd_t *kbd); #define CONFIG_SYS_LINUX_LOWMEM_MAX_SIZE (768*1024*1024) #endif +int arch_fixup_fdt(void *blob) +{ + return 0; +} + static void boot_jump_linux(bootm_headers_t *images) { void (*kernel)(bd_t *, ulong r4, ulong r5, ulong r6, diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c index 0c9a797..4cdd18f 100644 --- a/arch/sandbox/lib/bootm.c +++ b/arch/sandbox/lib/bootm.c @@ -50,6 +50,11 @@ int bootz_setup(ulong image, ulong *start, ulong *end) return ret; } +int arch_fixup_fdt(void *blob) +{ + return 0; +} + int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) { if (flag & (BOOTM_STATE_OS_GO | BOOTM_STATE_OS_FAKE_GO)) { diff --git a/common/fdt_support.c b/common/fdt_support.c index 0609470..c9f7019 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -381,6 +381,7 @@ void do_fixup_by_compat_u32(void *fdt, const char *compat, do_fixup_by_compat(fdt, compat, prop, &tmp, 4, create); } +#ifdef CONFIG_ARCH_FIXUP_FDT_MEMORY /* * fdt_pack_reg - pack address and size array into the "reg"-suitable stream */ @@ -459,6 +460,7 @@ int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks) } return 0; } +#endif int fdt_fixup_memory(void *blob, u64 start, u64 size) { diff --git a/common/image-fdt.c b/common/image-fdt.c index 5454227..e7540be 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -474,12 +474,10 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, printf("ERROR: /chosen node create failed\n"); goto err; } -#ifdef CONFIG_ARCH_FIXUP_FDT if (arch_fixup_fdt(blob) < 0) { printf("ERROR: arch-specific fdt fixup failed\n"); goto err; } -#endif if (IMAGE_OF_BOARD_SETUP) { fdt_ret = ft_board_setup(blob, gd->bd); if (fdt_ret) { diff --git a/include/fdt_support.h b/include/fdt_support.h index 506bc5a..955c121 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -93,7 +93,15 @@ int fdt_fixup_memory(void *blob, u64 start, u64 size); * property will be left untouched. * @return 0 if ok, or -1 or -FDT_ERR_... on error */ +#ifdef CONFIG_ARCH_FIXUP_FDT_MEMORY int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks); +#else +static inline int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], + int banks) +{ + return 0; +} +#endif void fdt_fixup_ethernet(void *fdt); int fdt_find_and_setprop(void *fdt, const char *node, const char *prop, -- 2.7.4

2 1

[U-Boot] [PATCH v2] dm: core: Add dev_get_addr_size_index() to retrieve addr and size
by Stefan Roese 03 Dec '16

03 Dec '16

The currently available functions accessing the 'reg' property of a device only retrieve the address. Sometimes its also necessary to retrieve the size described by the 'reg' property. This patch adds the new function dev_get_addr_size_index() which retrieves both, the address and the size described by the 'reg' property. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Simon Glass <sjg(a)chromium.org> --- v2: - Account 'index' in fdtdec_get_addr_size_auto_noparent() as spotted by Simon drivers/core/device.c | 22 ++++++++++++++++++++++ include/dm/device.h | 16 ++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/drivers/core/device.c b/drivers/core/device.c index dcf5d9df7d..ed553d70a6 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -693,6 +693,28 @@ fdt_addr_t dev_get_addr_index(struct udevice *dev, int index) #endif } +fdt_addr_t dev_get_addr_size_index(struct udevice *dev, int index, + fdt_size_t *size) +{ +#if CONFIG_IS_ENABLED(OF_CONTROL) + /* + * Only get the size in this first call. We'll get the addr in the + * next call to the exisiting dev_get_xxx function which handles + * all config options. + */ + fdtdec_get_addr_size_auto_noparent(gd->fdt_blob, dev->of_offset, + "reg", index, size, false); + + /* + * Get the base address via the existing function which handles + * all Kconfig cases + */ + return dev_get_addr_index(dev, index); +#else + return FDT_ADDR_T_NONE; +#endif +} + fdt_addr_t dev_get_addr_name(struct udevice *dev, const char *name) { #if CONFIG_IS_ENABLED(OF_CONTROL) diff --git a/include/dm/device.h b/include/dm/device.h index babf8ac8f0..9948bd49fa 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -497,6 +497,22 @@ void *dev_map_physmem(struct udevice *dev, unsigned long size); fdt_addr_t dev_get_addr_index(struct udevice *dev, int index); /** + * dev_get_addr_size_index() - Get the indexed reg property of a device + * + * Returns the address and size specified in the 'reg' property of a device. + * + * @dev: Pointer to a device + * @index: the 'reg' property can hold a list of <addr, size> pairs + * and @index is used to select which one is required + * @size: Pointer to size varible - this function returns the size + * specified in the 'reg' property here + * + * @return addr + */ +fdt_addr_t dev_get_addr_size_index(struct udevice *dev, int index, + fdt_size_t *size); + +/** * dev_get_addr_name() - Get the reg property of a device, indexed by name * * @dev: Pointer to a device -- 2.11.0

2 3

[U-Boot] qemu-x86 issues
by Tom Rini 03 Dec '16

03 Dec '16

Hey guys, After making Stephen's scripts work with qemu today, I've started testing out what platforms I can test out via qemu. I've found two problems with qemu-x86. First, there's a real problem with the network. I run qemu with "-nographic -cpu qemu32 -netdev user,id=net0,tftp=/tftpboot -device e1000,netdev=net0" so that I can tftpboot things in and I'm getting crc32 mismatches. Second, the sleep command is not at all accurate. It's returning the 3 second test in less than 1 second. Any ideas, or places I should try poking to solve these issues? I'm going to kludge around this for now by disabling these tests locally. Thanks! -- Tom

3 6