July 2020 - U-Boot

[PATCH] rockchip: rk3399: Add default env to support compressed krenel Image
by Kever Yang 18 Jul '20

18 Jul '20

Add default kernel_comp_addr_r and kernel_comp_size to support boot from compressed kernel Image, this space is temporarily used during decompress according to README.distro. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- include/configs/rk3399_common.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index e63ebb14f7..4121d5edc4 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -53,7 +53,9 @@ "pxefile_addr_r=0x00600000\0" \ "fdt_addr_r=0x01f00000\0" \ "kernel_addr_r=0x02080000\0" \ - "ramdisk_addr_r=0x06000000\0" + "ramdisk_addr_r=0x06000000\0" \ + "kernel_comp_addr_r=0x08000000\0" \ + "kernel_comp_size=0x2000000\0" #ifndef ROCKCHIP_DEVICE_SETTINGS #define ROCKCHIP_DEVICE_SETTINGS -- 2.17.1

1 0

[PATCH 0/3] rockchip: rk3328: Add SPI support
by Johannes Krottmayer 18 Jul '20

18 Jul '20

This patch series adds support for the RK3328 SPI controller. Johannes Krottmayer (3): drivers: clk: rockchip: clk_rk3328: Add SPI support drivers: spi: rk_spi: Add support for RK3328 ARM: dts: rk3328: Add SPI support arch/arm/dts/rk3328-u-boot.dtsi | 5 +++++ drivers/clk/rockchip/clk_rk3328.c | 31 +++++++++++++++++++++++++++++++ drivers/spi/rk_spi.c | 2 ++ 3 files changed, 38 insertions(+) -- 2.26.2

2 7

[PATCH] rockchip: sdram: fix dram_init_banksize
by Alex Bee 18 Jul '20

18 Jul '20

Currently 2.5 GB is calculated as DRAM size for a 1 GB RK322x board if CONFIG_SPL_OPTEE is set. This is troublesome when booting a linux kernel since this size will be injected in FDT of the kernel. gd->bd->bi_dram[0].start (which is basically CONFIG_SYS_SDRAM_BASE) must not be taken into consideration for calculation of second bank size, since this offset is already included in calculation of "top". After applying this patch 992 MB (1024 MB - 32 MB reserved for optee-os) is correctly calculated and has also been verified on 2 GB boards. Signed-off-by: Alex Bee <knaerzche(a)gmail.com> --- arch/arm/mach-rockchip/sdram.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-rockchip/sdram.c b/arch/arm/mach-rockchip/sdram.c index 24fe6cc8f0..4c637b7767 100644 --- a/arch/arm/mach-rockchip/sdram.c +++ b/arch/arm/mach-rockchip/sdram.c @@ -56,16 +56,14 @@ int dram_init_banksize(void) - CONFIG_SYS_SDRAM_BASE; gd->bd->bi_dram[1].start = tos_parameter->tee_mem.phy_addr + tos_parameter->tee_mem.size; - gd->bd->bi_dram[1].size = gd->bd->bi_dram[0].start - + top - gd->bd->bi_dram[1].start; + gd->bd->bi_dram[1].size = top - gd->bd->bi_dram[1].start; } else { gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; gd->bd->bi_dram[0].size = 0x8400000; /* Reserve 32M for OPTEE with TA */ gd->bd->bi_dram[1].start = CONFIG_SYS_SDRAM_BASE + gd->bd->bi_dram[0].size + 0x2000000; - gd->bd->bi_dram[1].size = gd->bd->bi_dram[0].start - + top - gd->bd->bi_dram[1].start; + gd->bd->bi_dram[1].size = top - gd->bd->bi_dram[1].start; } #else gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; -- 2.25.1

2 2

[PATCH 0/2] PINE64 Rock64 board: Add SPI Flash support
by Johannes Krottmayer 18 Jul '20

18 Jul '20

This patch series adds SPI Flash support for the PINE64 Rock64 board. Tested with the version 2.0 of the board. Johannes Krottmayer (2): ARM: dts: rk3328-rock64: Add SPI Flash support configs: rock64-rk3328_defconfig: Add SPI Flash support arch/arm/dts/rk3328-rock64-u-boot.dtsi | 6 ++++++ configs/rock64-rk3328_defconfig | 2 ++ 2 files changed, 8 insertions(+) -- 2.26.2

2 5

[PATCH v3 1/6] rock-pi-4: Enable USB3 Host
by Jagan Teki 18 Jul '20

18 Jul '20

Enable USB3.0 Host support for RockPI-4 boards. Note that the Upper USB3.0 port is marked as otg and lower USB3.0 port marked as host, so this below log capture when USB3.0 mass storage plug in at lower USB 3.0 port. Log: Bus usb@fe380000: USB EHCI 1.00 Bus usb@fe3c0000: USB EHCI 1.00 Bus dwc3: usb maximum-speed not found Register 2000140 NbrPorts 2 Starting the controller USB XHCI 1.10 Bus dwc3: usb maximum-speed not found Register 2000140 NbrPorts 2 Starting the controller USB XHCI 1.10 scanning bus usb@fe380000 for devices... 1 USB Device(s) found scanning bus usb@fe3c0000 for devices... 1 USB Device(s) found scanning bus dwc3 for devices... 1 USB Device(s) found scanning bus dwc3 for devices... cannot reset port 1!? 2 USB Device(s) found scanning usb for storage devices... 1 Storage Device(s) found => usb tree USB device tree: 1 Hub (480 Mb/s, 0mA) u-boot EHCI Host Controller 1 Hub (480 Mb/s, 0mA) u-boot EHCI Host Controller 1 Hub (5 Gb/s, 0mA) U-Boot XHCI Host Controller 1 Hub (5 Gb/s, 0mA) | U-Boot XHCI Host Controller | +-2 Mass Storage (5 Gb/s, 224mA) SanDisk Dual Drive 040130e3ee554b7078843f4eb331646 Cc: Tom Cubie <tom(a)radxa.com> Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang(a)rock-chips.com> --- Changes for v3: - collect kever review tag configs/rock-pi-4-rk3399_defconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig index 0d86fdc895..2487872219 100644 --- a/configs/rock-pi-4-rk3399_defconfig +++ b/configs/rock-pi-4-rk3399_defconfig @@ -28,6 +28,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MISC=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SDHCI=y @@ -35,11 +36,14 @@ CONFIG_MMC_SDHCI_ROCKCHIP=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y +CONFIG_PHY_ROCKCHIP_TYPEC=y CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM_RK3399_LPDDR4=y +CONFIG_DM_RESET=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y @@ -48,6 +52,8 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_GENERIC=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX88179=y -- 2.25.1

2 8

[PATCH v5 0/5] roc-rk3399-pc: Custom SPL
by Jagan Teki 18 Jul '20

18 Jul '20

This series supports custom initialization code required for roc-rk3399-pc board on SPL stage. Now this series is well mature code handling to add custom spl_board_init code parts. roc-rk3399-pc would require custom leds initialization based on user intervention of the power key. This code handles the user intervention via SPI environment variable. If someone or production systems wants this feature then 'pwr_key' has to be set otherwise it is normal like other rk3399 boards in Mainline. Changes for v5: - drop banner changes - add code changes in roc-pc-rk3399.c Changes for v4: - enable SPL_BOARD_INIT in all platforms Changes for v3: - support leds on SPL - support env 'pwr_key' Jagan Teki (5): roc-rk3399-pc: Move leds setup in SPL rockchip: Don't clear the reset status reg rockchip: Separate the reset cause from display cpuinfo rockchip: spl: Move board_early_init_f after cpu timer roc-rk3399-pc: Set LED only during POR and pwr_key=y arch/arm/include/asm/arch-rockchip/cru.h | 3 +- arch/arm/mach-rockchip/Makefile | 5 +- arch/arm/mach-rockchip/cpu-info.c | 26 ++++---- arch/arm/mach-rockchip/spl.c | 5 +- arch/arm/mach-rockchip/tpl.c | 7 --- board/firefly/roc-pc-rk3399/roc-pc-rk3399.c | 67 ++++++++++++++++----- configs/roc-pc-mezzanine-rk3399_defconfig | 5 +- configs/roc-pc-rk3399_defconfig | 5 +- 8 files changed, 80 insertions(+), 43 deletions(-) -- 2.25.1

2 9

[PATCH 1/3] ram: rk3399: Drop debug stride in driver
by Jagan Teki 18 Jul '20

18 Jul '20

stride debug is already present in sdram_common.c via RAM_ROCKCHIP_DEBUG. So, drop the redundant debug stride code in rk3399 driver. Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> --- drivers/ram/rockchip/sdram_rk3399.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index 60a1ab8b51..d2f3fde236 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -2875,31 +2875,6 @@ static unsigned char calculate_stride(struct rk3399_sdram_params *params) if (stride == (-1)) goto error; } - switch (stride) { - case 0xc: - printf("128B stride\n"); - break; - case 5: - case 9: - case 0xd: - case 0x11: - case 0x19: - printf("256B stride\n"); - break; - case 0xa: - case 0xe: - case 0x12: - printf("512B stride\n"); - break; - case 0xf: - printf("4K stride\n"); - break; - case 0x1f: - printf("32MB + 256B stride\n"); - break; - default: - printf("no stride\n"); - } sdram_print_stride(stride); -- 2.25.1

2 5

[PATCH 0/3] phy: rockchip: Add PCIe phy driver
by Jagan Teki 18 Jul '20

18 Jul '20

This series add PCIe PHY driver for rockchip platform. Tested on ROC-RK3399-PC and RockPi 4. Any inputs? Jagan. Jagan Teki (3): phy: Add Rockchip PCIe PHY driver pci: rockchip: Switch to generic-phy pci: rockchip: Drop legacy PHY driver drivers/pci/Kconfig | 1 + drivers/pci/Makefile | 2 +- drivers/pci/pcie_rockchip.c | 95 +++++++- drivers/pci/pcie_rockchip.h | 141 ------------ drivers/pci/pcie_rockchip_phy.c | 205 ----------------- drivers/phy/rockchip/Kconfig | 7 + drivers/phy/rockchip/Makefile | 1 + drivers/phy/rockchip/phy-rockchip-pcie.c | 271 +++++++++++++++++++++++ 8 files changed, 364 insertions(+), 359 deletions(-) delete mode 100644 drivers/pci/pcie_rockchip.h delete mode 100644 drivers/pci/pcie_rockchip_phy.c create mode 100644 drivers/phy/rockchip/phy-rockchip-pcie.c -- 2.25.1

2 6

[PATCH 1/1] efi_loader: document efi_save_gd(), efi_restore_gd()
by Heinrich Schuchardt 18 Jul '20

18 Jul '20

Provide function descriptions for efi_save_gd() and efi_restore_gd(). Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_boottime.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 0b16554ba2..d49145fc76 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -104,7 +104,15 @@ int __efi_exit_check(void) return ret; } -/* Called from do_bootefi_exec() */ +/** + * efi_save_gd() - save global data register + * + * On the ARM architecture gd is mapped to a fixed register (r9 or x18). + * As this register may be overwritten by an EFI payload we save it here + * and restore it on every callback entered. + * + * This function is called after relocation from initr_reloc_global_data(). + */ void efi_save_gd(void) { #ifdef CONFIG_ARM @@ -112,10 +120,12 @@ void efi_save_gd(void) #endif } -/* - * Special case handler for error/abort that just forces things back to u-boot - * world so we can dump out an abort message, without any care about returning - * back to UEFI world. +/** + * efi_restore_gd() - restore global data register + * + * On the ARM architecture gd is mapped to a fixed register (r9 or x18). + * Restore it after returning from the UEFI world to the value saved via + * efi_save_gd(). */ void efi_restore_gd(void) { -- 2.27.0

1 0

[PATCH 1/1] ls1088ardb :Set CONFIG_SYS_BOARD to ls1088ardb
by jaiprakash.singh＠nxp.com 18 Jul '20

18 Jul '20

From: Jaiprakash Singh <Jaiprakash.singh(a)nxp.com> Env variable board and board_name set to CONFIG_SYS_BOARD Signed-off-by: Jaiprakash Singh <Jaiprakash.singh(a)nxp.com> --- include/configs/ls1088ardb.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index 815449f..650ffa3 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -319,6 +319,8 @@ #endif /* CONFIG_TFABOOT */ #undef CONFIG_EXTRA_ENV_SETTINGS +#undef CONFIG_SYS_BOARD +#define CONFIG_SYS_BOARD "ls1088ardb" #ifdef CONFIG_TFABOOT #define CONFIG_EXTRA_ENV_SETTINGS \ "BOARD=ls1088ardb\0" \ -- 2.7.4

1 0