Either will be fine for me: u-boot-rockchip/master is only one DTS fix ahead of u-boot/master.
> On 16 Aug 2017, at 17:48, Paweł Jarosz <paweljarosz3...@gmail.com> wrote: > > Hi, > > > W dniu 16.08.2017 o 16:28, Dr. Philipp Tomsich pisze: >> Pawel, >> >> Could you rebase this onto the current master (the SPL/TPL changes for >> the RK3368 are likely to have affected a few things) and resubmit? > > By master you mean u-boot-rockchip master or u-boot master? > > Cheers, > Paweł > >> Thanks, >> Philipp. >> >>> On 11 Aug 2017, at 22:53, Paweł Jarosz <paweljarosz3...@gmail.com> wrote: >>> >>> 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 | 6 +- >>> 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, 5416 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 >>> > _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
