From d0037efda9e9ce855279d21b891d29edbfb664fb Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 18 Jan 2024 12:38:34 -0700 Subject: soc/*: Rename Makefiles from .inc to .mk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The .inc suffix is confusing to various tools as it's not specific to Makefiles. This means that editors don't recognize the files, and don't open them with highlighting and any other specific editor functionality. This issue is also seen in the release notes generation script where Makefiles get renamed before running cloc. Signed-off-by: Martin Roth Change-Id: I6f502b97864fd7782e514ee2daa902d2081633a2 Reviewed-on: https://review.coreboot.org/c/coreboot/+/80074 Reviewed-by: Maximilian Brune Reviewed-by: Michael Niewöhner Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans Reviewed-by: Felix Singer --- src/soc/rockchip/rk3288/Makefile.inc | 68 -------------------------------- src/soc/rockchip/rk3288/Makefile.mk | 68 ++++++++++++++++++++++++++++++++ src/soc/rockchip/rk3399/Makefile.inc | 75 ------------------------------------ src/soc/rockchip/rk3399/Makefile.mk | 75 ++++++++++++++++++++++++++++++++++++ 4 files changed, 143 insertions(+), 143 deletions(-) delete mode 100644 src/soc/rockchip/rk3288/Makefile.inc create mode 100644 src/soc/rockchip/rk3288/Makefile.mk delete mode 100644 src/soc/rockchip/rk3399/Makefile.inc create mode 100644 src/soc/rockchip/rk3399/Makefile.mk (limited to 'src/soc/rockchip') diff --git a/src/soc/rockchip/rk3288/Makefile.inc b/src/soc/rockchip/rk3288/Makefile.inc deleted file mode 100644 index 075fa36599..0000000000 --- a/src/soc/rockchip/rk3288/Makefile.inc +++ /dev/null @@ -1,68 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ifeq ($(CONFIG_SOC_ROCKCHIP_RK3288),y) - -IDBTOOL = util/rockchip/make_idb.py - -bootblock-y += bootblock.c -bootblock-y += ../common/uart.c -bootblock-y += timer.c -bootblock-y += clock.c -bootblock-y += ../common/spi.c -bootblock-y += ../common/gpio.c -bootblock-y += gpio.c -bootblock-y += ../common/i2c.c -bootblock-$(CONFIG_SOFTWARE_I2C) += software_i2c.c -bootblock-y += ../common/rk808.c - -verstage-y += ../common/spi.c -verstage-y += timer.c -verstage-y += ../common/uart.c -verstage-y += ../common/gpio.c -verstage-y += gpio.c -verstage-y += clock.c -verstage-y += crypto.c -verstage-y += ../common/i2c.c -verstage-$(CONFIG_SOFTWARE_I2C) += software_i2c.c - -romstage-y += ../common/cbmem.c -romstage-y += timer.c -romstage-y += ../common/uart.c -romstage-y += ../common/i2c.c -romstage-$(CONFIG_SOFTWARE_I2C) += software_i2c.c -romstage-y += clock.c -romstage-y += ../common/gpio.c -romstage-y += gpio.c -romstage-y += ../common/spi.c -romstage-y += sdram.c -romstage-y += ../common/rk808.c -romstage-y += ../common/pwm.c -romstage-y += tsadc.c -romstage-y += ../common/i2c.c - -ramstage-y += soc.c -ramstage-y += timer.c -ramstage-y += ../common/i2c.c -ramstage-$(CONFIG_SOFTWARE_I2C) += software_i2c.c -ramstage-y += clock.c -ramstage-y += ../common/spi.c -ramstage-y += sdram.c -ramstage-y += ../common/gpio.c -ramstage-y += gpio.c -ramstage-y += ../common/rk808.c -ramstage-y += ../common/pwm.c -ramstage-y += ../common/vop.c -ramstage-y += ../common/edp.c -ramstage-y += hdmi.c -ramstage-y += display.c -ramstage-y += ../common/uart.c - -CPPFLAGS_common += -Isrc/soc/rockchip/rk3288/include -CPPFLAGS_common += -Isrc/soc/rockchip/common/include - -$(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin - @printf "Generating: $(subst $(obj)/,,$(@))\n" - $(Q)mkdir -p $(dir $@) - $(Q)$(IDBTOOL) --from=$< --to=$@ --enable-align --chip=RK32 - -endif diff --git a/src/soc/rockchip/rk3288/Makefile.mk b/src/soc/rockchip/rk3288/Makefile.mk new file mode 100644 index 0000000000..075fa36599 --- /dev/null +++ b/src/soc/rockchip/rk3288/Makefile.mk @@ -0,0 +1,68 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ifeq ($(CONFIG_SOC_ROCKCHIP_RK3288),y) + +IDBTOOL = util/rockchip/make_idb.py + +bootblock-y += bootblock.c +bootblock-y += ../common/uart.c +bootblock-y += timer.c +bootblock-y += clock.c +bootblock-y += ../common/spi.c +bootblock-y += ../common/gpio.c +bootblock-y += gpio.c +bootblock-y += ../common/i2c.c +bootblock-$(CONFIG_SOFTWARE_I2C) += software_i2c.c +bootblock-y += ../common/rk808.c + +verstage-y += ../common/spi.c +verstage-y += timer.c +verstage-y += ../common/uart.c +verstage-y += ../common/gpio.c +verstage-y += gpio.c +verstage-y += clock.c +verstage-y += crypto.c +verstage-y += ../common/i2c.c +verstage-$(CONFIG_SOFTWARE_I2C) += software_i2c.c + +romstage-y += ../common/cbmem.c +romstage-y += timer.c +romstage-y += ../common/uart.c +romstage-y += ../common/i2c.c +romstage-$(CONFIG_SOFTWARE_I2C) += software_i2c.c +romstage-y += clock.c +romstage-y += ../common/gpio.c +romstage-y += gpio.c +romstage-y += ../common/spi.c +romstage-y += sdram.c +romstage-y += ../common/rk808.c +romstage-y += ../common/pwm.c +romstage-y += tsadc.c +romstage-y += ../common/i2c.c + +ramstage-y += soc.c +ramstage-y += timer.c +ramstage-y += ../common/i2c.c +ramstage-$(CONFIG_SOFTWARE_I2C) += software_i2c.c +ramstage-y += clock.c +ramstage-y += ../common/spi.c +ramstage-y += sdram.c +ramstage-y += ../common/gpio.c +ramstage-y += gpio.c +ramstage-y += ../common/rk808.c +ramstage-y += ../common/pwm.c +ramstage-y += ../common/vop.c +ramstage-y += ../common/edp.c +ramstage-y += hdmi.c +ramstage-y += display.c +ramstage-y += ../common/uart.c + +CPPFLAGS_common += -Isrc/soc/rockchip/rk3288/include +CPPFLAGS_common += -Isrc/soc/rockchip/common/include + +$(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin + @printf "Generating: $(subst $(obj)/,,$(@))\n" + $(Q)mkdir -p $(dir $@) + $(Q)$(IDBTOOL) --from=$< --to=$@ --enable-align --chip=RK32 + +endif diff --git a/src/soc/rockchip/rk3399/Makefile.inc b/src/soc/rockchip/rk3399/Makefile.inc deleted file mode 100644 index 8521bf3e14..0000000000 --- a/src/soc/rockchip/rk3399/Makefile.inc +++ /dev/null @@ -1,75 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ifeq ($(CONFIG_SOC_ROCKCHIP_RK3399),y) - -IDBTOOL = util/rockchip/make_idb.py - -decompressor-y += decompressor.c -decompressor-y += timer.c - -bootblock-y += ../common/i2c.c -bootblock-y += ../common/spi.c -bootblock-y += ../common/uart.c -bootblock-y += ../common/gpio.c -bootblock-y += ../common/pwm.c -bootblock-y += bootblock.c -bootblock-y += clock.c -bootblock-y += gpio.c -bootblock-y += saradc.c -bootblock-y += timer.c - -verstage-y += ../common/gpio.c -verstage-y += gpio.c -verstage-y += sdram.c -verstage-y += ../common/i2c.c -verstage-y += ../common/spi.c -verstage-y += ../common/uart.c -verstage-y += clock.c -verstage-y += timer.c - -################################################################################ - -romstage-y += ../common/cbmem.c -romstage-y += sdram.c -romstage-y += ../common/spi.c -romstage-y += ../common/uart.c -romstage-y += clock.c -romstage-y += ../common/pwm.c -romstage-y += timer.c -romstage-y += tsadc.c -romstage-y += usb.c -romstage-y += gpio.c -romstage-y += saradc.c -romstage-y += ../common/gpio.c -romstage-y += ../common/i2c.c - -################################################################################ - -ramstage-y += sdram.c -ramstage-y += ../common/spi.c -ramstage-y += ../common/uart.c -ramstage-y += clock.c -ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += display.c -ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += ../common/edp.c -ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += mipi.c -ramstage-y += ../common/gpio.c -ramstage-y += gpio.c -ramstage-y += ../common/i2c.c -ramstage-y += saradc.c -ramstage-y += soc.c -ramstage-y += timer.c -ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += ../common/vop.c -ramstage-y += usb.c - -BL31_MAKEARGS += PLAT=rk3399 M0_CROSS_COMPILE="$(CROSS_COMPILE_arm)" -################################################################################ - -CPPFLAGS_common += -Isrc/soc/rockchip/rk3399/include -CPPFLAGS_common += -Isrc/soc/rockchip/common/include - -$(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin - @printf "Generating: $(subst $(obj)/,,$(@))\n" - $(Q)mkdir -p $(dir $@) - $(Q)$(IDBTOOL) --from=$< --to=$@ --enable-align --chip=RK33 - -endif diff --git a/src/soc/rockchip/rk3399/Makefile.mk b/src/soc/rockchip/rk3399/Makefile.mk new file mode 100644 index 0000000000..8521bf3e14 --- /dev/null +++ b/src/soc/rockchip/rk3399/Makefile.mk @@ -0,0 +1,75 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ifeq ($(CONFIG_SOC_ROCKCHIP_RK3399),y) + +IDBTOOL = util/rockchip/make_idb.py + +decompressor-y += decompressor.c +decompressor-y += timer.c + +bootblock-y += ../common/i2c.c +bootblock-y += ../common/spi.c +bootblock-y += ../common/uart.c +bootblock-y += ../common/gpio.c +bootblock-y += ../common/pwm.c +bootblock-y += bootblock.c +bootblock-y += clock.c +bootblock-y += gpio.c +bootblock-y += saradc.c +bootblock-y += timer.c + +verstage-y += ../common/gpio.c +verstage-y += gpio.c +verstage-y += sdram.c +verstage-y += ../common/i2c.c +verstage-y += ../common/spi.c +verstage-y += ../common/uart.c +verstage-y += clock.c +verstage-y += timer.c + +################################################################################ + +romstage-y += ../common/cbmem.c +romstage-y += sdram.c +romstage-y += ../common/spi.c +romstage-y += ../common/uart.c +romstage-y += clock.c +romstage-y += ../common/pwm.c +romstage-y += timer.c +romstage-y += tsadc.c +romstage-y += usb.c +romstage-y += gpio.c +romstage-y += saradc.c +romstage-y += ../common/gpio.c +romstage-y += ../common/i2c.c + +################################################################################ + +ramstage-y += sdram.c +ramstage-y += ../common/spi.c +ramstage-y += ../common/uart.c +ramstage-y += clock.c +ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += display.c +ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += ../common/edp.c +ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += mipi.c +ramstage-y += ../common/gpio.c +ramstage-y += gpio.c +ramstage-y += ../common/i2c.c +ramstage-y += saradc.c +ramstage-y += soc.c +ramstage-y += timer.c +ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += ../common/vop.c +ramstage-y += usb.c + +BL31_MAKEARGS += PLAT=rk3399 M0_CROSS_COMPILE="$(CROSS_COMPILE_arm)" +################################################################################ + +CPPFLAGS_common += -Isrc/soc/rockchip/rk3399/include +CPPFLAGS_common += -Isrc/soc/rockchip/common/include + +$(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin + @printf "Generating: $(subst $(obj)/,,$(@))\n" + $(Q)mkdir -p $(dir $@) + $(Q)$(IDBTOOL) --from=$< --to=$@ --enable-align --chip=RK33 + +endif -- cgit v1.2.3