diff options
| author | Tom Rini <[email protected]> | 2023-04-04 09:50:13 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-04-04 09:50:13 -0400 |
| commit | 0916377b837a7a964587564c4560e4534aec72cb (patch) | |
| tree | ebfe7063344e48e8c39e0cb1d30fbaacffbd398d /include | |
| parent | 02f8486b9f9fd27c1ad7fdda78c3c892431285a9 (diff) | |
| parent | ab53bd43dbde4dc8895a9f419e018d219eb4dc20 (diff) | |
Merge tag 'u-boot-imx-next-20230404' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
u-boot-imx-next-20230404
------------------------
CI : https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/15887
- boards : DH-Electronics, Toradex, imx8mp-beacon-kit
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/dh_imx6.h | 2 | ||||
| -rw-r--r-- | include/configs/imx8mp_beacon.h | 29 | ||||
| -rw-r--r-- | include/configs/imx8mp_data_modul_edm_sbc.h | 45 |
3 files changed, 74 insertions, 2 deletions
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index e9b382a3b77..4b5ef4ad510 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -31,7 +31,6 @@ #define CFG_MXC_UART_BASE UART1_BASE /* USB Configs */ -#ifdef CONFIG_CMD_USB #define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CFG_MXC_USB_FLAGS 0 @@ -39,7 +38,6 @@ #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE) #define DFU_DEFAULT_POLL_TIMEOUT 300 #endif -#endif #define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200\0" \ diff --git a/include/configs/imx8mp_beacon.h b/include/configs/imx8mp_beacon.h new file mode 100644 index 00000000000..ee0fd07e650 --- /dev/null +++ b/include/configs/imx8mp_beacon.h @@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2023 Logic PD, Inc dba Beacon EmbeddedWorks + */ + +#ifndef __IMX8MP_BEACON_H +#define __IMX8MP_BEACON_H + +#include <asm/arch/imx-regs.h> + +#define CFG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) + +#if defined(CONFIG_CMD_NET) +#define PHY_ANEG_TIMEOUT 20000 +#endif + +/* Link Definitions */ + +#define CFG_SYS_INIT_RAM_ADDR 0x40000000 +#define CFG_SYS_INIT_RAM_SIZE 0x80000 + +/* Totally 6GB DDR */ +#define CFG_SYS_SDRAM_BASE 0x40000000 +#define PHYS_SDRAM 0x40000000 +#define PHYS_SDRAM_SIZE 0xC0000000 /* 3 GB */ +#define PHYS_SDRAM_2 0x100000000 +#define PHYS_SDRAM_2_SIZE 0xC0000000 /* 3 GB */ + +#endif diff --git a/include/configs/imx8mp_data_modul_edm_sbc.h b/include/configs/imx8mp_data_modul_edm_sbc.h new file mode 100644 index 00000000000..11ac3c00f7e --- /dev/null +++ b/include/configs/imx8mp_data_modul_edm_sbc.h @@ -0,0 +1,45 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2022 Marek Vasut <[email protected]> + */ + +#ifndef __IMX8MP_DATA_MODUL_EDM_SBC_H +#define __IMX8MP_DATA_MODUL_EDM_SBC_H + +#include <linux/sizes.h> +#include <linux/stringify.h> +#include <asm/arch/imx-regs.h> + +/* Link Definitions */ +#define CFG_SYS_INIT_RAM_ADDR 0x40000000 +#define CFG_SYS_INIT_RAM_SIZE 0x200000 + +#define CFG_SYS_SDRAM_BASE 0x40000000 +#define PHYS_SDRAM 0x40000000 +#define PHYS_SDRAM_SIZE 0x40000000 /* Minimum 1 GiB DDR */ + +#define CFG_MXC_UART_BASE UART3_BASE_ADDR + +/* PHY needs a longer autonegotiation timeout after reset */ +#define PHY_ANEG_TIMEOUT 20000 +#define FEC_QUIRK_ENET_MAC + +#define CFG_EXTRA_ENV_SETTINGS \ + "altbootcmd=setenv devpart 2 && run bootcmd ; reset\0" \ + "bootlimit=3\0" \ + "devtype=mmc\0" \ + "devpart=1\0" \ + /* Give slow devices beyond USB HUB chance to come up. */ \ + "usb_pgood_delay=2000\0" \ + "dmo_update_env=" \ + "setenv dmo_update_env true ; saveenv ; saveenv\0" \ + "dmo_update_sf_write_data=" \ + "sf probe && sf update ${loadaddr} 0 ${filesize}\0" \ + "dmo_update_emmc_to_sf=" \ + "load mmc 0:1 ${loadaddr} boot/flash.bin && " \ + "run dmo_update_sf_write_data\0" \ + "dmo_update_sd_to_sf=" \ + "load mmc 1:1 ${loadaddr} boot/flash.bin && " \ + "run dmo_update_sf_write_data\0" + +#endif |