June 2017 - U-Boot

[U-Boot] [PATCH v2 0/7] Add Rockchip RK3229 SoC
by Kever Yang 26 Jun '17

26 Jun '17

RK3229 is a Quad-core Cortex-A7 SoC, which supports: - 4K 10bit H.264/H.265,VP9. - 32KB internal memory; - eMMC 4.5.1, SD3.0; - DDR3, LPDDR2, LPDDR3; - HDMI 2.0 output, 4K@60Hz; - USB2.0 OTG and USB2.0 host; Changes in v2: - update copyright - fix typo - some update for sdram common code Kever Yang (7): rockchip: mkimage: add support for rk322x soc rockchip: rk322x: add clock driver rockchip: rk322x: add pinctrl driver rockchip: rk322x: add dts file rockchip: rk322x: add basic soc support rockchip: rk322x: add sysreset driver rockchip: add evb_rk3229 board arch/arm/dts/rk3229-evb.dts | 77 +++ arch/arm/dts/rk322x.dtsi | 710 ++++++++++++++++++++++++ arch/arm/include/asm/arch-rockchip/clock.h | 1 + arch/arm/include/asm/arch-rockchip/cru_rk322x.h | 215 +++++++ arch/arm/include/asm/arch-rockchip/grf_rk322x.h | 519 +++++++++++++++++ arch/arm/mach-rockchip/Kconfig | 14 + arch/arm/mach-rockchip/Makefile | 3 + arch/arm/mach-rockchip/rk322x-board-spl.c | 77 +++ arch/arm/mach-rockchip/rk322x-board.c | 136 +++++ arch/arm/mach-rockchip/rk322x/Kconfig | 18 + arch/arm/mach-rockchip/rk322x/Makefile | 9 + arch/arm/mach-rockchip/rk322x/clk_rk322x.c | 32 ++ arch/arm/mach-rockchip/rk322x/syscon_rk322x.c | 22 + board/rockchip/evb_rk3229/Kconfig | 15 + board/rockchip/evb_rk3229/MAINTAINERS | 6 + board/rockchip/evb_rk3229/Makefile | 7 + board/rockchip/evb_rk3229/evb_rk3229.c | 12 + configs/evb-rk3229_defconfig | 44 ++ drivers/clk/rockchip/Makefile | 1 + drivers/clk/rockchip/clk_rk322x.c | 413 ++++++++++++++ drivers/pinctrl/Kconfig | 10 + drivers/pinctrl/rockchip/Makefile | 1 + drivers/pinctrl/rockchip/pinctrl_rk322x.c | 294 ++++++++++ drivers/sysreset/sysreset_rk322x.c | 45 ++ include/configs/evb_rk3229.h | 60 ++ include/configs/rk322x_common.h | 93 ++++ include/dt-bindings/clock/rk3228-cru.h | 238 ++++++++ tools/rkcommon.c | 1 + 28 files changed, 3073 insertions(+) create mode 100644 arch/arm/dts/rk3229-evb.dts create mode 100644 arch/arm/dts/rk322x.dtsi create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk322x.h create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rk322x.h create mode 100644 arch/arm/mach-rockchip/rk322x-board-spl.c create mode 100644 arch/arm/mach-rockchip/rk322x-board.c create mode 100644 arch/arm/mach-rockchip/rk322x/Kconfig create mode 100644 arch/arm/mach-rockchip/rk322x/Makefile create mode 100644 arch/arm/mach-rockchip/rk322x/clk_rk322x.c create mode 100644 arch/arm/mach-rockchip/rk322x/syscon_rk322x.c create mode 100644 board/rockchip/evb_rk3229/Kconfig create mode 100644 board/rockchip/evb_rk3229/MAINTAINERS create mode 100644 board/rockchip/evb_rk3229/Makefile create mode 100644 board/rockchip/evb_rk3229/evb_rk3229.c create mode 100644 configs/evb-rk3229_defconfig create mode 100644 drivers/clk/rockchip/clk_rk322x.c create mode 100644 drivers/pinctrl/rockchip/pinctrl_rk322x.c create mode 100644 drivers/sysreset/sysreset_rk322x.c create mode 100644 include/configs/evb_rk3229.h create mode 100644 include/configs/rk322x_common.h create mode 100644 include/dt-bindings/clock/rk3228-cru.h -- 1.9.1

2 22

[U-Boot] [PATCH] rockchip: rk3328: correct mem_region
by Kever Yang 26 Jun '17

26 Jun '17

According to rk3328 TRM: 0~0xff000000 is ddr space; 0xff000000~0xffffffff is device space. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- arch/arm/mach-rockchip/rk3328/rk3328.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c index 857f014..cec6f90 100644 --- a/arch/arm/mach-rockchip/rk3328/rk3328.c +++ b/arch/arm/mach-rockchip/rk3328/rk3328.c @@ -13,13 +13,13 @@ static struct mm_region rk3328_mem_map[] = { { .virt = 0x0UL, .phys = 0x0UL, - .size = 0x80000000UL, + .size = 0xff000000UL, .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_INNER_SHARE }, { - .virt = 0xf0000000UL, - .phys = 0xf0000000UL, - .size = 0x10000000UL, + .virt = 0xff000000UL, + .phys = 0xff000000UL, + .size = 0x1000000UL, .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN -- 1.9.1

3 3

[U-Boot] [PATCH 0/7] rockchip: convert fdt_get to dev_read
by Philipp Tomsich 26 Jun '17

26 Jun '17

With the new dev_read functions available we can start converting drivers we use (and can test) over to the dev_read family of functions. As my development tree's test coverage is currently focused on our Rockchip devices, this series is limited to drivers used in our devices and the Rockchip subarchitecture. To make regression testing easier, these are individual commits (across driver subsystems) instead of a single, large change bunched together. Feel free to flatten these into a single commit as they are merged upstream. Philipp Tomsich (7): rockchip: pinctrl: dm: convert fdt_get to dev_read rockchip: spi: dm: convert fdt_get to dev_read rockchip: xhci: dm: convert fdt_get to dev_read rockchip: mmc: dm: convert fdt_get to dev_read rockchip: net: dm: convert fdt_get to dev_read rockchip: ns16550: dm: convert fdt_get to dev_read rockchip: dm: convert fdt_get to dev_read arch/arm/mach-rockchip/rk3188/sdram_rk3188.c | 20 +++++++++----------- arch/arm/mach-rockchip/rk3288/sdram_rk3288.c | 20 +++++++++----------- arch/arm/mach-rockchip/rk3399/sdram_rk3399.c | 8 +++----- drivers/mmc/rockchip_dw_mmc.c | 18 +++++++----------- drivers/mmc/rockchip_sdhci.c | 3 +-- drivers/net/designware.c | 7 +++---- drivers/net/gmac_rockchip.c | 10 ++++------ drivers/pinctrl/rockchip/pinctrl_rk3036.c | 3 +-- drivers/pinctrl/rockchip/pinctrl_rk3188.c | 3 +-- drivers/pinctrl/rockchip/pinctrl_rk3288.c | 3 +-- drivers/pinctrl/rockchip/pinctrl_rk3328.c | 3 +-- drivers/pinctrl/rockchip/pinctrl_rk3399.c | 3 +-- drivers/pinctrl/rockchip/pinctrl_rv1108.c | 3 +-- drivers/serial/ns16550.c | 11 ++++------- drivers/spi/rk_spi.c | 15 +++++++-------- drivers/usb/host/xhci-rockchip.c | 13 ++++--------- 16 files changed, 57 insertions(+), 86 deletions(-) -- 2.1.4

2 28

[U-Boot] [PATCH] libfdt: fix build with Python 3
by Stefan Agner 25 Jun '17

25 Jun '17

From: Stefan Agner <stefan.agner(a)toradex.com> For some reason Python 3 seems to think it does not need to build the library. Using the --force parameter makes sure that the library gets built always. This is especially important since we move the library in the next step of the Makefile, hence forcing a rebuild every time the higher level Makefile triggers a rebuild is required to make sure the library is always there. Signed-off-by: Stefan Agner <stefan.agner(a)toradex.com> --- lib/libfdt/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libfdt/setup.py b/lib/libfdt/setup.py index 62e7bcc1ac..845a0c2b10 100644 --- a/lib/libfdt/setup.py +++ b/lib/libfdt/setup.py @@ -27,7 +27,7 @@ libfdt_module = Extension( extra_compile_args = cflags ) -sys.argv = [progname, '--quiet', 'build_ext', '--inplace'] +sys.argv = [progname, '--quiet', 'build_ext', '--inplace', '--force'] setup (name = 'libfdt', version = '0.1', -- 2.12.1

4 13

[U-Boot] [PATCH 1/1] efi_loader: abort on unsupported relocation type
by Heinrich Schuchardt 25 Jun '17

25 Jun '17

If a relocation type is not supported loading the EFI binary should be aborted. Writing a message only is insufficient. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_image_loader.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index 3262d76bca..bc8e04d6d9 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -26,7 +26,7 @@ efi_status_t EFIAPI efi_return_handle(void *handle, efi_guid_t *protocol, return EFI_SUCCESS; } -static void efi_loader_relocate(const IMAGE_BASE_RELOCATION *rel, +static efi_status_t efi_loader_relocate(const IMAGE_BASE_RELOCATION *rel, unsigned long rel_size, void *efi_reloc) { const IMAGE_BASE_RELOCATION *end; @@ -63,11 +63,13 @@ static void efi_loader_relocate(const IMAGE_BASE_RELOCATION *rel, default: printf("Unknown Relocation off %x type %x\n", offset, type); + return EFI_LOAD_ERROR; } relocs++; } rel = (const IMAGE_BASE_RELOCATION *)relocs; } + return EFI_SUCCESS; } void __weak invalidate_icache_all(void) @@ -171,7 +173,11 @@ void *efi_load_pe(void *efi, struct efi_loaded_image *loaded_image_info) } /* Run through relocations */ - efi_loader_relocate(rel, rel_size, efi_reloc); + if (EFI_SUCCESS != efi_loader_relocate(rel, rel_size, efi_reloc)) { + efi_free_pages((uint64_t) efi_reloc, + (virt_size + EFI_PAGE_MASK) >> EFI_PAGE_SHIFT); + return NULL; + } /* Flush cache */ flush_cache((ulong)efi_reloc, -- 2.11.0

1 0

Re: [U-Boot] [ANN] U-Boot v2017.07-rc2 released
by Kostya Porotchkin 25 Jun '17

25 Jun '17

Hi, Andreas, What is your PCB revision (silkscreen)? Possible variants: - Rev 1.0 (2 pluggable modules with eMMC/SD) - Rev 2.0 (single module, eMMC soldered on board) Thanks Kosta > -----Original Message----- > From: Andreas Färber [mailto:afaerber@suse.de] > Sent: Friday, June 23, 2017 19:20 > To: u-boot(a)lists.denx.de; Stefan Roese > Cc: Ken Ma; Nadav Haklai; Wilson Ding; Kostya Porotchkin; Alexander > Graf; Matthias Brugger > Subject: [EXT] Re: [U-Boot] [ANN] U-Boot v2017.07-rc2 released > > External Email > > ---------------------------------------------------------------------- > Hi, > > On mvebu_db-88f3720 I am seeing endless resets when doing "scsi scan" or > "scan reset" (SATA). I am chain-loading U-Boot from the vendor U-Boot. > > It seems the latest version working was v2017.01, v2017.03 is failing. > Haven't had time to bisect between releases yet. > > Regards, > Andreas > > -- > SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany > GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG > Nürnberg)

1 0

[U-Boot] Please pull u-boot-rockchip/master
by Dr. Philipp Tomsich 25 Jun '17

25 Jun '17

Tom, there’s a few minor fixes on the Rockchip repository for you. Regards, Philipp. The following changes since commit 235c5b8315c6a9eb566fd3d99a098cc6db869fc5: Merge branch 'master' of git://git.denx.de/u-boot-samsung (2017-06-21 08:01:07 -0400) are available in the git repository at: git://git.denx.de/u-boot-rockchip.git master for you to fetch changes up to 6a464d9cab63f5317bc914e2de52a4de98377743: rockchip: clk: rk3036: correct setting for pll integer mode (2017-06-23 16:40:23 +0200) ---------------------------------------------------------------- Kever Yang (3): rockchip: rk3399: correct SPL_MAX_SIZE rockchip: mkimage: correct spl_size for rk3399 rockchip: clk: rk3036: correct setting for pll integer mode Tom Rini (1): rkcommon.c: Remove unused rkcommon_spi_to_offset drivers/clk/rockchip/clk_rk3036.c | 6 +++--- include/configs/rk3399_common.h | 2 +- tools/rkcommon.c | 7 +------ 3 files changed, 5 insertions(+), 10 deletions(-)

2 1

[U-Boot] [PATCH] atmel, at91: fix corvus board
by Heiko Schocher 25 Jun '17

25 Jun '17

since commit: f8b7fff1d5c5 "serial: atmel_usart: Add clk support" corvus board comes not up anymore. Fix it. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- arch/arm/dts/at91sam9g45-corvus.dts | 2 ++ configs/corvus_defconfig | 6 ++++++ include/configs/corvus.h | 3 +-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/at91sam9g45-corvus.dts b/arch/arm/dts/at91sam9g45-corvus.dts index c207c02..6367996 100644 --- a/arch/arm/dts/at91sam9g45-corvus.dts +++ b/arch/arm/dts/at91sam9g45-corvus.dts @@ -18,6 +18,7 @@ compatible = "atmel,at91sam9m10g45ek", "atmel,at91sam9g45", "atmel,at91sam9"; chosen { + u-boot,dm-pre-reloc; stdout-path = &dbgu; }; @@ -38,6 +39,7 @@ ahb { apb { dbgu: serial@ffffee00 { + u-boot,dm-pre-reloc; status = "okay"; }; diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index 36e6608..ac5eefd 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -6,6 +6,7 @@ CONFIG_TARGET_CORVUS=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9g45-corvus" @@ -31,8 +32,13 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y +CONFIG_CLK=y +CONFIG_CLK_AT91=y +CONFIG_AT91_UTMI=y CONFIG_DFU_NAND=y # CONFIG_MMC is not set +# CONFIG_SPL_DM_SERIAL is not set +CONFIG_ATMEL_USART=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 3847a19..8b8b122 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -43,7 +43,6 @@ #define CONFIG_AT91_GPIO_PULLUP 1 /* keep pullups on peripheral pins */ /* serial console */ -#define CONFIG_ATMEL_USART #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS @@ -72,7 +71,7 @@ #define CONFIG_SYS_SDRAM_SIZE 0x08000000 #define CONFIG_SYS_INIT_SP_ADDR \ - (CONFIG_SYS_SDRAM_BASE + SZ_4K - GENERATED_GBL_DATA_SIZE) + (CONFIG_SYS_SDRAM_BASE + SZ_32K - GENERATED_GBL_DATA_SIZE) /* NAND flash */ #ifdef CONFIG_CMD_NAND -- 2.7.4

2 1

[U-Boot] [PATCH] MAINTAINERS, git-mailrc: update the maintainer for rockchip
by Philipp Tomsich 25 Jun '17

25 Jun '17

Adding myself to MAINTAINERS and git-mailrc for the rockchip sub-architecture. Signed-off-by: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> --- MAINTAINERS | 1 + doc/git-mailrc | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 56dd1f3..0186cfa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -132,6 +132,7 @@ F: arch/arm/mach-rmobile/ ARM ROCKCHIP M: Simon Glass <sjg(a)chromium.org> +M: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> S: Maintained T: git git://git.denx.de/u-boot-rockchip.git F: arch/arm/mach-rockchip/ diff --git a/doc/git-mailrc b/doc/git-mailrc index 33317d1..04c6c8d 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -40,6 +40,7 @@ alias maxime Maxime Ripard <maxime.ripard(a)free-electrons.com> alias monstr Michal Simek <monstr(a)monstr.eu> alias prafulla Prafulla Wadaskar <prafulla(a)marvell.com> alias prom Minkyu Kang <mk7.kang(a)samsung.com> +alias ptomsich Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> alias rbohmer Remy Bohmer <linux(a)bohmer.net> alias reinhardm Reinhard Meyer <u-boot(a)emk-elektronik.de> alias sbabic Stefano Babic <sbabic(a)denx.de> @@ -77,7 +78,7 @@ alias tegra2 tegra alias ti uboot, trini alias uniphier uboot, masahiro alias zynq uboot, monstr -alias rockchip uboot, sjg, Kever Yang <kever.yang(a)rock-chips.com> +alias rockchip uboot, sjg, Kever Yang <kever.yang(a)rock-chips.com>, ptomsich alias avr32 uboot, abiessmann alias bfin uboot, vapier, sonic -- 2.1.4

3 2

[U-Boot] [PATCH] serial, kconfig: fix menutext
by Heiko Schocher 25 Jun '17

25 Jun '17

fix menutext for the options SPL_DM_SERIAL and TPL_DM_SERIAL. Both have the same text as DM_SERIAL, which is confusing. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- drivers/serial/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 5832066..8ab5ece 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -65,7 +65,7 @@ config DM_SERIAL defined in include/serial.h. config SPL_DM_SERIAL - bool "Enable Driver Model for serial drivers" + bool "Enable Driver Model for serial drivers in SPL" depends on DM_SERIAL default y if SPL && DM_SERIAL help @@ -75,7 +75,7 @@ config SPL_DM_SERIAL defined in include/serial.h. config TPL_DM_SERIAL - bool "Enable Driver Model for serial drivers" + bool "Enable Driver Model for serial drivers in TPL" depends on DM_SERIAL default y if TPL && DM_SERIAL help -- 2.7.4

3 2