am335x, shc: convert am335x based shc board to DM usage
cover am335x, shc: convert am335x based shc board to DM usage
This patchseries converts the shc board to DM usage and get rid of DM based compiler warnings.
Patch 1 copies the DTS from linux
Patch 2 introduces u-boot specific dtsi
Patch 3 reworks board code and shc specific defconfigs
Travis build is fine:
https://travis-ci.org/hsdenx/u-boot-test/builds/480340146
Heiko Schocher (3):
arm: dts: add am335x-shc.dts for shc board
ARM: dts: am335x-shc: add u-boot specific dtsi
am335x, shc: adapt shc board to DM
arch/arm/dts/Makefile | 1 + arch/arm/dts/am335x-shc-u-boot.dtsi | 51 ++ arch/arm/dts/am335x-shc.dts | 575 +++++++++++++++++++++ board/bosch/shc/MAINTAINERS | 4 +- board/bosch/shc/board.c | 133 +---- configs/am335x_shc_defconfig | 12 +- configs/am335x_shc_ict_defconfig | 12 +- configs/am335x_shc_netboot_defconfig | 12 +- configs/am335x_shc_prompt_defconfig | 45 -- configs/am335x_shc_sdboot_defconfig | 12 +- configs/am335x_shc_sdboot_prompt_defconfig | 47 -- 11 files changed, 671 insertions(+), 233 deletions(-) create mode 100644 arch/arm/dts/am335x-shc-u-boot.dtsi create mode 100644 arch/arm/dts/am335x-shc.dts delete mode 100644 configs/am335x_shc_prompt_defconfig delete mode 100644 configs/am335x_shc_sdboot_prompt_defconfig
Signature · 1 line
2.17.2
PATCH 1/3 arm: dts: add am335x-shc.dts for shc board
add DTS from linux tree commit
"47bfa6d9dc8c060bf56554a465c9031e286d2f80"
change for U-Boot:
switch to SPDX-license identifier.
---
arch/arm/dts/Makefile | 1 + arch/arm/dts/am335x-shc.dts | 575 ++++++++++++++++++++++++++++++++++++ board/bosch/shc/MAINTAINERS | 1 + 3 files changed, 577 insertions(+) create mode 100644 arch/arm/dts/am335x-shc.dts
arch/arm/dts/Makefile +1 -0
@@ -192,6 +192,7 @@ dtb-$(CONFIG_AM33XX) += am335x-boneblack.dtb am335x-bone.dtb \ am335x-icev2.dtb \ am335x-pxm50.dtb \ am335x-rut.dtb \ + am335x-shc.dtb \ am335x-pdu001.dtb \ am335x-chiliboard.dtb dtb-$(CONFIG_AM43XX) += am437x-gp-evm.dtb am437x-sk-evm.dtb \
arch/arm/dts/am335x-shc.dts new file +575 -0
575 lines not on this page · raw message
board/bosch/shc/MAINTAINERS +1 -0
@@ -9,3 +9,4 @@ F: configs/am335x_shc_netboot_defconfig F: configs/am335x_shc_prompt_defconfig F: configs/am335x_shc_sdboot_defconfig F: configs/am335x_shc_sdboot_prompt_defconfig +F: arch/arm/dts/am335x-shc.dts
Signature · 1 line
2.17.2
PATCH 1/3 arm: dts: add am335x-shc.dts for shc board
Quoted 7 lines · Heiko Schocher
add DTS from linux tree commit
"47bfa6d9dc8c060bf56554a465c9031e286d2f80"change for U-Boot:
switch to SPDX-license identifier.Signed-off-by Heiko Schocher <[email protected]>
You should take this as-is from Linux, where you can/should have an SPDX tag nowadays, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190121/7a7168b9/attachment.sig>
PATCH 1/3 arm: dts: add am335x-shc.dts for shc board
Hello Tom,
Am 21.01.2019 um 17:41 schrieb Tom Rini:
Quoted 5 lines · Heiko Schocher
Quoted 4 lines
add DTS from linux tree commit
"47bfa6d9dc8c060bf56554a465c9031e286d2f80"
Quoted 7 lines
Quoted 4 lines
change for U-Boot:
switch to SPDX-license identifier.Signed-off-by Heiko Schocher <[email protected]>You should take this as-is from Linux, where you can/should have an SPDX tag nowadays, thanks!
Yes, just sended the updates to Linux ... should I wait until they are in Linux, and send a v2 ?
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH 1/3 arm: dts: add am335x-shc.dts for shc board
Quoted 11 lines · Heiko Schocher
Hello Tom,
Am 21.01.2019 um 17:41 schrieb Tom Rini:
Quoted 8 lines · Heiko Schocher
Quoted 7 lines
add DTS from linux tree commit
"47bfa6d9dc8c060bf56554a465c9031e286d2f80"change for U-Boot:
switch to SPDX-license identifier.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Heiko Schocher <[email protected]>You should take this as-is from Linux, where you can/should have an SPDX tag nowadays, thanks!
Yes, just sended the updates to Linux ... should I wait until they are in Linux, and send a v2 ?
You can send a v2 with what you sent for Linux and just be responsible for re-syncing any changes that are requested, if any, there. Thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190122/a7f27a3f/attachment.sig>
PATCH 1/3 arm: dts: add am335x-shc.dts for shc board
In reply to Heiko SchocherQuoted 7 lines · Heiko Schocher
add DTS from linux tree commit
"47bfa6d9dc8c060bf56554a465c9031e286d2f80"change for U-Boot:
switch to SPDX-license identifier.Signed-off-by Heiko Schocher <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190202/a6a5af27/attachment.sig>
PATCH 2/3 ARM: dts: am335x-shc: add u-boot specific dtsi
In reply to Heiko Schocheradd u-boot specific am335x-shc-u-boot.dtsi file,
in which we add u-boot specific adaptions.
---
arch/arm/dts/am335x-shc-u-boot.dtsi | 51 +++++++++++++++++++++++++++++ board/bosch/shc/MAINTAINERS | 1 + 2 files changed, 52 insertions(+) create mode 100644 arch/arm/dts/am335x-shc-u-boot.dtsi
arch/arm/dts/am335x-shc-u-boot.dtsi new file +51 -0
@@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2019 Heiko Schocher <[email protected]> + */ + +/ { + ocp { + u-boot,dm-pre-reloc; + }; +}; + +&l4_wkup { + u-boot,dm-pre-reloc; +}; + +&scm { + u-boot,dm-pre-reloc; +}; + +&am33xx_pinmux { + u-boot,dm-pre-reloc; +}; + +&uart0_pins { + u-boot,dm-pre-reloc; +}; + +&uart0 { + u-boot,dm-pre-reloc; +}; + +&mmc1 { + u-boot,dm-pre-reloc; + cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; +}; + +&emmc_pins { + u-boot,dm-pre-reloc; +}; + +&mmc2 { + u-boot,dm-pre-reloc; +}; + +&mmc1_pins { + u-boot,dm-pre-reloc; +}; + +&mmc3 { + status = "disabled"; +};
board/bosch/shc/MAINTAINERS +1 -0
@@ -10,3 +10,4 @@ F: configs/am335x_shc_prompt_defconfig F: configs/am335x_shc_sdboot_defconfig F: configs/am335x_shc_sdboot_prompt_defconfig F: arch/arm/dts/am335x-shc.dts +F: arch/arm/dts/am335x-shc-u-boot.dtsi
Signature · 1 line
2.17.2
PATCH 2/3 ARM: dts: am335x-shc: add u-boot specific dtsi
Quoted 4 lines · Heiko Schocher
add u-boot specific
am335x-shc-u-boot.dtsifile,
in which we add u-boot specific adaptions.Signed-off-by Heiko Schocher <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190121/70752b0b/attachment.sig>
PATCH 2/3 ARM: dts: am335x-shc: add u-boot specific dtsi
In reply to Heiko SchocherQuoted 5 lines · Heiko Schocher
add u-boot specific
am335x-shc-u-boot.dtsifile,
in which we add u-boot specific adaptions.Signed-off-by Heiko Schocher <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190202/cefff239/attachment.sig>
PATCH 3/3 am335x, shc: adapt shc board to DM
In reply to Heiko Schocherport the am335x based shc board to DM, to get rid
of DW warnings when compiling U-Boot.
- remove uneccessary board code
- adapt defconfigs
- remove unneeded defconfigs
configs/am335x_shc_prompt_defconfig
configs/am335x_shc_sdboot_prompt_defconfig
---
board/bosch/shc/MAINTAINERS | 2 - board/bosch/shc/board.c | 133 +-------------------- configs/am335x_shc_defconfig | 12 +- configs/am335x_shc_ict_defconfig | 12 +- configs/am335x_shc_netboot_defconfig | 12 +- configs/am335x_shc_prompt_defconfig | 45 ------- configs/am335x_shc_sdboot_defconfig | 12 +- configs/am335x_shc_sdboot_prompt_defconfig | 47 -------- 8 files changed, 42 insertions(+), 233 deletions(-) delete mode 100644 configs/am335x_shc_prompt_defconfig delete mode 100644 configs/am335x_shc_sdboot_prompt_defconfig
board/bosch/shc/MAINTAINERS +0 -2
@@ -6,8 +6,6 @@ F: include/configs/am335x_shc.h F: configs/am335x_shc_defconfig F: configs/am335x_shc_ict_defconfig F: configs/am335x_shc_netboot_defconfig -F: configs/am335x_shc_prompt_defconfig F: configs/am335x_shc_sdboot_defconfig -F: configs/am335x_shc_sdboot_prompt_defconfig F: arch/arm/dts/am335x-shc.dts F: arch/arm/dts/am335x-shc-u-boot.dtsi
board/bosch/shc/board.c +6 -127
171 lines not on this page · raw message
configs/am335x_shc_defconfig +9 -3
@@ -14,7 +14,9 @@ CONFIG_SERIES=y CONFIG_DISTRO_DEFAULTS=y # CONFIG_USE_BOOTCOMMAND is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_DEFAULT_FDT_FILE="am335x-shc" CONFIG_VERSION_VARIABLE=y +CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_NAND_SUPPORT is not set
@@ -32,15 +34,19 @@ CONFIG_AUTOBOOT_STOP_STR="noautoboot" CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y +# CONFIG_CMD_PINMUX is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="am335x-shc" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_PHY_ADDR_ENABLE=y +CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y -CONFIG_SPI=y -CONFIG_OMAP3_SPI=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_SINGLE=y CONFIG_FAT_WRITE=y CONFIG_LZO=y -CONFIG_OF_LIBFDT=y
configs/am335x_shc_ict_defconfig +9 -3
@@ -15,7 +15,9 @@ CONFIG_SERIES=y CONFIG_DISTRO_DEFAULTS=y # CONFIG_USE_BOOTCOMMAND is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_DEFAULT_FDT_FILE="am335x-shc" CONFIG_VERSION_VARIABLE=y +CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_NAND_SUPPORT is not set
@@ -33,15 +35,19 @@ CONFIG_AUTOBOOT_STOP_STR="noautoboot" CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y +# CONFIG_CMD_PINMUX is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="am335x-shc" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_PHY_ADDR_ENABLE=y +CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y -CONFIG_SPI=y -CONFIG_OMAP3_SPI=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_SINGLE=y CONFIG_FAT_WRITE=y CONFIG_LZO=y -CONFIG_OF_LIBFDT=y
configs/am335x_shc_netboot_defconfig +9 -3
@@ -15,7 +15,9 @@ CONFIG_SERIES=y CONFIG_DISTRO_DEFAULTS=y # CONFIG_USE_BOOTCOMMAND is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_DEFAULT_FDT_FILE="am335x-shc" CONFIG_VERSION_VARIABLE=y +CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y
@@ -34,15 +36,19 @@ CONFIG_AUTOBOOT_STOP_STR="noautoboot" CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y +# CONFIG_CMD_PINMUX is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="am335x-shc" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_PHY_ADDR_ENABLE=y +CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y -CONFIG_SPI=y -CONFIG_OMAP3_SPI=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_SINGLE=y CONFIG_FAT_WRITE=y CONFIG_LZO=y -CONFIG_OF_LIBFDT=y
configs/am335x_shc_prompt_defconfig deleted +0 -45
45 lines not on this page · raw message
configs/am335x_shc_sdboot_defconfig +9 -3
@@ -15,7 +15,9 @@ CONFIG_SERIES=y CONFIG_DISTRO_DEFAULTS=y # CONFIG_USE_BOOTCOMMAND is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_DEFAULT_FDT_FILE="am335x-shc" CONFIG_VERSION_VARIABLE=y +CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_NAND_SUPPORT is not set
@@ -33,15 +35,19 @@ CONFIG_AUTOBOOT_STOP_STR="noautoboot" CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y +# CONFIG_CMD_PINMUX is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="am335x-shc" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_PHY_ADDR_ENABLE=y +CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y -CONFIG_SPI=y -CONFIG_OMAP3_SPI=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_SINGLE=y CONFIG_FAT_WRITE=y CONFIG_LZO=y -CONFIG_OF_LIBFDT=y
configs/am335x_shc_sdboot_prompt_defconfig deleted +0 -47
47 lines not on this page · raw message
Signature · 1 line
2.17.2
PATCH 3/3 am335x, shc: adapt shc board to DM
Quoted 10 lines · Heiko Schocher
port the am335x based shc board to DM, to get rid
of DW warnings when compiling U-Boot.- remove uneccessary board code
- adapt defconfigs
- remove unneeded defconfigs
configs/am335x_shc_prompt_defconfig
configs/am335x_shc_sdboot_prompt_defconfigSigned-off-by Heiko Schocher <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190121/1f571abc/attachment.sig>
PATCH 3/3 am335x, shc: adapt shc board to DM
In reply to Heiko SchocherQuoted 11 lines · Heiko Schocher
port the am335x based shc board to DM, to get rid
of DW warnings when compiling U-Boot.- remove uneccessary board code
- adapt defconfigs
- remove unneeded defconfigs
configs/am335x_shc_prompt_defconfig
configs/am335x_shc_sdboot_prompt_defconfigSigned-off-by Heiko Schocher <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190202/bebac01c/attachment.sig>