Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

u-boot-imx-20231024

Browse source 
-------------------
 
 CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/18211
 
 - Fixes for MC2432 Eeprom
 - i.MX93 ADC
 - Secondary boot mode on i.MX8M
 -----BEGIN PGP SIGNATURE-----
 
 iG0EABECAC0WIQS2TmnA27QKhpKSZe309WXkmmjvpgUCZTd93A8cc2JhYmljQGRl
 bnguZGUACgkQ9PVl5Jpo76bb9gCdEQkNaVg/xSF2FXyFmwSxMDfasfsAmgKWOgPJ
 fcLnp+4ZLv6rBw9mzvCK
 =t171
 -----END PGP SIGNATURE-----

Merge tag 'u-boot-imx-20231024' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

u-boot-imx-20231024
-------------------

CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/18211

- Fixes for MC2432 Eeprom
- i.MX93 ADC
- Secondary boot mode on i.MX8M
This commit is contained in:
Tom Rini 2023-10-24 09:39:02 -04:00
commit 1b2a3d08c0
17 changed files with 184 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/arm/dts/imx8mp-dhcom-som-overlay-rev100.dts
View file

@ -24,6 +24,14 @@
pagesize = <16>;
};
&eeprom0wl {
status = "disabled";
};
&eeprom1wl {
status = "disabled";
};
&ethphy0f { /* SMSC LAN8740Ai */
pinctrl-0 = <&pinctrl_ethphy0 &pinctrl_ioexp>;
reset-gpios = <&gpio3 20 GPIO_ACTIVE_LOW>;

12
arch/arm/dts/imx8mp-dhcom-som.dtsi
View file

@ -392,6 +392,18 @@
reg = <0x53>;
};
eeprom0wl: eeprom@58 {
compatible = "atmel,24c32d-wl"; /* M24C32-D WL page of 0x50 */
pagesize = <32>;
reg = <0x58>;
};
eeprom1wl: eeprom@5b {
compatible = "atmel,24c32d-wl"; /* M24C32-D WL page of 0x53 */
pagesize = <32>;
reg = <0x5b>;
};
ioexp: gpio@74 {
compatible = "nxp,pca9539";
reg = <0x74>;

20
arch/arm/dts/imx93-11x11-evk-u-boot.dtsi
View file

@ -8,6 +8,7 @@
compatible = "wdt-reboot";
wdt = <&wdog3>;
bootph-pre-ram;
bootph-some-ram;
};
firmware {
@ -30,19 +31,23 @@
&aips2 {
bootph-pre-ram;
bootph-some-ram;
};
&aips3 {
bootph-pre-ram;
bootph-some-ram;
};
&iomuxc {
bootph-pre-ram;
bootph-some-ram;
};
&reg_usdhc2_vmmc {
u-boot,off-on-delay-us = <20000>;
bootph-pre-ram;
bootph-some-ram;
};
&pinctrl_reg_usdhc2_vmmc {
@ -51,59 +56,73 @@
&pinctrl_uart1 {
bootph-pre-ram;
bootph-some-ram;
};
&pinctrl_usdhc2_gpio {
bootph-pre-ram;
bootph-some-ram;
};
&pinctrl_usdhc2 {
bootph-pre-ram;
bootph-some-ram;
};
&gpio1 {
bootph-pre-ram;
bootph-some-ram;
};
&gpio2 {
bootph-pre-ram;
bootph-some-ram;
};
&gpio3 {
bootph-pre-ram;
bootph-some-ram;
};
&gpio4 {
bootph-pre-ram;
bootph-some-ram;
};
&lpuart1 {
bootph-pre-ram;
bootph-some-ram;
};
&usdhc1 {
bootph-pre-ram;
bootph-some-ram;
};
&usdhc2 {
bootph-pre-ram;
bootph-some-ram;
fsl,signal-voltage-switch-extra-delay-ms = <8>;
};
&lpi2c2 {
bootph-pre-ram;
bootph-some-ram;
};
&{/soc@0/bus@44000000/i2c@44350000/pmic@25} {
bootph-pre-ram;
bootph-some-ram;
};
&{/soc@0/bus@44000000/i2c@44350000/pmic@25/regulators} {
bootph-pre-ram;
bootph-some-ram;
};
&pinctrl_lpi2c2 {
bootph-pre-ram;
bootph-some-ram;
};
&fec {
@ -124,6 +143,7 @@
&s4muap {
bootph-pre-ram;
bootph-some-ram;
status = "okay";
};

2
arch/arm/mach-imx/Kconfig
View file

@ -71,7 +71,7 @@ config CSF_SIZE
config CMD_BMODE
bool "Support the 'bmode' command"
default y
depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5
depends on ARCH_IMX8M || ARCH_MX7 || ARCH_MX6 || ARCH_MX5
help
This enables the 'bmode' (bootmode) command for forcing
a boot from specific media.

4
arch/arm/mach-imx/cmd_bmode.c
View file

@ -83,7 +83,11 @@ static int do_boot_mode(struct cmd_tbl *cmdtp, int flag, int argc,
reset_requested = 0;
}
/* No longer applicable to i.MX8M */
#if IS_ENABLED(CONFIG_MX53) || IS_ENABLED(CONFIG_MX6) || IS_ENABLED(CONFIG_MX7)
boot_mode_apply(p->cfg_val);
#endif
if (reset_requested && p->cfg_val)
do_reset(NULL, 0, 0, NULL);
return 0;

2
arch/arm/mach-imx/image-container.c
View file

@ -276,7 +276,7 @@ unsigned long spl_spi_get_uboot_offs(struct spi_flash *flash)
#endif
#ifdef CONFIG_SPL_MMC
unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc,
unsigned long arch_spl_mmc_get_uboot_raw_sector(struct mmc *mmc,
unsigned long raw_sect)
{
int end;

83
arch/arm/mach-imx/imx8m/soc.c
View file

@ -28,8 +28,10 @@
#include <errno.h>
#include <fdt_support.h>
#include <fsl_wdog.h>
#include <fuse.h>
#include <imx_sip.h>
#include <linux/bitops.h>
#include <linux/bitfield.h>
DECLARE_GLOBAL_DATA_PTR;
@ -648,19 +650,17 @@ struct rom_api *g_rom_api = (struct rom_api *)0x980;
#if defined(CONFIG_IMX8M)
#include <spl.h>
int spl_mmc_emmc_boot_partition(struct mmc *mmc)
int imx8m_detect_secondary_image_boot(void)
{
u32 *rom_log_addr = (u32 *)0x9e0;
u32 *rom_log;
u8 event_id;
int i, part;
part = default_spl_mmc_emmc_boot_partition(mmc);
int i, boot_secondary = 0;
/* If the ROM event log pointer is not valid. */
if (*rom_log_addr < 0x900000 || *rom_log_addr >= 0xb00000 ||
*rom_log_addr & 0x3)
return part;
return -EINVAL;
/* Parse the ROM event ID version 2 log */
rom_log = (u32 *)(uintptr_t)(*rom_log_addr);
@ -668,7 +668,7 @@ int spl_mmc_emmc_boot_partition(struct mmc *mmc)
event_id = rom_log[i] >> 24;
switch (event_id) {
case 0x00: /* End of list */
return part;
return boot_secondary;
/* Log entries with 1 parameter, skip 1 */
case 0x80: /* Start to perform the device initialization */
case 0x81: /* The boot device initialization completes */
@ -686,6 +686,31 @@ int spl_mmc_emmc_boot_partition(struct mmc *mmc)
continue;
/* Boot from the secondary boot image */
case 0x51:
boot_secondary = 1;
continue;
default:
continue;
}
}
return boot_secondary;
}
int spl_mmc_emmc_boot_partition(struct mmc *mmc)
{
int part, ret;
part = default_spl_mmc_emmc_boot_partition(mmc);
if (part == 0)
return part;
ret = imx8m_detect_secondary_image_boot();
if (ret < 0) {
printf("Could not get boot partition! Using %d\n", part);
return part;
}
if (ret == 1) {
/*
* Swap the eMMC boot partitions in case there was a
* fallback event (i.e. primary image was corrupted
@ -698,14 +723,52 @@ int spl_mmc_emmc_boot_partition(struct mmc *mmc)
part = 2;
else if (part == 2)
part = 1;
continue;
default:
continue;
}
}
return part;
}
int boot_mode_getprisec(void)
{
return !!imx8m_detect_secondary_image_boot();
}
#endif
#if defined(CONFIG_IMX8MN) || defined(CONFIG_IMX8MP)
#define IMG_CNTN_SET1_OFFSET GENMASK(22, 19)
unsigned long arch_spl_mmc_get_uboot_raw_sector(struct mmc *mmc,
unsigned long raw_sect)
{
u32 val, offset;
if (fuse_read(2, 1, &val)) {
debug("Error reading fuse!\n");
return raw_sect;
}
val = FIELD_GET(IMG_CNTN_SET1_OFFSET, val);
if (val > 10) {
debug("Secondary image boot disabled!\n");
return raw_sect;
}
if (val == 0)
offset = SZ_4M;
else if (val == 1)
offset = SZ_2M;
else if (val == 2)
offset = SZ_1M;
else /* flash.bin offset = 1 MiB * 2^n */
offset = SZ_1M << val;
offset /= 512;
offset -= CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_DATA_PART_OFFSET;
if (imx8m_detect_secondary_image_boot())
raw_sect += offset;
return raw_sect;
}
#endif
bool is_usb_boot(void)

2
arch/arm/mach-mvebu/spl.c
View file

@ -123,7 +123,7 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)
{
return IS_SD(mmc) ? MMCSD_MODE_RAW : MMCSD_MODE_EMMCBOOT;
}
unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc,
unsigned long arch_spl_mmc_get_uboot_raw_sector(struct mmc *mmc,
unsigned long raw_sect)
{
return IS_SD(mmc) ? 1 : 0;

2
arch/arm/mach-sunxi/board.c
View file

@ -338,7 +338,7 @@ uint32_t sunxi_get_spl_size(void)
* Also U-Boot proper is located at least 32KB after the SPL, but will
* immediately follow the SPL if that is bigger than that.
*/
unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc,
unsigned long board_spl_mmc_get_uboot_raw_sector(struct mmc *mmc,
unsigned long raw_sect)
{
unsigned long spl_size = sunxi_get_spl_size();

2
board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c
View file

@ -193,7 +193,7 @@ int board_late_init(void)
#ifdef CONFIG_SPL_MMC
#define UBOOT_RAW_SECTOR_OFFSET 0x40
unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc,
unsigned long board_spl_mmc_get_uboot_raw_sector(struct mmc *mmc,
unsigned long raw_sector)
{
u32 boot_dev = spl_boot_device();

2
board/data_modul/imx8mp_edm_sbc/spl.c
View file

@ -107,7 +107,7 @@ void board_boot_order(u32 *spl_boot_list)
spl_boot_list[4] = BOOT_DEVICE_NONE;
}
unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc, unsigned long sect)
unsigned long board_spl_mmc_get_uboot_raw_sector(struct mmc *mmc, unsigned long sect)
{
const u32 boot_dev = spl_boot_device();
int part;

2
board/gateworks/venice/spl.c
View file

@ -346,7 +346,7 @@ int spl_board_boot_device(enum boot_device boot_dev_spl)
}
}
unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc, unsigned long raw_sect)
unsigned long board_spl_mmc_get_uboot_raw_sector(struct mmc *mmc, unsigned long raw_sect)
{
if (!IS_SD(mmc)) {
switch (EXT_CSD_EXTRACT_BOOT_PART(mmc->part_config)) {

14
common/spl/spl_mmc.c
View file

@ -365,12 +365,24 @@ int __weak spl_mmc_boot_partition(const u32 boot_device)
}
#endif
unsigned long __weak spl_mmc_get_uboot_raw_sector(struct mmc *mmc,
unsigned long __weak arch_spl_mmc_get_uboot_raw_sector(struct mmc *mmc,
unsigned long raw_sect)
{
return raw_sect;
}
unsigned long __weak board_spl_mmc_get_uboot_raw_sector(struct mmc *mmc,
unsigned long raw_sect)
{
return arch_spl_mmc_get_uboot_raw_sector(mmc, raw_sect);
}
unsigned long __weak spl_mmc_get_uboot_raw_sector(struct mmc *mmc,
unsigned long raw_sect)
{
return board_spl_mmc_get_uboot_raw_sector(mmc, raw_sect);
}
int default_spl_mmc_emmc_boot_partition(struct mmc *mmc)
{
int part;

1
configs/imx93_11x11_evk_defconfig
View file

@ -81,6 +81,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SPL_DM=y
CONFIG_REGMAP=y
CONFIG_SYSCON=y
CONFIG_ADC=y
CONFIG_ADC_IMX93=y
CONFIG_SPL_CLK_IMX93=y
CONFIG_CLK_IMX93=y

1
drivers/adc/Kconfig
View file

@ -66,6 +66,7 @@ config STM32_ADC
config ADC_IMX93
bool "Enable NXP IMX93 ADC driver"
depends on ADC
help
This enables basic driver for NXP IMX93 ADC.
It provides:

8
drivers/misc/i2c_eeprom.c
View file

@ -227,6 +227,13 @@ static const struct i2c_eeprom_drv_data atmel24c32_data = {
.offset_len = 2,
};
static const struct i2c_eeprom_drv_data atmel24c32d_wlp_data = {
.size = 32,
.pagesize = 32,
.addr_offset_mask = 0,
.offset_len = 2,
};
static const struct i2c_eeprom_drv_data atmel24c64_data = {
.size = 8192,
.pagesize = 32,
@ -266,6 +273,7 @@ static const struct udevice_id i2c_eeprom_std_ids[] = {
{ .compatible = "atmel,24c16a", (ulong)&atmel24c16a_data },
{ .compatible = "atmel,24mac402", (ulong)&atmel24mac402_data },
{ .compatible = "atmel,24c32", (ulong)&atmel24c32_data },
{ .compatible = "atmel,24c32d-wl", (ulong)&atmel24c32d_wlp_data },
{ .compatible = "atmel,24c64", (ulong)&atmel24c64_data },
{ .compatible = "atmel,24c128", (ulong)&atmel24c128_data },
{ .compatible = "atmel,24c256", (ulong)&atmel24c256_data },

26
include/spl.h
View file

@ -496,6 +496,32 @@ int spl_mmc_emmc_boot_partition(struct mmc *mmc);
void spl_set_bd(void);
/**
* spl_mmc_get_uboot_raw_sector() - Provide raw sector of the start of U-Boot (architecture override)
*
* This is a weak function which by default will provide the raw sector that is
* where the start of the U-Boot image has been written to.
*
* @mmc: struct mmc that describes the devie where U-Boot resides
* @raw_sect: The raw sector number where U-Boot is by default.
* Return: The raw sector location that U-Boot resides at
*/
unsigned long arch_spl_mmc_get_uboot_raw_sector(struct mmc *mmc,
unsigned long raw_sect);
/**
* spl_mmc_get_uboot_raw_sector() - Provide raw sector of the start of U-Boot (board override)
*
* This is a weak function which by default will provide the raw sector that is
* where the start of the U-Boot image has been written to.
*
* @mmc: struct mmc that describes the devie where U-Boot resides
* @raw_sect: The raw sector number where U-Boot is by default.
* Return: The raw sector location that U-Boot resides at
*/
unsigned long board_spl_mmc_get_uboot_raw_sector(struct mmc *mmc,
unsigned long raw_sect);
/**
* spl_mmc_get_uboot_raw_sector() - Provide raw sector of the start of U-Boot
*