Switch to OF_UPSTREAM using the upstream devicetrees instead of the uboot ones. This change requires updates for u-boot.dtsi and defconfig files.
*-u-boot.dtsi needs to be updated to reflect the new label names of the upstream devicetrees. The defconfigs need to support multiple new drivers/frameworks to have the boot working. The qspi variants have no SPL config options enabled as the boot ROM executes uboot directly from the flash. Signed-off-by: Markus Schneider-Pargmann (TI) <[email protected]> --- arch/arm/dts/am4372-u-boot.dtsi | 32 +++++++++++++++---------------- arch/arm/dts/am437x-gp-evm-u-boot.dtsi | 8 ++++---- configs/am43xx_evm_defconfig | 22 +++++++++++++++++++-- configs/am43xx_evm_qspiboot_defconfig | 8 ++++++-- configs/am43xx_evm_rtconly_defconfig | 22 +++++++++++++++++++-- configs/am43xx_evm_usbhost_boot_defconfig | 22 +++++++++++++++++++-- configs/am43xx_hs_evm_defconfig | 22 +++++++++++++++++++-- configs/am43xx_hs_evm_qspi_defconfig | 8 ++++++-- configs/cm_t43_defconfig | 17 ++++++++++++++-- 9 files changed, 127 insertions(+), 34 deletions(-) diff --git a/arch/arm/dts/am4372-u-boot.dtsi b/arch/arm/dts/am4372-u-boot.dtsi index 989249ca2878..24ab38920ec5 100644 --- a/arch/arm/dts/am4372-u-boot.dtsi +++ b/arch/arm/dts/am4372-u-boot.dtsi @@ -14,14 +14,6 @@ }; }; -&am43xx_control_usb2phy1 { - compatible = "ti,control-phy-usb2-am437", "syscon"; -}; - -&am43xx_control_usb2phy2 { - compatible = "ti,control-phy-usb2-am437", "syscon"; -}; - &ocp2scp0 { compatible = "ti,am437x-ocp2scp", "ti,omap-ocp2scp", "simple-bus"; }; @@ -42,10 +34,6 @@ bootph-pre-ram; }; -&am43xx_control_usb2phy1 { - bootph-pre-ram; -}; - &ocp2scp0 { bootph-pre-ram; }; @@ -62,10 +50,22 @@ bootph-pre-ram; }; -&am43xx_control_usb2phy2 { - bootph-pre-ram; -}; - &ocp2scp1 { bootph-pre-ram; }; + +&prm_wkup { + bootph-pre-ram; +}; + +&prm_per { + bootph-pre-ram; +}; + +&prcm_clocks { + compatible = "simple-bus"; +}; + +&scm_clocks { + compatible = "simple-bus"; +}; diff --git a/arch/arm/dts/am437x-gp-evm-u-boot.dtsi b/arch/arm/dts/am437x-gp-evm-u-boot.dtsi index 6393170ad22e..0574abeb7a2b 100644 --- a/arch/arm/dts/am437x-gp-evm-u-boot.dtsi +++ b/arch/arm/dts/am437x-gp-evm-u-boot.dtsi @@ -23,19 +23,19 @@ bootph-pre-ram; }; -&mac { +&mac_sw { bootph-pre-ram; }; -&davinci_mdio { +&davinci_mdio_sw { bootph-pre-ram; }; -&cpsw_emac0 { +&cpsw_port1 { bootph-pre-ram; }; -&phy_sel { +&phy_gmii_sel { bootph-pre-ram; }; diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 741f8f85f801..8bcca44c69c4 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -6,10 +6,11 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SF_DEFAULT_SPEED=48000000 CONFIG_ENV_SIZE=0x10000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm" +CONFIG_DEFAULT_DEVICE_TREE="ti/omap/am437x-gp-evm" CONFIG_AM43XX=y CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y +CONFIG_SPL_OPTIMIZE_INLINING=y CONFIG_SPL_LOAD_FIT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" @@ -32,6 +33,7 @@ CONFIG_SPL_FALCON_BOOT_MMCSD=y CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200 +CONFIG_SPL_POWER_DOMAIN=y CONFIG_CMD_SPL_NAND_OFS=0x00100000 CONFIG_CMD_SPL_WRITE_SIZE=0x40000 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2 @@ -42,7 +44,8 @@ CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:256k(NAND.SPL),256k(NAND.SPL.backup1),256k(NAND.SPL.backup2),256k(NAND.SPL.backup3),512k(NAND.u-boot-spl-os),1m(NAND.u-boot),256k(NAND.u-boot-env),256k(NAND.u-boot-env.backup1),7m(NAND.kernel),-(NAND.file-system)" CONFIG_OF_CONTROL=y -CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm" +CONFIG_OF_UPSTREAM=y +CONFIG_OF_LIST="ti/omap/am437x-gp-evm ti/omap/am437x-sk-evm ti/omap/am43x-epos-evm ti/omap/am437x-idk-evm ti/omap/am4372-generic" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y @@ -52,10 +55,21 @@ CONFIG_BOOTP_SEND_HOSTNAME=y CONFIG_SYS_RX_ETH_BUFFER=64 CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y +CONFIG_SIMPLE_PM_BUS=y +CONFIG_SPL_SIMPLE_PM_BUS=y +CONFIG_SPL_TI_SYSC=y +CONFIG_CLK_CCF=y CONFIG_CLK_CDCE9XX=y +CONFIG_CLK_TI_AM3_DPLL=y +CONFIG_CLK_TI_CTRL=y +CONFIG_CLK_TI_DIVIDER=y +CONFIG_CLK_TI_GATE=y +CONFIG_CLK_TI_MUX=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_SF=y +# CONFIG_SPL_DM_I2C is not set +CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_MISC=y CONFIG_SYS_I2C_EEPROM_ADDR=0x50 CONFIG_MMC_OMAP_HS=y @@ -75,8 +89,12 @@ CONFIG_PHY_ANEG_TIMEOUT=8000 CONFIG_PHY=y CONFIG_SPL_PHY=y CONFIG_OMAP_USB2_PHY=y +CONFIG_SPL_POWER_LEGACY=y +CONFIG_POWER_DOMAIN=y +CONFIG_TI_OMAP_PRM_POWER_DOMAIN=y CONFIG_POWER_TPS65218=y CONFIG_POWER_TPS62362=y +CONFIG_SPL_POWER_I2C=y CONFIG_DM_SERIAL=y CONFIG_SPI=y CONFIG_TI_QSPI=y diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index 86d8389951be..b936a19ddcb0 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -9,7 +9,7 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x110000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="am437x-sk-evm" +CONFIG_DEFAULT_DEVICE_TREE="ti/omap/am437x-sk-evm" CONFIG_AM43XX=y CONFIG_ENV_OFFSET_REDUND=0x120000 CONFIG_DISTRO_DEFAULTS=y @@ -30,7 +30,8 @@ CONFIG_CMD_USB=y CONFIG_BOOTP_DNS2=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y -CONFIG_OF_LIST="am4372-generic am437x-sk-evm am437x-idk-evm" +CONFIG_OF_UPSTREAM=y +CONFIG_OF_LIST="ti/omap/am4372-generic ti/omap/am437x-sk-evm ti/omap/am437x-idk-evm" CONFIG_DTB_RESELECT=y CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_OVERWRITE=y @@ -42,6 +43,9 @@ CONFIG_VERSION_VARIABLE=y CONFIG_NET_RETRY_COUNT=10 CONFIG_BOOTP_SEND_HOSTNAME=y CONFIG_SYS_RX_ETH_BUFFER=64 +CONFIG_POWER_DOMAIN=y +CONFIG_TI_OMAP_PRM_POWER_DOMAIN=y +CONFIG_SIMPLE_PM_BUS=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_SF=y diff --git a/configs/am43xx_evm_rtconly_defconfig b/configs/am43xx_evm_rtconly_defconfig index 11310935e7e8..78c17385a08d 100644 --- a/configs/am43xx_evm_rtconly_defconfig +++ b/configs/am43xx_evm_rtconly_defconfig @@ -6,10 +6,11 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SF_DEFAULT_SPEED=48000000 CONFIG_ENV_SIZE=0x10000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm" +CONFIG_DEFAULT_DEVICE_TREE="ti/omap/am437x-gp-evm" CONFIG_AM43XX=y CONFIG_SPL_RTC_DDR_SUPPORT=y CONFIG_SPL=y +CONFIG_SPL_OPTIMIZE_INLINING=y CONFIG_SPL_LOAD_FIT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" @@ -29,6 +30,7 @@ CONFIG_SPL_FALCON_BOOT_MMCSD=y CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200 +CONFIG_SPL_POWER_DOMAIN=y CONFIG_CMD_SPL_NAND_OFS=0x00100000 CONFIG_CMD_SPL_WRITE_SIZE=0x40000 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2 @@ -39,7 +41,8 @@ CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:256k(NAND.SPL),256k(NAND.SPL.backup1),256k(NAND.SPL.backup2),256k(NAND.SPL.backup3),512k(NAND.u-boot-spl-os),1m(NAND.u-boot),256k(NAND.u-boot-env),256k(NAND.u-boot-env.backup1),7m(NAND.kernel),-(NAND.file-system)" CONFIG_OF_CONTROL=y -CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm" +CONFIG_OF_UPSTREAM=y +CONFIG_OF_LIST="ti/omap/am437x-gp-evm ti/omap/am437x-sk-evm ti/omap/am43x-epos-evm ti/omap/am437x-idk-evm ti/omap/am4372-generic" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y @@ -47,9 +50,20 @@ CONFIG_VERSION_VARIABLE=y CONFIG_NET_RETRY_COUNT=10 CONFIG_BOOTP_SEND_HOSTNAME=y CONFIG_SYS_RX_ETH_BUFFER=64 +CONFIG_SIMPLE_PM_BUS=y +CONFIG_SPL_SIMPLE_PM_BUS=y +CONFIG_SPL_TI_SYSC=y +CONFIG_CLK_CCF=y +CONFIG_CLK_TI_AM3_DPLL=y +CONFIG_CLK_TI_CTRL=y +CONFIG_CLK_TI_DIVIDER=y +CONFIG_CLK_TI_GATE=y +CONFIG_CLK_TI_MUX=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_SF=y +# CONFIG_SPL_DM_I2C is not set +CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_EEPROM_ADDR=0x50 CONFIG_MMC_OMAP_HS=y CONFIG_MTD_RAW_NAND=y @@ -65,8 +79,12 @@ CONFIG_PHY_GIGE=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y CONFIG_PHY_ANEG_TIMEOUT=8000 +CONFIG_SPL_POWER_LEGACY=y +CONFIG_POWER_DOMAIN=y +CONFIG_TI_OMAP_PRM_POWER_DOMAIN=y CONFIG_POWER_TPS65218=y CONFIG_POWER_TPS62362=y +CONFIG_SPL_POWER_I2C=y CONFIG_DM_SERIAL=y CONFIG_SPI=y CONFIG_TI_QSPI=y diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index f2dfb79802f1..1d8ca3c01f8f 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -5,10 +5,11 @@ CONFIG_ARCH_OMAP2PLUS=y CONFIG_SF_DEFAULT_SPEED=48000000 CONFIG_ENV_SIZE=0x10000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm" +CONFIG_DEFAULT_DEVICE_TREE="ti/omap/am437x-gp-evm" CONFIG_AM43XX=y CONFIG_SPL_TEXT_BASE=0x40300350 CONFIG_SPL=y +CONFIG_SPL_OPTIMIZE_INLINING=y CONFIG_SPL_LOAD_FIT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" @@ -28,6 +29,7 @@ CONFIG_SPL_FALCON_BOOT_MMCSD=y CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200 +CONFIG_SPL_POWER_DOMAIN=y CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x00100000 CONFIG_CMD_SPL_WRITE_SIZE=0x40000 @@ -47,7 +49,8 @@ CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:256k(NAND.SPL),256k(NAND.SPL.backup1),256k(NAND.SPL.backup2),256k(NAND.SPL.backup3),512k(NAND.u-boot-spl-os),1m(NAND.u-boot),256k(NAND.u-boot-env),256k(NAND.u-boot-env.backup1),7m(NAND.kernel),-(NAND.file-system)" CONFIG_OF_CONTROL=y -CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm" +CONFIG_OF_UPSTREAM=y +CONFIG_OF_LIST="ti/omap/am437x-gp-evm ti/omap/am437x-sk-evm ti/omap/am43x-epos-evm ti/omap/am437x-idk-evm ti/omap/am4372-generic" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FAT=y CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" @@ -59,9 +62,20 @@ CONFIG_BOOTP_SEND_HOSTNAME=y CONFIG_SYS_RX_ETH_BUFFER=64 CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y +CONFIG_SIMPLE_PM_BUS=y +CONFIG_SPL_SIMPLE_PM_BUS=y +CONFIG_SPL_TI_SYSC=y +CONFIG_CLK_CCF=y +CONFIG_CLK_TI_AM3_DPLL=y +CONFIG_CLK_TI_CTRL=y +CONFIG_CLK_TI_DIVIDER=y +CONFIG_CLK_TI_GATE=y +CONFIG_CLK_TI_MUX=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_SF=y +# CONFIG_SPL_DM_I2C is not set +CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_MISC=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD_RAW_NAND=y @@ -80,8 +94,12 @@ CONFIG_PHY_ANEG_TIMEOUT=8000 CONFIG_PHY=y CONFIG_SPL_PHY=y CONFIG_OMAP_USB2_PHY=y +CONFIG_SPL_POWER_LEGACY=y +CONFIG_POWER_DOMAIN=y +CONFIG_TI_OMAP_PRM_POWER_DOMAIN=y CONFIG_POWER_TPS65218=y CONFIG_POWER_TPS62362=y +CONFIG_SPL_POWER_I2C=y CONFIG_DM_SERIAL=y CONFIG_SPI=y CONFIG_TI_QSPI=y diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index fca9ea21a778..1857e1a2c271 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -7,7 +7,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SF_DEFAULT_SPEED=48000000 CONFIG_ENV_SIZE=0x10000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm" +CONFIG_DEFAULT_DEVICE_TREE="ti/omap/am437x-gp-evm" CONFIG_AM43XX=y CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000 CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000 @@ -16,6 +16,7 @@ CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL_TEXT_BASE=0x403018e0 CONFIG_SPL=y CONFIG_SYS_MEM_TOP_HIDE=0x4000000 +CONFIG_SPL_OPTIMIZE_INLINING=y CONFIG_SPL_LOAD_FIT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y @@ -33,6 +34,7 @@ CONFIG_SPL_NAND_ECC=y CONFIG_SPL_NAND_BASE=y CONFIG_SPL_NET=y CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" +CONFIG_SPL_POWER_DOMAIN=y CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2 CONFIG_CMD_NAND=y CONFIG_BOOTP_DNS2=y @@ -40,7 +42,8 @@ CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:256k(NAND.SPL),256k(NAND.SPL.backup1),256k(NAND.SPL.backup2),256k(NAND.SPL.backup3),512k(NAND.u-boot-spl-os),1m(NAND.u-boot),256k(NAND.u-boot-env),256k(NAND.u-boot-env.backup1),7m(NAND.kernel),-(NAND.file-system)" CONFIG_OF_CONTROL=y -CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm" +CONFIG_OF_UPSTREAM=y +CONFIG_OF_LIST="ti/omap/am437x-gp-evm ti/omap/am437x-sk-evm ti/omap/am43x-epos-evm ti/omap/am437x-idk-evm ti/omap/am4372-generic" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y @@ -50,10 +53,21 @@ CONFIG_BOOTP_SEND_HOSTNAME=y CONFIG_SYS_RX_ETH_BUFFER=64 CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y +CONFIG_SIMPLE_PM_BUS=y +CONFIG_SPL_SIMPLE_PM_BUS=y +CONFIG_SPL_TI_SYSC=y +CONFIG_CLK_CCF=y CONFIG_CLK_CDCE9XX=y +CONFIG_CLK_TI_AM3_DPLL=y +CONFIG_CLK_TI_CTRL=y +CONFIG_CLK_TI_DIVIDER=y +CONFIG_CLK_TI_GATE=y +CONFIG_CLK_TI_MUX=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_SF=y +# CONFIG_SPL_DM_I2C is not set +CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_MISC=y CONFIG_SYS_I2C_EEPROM_ADDR=0x50 CONFIG_MMC_OMAP_HS=y @@ -73,8 +87,12 @@ CONFIG_PHY_ANEG_TIMEOUT=8000 CONFIG_PHY=y CONFIG_SPL_PHY=y CONFIG_OMAP_USB2_PHY=y +CONFIG_SPL_POWER_LEGACY=y +CONFIG_POWER_DOMAIN=y +CONFIG_TI_OMAP_PRM_POWER_DOMAIN=y CONFIG_POWER_TPS65218=y CONFIG_POWER_TPS62362=y +CONFIG_SPL_POWER_I2C=y CONFIG_DM_SERIAL=y CONFIG_SPI=y CONFIG_TI_QSPI=y diff --git a/configs/am43xx_hs_evm_qspi_defconfig b/configs/am43xx_hs_evm_qspi_defconfig index 6b754cdc0ec9..6eefc3884e1d 100644 --- a/configs/am43xx_hs_evm_qspi_defconfig +++ b/configs/am43xx_hs_evm_qspi_defconfig @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x110000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="am43x-epos-evm" +CONFIG_DEFAULT_DEVICE_TREE="ti/omap/am43x-epos-evm" CONFIG_AM43XX=y CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000 CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000 @@ -32,7 +32,8 @@ CONFIG_CMD_USB=y CONFIG_BOOTP_DNS2=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y -CONFIG_OF_LIST="am4372-generic am437x-sk-evm am437x-idk-evm" +CONFIG_OF_UPSTREAM=y +CONFIG_OF_LIST="ti/omap/am4372-generic ti/omap/am437x-sk-evm ti/omap/am437x-idk-evm ti/omap/am43x-epos-evm" CONFIG_DTB_RESELECT=y CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_OVERWRITE=y @@ -44,6 +45,9 @@ CONFIG_VERSION_VARIABLE=y CONFIG_NET_RETRY_COUNT=10 CONFIG_BOOTP_SEND_HOSTNAME=y CONFIG_SYS_RX_ETH_BUFFER=64 +CONFIG_POWER_DOMAIN=y +CONFIG_TI_OMAP_PRM_POWER_DOMAIN=y +CONFIG_SIMPLE_PM_BUS=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_SF=y diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index ba898b119537..fe2988243d9e 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -11,7 +11,7 @@ CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y CONFIG_SPL_DM_SPI=y -CONFIG_DEFAULT_DEVICE_TREE="am437x-cm-t43" +CONFIG_DEFAULT_DEVICE_TREE="ti/omap/am437x-cm-t43" CONFIG_AM43XX=y CONFIG_TARGET_CM_T43=y CONFIG_SYS_MONITOR_LEN=524288 @@ -23,6 +23,7 @@ CONFIG_SPL_FS_FAT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y +CONFIG_SPL_OPTIMIZE_INLINING=y CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTCOMMAND="mmc dev 0; if mmc rescan; then if run loadbootscript; then run bootscript; fi; fi; mmc dev 1; if mmc rescan; then run emmcboot; fi;" CONFIG_SYS_PBSIZE=1050 @@ -41,7 +42,7 @@ CONFIG_SPL_MTD=y CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y CONFIG_SPL_DM_SPI_FLASH=y -CONFIG_SPL_POWER=y +CONFIG_SPL_POWER_DOMAIN=y CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_SYS_PROMPT="CM-T43 # " @@ -63,6 +64,7 @@ CONFIG_SYS_DISABLE_AUTOLOAD=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y CONFIG_OF_CONTROL=y +CONFIG_OF_UPSTREAM=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y @@ -70,6 +72,15 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_VERSION_VARIABLE=y CONFIG_BOOTP_SEND_HOSTNAME=y CONFIG_SYS_RX_ETH_BUFFER=64 +CONFIG_SIMPLE_PM_BUS=y +CONFIG_SPL_SIMPLE_PM_BUS=y +CONFIG_SPL_TI_SYSC=y +CONFIG_CLK_CCF=y +CONFIG_CLK_TI_AM3_DPLL=y +CONFIG_CLK_TI_CTRL=y +CONFIG_CLK_TI_DIVIDER=y +CONFIG_CLK_TI_GATE=y +CONFIG_CLK_TI_MUX=y CONFIG_DM_I2C=y # CONFIG_SPL_DM_I2C is not set CONFIG_SPL_SYS_I2C_LEGACY=y @@ -93,6 +104,8 @@ CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y CONFIG_PHY_ATHEROS=y CONFIG_POWER_LEGACY=y +CONFIG_POWER_DOMAIN=y +CONFIG_TI_OMAP_PRM_POWER_DOMAIN=y CONFIG_POWER_TPS65218=y CONFIG_POWER_I2C=y CONFIG_DM_SERIAL=y -- 2.55.0
