diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-25 14:09:42 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-25 14:09:42 -0400 |
| commit | 60c7facfc965af6ff8ea14ee26c9d49cd2d0ec22 (patch) | |
| tree | 7bc7f20aae283028bca5fde34205e3ab7fc618de /board/logicpd | |
| parent | 71f70cfcf4a79a58682596e6b7769fe6f8f0c4d1 (diff) | |
| parent | c02712a7484918648e5dd09c092035c7eeb7794a (diff) | |
| download | u-boot-60c7facfc965af6ff8ea14ee26c9d49cd2d0ec22.tar.gz u-boot-60c7facfc965af6ff8ea14ee26c9d49cd2d0ec22.tar.bz2 u-boot-60c7facfc965af6ff8ea14ee26c9d49cd2d0ec22.zip | |
Merge tag 'ti-v2020.07-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
- Enable DM_ETH on omap3_logic board
- Enable Caches in SPL for K3 platforms
- Enable backup boot mode support for J721E
- Update the DDR timings for AM654 EVM
- Add automated tests for RX-51
Diffstat (limited to 'board/logicpd')
| -rw-r--r-- | board/logicpd/omap3som/omap3logic.c | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index 5c178a27e7..496886fea2 100644 --- a/board/logicpd/omap3som/omap3logic.c +++ b/board/logicpd/omap3som/omap3logic.c @@ -15,7 +15,6 @@ #include <init.h> #include <net.h> #include <ns16550.h> -#include <netdev.h> #include <flash.h> #include <nand.h> #include <i2c.h> @@ -59,6 +58,8 @@ DECLARE_GLOBAL_DATA_PTR; #define LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG6 0x09030000 #define LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG7 0x00000C50 +#define CONFIG_SMC911X_BASE 0x08000000 + #ifdef CONFIG_SPL_OS_BOOT int spl_start_uboot(void) { @@ -205,22 +206,6 @@ static void unlock_nand(void) nand_unlock(mtd, 0, mtd->size, 0); } -int board_late_init(void) -{ -#ifdef CONFIG_CMD_NAND_LOCK_UNLOCK - unlock_nand(); -#endif - return 0; -} -#endif - -#if defined(CONFIG_MMC) -void board_mmc_power_init(void) -{ - twl4030_power_mmc_init(0); -} -#endif - #ifdef CONFIG_SMC911X /* GPMC CS1 settings for Logic SOM LV/Torpedo LAN92xx Ethernet chip */ static const u32 gpmc_lan92xx_config[] = { @@ -231,12 +216,25 @@ static const u32 gpmc_lan92xx_config[] = { NET_LAN92XX_GPMC_CONFIG5, NET_LAN92XX_GPMC_CONFIG6, }; +#endif -int board_eth_init(bd_t *bis) +int board_late_init(void) { +#ifdef CONFIG_CMD_NAND_LOCK_UNLOCK + unlock_nand(); +#endif + +#ifdef CONFIG_SMC911X enable_gpmc_cs_config(gpmc_lan92xx_config, &gpmc_cfg->cs[1], CONFIG_SMC911X_BASE, GPMC_SIZE_16M); +#endif + return 0; +} +#endif - return smc911x_initialize(0, CONFIG_SMC911X_BASE); +#if defined(CONFIG_MMC) +void board_mmc_power_init(void) +{ + twl4030_power_mmc_init(0); } #endif |