October 2018 - U-Boot

[U-Boot] Pull request: u-boot-spi/master
by Jagan Teki 05 Oct '18

05 Oct '18

Hi Tom, Please pull this PR. thanks, Jagan. The following changes since commit 94228a9188803473206544c8f33649ea72bf1ee1: Merge git://git.denx.de/u-boot-riscv (2018-10-03 08:09:53 -0400) are available in the Git repository at: git://git.denx.de/u-boot-spi.git master for you to fetch changes up to 5eee9dee419f940ea75977df8b7ed8bb12bc029f: spi: Add SPI driver for MT76xx SoCs (2018-10-04 18:27:28 +0530) ---------------------------------------------------------------- Stefan Roese (3): sf: Add XMC xm25qh64a and xm25qh128a entries mtd: nand: spi: Add Gigadevice SPI NAND support spi: Add SPI driver for MT76xx SoCs drivers/mtd/nand/spi/Makefile | 2 +- drivers/mtd/nand/spi/core.c | 1 + drivers/mtd/nand/spi/gigadevice.c | 135 +++++++++++++++++ drivers/mtd/spi/Kconfig | 6 + drivers/mtd/spi/spi_flash_ids.c | 4 + drivers/spi/Kconfig | 8 + drivers/spi/Makefile | 1 + drivers/spi/mt7621_spi.c | 312 ++++++++++++++++++++++++++++++++++++++ include/linux/mtd/spinand.h | 1 + 9 files changed, 469 insertions(+), 1 deletion(-) create mode 100644 drivers/mtd/nand/spi/gigadevice.c create mode 100644 drivers/spi/mt7621_spi.c

2 1

Re: [U-Boot] Fwd: build u-boot failed with config CONFIG_ARMV8_PSCI by aarch linux gcc 8.1
by Renlin Li 05 Oct '18

05 Oct '18

CC u-boot mailing list to make people aware of the discussion. By the way, I also noticed that, the final linking command is using: '''-pie -Bstatic --no-dynamic-linker''' And there are self-relocating code in Start.S. BUT it is not included when u-boot is not configured using "POSITION_INDEPENDENT" Which means, PIE feature cannot be used at load time. I am not sure about the code design and use cases, but '''LDFLAGS_u-boot += -pie''' may need to be guarded with '''CONFIG_POSITION_INDEPENDENT''' as well? Otherwise what is the purpose of pie without processing the dynamic relocations? I tried to do that, and with some fixes in other places to change the checks for relocations, it could generate a binary without any relocations. Though, I am NOT sure about the CORRECTNESS of the binary. In the original code, R_AARCH64_ABS32 relocation is used to resolve an address at static linking time. It seems works fine originally (which doesn't mean it is not bugous). I assume it is because, no one is trying to use pie feature really. If people is using pie feature to load the binary in a different address, proper relocations are required, as well as the self-relocating code. The linker won't generate a dynamic RELATIVE relocation for _AARCH64_ABS32. SO the address in the table won't be updated by the fixup code. However, bfd linker will generate a dynamic RELATIVE relocation for R_AARCH64_ABS64 relocation, and it could be processed by self-relocating code, taking the load address into account. Regards, Renlin On Tue, Oct 2, 2018 at 11:45 AM Renlin Li <renlin.dev(a)gmail.com> wrote: > Hi Meng, > > Thanks for raising the issue! > I could reproduce the issue with the information you gave. > > It seems to me that, the change I made earlier catches an issue here. > in /arch/arm/cpu/armv8/psci.S > > */* PSCI function and ID table definition*/* > *#define PSCI_TABLE(__id, __fn) \* > * .word __id; \* > * .word __fn* > > "*.word*" is used to hold the address of a function. > > The toolchain you used is aarch64-linux, which by default supports LP64 > ABI. > This means Long and void * (pointer) data type is 64-bit. > > IIUC, a "*.xword*" should be used instead. Otherwise, you should use > ILP32 ABI. But be aware, the support for ILP32 might not be complete. > > Regards, > Renlin > > > >> >> Hi All, >> Could you please help to have a look whether below issue is valuable? >> I got u-boot source code from https://github.com/u-boot/u-boot.git, >> branch = >> is master. >> I got toolchain from >> https://mirrors.edge.kernel.org/pub/tools/crosstool/fi= >> les/bin/x86_64/8.1.0/ >> I built stratix10(socfpga) platform with below commands: >> export >> CROSS_COMPILE=3Dxxx/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux= >> - >> export ARCH=3Darm64 >> make mrproper >> make socfpga_stratix10_defconfig >> make menuconfig, and then enable CONFIG_ARMV8_PSCI >> make >> there will be below error: >> LD u-boot >> >> /home/wrsadmin/Project/Native/SDK/Altera-Arria-10/gcc-8.1.0-nolibc/aarch64-= >> linux/bin/aarch64-linux-ld.bfd: arch/arm/cpu/armv8/built-in.o: relocation >> R= >> _AARCH64_ABS32 against `psci_cpu_suspend' can not be used when making a >> sha= >> red object > >

1 0

[U-Boot] [PATCH] rockchip: Fix rkimage format for SPL boot over USB
by Daniel Gröber 05 Oct '18

05 Oct '18

The 'rkimage' format used for booting rockchip boards over USB seems to have been broken since commit 7bf274b9caab ("rockchip: mkimage: use imagename to select spl hdr & spl size"). That commit adds an offset of RK_SPL_HDR_START(=2048) to the location the 'RKxx' header is written at. However the bootrom expects this header to be the first four bytes of the image, not at offset 2048. This appears to have been a copy paste error since the 'rksd' and 'rkspi' image types do require this offset. Furthermore commit 111bcc4fb6cb ("rockchip: mkimage: pad the header to 8-bytes (using a 'nop') for RK3399"), commit 3d54eabcafec9 ("rockchip: spl: RK3399: use boot0 hook to create space for SPL magic") and commit 308277569229 ("rockchip: mkimage: update rkimage to support pre-padded payloads") changed the way the space for the 'RKxx' header is allocated and written to the image without adjusting 'rkimage'. This commit fixes those mistakes and makes it possible to load u-boot SPL over USB once more. (Tested on RK3399) Signed-off-by: Daniel Gröber <daniel(a)dps.uibk.ac.at> --- tools/rkimage.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/rkimage.c b/tools/rkimage.c index a0a3185370..ae50de55c9 100644 --- a/tools/rkimage.c +++ b/tools/rkimage.c @@ -15,8 +15,7 @@ static uint32_t header; static void rkimage_set_header(void *buf, struct stat *sbuf, int ifd, struct image_tool_params *params) { - memcpy(buf + RK_SPL_HDR_START, rkcommon_get_spl_hdr(params), - RK_SPL_HDR_SIZE); + memcpy(buf, rkcommon_get_spl_hdr(params), RK_SPL_HDR_SIZE); if (rkcommon_need_rc4_spl(params)) rkcommon_rc4_encode_spl(buf, 4, params->file_size); @@ -36,7 +35,7 @@ static int rkimage_check_image_type(uint8_t type) U_BOOT_IMAGE_TYPE( rkimage, "Rockchip Boot Image support", - 4, + 0, &header, rkcommon_check_params, NULL, -- 2.11.0

2 2

[U-Boot] [PATCH] Revert "test/py: Import 'configparser' lower case to be python 3.x safe"
by Michal Simek 05 Oct '18

05 Oct '18

This reverts commit 052ca37daa20a9825d7ce905d632e349f434058d. This patch introduced bug which hasn't been resolved for quite a long time. Full failed log is placed below but the major sign is "codec can't decode byte 0x80 in position". This issue is at least on my Ubuntu 14.04 system but others reported similar issue. FAILED: u_boot_console = <u_boot_console_exec_attach.ConsoleExecAttach object at 0x7f6020cc1950> def test_version(u_boot_console): """Test that the "version" command prints the U-Boot version.""" # "version" prints the U-Boot sign-on message. This is usually # considered # an error, so that any unexpected reboot causes an error. Here, # this # error detection is disabled since the sign-on message is # expected. with u_boot_console.disable_check('main_signon'): > response = u_boot_console.run_command('version') test/py/tests/test_000_version.py:17: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ test/py/u_boot_console_base.py:181: in run_command self.logstream.write(self.prompt, implicit=True) test/py/multiplexed_log.py:65: in write self.logfile.write(self, data, implicit) test/py/multiplexed_log.py:688: in write self.f.write(self._escape(data)) test/py/multiplexed_log.py:335: in _escape c for c in data) _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ .0 = <iterator object at 0x7f6020bce950> data = ''.join((c in self._nonprint) and ('%25%25%2502x' %25 ord(c)) or > c for c in data) E UnicodeDecodeError: 'ascii' codec can't decode byte 0x80 in position 32: ordinal not in range(128) test/py/multiplexed_log.py:335: UnicodeDecodeError Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- I am sending this revert because Marek also hit this issue on his PC. --- test/py/conftest.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/test/py/conftest.py b/test/py/conftest.py index 5c658b8c4840..e591f5879dcb 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -18,15 +18,11 @@ import os import os.path import pytest from _pytest.runner import runtestprotocol +import ConfigParser import re import StringIO import sys -try: - import configparser -except: - import ConfigParser as configparser - # Globals: The HTML log file, and the connection to the U-Boot console. log = None console = None @@ -170,7 +166,7 @@ def pytest_configure(config): with open(dot_config, 'rt') as f: ini_str = '[root]\n' + f.read() ini_sio = StringIO.StringIO(ini_str) - parser = configparser.RawConfigParser() + parser = ConfigParser.RawConfigParser() parser.readfp(ini_sio) ubconfig.buildconfig.update(parser.items('root')) -- 1.9.1

2 2

[U-Boot] [PATCH 0/3] power: Add support for the Dialog DA9063 PMIC
by Martin Fuzzey 05 Oct '18

05 Oct '18

Add basic support for the Dialog DA9063 PMIC. Only the regulators are supported for the moment. Also teach "pmic dump" to handle non contiguous register maps. Martin Fuzzey (3): pmic: allow dump command for non contiguous register maps power: pmic: add driver for Dialog DA9063 PMIC power: regulator: add driver for Dialog DA9063 PMIC cmd/pmic.c | 12 +- drivers/power/pmic/Kconfig | 7 + drivers/power/pmic/Makefile | 1 + drivers/power/pmic/da9063.c | 187 ++++++++++++++++++ drivers/power/regulator/Kconfig | 10 + drivers/power/regulator/Makefile | 1 + drivers/power/regulator/da9063.c | 395 +++++++++++++++++++++++++++++++++++++++ include/power/da9063_pmic.h | 308 ++++++++++++++++++++++++++++++ 8 files changed, 919 insertions(+), 2 deletions(-) create mode 100644 drivers/power/pmic/da9063.c create mode 100644 drivers/power/regulator/da9063.c create mode 100644 include/power/da9063_pmic.h -- 1.9.1

1 3

[U-Boot] [PATCH] arm64: zynqmp: Enable CDC ethernet gadget for zcu100/Ultra96
by Michal Simek 05 Oct '18

05 Oct '18

Ethernet is not present on this board that's why there are two other options how to wire the board to ethernet. The first is asix_eth usb host converter which is already enabled by default. The second option is to use USB CDC/RNDIS ethernet gadget. This patch is enabling CDC which is working with Linux. With new bind/unbind command there is no need to call usb_ether_init() from platform code and use for example these commands: bind /amba/usb0@ff9d0000/dwc3@fe200000 usb_ether dhcp unbind /amba/usb0@ff9d0000/dwc3@fe200000 Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- configs/avnet_ultra96_rev1_defconfig | 5 +++++ configs/xilinx_zynqmp_zcu100_revC_defconfig | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/configs/avnet_ultra96_rev1_defconfig b/configs/avnet_ultra96_rev1_defconfig index 3d073670075f..c49c9f23465d 100644 --- a/configs/avnet_ultra96_rev1_defconfig +++ b/configs/avnet_ultra96_rev1_defconfig @@ -21,6 +21,7 @@ CONFIG_SPL_ATF=y CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_BOOTMENU=y CONFIG_CMD_MEMTEST=y +CONFIG_CMD_BIND=y CONFIG_CMD_CLK=y CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set @@ -65,6 +66,8 @@ CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_DM_ETH=y +# CONFIG_NETDEVICES is not set CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ZYNQ_SERIAL=y @@ -83,6 +86,8 @@ CONFIG_USB_ULPI=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_USB_ETHER=y +CONFIG_USB_ETH_CDC=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_WDT=y diff --git a/configs/xilinx_zynqmp_zcu100_revC_defconfig b/configs/xilinx_zynqmp_zcu100_revC_defconfig index d21abe253a26..dc1e7cd8240f 100644 --- a/configs/xilinx_zynqmp_zcu100_revC_defconfig +++ b/configs/xilinx_zynqmp_zcu100_revC_defconfig @@ -21,6 +21,7 @@ CONFIG_SPL_ATF=y CONFIG_SYS_PROMPT="ZynqMP> " CONFIG_CMD_BOOTMENU=y CONFIG_CMD_MEMTEST=y +CONFIG_CMD_BIND=y CONFIG_CMD_CLK=y CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set @@ -65,6 +66,8 @@ CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_DM_ETH=y +# CONFIG_NETDEVICES is not set CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ZYNQ_SERIAL=y @@ -83,6 +86,8 @@ CONFIG_USB_ULPI=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_USB_ETHER=y +CONFIG_USB_ETH_CDC=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_WDT=y -- 1.9.1

1 0

[U-Boot] [PATCH v5 1/2] spl: add support to booting with OP-TEE
by Kever Yang 04 Oct '18

04 Oct '18

OP-TEE is an open source trusted OS, in armv7, its loading and running are like this: loading: - SPL load both OP-TEE and U-Boot running: - SPL run into OP-TEE in secure mode; - OP-TEE run into U-Boot in non-secure mode; To make code simple, it would be fine to use IH_OS_TEE for the os tyle in TPL(just like IH_OS_LINUX is using both in SPL and U-Boot). Here is the diagram for SPL loading OP-TEE, IH_OS_TEE:(make u-boot.itb for SPL) Non-Secure Secure BootROM | v SPL | v --------- OP-TEE | v U-Boot | V Linux For other two king of OP-TEE loading/booting, see commit message: 45b55712d4 image: Add IH_OS_TEE for TEE chain-load boot More detail: https://github.com/OP-TEE/optee_os and search for 'boot arguments' for detail entry parameter in: core/arch/arm/kernel/generic_entry_a32.S Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> Cc: Bryan O'Donoghue <bryan.odonoghue(a)linaro.org> --- Changes in v5: - Split the patch out from rk3229 seris - Use IH_OS_TEE instead of IH_OS_OP-TEE Changes in v4: - use NULL instead of '0' - add fdt_addr as arg2 of entry Changes in v2: - Using new image type for op-tee common/spl/Kconfig | 7 +++++++ common/spl/Makefile | 1 + common/spl/spl.c | 7 +++++++ common/spl/spl_optee.S | 12 ++++++++++++ include/spl.h | 13 +++++++++++++ 5 files changed, 40 insertions(+) create mode 100644 common/spl/spl_optee.S diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 99c9053ab8..db1915fe5c 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -799,6 +799,13 @@ config SPL_AM33XX_ENABLE_RTC32K_OSC Enable access to the AM33xx RTC and select the external 32kHz clock source. +config SPL_OPTEE + bool "Support OP-TEE Trusted OS" + depends on ARM + help + OP-TEE is an open source Trusted OS which is loaded by SPL. + More detail at: https://github.com/OP-TEE/optee_os + config TPL bool depends on SUPPORT_TPL diff --git a/common/spl/Makefile b/common/spl/Makefile index 814081feda..a130a5be4b 100644 --- a/common/spl/Makefile +++ b/common/spl/Makefile @@ -21,6 +21,7 @@ obj-$(CONFIG_$(SPL_TPL_)UBI) += spl_ubi.o obj-$(CONFIG_$(SPL_TPL_)NET_SUPPORT) += spl_net.o obj-$(CONFIG_$(SPL_TPL_)MMC_SUPPORT) += spl_mmc.o obj-$(CONFIG_$(SPL_TPL_)ATF) += spl_atf.o +obj-$(CONFIG_$(SPL_TPL_)OPTEE) += spl_optee.o obj-$(CONFIG_$(SPL_TPL_)USB_SUPPORT) += spl_usb.o obj-$(CONFIG_$(SPL_TPL_)FAT_SUPPORT) += spl_fat.o obj-$(CONFIG_$(SPL_TPL_)EXT_SUPPORT) += spl_ext.o diff --git a/common/spl/spl.c b/common/spl/spl.c index a1e7b9fa91..482f6e53ef 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -529,6 +529,13 @@ void board_init_r(gd_t *dummy1, ulong dummy2) spl_invoke_atf(&spl_image); break; #endif +#if CONFIG_IS_ENABLED(OPTEE) + case IH_OS_TEE: + debug("Jumping to U-Boot via OP-TEE\n"); + spl_optee_entry(NULL, NULL, spl_image.fdt_addr, + (void *)spl_image.entry_point); + break; +#endif #ifdef CONFIG_SPL_OS_BOOT case IH_OS_LINUX: debug("Jumping to Linux\n"); diff --git a/common/spl/spl_optee.S b/common/spl/spl_optee.S new file mode 100644 index 0000000000..86fc398546 --- /dev/null +++ b/common/spl/spl_optee.S @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2017 Rockchip Electronic Co.,Ltd + */ + +#include <linux/linkage.h> +#include <asm/assembler.h> + +ENTRY(spl_optee_entry) + ldr lr, =CONFIG_SYS_TEXT_BASE + mov pc, r3 +ENDPROC(spl_optee_entry) diff --git a/include/spl.h b/include/spl.h index 86287874e1..d9145ad6dc 100644 --- a/include/spl.h +++ b/include/spl.h @@ -288,6 +288,19 @@ int spl_mmc_load_image(struct spl_image_info *spl_image, */ void spl_invoke_atf(struct spl_image_info *spl_image); +/** + * spl_optee_entry - entry function for optee + * + * args defind in op-tee project + * https://github.com/OP-TEE/optee_os/ + * core/arch/arm/kernel/generic_entry_a32.S + * @arg0: pagestore + * @arg1: (ARMv7 standard bootarg #1) + * @arg2: device tree address, (ARMv7 standard bootarg #2) + * @arg3: non-secure entry address (ARMv7 bootarg #0) + */ +void spl_optee_entry(void *arg0, void *arg1, void *arg2, void *arg3); + /** * board_return_to_bootrom - allow for boards to continue with the boot ROM * -- 2.18.0

2 4

[U-Boot] [PATCH] rockchip: make_fit_atf.py depends on u-boot
by Andreas Färber 04 Oct '18

04 Oct '18

u-boot.itb depends on u-boot-nodtb.bin, which in turn depends on u-boot. u-boot.its from Rockchip make_fit_atf.py (used by {evb,firefly}-rk3399) wants to read u-boot but is lacking this dependency, so that u-boot.itb cannot be built in one go. Detect its use and add the missing dependency. Reported-by: Yousaf Kaukab <yousaf.kaukab(a)suse.com> Signed-off-by: Andreas Färber <afaerber(a)suse.de> --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f31ee60e4c..3723346c4f 100644 --- a/Makefile +++ b/Makefile @@ -1051,7 +1051,10 @@ U_BOOT_ITS = $(subst ",,$(CONFIG_SPL_FIT_SOURCE)) else ifneq ($(CONFIG_SPL_FIT_GENERATOR),"") U_BOOT_ITS := u-boot.its -$(U_BOOT_ITS): FORCE +ifeq ($(CONFIG_SPL_FIT_GENERATOR),"arch/arm/mach-rockchip/make_fit_atf.py") +U_BOOT_ITS_DEPS += u-boot +endif +$(U_BOOT_ITS): $(U_BOOT_ITS_DEPS) FORCE $(srctree)/$(CONFIG_SPL_FIT_GENERATOR) \ $(patsubst %,arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) > $@ endif -- 2.16.3

2 2

[U-Boot] [PATCH RESEND 1/2] rockchip: make_fit_atf: use elf entry point
by Mian Yousaf Kaukab 04 Oct '18

04 Oct '18

make_fit_atf.py uses physical address of first segment as the entry point to bl31. It is incorrect and causes following abort when bl31_entry() is called: U-Boot SPL board initTrying to boot from MMC1 "Synchronous Abort" handler, esr 0x02000000 elr: 0000000000000000 lr : 00000000ff8c7e8c x 0: 00000000ff8e0000 x 1: 0000000000000000 x 2: 0000000000000000 x 3: 00000000ff8e0180 x 4: 0000000000000000 x 5: 0000000000000000 x 6: 0000000000000030 x 7: 00000000ff8e0188 x 8: 00000000000001e0 x 9: 0000000000000000 x10: 000000000007fcdc x11: 00000000002881b8 x12: 00000000000001a2 x13: 0000000000000198 x14: 000000000007fdcc x15: 00000000002881b8 x16: 00000000003c0724 x17: 00000000003c0718 x18: 000000000007fe80 x19: 00000000ff8e0000 x20: 0000000000200000 x21: 00000000ff8e0000 x22: 0000000000000000 x23: 000000000007fe30 x24: 00000000ff8d1c3c x25: 00000000ff8d5000 x26: 00000000deadbeef x27: 00000000000004a0 x28: 000000000000009c x29: 000000000007fd90 Fix it by using the entry point from the elf header. Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab(a)suse.com> --- arch/arm/mach-rockchip/make_fit_atf.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-rockchip/make_fit_atf.py b/arch/arm/mach-rockchip/make_fit_atf.py index 6b3d9201c9..b88a5e1f16 100755 --- a/arch/arm/mach-rockchip/make_fit_atf.py +++ b/arch/arm/mach-rockchip/make_fit_atf.py @@ -53,7 +53,7 @@ DT_END=""" }; """ -def append_atf_node(file, atf_index, phy_addr): +def append_atf_node(file, atf_index, phy_addr, elf_entry): """ Append ATF DT node to input FIT dts file. """ @@ -67,7 +67,7 @@ def append_atf_node(file, atf_index, phy_addr): print >> file, '\t\t\tcompression = "none";' print >> file, '\t\t\tload = <0x%08x>;' % phy_addr if atf_index == 1: - print >> file, '\t\t\tentry = <0x%08x>;' % phy_addr + print >> file, '\t\t\tentry = <0x%08x>;' % elf_entry print >> file, '\t\t};' print >> file, '' @@ -141,12 +141,13 @@ def generate_atf_fit_dts(fit_file_name, bl31_file_name, uboot_file_name, dtbs_fi with open(bl31_file_name) as bl31_file: bl31 = ELFFile(bl31_file) + elf_entry = bl31.header['e_entry'] for i in range(bl31.num_segments()): seg = bl31.get_segment(i) if ('PT_LOAD' == seg.__getitem__(ELF_SEG_P_TYPE)): paddr = seg.__getitem__(ELF_SEG_P_PADDR) p= seg.__getitem__(ELF_SEG_P_PADDR) - append_atf_node(fit_file, i+1, paddr) + append_atf_node(fit_file, i+1, paddr, elf_entry) atf_cnt = i+1 append_fdt_node(fit_file, dtbs_file_name) print >> fit_file, '%s' % DT_IMAGES_NODE_END -- 2.11.0

5 12

[U-Boot] [PATCH v4 0/7] Add ethernet support for phyCORE-RK3288
by Janine Hagemann 04 Oct '18

04 Oct '18

- Change a used function Janine Hagemann (7): arch: arm: mach-rockchip: rk3288: Enable regulators in board_init config: phycore-rk3288_defconfig: add PHY_TI drivers: net: designware: Add reading of DT phy-handle node ARM: dts: rockchip: ADD dp83867 CLK_OUT muxing rockchip: rk3288-phycore: set flash1 iodomain to 1.8V net: gmac_rockchip: Fix a register write in rk3328_gmac_set_to_rgmii net: gmac_rockchip: Add handeling for RGMII_ID/RXID/TXID arch/arm/dts/rk3288-phycore-som.dtsi | 1 + arch/arm/mach-rockchip/rk3288-board.c | 12 ++--- board/phytec/phycore_rk3288/phycore-rk3288.c | 16 ++++++ configs/phycore-rk3288_defconfig | 1 + drivers/net/designware.c | 11 +++- drivers/net/designware.h | 1 + drivers/net/gmac_rockchip.c | 80 ++++++++++++++++++++++------ 7 files changed, 98 insertions(+), 24 deletions(-) -- 2.7.4

4 13