Merge patch series "Switch to using $(PHASE_) in Makefiles"
authorTom Rini <trini@konsulko.com>
Fri, 11 Apr 2025 18:16:49 +0000 (12:16 -0600)
committerTom Rini <trini@konsulko.com>
Fri, 11 Apr 2025 18:16:49 +0000 (12:16 -0600)
Tom Rini <trini@konsulko.com> says:

This series switches to always using $(PHASE_) in Makefiles when
building rather than $(PHASE_) or $(XPL_). It also starts on documenting
this part of the build, but as a follow-up we need to rename
doc/develop/spl.rst and expand on explaining things a bit.

Link: https://lore.kernel.org/r/20250401225851.1125678-1-trini@konsulko.com
1  2 
Makefile
arch/arm/lib/Makefile
arch/x86/lib/Makefile
boot/Makefile
drivers/misc/Makefile
drivers/power/domain/Makefile
drivers/power/regulator/Makefile
drivers/video/Makefile
lib/Makefile
test/lib/Makefile

diff --cc Makefile
Simple merge
Simple merge
Simple merge
diff --cc boot/Makefile
Simple merge
Simple merge
Simple merge
@@@ -4,25 -4,24 +4,25 @@@
  # Przemyslaw Marczak <p.marczak@samsung.com>
  #
  
- obj-$(CONFIG_$(XPL_)DM_REGULATOR) += regulator-uclass.o
+ obj-$(CONFIG_$(PHASE_)DM_REGULATOR) += regulator-uclass.o
  obj-$(CONFIG_REGULATOR_ACT8846) += act8846.o
  obj-$(CONFIG_REGULATOR_AS3722)        += as3722_regulator.o
- obj-$(CONFIG_$(XPL_)REGULATOR_AXP) += axp_regulator.o
- obj-$(CONFIG_$(XPL_)REGULATOR_AXP_USB_POWER) += axp_usb_power.o
- obj-$(CONFIG_$(XPL_)DM_REGULATOR_DA9063) += da9063.o
- obj-$(CONFIG_$(XPL_)DM_REGULATOR_MAX77663) += max77663_regulator.o
+ obj-$(CONFIG_$(PHASE_)REGULATOR_AXP) += axp_regulator.o
+ obj-$(CONFIG_$(PHASE_)REGULATOR_AXP_USB_POWER) += axp_usb_power.o
+ obj-$(CONFIG_$(PHASE_)DM_REGULATOR_DA9063) += da9063.o
+ obj-$(CONFIG_$(PHASE_)DM_REGULATOR_MAX77663) += max77663_regulator.o
  obj-$(CONFIG_DM_REGULATOR_MAX77686) += max77686.o
  obj-$(CONFIG_DM_REGULATOR_NPCM8XX) += npcm8xx_regulator.o
- obj-$(CONFIG_$(XPL_)DM_PMIC_PFUZE100) += pfuze100.o
- obj-$(CONFIG_$(XPL_)DM_REGULATOR_BD71837) += bd71837.o
- obj-$(CONFIG_$(XPL_)DM_REGULATOR_PCA9450) += pca9450.o
- obj-$(CONFIG_$(XPL_)REGULATOR_PWM) += pwm_regulator.o
- obj-$(CONFIG_$(XPL_)DM_REGULATOR_FAN53555) += fan53555.o
- obj-$(CONFIG_$(XPL_)DM_REGULATOR_COMMON) += regulator_common.o
- obj-$(CONFIG_$(XPL_)DM_REGULATOR_FIXED) += fixed.o
- obj-$(CONFIG_$(XPL_)DM_REGULATOR_GPIO) += gpio-regulator.o
+ obj-$(CONFIG_$(PHASE_)DM_PMIC_PFUZE100) += pfuze100.o
+ obj-$(CONFIG_$(PHASE_)DM_REGULATOR_BD71837) += bd71837.o
+ obj-$(CONFIG_$(PHASE_)DM_REGULATOR_PCA9450) += pca9450.o
+ obj-$(CONFIG_$(PHASE_)REGULATOR_PWM) += pwm_regulator.o
+ obj-$(CONFIG_$(PHASE_)DM_REGULATOR_FAN53555) += fan53555.o
+ obj-$(CONFIG_$(PHASE_)DM_REGULATOR_COMMON) += regulator_common.o
+ obj-$(CONFIG_$(PHASE_)DM_REGULATOR_FIXED) += fixed.o
+ obj-$(CONFIG_$(PHASE_)DM_REGULATOR_GPIO) += gpio-regulator.o
  obj-$(CONFIG_DM_REGULATOR_QCOM_RPMH) += qcom-rpmh-regulator.o
 +obj-$(CONFIG_DM_REGULATOR_QCOM_USB_VBUS) += qcom_usb_vbus_regulator.o
  obj-$(CONFIG_$(PHASE_)REGULATOR_RK8XX) += rk8xx.o
  obj-$(CONFIG_DM_REGULATOR_S2MPS11) += s2mps11_regulator.o
  obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o
Simple merge
diff --cc lib/Makefile
Simple merge
Simple merge