[U-Boot] [GIT PULL v2] Please pull u-boot-rockchip/master
Dr. Philipp Tomsich
philipp.tomsich at theobroma-systems.com
Sun Aug 13 16:37:05 UTC 2017
Tom,
Here’s another pull-request for u-boot-rockchip.
This one shows no regressions with Travis after fixing up a few more
defconfig files and adjusting the target-list when the mxs-variant of
the SPL ldscript should be used.
Regards,
Phil.
The following changes since commit da0227f7d2568c0cb0e435ed3caf780f9846d9a0:
arm: omap: Fix 'get_device_type()' for OMAP34XX (2017-08-12 18:56:26 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-rockchip.git master
for you to fetch changes up to 217273cd441fe3d00a1bdad143dcb656854963f9:
rockchip: clk: remove RATE_TO_DIV (2017-08-13 17:15:09 +0200)
----------------------------------------------------------------
Andy Yan (3):
rockchip: add u-boot specific dts for rk3368 based boards
rockchip: set Pre-reloc malloc pool size to 4kb for rk3368 based boards
rockchip: remove the hard coded uart iomux setting for px5 evb
Kever Yang (6):
rockchip: rk3288: fix EMMC_DIV_MASK definition in header
rockchip: rk322x: set the DDR region as non-secure in SPL
rockchip: dts: rk322x: add sdmmc device node
rockchip: rk322x: update max-frequency for mmc node
rockchip: clk: update dwmmc clock div
rockchip: clk: remove RATE_TO_DIV
Klaus Goger (1):
rockchip: board: puma_rk3399: rename ATF firmware
Philipp Tomsich (77):
spl: add a 'return to bootrom' boot method
spl: configure 'return to bootrom' separately for SPL and TPL
rockchip: back-to-bootrom: add 'back-to-bootrom' support for AArch64
rockchip: back-to-bootrom: split BACK_TO_BOOTROM for TPL/SPL
rockchip: back-to-bootrom: simplify the #ifdef-check for LIBCOMMON in TPL/SPL
spl: use TPL_SYS_MALLOC_F_LEN for TPL
spl: dm: Kconfig: fix help text for SPL/TPL confusion
spl: dm: Kconfig: use more specific prereqs for SPL_REGMAP and SPL_SYSCON
spl: dm: Kconfig: split REGMAP/SYSCON support for TPL from SPL
spl: dm: Kconfig: SPL_RAM depends on SPL_DM
spl: dm: Kconfig: introduce TPL_RAM (in analogy to SPL_RAM)
spl: dm: Kconfig: SPL_CLK depends on SPL_DM
spl: dm: Kconfig: split CLK support for SPL and TPL
spl: dm: Kconfig: split OF_CONTROL and OF_PLATDATA between SPL and TPL
spl: dm: use CONFIG_IS_ENABLED to test for the DM option
armv8: move low-level assembly functions into function-sections
armv8: spl: Support separate stack for TPL
spl: allow a separate TEXT_BASE, LDSCRIPT and MAX_SIZE for TPL
spl: Kconfig: split SYS_MALLOC_SIMPLE for TPL and SPL
lib: spl: differentiate between TPL and SPL for libfdt/of_control/of_platdata
spl: consistently use $(SPL_TPL_) to select features for SPL and TPL builds
spl: add TPL_DRIVER_MISC_SUPPORT option
drivers: spl: consistently use the $(SPL_TPL_) macro
rockchip: Makefile: allow selective inclusion of sdram_common.o from TPL/SPL/U-Boot
rockchip: rk3368: improve Kconfig text for the RK3368
rockchip: rk3368: mkimage: add support for the RK3368
rockchip: rk3368: pmugrf: add definitions for os_reg[0..3]
rockchip: rk3368: spl: define COUNTER_FREQUENCY to 24MHz
rockchip: rk3368: spl: add memory layout for TPL and SPL
rockchip: rk3368: syscon: MSCH/PMUGRF/GRF support for OF_PLATDATA
rockchip: rk3368: syscon: SGRF support for OF_PLATDATA
rockchip: rk3368: grf: use shifted-constants
rockchip: rk3368: dts: add sgrf node
rockchip: pinctrl: rk3368: add GMAC (RGMII only) support
rockchip: pinctrl: rk3368: add support for configuring the MMC pins
rockchip: pinctrl: rk3368: move IOMUX bit-definitions to pinctrl driver
rockchip: pinctrl: rk3368: add SPI support
rockchip: clk: rk3368: implement bandwidth adjust for PLLs
rockchip: clk: rk3368: support OF_PLATDATA for the RK3368 clk driver
rockchip: clk: rk3368: do not change CPLL/GPLL before returning to BROM
rockchip: clk: rk3368: implement DPLL (DRAM PLL) support
rockchip: clk: rk3368: define DMA1_SRST_REQ and DMA2_SRST_REQ
rockchip: clk: rk3368: implement MMC/SD clock reparenting
rockchip: clk: rk3368: support configuring the DRAM PLL (from TPL)
rockchip: clk: rk3368: add support for GMAC (SLCK_MAC) clock
rockchip: clk: rk3368: mark 'priv' __maybe_unused in rk3368_clk_set_rate()
rockchip: clk: rk3368: add support for configuring the SPI clocks
net: gmac_rockchip: Add support for the RK3368 GMAC
rockchip: Makefile: streamline SPL/TPL configuration
rockchip: rk3368: add DRAM controller driver with DRAM initialisation
rockchip: rk3368: dts: add DMC node in rk3368.dtsi
rockchip: rk3368: spl: enable SPL_FRAMEWORK in rk3368_common.h
rockchip: rk3368: spl: add TPL support
rockchip: spl: make spl-boot-order code reusable (split from rk3399)
rockchip: rk3368: spl: add SPL support
rockchip: rk3368: spl: mark SPL and TPL as supported for ROCKCHIP_RK3368
rockchip: spi: enable support for the rk_spi driver for the RK3368
rockchip: board: lion-rk3368: add support for the RK3368-uQ7
spl: Kconfig: migrate $(SPL_TPL_)LDSCRIPT to Kconfig
rockchip: Kconfig: preset TPL_LDSCRIPT via Kconfig for the RK3368
spl: support TPL_STACK, TPL_MAX_SIZE and TPL_TEXT_BASE via Kconfig
armv8: TPL_STACK will always be defined, so test CONFIG_TPL_NEEDS_SEPARATE_STACK
rockchip: rk3368: mark TPL as not inheriting its stack, text-base and size from SPL
moveconfig: migrate TPL_STACK, TPL_TEXT_BASE and TPL_MAX_SIZE
rockchip: board: puma-rk3399: fix warnings in puma_rk3399/fit_spl_atf.its
configs: mpc85xx: fix fallout from SPL/TPL changes
timer: add OF_PLATDATA support for timer-uclass
dm: timer: normalise SPL and TPL support
rockchip: timer: add device-model timer driver for RK3368 (and similar)
dts: rk3368: make timer0 accessible for SPL and TPL
rockchip: lion-rk3368: defconfig: enable DM timer for all stages
rockchip: rk3368: remove setup of secure timer from TPL/SPL
rockchip: rk3188: rock: adjust for SPL/TPL split
spl: add hierarchical defaults for SPL_LDSCRIPT
spl: moveconfig: remove SPL_LDSCRIPT definitions for header-files
rockchip: rk3368: spl: move SPL_LDSCRIPT to Kconfig
scripts: setlocalversion: safely extract variables from auto.conf using awk
Kconfig | 12 +-
Makefile | 3 +-
arch/arm/Kconfig | 12 ++
arch/arm/cpu/armv8/Makefile | 2 +
arch/arm/cpu/armv8/cache.S | 22 +++
arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 3 +
arch/arm/cpu/armv8/tlb.S | 4 +-
arch/arm/cpu/armv8/transition.S | 6 +
arch/arm/dts/Makefile | 1 +
arch/arm/dts/rk3229-evb.dts | 11 ++
arch/arm/dts/rk322x.dtsi | 66 ++++++-
arch/arm/dts/rk3368-geekbox-u-boot.dtsi | 34 ++++
arch/arm/dts/rk3368-lion-u-boot.dtsi | 93 ++++++++++
arch/arm/dts/rk3368-lion.dts | 195 +++++++++++++++++++
arch/arm/dts/rk3368-px5-evb-u-boot.dtsi | 34 ++++
arch/arm/dts/rk3368-sheep-u-boot.dtsi | 34 ++++
arch/arm/dts/rk3368.dtsi | 30 ++-
arch/arm/include/asm/arch-rockchip/cru_rk3288.h | 2 +-
arch/arm/include/asm/arch-rockchip/cru_rk3368.h | 15 +-
arch/arm/include/asm/arch-rockchip/ddr_rk3368.h | 187 +++++++++++++++++++
arch/arm/include/asm/arch-rockchip/grf_rk3368.h | 326 +-------------------------------
arch/arm/include/asm/spl.h | 1 +
arch/arm/lib/crt0_64.S | 4 +-
arch/arm/mach-at91/Kconfig | 4 +
arch/arm/mach-davinci/Kconfig | 4 +
arch/arm/mach-exynos/Kconfig | 3 +
arch/arm/mach-omap2/Kconfig | 3 +
arch/arm/mach-orion5x/Kconfig | 3 +
arch/arm/mach-rockchip/Kconfig | 55 +++++-
arch/arm/mach-rockchip/Makefile | 47 +++--
arch/arm/mach-rockchip/bootrom.c | 4 +-
arch/arm/mach-rockchip/rk3188-board-spl.c | 5 +-
arch/arm/mach-rockchip/rk3188-board.c | 2 +-
arch/arm/mach-rockchip/rk3188/Kconfig | 3 -
arch/arm/mach-rockchip/rk322x-board-spl.c | 4 +
arch/arm/mach-rockchip/rk3288-board-spl.c | 4 +-
arch/arm/mach-rockchip/rk3288-board.c | 4 +-
arch/arm/mach-rockchip/rk3368-board-spl.c | 78 ++++++++
arch/arm/mach-rockchip/rk3368-board-tpl.c | 157 ++++++++++++++++
arch/arm/mach-rockchip/rk3368/Kconfig | 24 +++
arch/arm/mach-rockchip/rk3368/Makefile | 1 -
arch/arm/mach-rockchip/rk3368/sdram_rk3368.c | 60 ------
arch/arm/mach-rockchip/rk3368/syscon_rk3368.c | 44 +++++
arch/arm/mach-rockchip/rk3368/u-boot-tpl.lds | 13 ++
arch/arm/mach-rockchip/rk3399-board-spl.c | 106 +----------
arch/arm/mach-rockchip/save_boot_param.S | 37 ++++
arch/arm/mach-rockchip/spl-boot-order.c | 108 +++++++++++
arch/arm/mach-sunxi/Kconfig | 3 +
arch/arm/mach-zynq/Kconfig | 3 +
arch/microblaze/Kconfig | 3 +
board/armadeus/apf27/Kconfig | 3 +
board/freescale/mx31pdk/Kconfig | 3 +
board/rockchip/evb_px5/evb-px5.c | 24 ---
board/spear/x600/Kconfig | 3 +
board/theobroma-systems/lion_rk3368/Kconfig | 15 ++
board/theobroma-systems/lion_rk3368/MAINTAINERS | 10 +
board/theobroma-systems/lion_rk3368/Makefile | 7 +
board/theobroma-systems/lion_rk3368/README | 60 ++++++
board/theobroma-systems/lion_rk3368/fit_spl_atf.its | 51 +++++
board/theobroma-systems/lion_rk3368/lion_rk3368.c | 25 +++
board/theobroma-systems/puma_rk3399/README | 2 +-
board/theobroma-systems/puma_rk3399/fit_spl_atf.its | 20 +-
common/Makefile | 10 +-
common/spl/Kconfig | 116 ++++++++++--
common/spl/Makefile | 35 ++--
common/spl/spl.c | 7 +-
common/spl/spl_bootrom.c | 27 +++
configs/C29XPCIE_NAND_defconfig | 3 +-
configs/P1010RDB-PA_36BIT_NAND_defconfig | 4 +-
configs/P1010RDB-PA_NAND_defconfig | 4 +-
configs/P1010RDB-PB_36BIT_NAND_defconfig | 4 +-
configs/P1010RDB-PB_NAND_defconfig | 3 +-
configs/P1020RDB-PC_36BIT_NAND_defconfig | 3 +-
configs/P1020RDB-PC_NAND_defconfig | 3 +-
configs/P1020RDB-PD_NAND_defconfig | 3 +-
configs/P1021RDB-PC_36BIT_NAND_defconfig | 3 +-
configs/P1021RDB-PC_NAND_defconfig | 3 +-
configs/P1022DS_36BIT_NAND_defconfig | 3 +-
configs/P1022DS_NAND_defconfig | 2 +-
configs/P1024RDB_NAND_defconfig | 3 +-
configs/P1025RDB_NAND_defconfig | 2 +-
configs/P2020RDB-PC_36BIT_NAND_defconfig | 2 +-
configs/P2020RDB-PC_NAND_defconfig | 3 +-
configs/chromebook_link64_defconfig | 2 +-
configs/evb-px5_defconfig | 1 +
configs/evb-rk3229_defconfig | 2 +-
configs/evb-rk3288_defconfig | 2 +-
configs/fennec-rk3288_defconfig | 2 +-
configs/firefly-rk3288_defconfig | 2 +-
configs/geekbox_defconfig | 1 +
configs/lion-rk3368_defconfig | 95 ++++++++++
configs/miqi-rk3288_defconfig | 2 +-
configs/phycore-rk3288_defconfig | 2 +-
configs/popmetal-rk3288_defconfig | 2 +-
configs/qemu-x86_64_defconfig | 2 +-
configs/rock2_defconfig | 2 +-
configs/rock_defconfig | 4 +-
configs/sheep-rk3368_defconfig | 1 +
configs/tinker-rk3288_defconfig | 2 +-
doc/README.rockchip | 2 +-
doc/device-tree-bindings/clock/rockchip,rk3368-dmc.txt | 67 +++++++
drivers/Makefile | 39 ++--
drivers/clk/Kconfig | 12 +-
drivers/clk/Makefile | 2 +-
drivers/clk/rockchip/clk_rk3036.c | 9 +-
drivers/clk/rockchip/clk_rk3188.c | 15 +-
drivers/clk/rockchip/clk_rk322x.c | 14 +-
drivers/clk/rockchip/clk_rk3288.c | 12 +-
drivers/clk/rockchip/clk_rk3328.c | 9 +-
drivers/clk/rockchip/clk_rk3368.c | 306 ++++++++++++++++++++++++++----
drivers/clk/rockchip/clk_rk3399.c | 27 +--
drivers/clk/rockchip/clk_rv1108.c | 3 -
drivers/core/Kconfig | 23 ++-
drivers/core/Makefile | 4 +-
drivers/net/gmac_rockchip.c | 78 ++++++++
drivers/pinctrl/rockchip/pinctrl_rk3368.c | 577 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
drivers/ram/Kconfig | 11 +-
drivers/ram/Makefile | 2 +
drivers/ram/rockchip/Makefile | 7 +
drivers/ram/rockchip/dmc-rk3368.c | 1007 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/spi/rk_spi.c | 9 +
drivers/timer/Kconfig | 25 +++
drivers/timer/Makefile | 3 +-
drivers/timer/rockchip_timer.c | 107 +++++++++++
drivers/timer/timer-uclass.c | 8 +-
dts/Kconfig | 29 +++
include/configs/am335x_evm.h | 2 -
include/configs/am335x_igep003x.h | 1 -
include/configs/am335x_shc.h | 2 -
include/configs/am335x_sl50.h | 2 -
include/configs/am3517_crane.h | 1 -
include/configs/am3517_evm.h | 1 -
include/configs/am43xx_evm.h | 2 -
include/configs/apf27.h | 1 -
include/configs/at91sam9m10g45ek.h | 1 -
include/configs/at91sam9n12ek.h | 1 -
include/configs/at91sam9x5ek.h | 1 -
include/configs/baltos.h | 2 -
include/configs/bav335x.h | 2 -
include/configs/bur_am335x_common.h | 1 -
include/configs/chiliboard.h | 2 -
include/configs/cm_t335.h | 1 -
include/configs/cm_t35.h | 1 -
include/configs/cm_t43.h | 2 -
include/configs/da850evm.h | 1 -
include/configs/edminiv2.h | 1 -
include/configs/exynos5-common.h | 1 -
include/configs/imx6_spl.h | 1 -
include/configs/ipam390.h | 1 -
include/configs/kc1.h | 2 -
include/configs/lion_rk3368.h | 18 ++
include/configs/ls1021aiot.h | 1 -
include/configs/ls1021aqds.h | 2 -
include/configs/ls1021atwr.h | 1 -
include/configs/ls1043a_common.h | 2 -
include/configs/ls1046a_common.h | 2 -
include/configs/ls2080a_common.h | 1 -
include/configs/ma5d4evk.h | 1 -
include/configs/mcx.h | 1 -
include/configs/microblaze-generic.h | 2 -
include/configs/mx31pdk.h | 1 -
include/configs/mxs.h | 1 -
include/configs/omapl138_lcdk.h | 1 -
include/configs/origen.h | 1 -
include/configs/pcm051.h | 2 -
include/configs/pengwyn.h | 2 -
include/configs/pepper.h | 1 -
include/configs/picosam9g45.h | 1 -
include/configs/rk3188_common.h | 2 +-
include/configs/rk3288_common.h | 2 +-
include/configs/rk3368_common.h | 8 +
include/configs/rock.h | 2 +-
include/configs/rockchip-common.h | 2 +-
include/configs/sama5d2_xplained.h | 1 -
include/configs/sama5d3_xplained.h | 1 -
include/configs/sama5d3xek.h | 1 -
include/configs/sama5d4_xplained.h | 1 -
include/configs/sama5d4ek.h | 1 -
include/configs/siemens-am33x-common.h | 2 -
include/configs/smartweb.h | 1 -
include/configs/smdkv310.h | 1 -
include/configs/sniper.h | 2 -
include/configs/sunxi-common.h | 4 -
include/configs/tam3517-common.h | 1 -
include/configs/tao3530.h | 1 -
include/configs/ti814x_evm.h | 1 -
include/configs/ti816x_evm.h | 2 -
include/configs/ti_omap3_common.h | 1 -
include/configs/ti_omap4_common.h | 1 -
include/configs/ti_omap5_common.h | 1 -
include/configs/tricorder.h | 1 -
include/configs/woodburn_sd.h | 1 -
include/configs/x600.h | 1 -
include/configs/zynq-common.h | 2 -
include/dt-bindings/memory/rk3368-dmc.h | 30 +++
include/linux/kconfig.h | 13 ++
include/spl.h | 10 +
lib/Kconfig | 9 +
lib/Makefile | 10 +-
scripts/Makefile.spl | 19 +-
scripts/config_whitelist.txt | 2 -
scripts/setlocalversion | 6 +-
tools/rkcommon.c | 1 +
203 files changed, 4234 insertions(+), 860 deletions(-)
create mode 100644 arch/arm/dts/rk3368-geekbox-u-boot.dtsi
create mode 100644 arch/arm/dts/rk3368-lion-u-boot.dtsi
create mode 100644 arch/arm/dts/rk3368-lion.dts
create mode 100644 arch/arm/dts/rk3368-px5-evb-u-boot.dtsi
create mode 100644 arch/arm/dts/rk3368-sheep-u-boot.dtsi
create mode 100644 arch/arm/include/asm/arch-rockchip/ddr_rk3368.h
create mode 100644 arch/arm/mach-rockchip/rk3368-board-spl.c
create mode 100644 arch/arm/mach-rockchip/rk3368-board-tpl.c
delete mode 100644 arch/arm/mach-rockchip/rk3368/sdram_rk3368.c
create mode 100644 arch/arm/mach-rockchip/rk3368/u-boot-tpl.lds
create mode 100644 arch/arm/mach-rockchip/spl-boot-order.c
create mode 100644 board/theobroma-systems/lion_rk3368/Kconfig
create mode 100644 board/theobroma-systems/lion_rk3368/MAINTAINERS
create mode 100644 board/theobroma-systems/lion_rk3368/Makefile
create mode 100644 board/theobroma-systems/lion_rk3368/README
create mode 100644 board/theobroma-systems/lion_rk3368/fit_spl_atf.its
create mode 100644 board/theobroma-systems/lion_rk3368/lion_rk3368.c
create mode 100644 common/spl/spl_bootrom.c
create mode 100644 configs/lion-rk3368_defconfig
create mode 100644 doc/device-tree-bindings/clock/rockchip,rk3368-dmc.txt
create mode 100644 drivers/ram/rockchip/Makefile
create mode 100644 drivers/ram/rockchip/dmc-rk3368.c
create mode 100644 drivers/timer/rockchip_timer.c
create mode 100644 include/configs/lion_rk3368.h
create mode 100644 include/dt-bindings/memory/rk3368-dmc.h
More information about the U-Boot
mailing list