This patch set is to clean code for board related file, after this patch set, all the Rockchip SoCs will share the same tpl/spl/board file and very similar boot flow.
tpl.c: target for init DDR sdram, only internal sram available, prefer tpl to be as simple as possible and then back to backrom; spl.c: target for load U-Boot and Trust(option) image and boot into next stage, init DDR sdram if no tpl exist; board.c: use for U-Boot proper for all Rockchip SoCs.
We prefer to reduce boot flow option like RETURN_TO_BROM in SPL/TPL, and will enable trust(ATF or OPTEE) support for all SoCs with TrustZone, will share scripts for link and firmware package.
Only rk3399 is using spl+Trust/U-Boot and all other SoCs should go to tpl+spl_Trust/U-Boot mode now.
Kever Yang (36): rockchip: rk3288: move configure_l2ctlr back to rk3288 rockchip: add common MACRO to enable sys arch timer rockchip: enable SYS_NS16550 for all SoCs by default rockchip: defconfig: remove CONFIG_SYS_NS16550 rockchip: add STIMER_BASE for all SoCs rockchip: add IRAM_START_ADDR for all SoCs rockchip: rk3328: add BOOT_MODE_REG for rk3328 rockchip: rk322x: remove use rockchip timer as sys timer rockchip: rk322x: sdram: use common udelay instead of rockchip_udelay rockchip: rk322x: prepare to use common board file rockchip: defconfig enable sysreset for rk3229 spl rockchip: rk3036: sdram: use udelay instead of rockchip_udelay rockchip: rk3036: remove sys timer rockchip: rk3036: prepare to use commong board file rockchip: declare sdram_init() in common header rockchip: sdram-common: add api to pass dram info to trust os rockchip: sdram_common: add common dram_init_banksize rockchip: rk3188: remove rockchip timer as sys timer rockchip: rk3188: prepare to use common board file rockchip: rk3128: remove rockchip timer as systimer rockchip: rk3128: prepare use common board file rockchip: dts: rk3288: update spl-boot-order rockchip: rk3288: remove rockchip timer for sys timer armv8: add timer_get_boot_us() for generic timer rockchip: rk3288: prepare to use common board file rockchip: rk1108: remove rockchip timer for sys timer rockchip: rv1108: prepare to use common board file rockchip: rk3328: prepare to use common board file rockchip: rk3368: prepare to use common board file rockchip: lion-rk3368: remove rockchip timer rockchip: rk3399: prepare to use common board file rockchip: remove rk_timer rockchip: dts: rk3399-firefly: enable uart2 in spl rockchip: spl-boot-order: do not enable with OF_PLATDATA rockchip: declear boot_devices in bootrom.h rockchip: add common board file for rockchip platform
arch/arm/Kconfig | 1 + arch/arm/cpu/armv8/generic_timer.c | 6 + arch/arm/dts/rk3288-phycore-rdk.dts | 6 +- arch/arm/dts/rk3288-veyron.dtsi | 6 +- arch/arm/dts/rk3399-firefly.dts | 1 + arch/arm/include/asm/arch-rockchip/bootrom.h | 2 + arch/arm/include/asm/arch-rockchip/sdram_common.h | 4 + arch/arm/include/asm/arch-rockchip/sys_proto.h | 25 +- arch/arm/mach-rockchip/Kconfig | 38 ++- arch/arm/mach-rockchip/Makefile | 23 +- arch/arm/mach-rockchip/{rk3128-board.c => board.c} | 93 +++--- arch/arm/mach-rockchip/rk3036-board.c | 104 ------- arch/arm/mach-rockchip/rk3036/Makefile | 2 +- .../{rk3036-board-spl.c => rk3036/rk3036.c} | 41 +-- arch/arm/mach-rockchip/rk3036/sdram_rk3036.c | 33 +- arch/arm/mach-rockchip/rk3188-board-spl.c | 226 -------------- arch/arm/mach-rockchip/rk3188-board.c | 82 ----- arch/arm/mach-rockchip/rk3188/Makefile | 1 + arch/arm/mach-rockchip/rk3188/rk3188.c | 23 ++ arch/arm/mach-rockchip/rk322x-board.c | 155 ---------- arch/arm/mach-rockchip/rk322x/Makefile | 2 +- .../{rk322x-board-spl.c => rk322x/rk322x.c} | 86 ++---- arch/arm/mach-rockchip/rk3288-board-spl.c | 304 ------------------ arch/arm/mach-rockchip/rk3288-board-tpl.c | 84 ----- arch/arm/mach-rockchip/rk3288-board.c | 338 --------------------- arch/arm/mach-rockchip/rk3288/rk3288.c | 328 +++++++++++++++++++- arch/arm/mach-rockchip/rk3328/rk3328.c | 59 +++- arch/arm/mach-rockchip/rk3368-board-spl.c | 73 ----- arch/arm/mach-rockchip/rk3368-board-tpl.c | 157 ---------- arch/arm/mach-rockchip/rk3368/rk3368.c | 116 ++++++- arch/arm/mach-rockchip/rk3399-board-spl.c | 179 ----------- arch/arm/mach-rockchip/rk3399-board.c | 14 - arch/arm/mach-rockchip/rk3399/rk3399.c | 86 +++++- arch/arm/mach-rockchip/rk_timer.c | 48 --- arch/arm/mach-rockchip/rv1108/rv1108.c | 8 - arch/arm/mach-rockchip/sdram_common.c | 84 ++++- arch/arm/mach-rockchip/spl-boot-order.c | 2 +- arch/arm/mach-rockchip/spl.c | 195 ++++++++++++ arch/arm/mach-rockchip/tpl.c | 111 +++++++ board/chipspark/popmetal_rk3288/popmetal-rk3288.c | 9 +- board/geekbuying/geekbox/geekbox.c | 5 - board/mqmaker/miqi_rk3288/miqi-rk3288.c | 7 - board/phytec/phycore_rk3288/phycore-rk3288.c | 45 ++- board/rockchip/evb_px5/evb-px5.c | 5 - board/rockchip/evb_rk3288/evb-rk3288.c | 7 - .../rockchip/evb_rk3288_rk1608/evb-rk3288-rk1608.c | 8 + board/rockchip/evb_rk3328/evb-rk3328.c | 66 ---- board/rockchip/evb_rk3399/evb-rk3399.c | 56 ++-- board/rockchip/evb_rv1108/evb_rv1108.c | 6 - board/rockchip/fennec_rk3288/fennec-rk3288.c | 7 - board/rockchip/sheep_rk3368/sheep_rk3368.c | 5 - board/rockchip/tinker_rk3288/tinker-rk3288.c | 2 +- board/theobroma-systems/lion_rk3368/lion_rk3368.c | 8 - board/theobroma-systems/puma_rk3399/puma-rk3399.c | 17 +- configs/evb-rk3128_defconfig | 1 - configs/evb-rk3229_defconfig | 2 +- configs/evb-rk3288_defconfig | 1 - configs/evb-rk3328_defconfig | 1 - configs/evb-rk3399_defconfig | 1 - configs/fennec-rk3288_defconfig | 1 - configs/firefly-rk3288_defconfig | 1 - configs/firefly-rk3399_defconfig | 1 - configs/lion-rk3368_defconfig | 4 - configs/miqi-rk3288_defconfig | 1 - configs/phycore-rk3288_defconfig | 1 - configs/popmetal-rk3288_defconfig | 1 - configs/puma-rk3399_defconfig | 1 - configs/tinker-rk3288_defconfig | 1 - configs/vyasa-rk3288_defconfig | 1 - drivers/ram/rockchip/sdram_rk322x.c | 29 +- include/configs/rk3036_common.h | 7 - include/configs/rk3128_common.h | 6 - include/configs/rk3188_common.h | 5 - include/configs/rk322x_common.h | 4 - include/configs/rk3288_common.h | 6 - include/configs/rk3328_common.h | 2 - include/configs/rk3368_common.h | 4 - include/configs/rk3399_common.h | 4 - include/configs/rockchip-common.h | 6 + include/configs/rv1108_common.h | 8 - 80 files changed, 1248 insertions(+), 2251 deletions(-) rename arch/arm/mach-rockchip/{rk3128-board.c => board.c} (63%) delete mode 100644 arch/arm/mach-rockchip/rk3036-board.c rename arch/arm/mach-rockchip/{rk3036-board-spl.c => rk3036/rk3036.c} (50%) delete mode 100644 arch/arm/mach-rockchip/rk3188-board-spl.c delete mode 100644 arch/arm/mach-rockchip/rk3188-board.c create mode 100644 arch/arm/mach-rockchip/rk3188/rk3188.c delete mode 100644 arch/arm/mach-rockchip/rk322x-board.c rename arch/arm/mach-rockchip/{rk322x-board-spl.c => rk322x/rk322x.c} (51%) delete mode 100644 arch/arm/mach-rockchip/rk3288-board-spl.c delete mode 100644 arch/arm/mach-rockchip/rk3288-board-tpl.c delete mode 100644 arch/arm/mach-rockchip/rk3288-board.c delete mode 100644 arch/arm/mach-rockchip/rk3368-board-spl.c delete mode 100644 arch/arm/mach-rockchip/rk3368-board-tpl.c delete mode 100644 arch/arm/mach-rockchip/rk3399-board-spl.c delete mode 100644 arch/arm/mach-rockchip/rk3399-board.c delete mode 100644 arch/arm/mach-rockchip/rk_timer.c create mode 100644 arch/arm/mach-rockchip/spl.c create mode 100644 arch/arm/mach-rockchip/tpl.c create mode 100644 board/rockchip/evb_rk3288_rk1608/evb-rk3288-rk1608.c