August 2017 - U-Boot

[U-Boot] [PATCH v4 00/19] add support for rk3066 platform.
by Paweł Jarosz 21 Aug '17

21 Aug '17

This patch serie adds support for Rockchip RK3066 processor. Paweł Jarosz (19): rockchip: rk3066: add grf header file rockchip: rk3066: add rk3066 pinctrl driver rockchip: rk3066: add sysreset driver rockchip: rk3066: add clock driver for rk3066 soc rockchip: rk3066: add rk3066 platform devicetree file rockchip: rk3066: add core support rockchip: rk3066: add mk808 board files rockchip: rk3066: add sdram driver mtd: nand: add support for the Sandisk SDTNQGAMA chip mtd: nand: add the rockchip nand controller driver rockchip: mkimage: add support for rockchip nand boot image rockchip: board: rk3066: convert board_usb_init to live tree functions ARM: dts: rockchip: prefer u-boot,dm-pre-reloc rather than u-boot,dm-spl mmc: dw_mmc: support transfer mode autodetection mmc: dw_mmc: rockchip: add support for rk3066 sdmmc armv7: support rk3066 early back to bootrom in vector.S rockchip: sysreset: deduplicate rk3066 and rk3188 sysreset drivers dfu: fix spl build mtd: nand: spl: allow build nand_bbt, nand_ids and nand_util arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3066a-mk808.dts | 189 +++++ arch/arm/dts/rk3066a.dtsi | 707 +++++++++++++++ arch/arm/dts/rk3xxx.dtsi | 8 +- arch/arm/include/asm/arch-rockchip/boot0.h | 14 + arch/arm/include/asm/arch-rockchip/cru_rk3066.h | 189 +++++ arch/arm/include/asm/arch-rockchip/grf_rk3066.h | 621 ++++++++++++++ arch/arm/include/asm/arch-rockchip/periph.h | 1 + .../include/asm/arch-rockchip/sysreset_common.h | 20 + arch/arm/lib/vectors.S | 18 +- arch/arm/mach-rockchip/Kconfig | 16 + arch/arm/mach-rockchip/Makefile | 7 + arch/arm/mach-rockchip/rk3066-board-spl.c | 139 +++ arch/arm/mach-rockchip/rk3066-board-tpl.c | 90 ++ arch/arm/mach-rockchip/rk3066-board.c | 112 +++ arch/arm/mach-rockchip/rk3066/Kconfig | 31 + arch/arm/mach-rockchip/rk3066/Makefile | 9 + arch/arm/mach-rockchip/rk3066/clk_rk3066.c | 33 + arch/arm/mach-rockchip/rk3066/sdram_rk3066.c | 943 +++++++++++++++++++++ arch/arm/mach-rockchip/rk3066/syscon_rk3066.c | 54 ++ arch/arm/mach-rockchip/sysreset-common.c | 39 + board/rikomagic/mk808_rk3066/Kconfig | 15 + board/rikomagic/mk808_rk3066/MAINTAINERS | 6 + board/rikomagic/mk808_rk3066/Makefile | 7 + board/rikomagic/mk808_rk3066/mk808_rk3066.c | 10 + common/image.c | 1 + configs/mk808_defconfig | 115 +++ drivers/clk/rockchip/Makefile | 1 + drivers/clk/rockchip/clk_rk3066.c | 587 +++++++++++++ drivers/dfu/dfu_nand.c | 5 +- drivers/mmc/dw_mmc.c | 8 + drivers/mmc/rockchip_dw_mmc.c | 1 + drivers/mtd/nand/Kconfig | 6 + drivers/mtd/nand/Makefile | 4 + drivers/mtd/nand/nand_ids.c | 3 + drivers/mtd/nand/rockchip_nand.c | 660 ++++++++++++++ drivers/pinctrl/Kconfig | 9 + drivers/pinctrl/rockchip/Makefile | 1 + drivers/pinctrl/rockchip/pinctrl_rk3066.c | 340 ++++++++ drivers/sysreset/Makefile | 1 + drivers/sysreset/sysreset_rk3066.c | 49 ++ drivers/sysreset/sysreset_rk3188.c | 35 +- include/configs/mk808_rk3066.h | 61 ++ include/configs/rk3066_common.h | 99 +++ include/dwmmc.h | 4 + include/fdtdec.h | 1 + include/image.h | 1 + lib/fdtdec.c | 1 + tools/Makefile | 2 +- tools/imagetool.h | 1 + tools/mkimage.c | 8 +- tools/rkcommon.c | 10 +- tools/rkcommon.h | 10 +- tools/rknand.c | 156 ++++ tools/rksd.c | 2 +- tools/rkspi.c | 2 +- 56 files changed, 5415 insertions(+), 48 deletions(-) create mode 100644 arch/arm/dts/rk3066a-mk808.dts create mode 100644 arch/arm/dts/rk3066a.dtsi create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk3066.h create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rk3066.h create mode 100644 arch/arm/include/asm/arch-rockchip/sysreset_common.h create mode 100644 arch/arm/mach-rockchip/rk3066-board-spl.c create mode 100644 arch/arm/mach-rockchip/rk3066-board-tpl.c create mode 100644 arch/arm/mach-rockchip/rk3066-board.c create mode 100644 arch/arm/mach-rockchip/rk3066/Kconfig create mode 100644 arch/arm/mach-rockchip/rk3066/Makefile create mode 100644 arch/arm/mach-rockchip/rk3066/clk_rk3066.c create mode 100644 arch/arm/mach-rockchip/rk3066/sdram_rk3066.c create mode 100644 arch/arm/mach-rockchip/rk3066/syscon_rk3066.c create mode 100644 arch/arm/mach-rockchip/sysreset-common.c create mode 100644 board/rikomagic/mk808_rk3066/Kconfig create mode 100644 board/rikomagic/mk808_rk3066/MAINTAINERS create mode 100644 board/rikomagic/mk808_rk3066/Makefile create mode 100644 board/rikomagic/mk808_rk3066/mk808_rk3066.c create mode 100644 configs/mk808_defconfig create mode 100644 drivers/clk/rockchip/clk_rk3066.c create mode 100644 drivers/mtd/nand/rockchip_nand.c create mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3066.c create mode 100644 drivers/sysreset/sysreset_rk3066.c create mode 100644 include/configs/mk808_rk3066.h create mode 100644 include/configs/rk3066_common.h create mode 100644 tools/rknand.c -- 2.7.4

5 63

[U-Boot] [PATCH] spl: fix usage of $(SPL_TPL_) for some files
by Vikas Manocha 21 Aug '17

21 Aug '17

Signed-off-by: Vikas Manocha <vikas.manocha(a)st.com> --- common/spl/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/spl/Makefile b/common/spl/Makefile index 112b3e6..fde0d09 100644 --- a/common/spl/Makefile +++ b/common/spl/Makefile @@ -12,9 +12,9 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_FRAMEWORK) += spl.o obj-$(CONFIG_$(SPL_TPL_)BOOTROM_SUPPORT) += spl_bootrom.o obj-$(CONFIG_$(SPL_TPL_)LOAD_FIT) += spl_fit.o -obj-$(CONFIG_$(SPL_TPL_)SPL_NOR_SUPPORT) += spl_nor.o -obj-$(CONFIG_$(SPL_TPL_)SPL_XIP_SUPPORT) += spl_xip.o -obj-$(CONFIG_$(SPL_TPL_)SPL_YMODEM_SUPPORT) += spl_ymodem.o +obj-$(CONFIG_$(SPL_TPL_)NOR_SUPPORT) += spl_nor.o +obj-$(CONFIG_$(SPL_TPL_)XIP_SUPPORT) += spl_xip.o +obj-$(CONFIG_$(SPL_TPL_)YMODEM_SUPPORT) += spl_ymodem.o ifndef CONFIG_SPL_UBI obj-$(CONFIG_$(SPL_TPL_)NAND_SUPPORT) += spl_nand.o obj-$(CONFIG_$(SPL_TPL_)ONENAND_SUPPORT) += spl_onenand.o -- 1.9.1

3 2

[U-Boot] [PATCH v4] rockchip: rk3288: Add reset reason detection
by Wadim Egorov 21 Aug '17

21 Aug '17

Sometimes it's helpful to know the reset reason caused in the SoC. Add reset reason detection for the RK3288 SoC. This will set an environment variable which represents the reset reason. Signed-off-by: Wadim Egorov <w.egorov(a)phytec.de> --- Changes in v4: - Factore out env_set() - Use BIT/GENMASK for CRU_GLB_RST_ST register enum --- arch/arm/include/asm/arch-rockchip/cru_rk3288.h | 12 ++++++++ arch/arm/mach-rockchip/rk3288-board.c | 39 +++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3288.h b/arch/arm/include/asm/arch-rockchip/cru_rk3288.h index c7e21bd..3885c05 100644 --- a/arch/arm/include/asm/arch-rockchip/cru_rk3288.h +++ b/arch/arm/include/asm/arch-rockchip/cru_rk3288.h @@ -220,4 +220,16 @@ enum { CLKF_MASK = 0x1fff << CLKF_SHIFT, }; +/* CRU_GLB_RST_ST */ +enum { + GLB_POR_RST, + FST_GLB_RST_ST = BIT(0), + SND_GLB_RST_ST = BIT(1), + FST_GLB_TSADC_RST_ST = BIT(2), + SND_GLB_TSADC_RST_ST = BIT(3), + FST_GLB_WDT_RST_ST = BIT(4), + SND_GLB_WDT_RST_ST = BIT(5), + GLB_RST_ST_MASK = GENMASK(5, 0), +}; + #endif diff --git a/arch/arm/mach-rockchip/rk3288-board.c b/arch/arm/mach-rockchip/rk3288-board.c index 74c6cc1..278bb40 100644 --- a/arch/arm/mach-rockchip/rk3288-board.c +++ b/arch/arm/mach-rockchip/rk3288-board.c @@ -11,6 +11,7 @@ #include <syscon.h> #include <asm/io.h> #include <asm/arch/clock.h> +#include <asm/arch/cru_rk3288.h> #include <asm/arch/periph.h> #include <asm/arch/pmu_rk3288.h> #include <asm/arch/qos_rk3288.h> @@ -70,10 +71,48 @@ int rk3288_qos_init(void) return 0; } +static void rk3288_detect_reset_reason(void) +{ + struct rk3288_cru *cru = rockchip_get_cru(); + const char *reason; + + if (IS_ERR(cru)) + return; + + switch (cru->cru_glb_rst_st) { + case GLB_POR_RST: + reason = "POR"; + break; + case FST_GLB_RST_ST: + case SND_GLB_RST_ST: + reason = "RST"; + break; + case FST_GLB_TSADC_RST_ST: + case SND_GLB_TSADC_RST_ST: + reason = "THERMAL"; + break; + case FST_GLB_WDT_RST_ST: + case SND_GLB_WDT_RST_ST: + reason = "WDOG"; + break; + default: + reason = "unknown reset"; + } + + env_set("reset_reason", reason); + + /* + * Clear cru_glb_rst_st, so we can determine the last reset cause + * for following resets. + */ + rk_clrreg(&cru->cru_glb_rst_st, GLB_RST_ST_MASK); +} + int board_late_init(void) { setup_boot_mode(); rk3288_qos_init(); + rk3288_detect_reset_reason(); return rk_board_late_init(); } -- 2.7.4

2 3

[U-Boot] [PATCH v3] rockchip: phycore: Read configuration EEPROM & set ethaddr in late init
by Wadim Egorov 21 Aug '17

21 Aug '17

Read SoM information from EEPROM and set ethaddr in late init. Signed-off-by: Wadim Egorov <w.egorov(a)phytec.de> --- Changes in v3: - Rebased to current master. Renamed eth_setenv_enetaddr() --- board/phytec/phycore_rk3288/phycore-rk3288.c | 62 ++++++++++++++++++++++++++++ board/phytec/phycore_rk3288/som.h | 21 ++++++++++ configs/phycore-rk3288_defconfig | 2 + 3 files changed, 85 insertions(+) create mode 100644 board/phytec/phycore_rk3288/som.h diff --git a/board/phytec/phycore_rk3288/phycore-rk3288.c b/board/phytec/phycore_rk3288/phycore-rk3288.c index 20696f6..47b069e 100644 --- a/board/phytec/phycore_rk3288/phycore-rk3288.c +++ b/board/phytec/phycore_rk3288/phycore-rk3288.c @@ -5,4 +5,66 @@ * SPDX-License-Identifier: GPL-2.0+ */ +#include <asm/io.h> #include <common.h> +#include <dm.h> +#include <i2c.h> +#include <i2c_eeprom.h> +#include <netdev.h> +#include "som.h" + +static int valid_rk3288_som(struct rk3288_som *som) +{ + unsigned char *p = (unsigned char *)som; + unsigned char *e = p + sizeof(struct rk3288_som) - 1; + int hw = 0; + + while (p < e) { + hw += hweight8(*p); + p++; + } + + return hw == som->bs; +} + +int rk_board_late_init(void) +{ + int ret; + struct udevice *dev; + struct rk3288_som opt; + int off; + + /* Get the identificatioin page of M24C32-D EEPROM */ + off = fdt_path_offset(gd->fdt_blob, "eeprom0"); + if (off < 0) { + printf("%s: No eeprom0 path offset\n", __func__); + return off; + } + + ret = uclass_get_device_by_of_offset(UCLASS_I2C_EEPROM, off, &dev); + if (ret) { + printf("%s: Could not find EEPROM\n", __func__); + return ret; + } + + ret = i2c_set_chip_offset_len(dev, 2); + if (ret) + return ret; + + ret = i2c_eeprom_read(dev, 0, (uint8_t *)&opt, + sizeof(struct rk3288_som)); + if (ret) { + printf("%s: Could not read EEPROM\n", __func__); + return ret; + } + + if (opt.api_version != 0 || !valid_rk3288_som(&opt)) { + printf("Invalid data or wrong EEPROM layout version.\n"); + /* Proceed anyway, since there is no fallback option */ + } + + if (is_valid_ethaddr(opt.mac)) + eth_env_set_enetaddr("ethaddr", opt.mac); + + return 0; +} diff --git a/board/phytec/phycore_rk3288/som.h b/board/phytec/phycore_rk3288/som.h new file mode 100644 index 0000000..1b7f9a1 --- /dev/null +++ b/board/phytec/phycore_rk3288/som.h @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2017 PHYTEC Messtechnik GmbH + * Author: Wadim Egorov <w.egorov(a)phytec.de> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/* + * rk3288_som struct represents the eeprom layout for PHYTEC RK3288 based SoMs + */ +struct rk3288_som { + unsigned char api_version; /* EEPROM layout API version */ + unsigned char mod_version; /* PCM/PFL/PCA */ + unsigned char option[12]; /* coding for variants */ + unsigned char som_rev; /* SOM revision */ + unsigned char mac[6]; + unsigned char ksp; /* 1: KSP, 2: KSM */ + unsigned char kspno; /* Number for KSP/KSM module */ + unsigned char reserved[8]; /* not used */ + unsigned char bs; /* Bits set in previous bytes */ +} __attribute__ ((__packed__)); diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig index 70dc3f7..6ad70ab 100644 --- a/configs/phycore-rk3288_defconfig +++ b/configs/phycore-rk3288_defconfig @@ -43,6 +43,8 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MISC=y +CONFIG_I2C_EEPROM=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_DM_ETH=y -- 2.7.4

2 3

[U-Boot] [PATCH] rockchip: rk3399: spl: remove unused header inclusion
by Philipp Tomsich 21 Aug '17

21 Aug '17

fdtdec.h is included, but not used in rk3399-board-spl.c: remove the '#include'-statement. Signed-off-by: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> --- arch/arm/mach-rockchip/rk3399-board-spl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/mach-rockchip/rk3399-board-spl.c b/arch/arm/mach-rockchip/rk3399-board-spl.c index a13b717..d6bf74f 100644 --- a/arch/arm/mach-rockchip/rk3399-board-spl.c +++ b/arch/arm/mach-rockchip/rk3399-board-spl.c @@ -7,7 +7,6 @@ #include <common.h> #include <debug_uart.h> #include <dm.h> -#include <fdtdec.h> #include <ram.h> #include <spl.h> #include <asm/gpio.h> -- 2.1.4

1 3

[U-Boot] [PATCH] ARM: mvebu: set correct mem_size for db-88f6820-amc
by Chris Packham 21 Aug '17

21 Aug '17

The db-88f6820-amc has four chips with 2Gb density giving a total of 1GB DRAM. Update the board_topology_map to reflect the correct configuration. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- When I setup this board I misinterpreted 2 Gigabits as 2 Gigabytes. It happened to work so I never noticed it was wrong until I started seeing some unexpected mirroring of addresses. board/Marvell/db-88f6820-amc/db-88f6820-amc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c index 40fa59986573..ac58f9085266 100644 --- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c +++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c @@ -66,7 +66,7 @@ static struct hws_topology_map board_topology_map = { {0x1, 0, 0, 0} }, SPEED_BIN_DDR_1866L, /* speed_bin */ BUS_WIDTH_8, /* memory_width */ - MEM_4G, /* mem_size */ + MEM_2G, /* mem_size */ DDR_FREQ_800, /* frequency */ 0, 0, /* cas_l cas_wl */ HWS_TEMP_LOW, /* temperature */ -- 2.14.1

2 2

[U-Boot] [GIT] Pull request: u-boot-dfu
by Łukasz Majewski 21 Aug '17

21 Aug '17

Dear Marek, The following changes since commit 5b70b1688cdf677563096063e4a48e4bed250a10: usb: ehci: Convert CONFIG_USB_EHCI_PCI to Kconfig (2017-08-09 10:50:08 +0200) are available in the git repository at: git://git.denx.de/u-boot-dfu.git/master for you to fetch changes up to b14b19e1a96f8b891ed094009204e07af798b137: doc: license: Add license header to the README.dfutftp file (2017-08-21 11:07:26 +0200) ---------------------------------------------------------------- John Keeping (1): fastboot: avoid printing invalid data Lukasz Majewski (1): doc: license: Add license header to the README.dfutftp file Peter Chubb (1): Fix fastboot boot address Tom Rini (2): common/fb_mmc.c: Fix warnings about casts fb_mmc.c: Correct blk_dread() return value checks common/fb_mmc.c | 8 ++++---- doc/README.dfutftp | 8 ++++++++ drivers/usb/gadget/f_fastboot.c | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) Test HW: BBB (Beagle Bone Black) (Old dfu tests passed) Build test: https://travis-ci.org/lmajewski/u-boot-dfu/builds/266707409 -- Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de

2 1

[U-Boot] [PATCH] env: Correct case of no sub-init function
by Tom Rini 21 Aug '17

21 Aug '17

With the change to the environment code to remove the common init stage of pointing to the default environment and setting it as valid, combined with the change to switch gd->env_valid from 0/1/2 to an enum we now must set env_valid to one of the enum values rather than an int. And in this case, not only was setting it to an int wrong, it was now the wrong value. Fixes: 7938822a6b75 ("env: Drop common init() functions") Reported-by: Marek Vasut <marek.vasut(a)gmail.com> Reported-by: Andy Shevchenko <andy.shevchenko(a)gmail.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- env/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env/env.c b/env/env.c index 2b8b9611cfff..8671f13f8d9e 100644 --- a/env/env.c +++ b/env/env.c @@ -138,7 +138,7 @@ int env_init(void) ret = drv->init(); if (ret == -ENOENT) { gd->env_addr = (ulong)&default_environment[0]; - gd->env_valid = 0; + gd->env_valid = ENV_VALID; return 0; } else if (ret) { -- 1.9.1

4 6

[U-Boot] [PATCH v3 0/1] arm: socfpga: Enable EFI support for DE0-nano-SoC disto boot
by Frank Kunz 21 Aug '17

21 Aug '17

This enables EFI support for DE0-nano-SoC distro boot. Tested on openSUSE openSUSE Tumbleweed ARM JeOS image. Signed-off-by: Frank Kunz <mailinglists(a)kunz-im-inter.net> --- Changes in v3: Adaption to distroboot changes in mainline Frank Kunz (1): arm: socfpga: Configuration for EFI boot on DE0-nano-SoC configs/socfpga_de0_nano_soc_defconfig | 3 +++ 1 file changed, 3 insertions(+) -- 2.13.3

2 4

[U-Boot] [PATCH 1/3] env: Fix up invalid environment in env_init()
by Simon Glass 21 Aug '17

21 Aug '17

This should be set to valid, not invalid. Otherwise the environment will not load after relocation. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- env/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env/env.c b/env/env.c index 2b8b9611cf..8671f13f8d 100644 --- a/env/env.c +++ b/env/env.c @@ -138,7 +138,7 @@ int env_init(void) ret = drv->init(); if (ret == -ENOENT) { gd->env_addr = (ulong)&default_environment[0]; - gd->env_valid = 0; + gd->env_valid = ENV_VALID; return 0; } else if (ret) { -- 2.14.1.480.gb18f417b89-goog

2 4