rk3188 and rk3288 can easily be built together in a single image. Add support for this and merge the two defconfig files. Sascha Hauer (3): ARM: rockchip: Allow to build for multiple SoCs ARM: Rockchip: Merge defconfig files ARM: rockchip: radxa-rock: build defaultenv arch/arm/boards/radxa-rock/Makefile | 1 + arch/arm/boards/radxa-rock/board.c | 3 + .../{env => defaultenv-radxa-rock}/boot/mshc1 | 0 .../boot/mshc1-old | 0 .../init/bootsource | 0 .../nv/hostname | 0 .../nv/linux.bootargs.console | 0 arch/arm/configs/rk3188_defconfig | 98 ------------------- .../{rk3288_defconfig => rockchip_defconfig} | 5 +- arch/arm/mach-rockchip/Kconfig | 12 +-- arch/arm/mach-rockchip/Makefile | 1 + .../arm/mach-rockchip/include/mach/debug_ll.h | 12 ++- .../arm/mach-rockchip/include/mach/rockchip.h | 22 +++++ arch/arm/mach-rockchip/rk3188.c | 4 +- arch/arm/mach-rockchip/rk3288.c | 25 ++--- arch/arm/mach-rockchip/rockchip.c | 17 ++++ common/Kconfig | 18 +++- 17 files changed, 89 insertions(+), 129 deletions(-) rename arch/arm/boards/radxa-rock/{env => defaultenv-radxa-rock}/boot/mshc1 (100%) rename arch/arm/boards/radxa-rock/{env => defaultenv-radxa-rock}/boot/mshc1-old (100%) rename arch/arm/boards/radxa-rock/{env => defaultenv-radxa-rock}/init/bootsource (100%) rename arch/arm/boards/radxa-rock/{env => defaultenv-radxa-rock}/nv/hostname (100%) rename arch/arm/boards/radxa-rock/{env => defaultenv-radxa-rock}/nv/linux.bootargs.console (100%) delete mode 100644 arch/arm/configs/rk3188_defconfig rename arch/arm/configs/{rk3288_defconfig => rockchip_defconfig} (96%) create mode 100644 arch/arm/mach-rockchip/include/mach/rockchip.h create mode 100644 arch/arm/mach-rockchip/rockchip.c -- 2.29.2 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox