| Message ID | 20240418-b4-qcom-rbx-fixes-v1-1-e524eb29ae86@linaro.org |
|---|---|
| State | Accepted |
| Delegated to: | Caleb Connolly |
| Headers | show |
| Series | qcom: switch to OF_UPSTREAM | expand |
On 18/04/2024 19:24, Caleb Connolly wrote: > Switch to using upstream DT from dts/upstream. > > Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org> > --- > MAINTAINERS | 4 ---- > arch/arm/Kconfig | 1 + > configs/dragonboard410c_defconfig | 2 +- > configs/dragonboard820c_defconfig | 2 +- > configs/qcom_defconfig | 2 +- > 5 files changed, 4 insertions(+), 7 deletions(-) > > diff --git a/MAINTAINERS b/MAINTAINERS > index c0d2b5138fca..d0a4a28b401d 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -605,12 +605,8 @@ M: Neil Armstrong <neil.armstrong@linaro.org> > R: Sumit Garg <sumit.garg@linaro.org> > L: u-boot-qcom@groups.io > S: Maintained > T: git https://source.denx.de/u-boot/custodians/u-boot-snapdragon.git > -F: arch/arm/dts/msm8*.dtsi > -F: arch/arm/dts/pm8???.dtsi > -F: arch/arm/dts/pms405.dtsi > -F: arch/arm/dts/sdm845.dtsi > F: drivers/*/*/pm8???-* > F: drivers/gpio/msm_gpio.c > F: drivers/mmc/msm_sdhci.c > F: drivers/phy/msm8916-usbh-phy.c > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 23ee25269a24..2931c82eb11f 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -1088,8 +1088,9 @@ config ARCH_SNAPDRAGON > select BOARD_LATE_INIT > select OF_BOARD > select SAVE_PREV_BL_FDT_ADDR > select LINUX_KERNEL_IMAGE_HEADER > + imply OF_UPSTREAM > imply CMD_DM > > config ARCH_SOCFPGA > bool "Altera SOCFPGA family" > diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig > index 260a8349d3b2..9ef04fd45546 100644 > --- a/configs/dragonboard410c_defconfig > +++ b/configs/dragonboard410c_defconfig > @@ -8,9 +8,9 @@ CONFIG_SYS_MALLOC_LEN=0x802000 > CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y > CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x8007fff0 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x0 > -CONFIG_DEFAULT_DEVICE_TREE="apq8016-sbc" > +CONFIG_DEFAULT_DEVICE_TREE="qcom/apq8016-sbc" > CONFIG_OF_LIBFDT_OVERLAY=y > CONFIG_IDENT_STRING="\nQualcomm-DragonBoard 410C" > CONFIG_SYS_LOAD_ADDR=0x80080000 > CONFIG_REMAKE_ELF=y > diff --git a/configs/dragonboard820c_defconfig b/configs/dragonboard820c_defconfig > index ebc80eb2a464..f6b2cb09ba31 100644 > --- a/configs/dragonboard820c_defconfig > +++ b/configs/dragonboard820c_defconfig > @@ -6,9 +6,9 @@ CONFIG_TEXT_BASE=0x80080000 > CONFIG_SYS_MALLOC_LEN=0x804000 > CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y > CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x8007fff0 > CONFIG_ENV_SIZE=0x4000 > -CONFIG_DEFAULT_DEVICE_TREE="apq8096-db820c" > +CONFIG_DEFAULT_DEVICE_TREE="qcom/apq8096-db820c" > CONFIG_IDENT_STRING="\nQualcomm-DragonBoard 820C" > CONFIG_SYS_LOAD_ADDR=0x80080000 > CONFIG_DISTRO_DEFAULTS=y > CONFIG_USE_BOOTARGS=y > diff --git a/configs/qcom_defconfig b/configs/qcom_defconfig > index ee3ed89cbc8a..218a9a769682 100644 > --- a/configs/qcom_defconfig > +++ b/configs/qcom_defconfig > @@ -1,9 +1,9 @@ > CONFIG_ARM=y > CONFIG_SKIP_LOWLEVEL_INIT=y > CONFIG_POSITION_INDEPENDENT=y > CONFIG_ARCH_SNAPDRAGON=y > -CONFIG_DEFAULT_DEVICE_TREE="sdm845-db845c" > +CONFIG_DEFAULT_DEVICE_TREE="qcom/sdm845-db845c" > CONFIG_SYS_LOAD_ADDR=0x0 > CONFIG_BUTTON_CMD=y > CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
diff --git a/MAINTAINERS b/MAINTAINERS index c0d2b5138fca..d0a4a28b401d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -605,12 +605,8 @@ M: Neil Armstrong <neil.armstrong@linaro.org> R: Sumit Garg <sumit.garg@linaro.org> L: u-boot-qcom@groups.io S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-snapdragon.git -F: arch/arm/dts/msm8*.dtsi -F: arch/arm/dts/pm8???.dtsi -F: arch/arm/dts/pms405.dtsi -F: arch/arm/dts/sdm845.dtsi F: drivers/*/*/pm8???-* F: drivers/gpio/msm_gpio.c F: drivers/mmc/msm_sdhci.c F: drivers/phy/msm8916-usbh-phy.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 23ee25269a24..2931c82eb11f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1088,8 +1088,9 @@ config ARCH_SNAPDRAGON select BOARD_LATE_INIT select OF_BOARD select SAVE_PREV_BL_FDT_ADDR select LINUX_KERNEL_IMAGE_HEADER + imply OF_UPSTREAM imply CMD_DM config ARCH_SOCFPGA bool "Altera SOCFPGA family" diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig index 260a8349d3b2..9ef04fd45546 100644 --- a/configs/dragonboard410c_defconfig +++ b/configs/dragonboard410c_defconfig @@ -8,9 +8,9 @@ CONFIG_SYS_MALLOC_LEN=0x802000 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x8007fff0 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x0 -CONFIG_DEFAULT_DEVICE_TREE="apq8016-sbc" +CONFIG_DEFAULT_DEVICE_TREE="qcom/apq8016-sbc" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_IDENT_STRING="\nQualcomm-DragonBoard 410C" CONFIG_SYS_LOAD_ADDR=0x80080000 CONFIG_REMAKE_ELF=y diff --git a/configs/dragonboard820c_defconfig b/configs/dragonboard820c_defconfig index ebc80eb2a464..f6b2cb09ba31 100644 --- a/configs/dragonboard820c_defconfig +++ b/configs/dragonboard820c_defconfig @@ -6,9 +6,9 @@ CONFIG_TEXT_BASE=0x80080000 CONFIG_SYS_MALLOC_LEN=0x804000 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x8007fff0 CONFIG_ENV_SIZE=0x4000 -CONFIG_DEFAULT_DEVICE_TREE="apq8096-db820c" +CONFIG_DEFAULT_DEVICE_TREE="qcom/apq8096-db820c" CONFIG_IDENT_STRING="\nQualcomm-DragonBoard 820C" CONFIG_SYS_LOAD_ADDR=0x80080000 CONFIG_DISTRO_DEFAULTS=y CONFIG_USE_BOOTARGS=y diff --git a/configs/qcom_defconfig b/configs/qcom_defconfig index ee3ed89cbc8a..218a9a769682 100644 --- a/configs/qcom_defconfig +++ b/configs/qcom_defconfig @@ -1,9 +1,9 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_POSITION_INDEPENDENT=y CONFIG_ARCH_SNAPDRAGON=y -CONFIG_DEFAULT_DEVICE_TREE="sdm845-db845c" +CONFIG_DEFAULT_DEVICE_TREE="qcom/sdm845-db845c" CONFIG_SYS_LOAD_ADDR=0x0 CONFIG_BUTTON_CMD=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y
Switch to using upstream DT from dts/upstream. Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org> --- MAINTAINERS | 4 ---- arch/arm/Kconfig | 1 + configs/dragonboard410c_defconfig | 2 +- configs/dragonboard820c_defconfig | 2 +- configs/qcom_defconfig | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-)