* [PATCH 1/3] ARM: omap3: evm: Power on MMC when setting up PMIC
2022-05-16 3:25 [PATCH 0/3] Updates for omap3-evm Derald D. Woods
@ 2022-05-16 3:25 ` Derald D. Woods
2022-06-10 21:39 ` Tom Rini
2022-05-16 3:25 ` [PATCH 2/3] ARM: omap3: evm: Complete DM_I2C migration Derald D. Woods
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ messages in thread
From: Derald D. Woods @ 2022-05-16 3:25 UTC (permalink / raw)
To: u-boot; +Cc: trini, Derald D. Woods
This commit copies the related code changes from the BeagleBoard.
Reference:
- https://source.denx.de/u-boot/u-boot/-/commit/848cfe098f59c47a2542385513fb554430b874d6
Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
---
board/ti/evm/evm.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
index 96434b3ba0..39b5c706a9 100644
--- a/board/ti/evm/evm.c
+++ b/board/ti/evm/evm.c
@@ -159,6 +159,7 @@ void get_board_mem_timings(struct board_sdrc_timings *timings)
int misc_init_r(void)
{
twl4030_power_init();
+ twl4030_power_mmc_init(0);
#if defined(CONFIG_SMC911X)
setup_net_chip();
@@ -247,10 +248,3 @@ static void reset_net_chip(void)
gpio_set_value(rst_gpio, 1);
}
#endif /* CONFIG_SMC911X */
-
-#if defined(CONFIG_MMC)
-void board_mmc_power_init(void)
-{
- twl4030_power_mmc_init(0);
-}
-#endif /* CONFIG_MMC */
--
2.36.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/3] ARM: omap3: evm: Complete DM_I2C migration
2022-05-16 3:25 [PATCH 0/3] Updates for omap3-evm Derald D. Woods
2022-05-16 3:25 ` [PATCH 1/3] ARM: omap3: evm: Power on MMC when setting up PMIC Derald D. Woods
@ 2022-05-16 3:25 ` Derald D. Woods
2022-06-10 21:39 ` Tom Rini
2022-05-16 3:25 ` [PATCH 3/3] ARM: omap3: evm: Fix 'fitImage' booting Derald D. Woods
2022-06-06 15:09 ` [PATCH 0/3] Updates for omap3-evm Derald Woods
3 siblings, 1 reply; 10+ messages in thread
From: Derald D. Woods @ 2022-05-16 3:25 UTC (permalink / raw)
To: u-boot; +Cc: trini, Derald D. Woods
This commits enables DM_I2C and sets the default bus to 0.
Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
---
configs/omap3_evm_defconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
index d451e201c7..2d8e627171 100644
--- a/configs/omap3_evm_defconfig
+++ b/configs/omap3_evm_defconfig
@@ -56,8 +56,8 @@ CONFIG_SPL_OF_TRANSLATE=y
CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000
CONFIG_GPIO_HOG=y
-CONFIG_SYS_I2C_LEGACY=y
-CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_DM_I2C=y
+CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
CONFIG_MMC_OMAP_HS=y
CONFIG_MTD=y
CONFIG_MTD_RAW_NAND=y
--
2.36.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/3] ARM: omap3: evm: Fix 'fitImage' booting
2022-05-16 3:25 [PATCH 0/3] Updates for omap3-evm Derald D. Woods
2022-05-16 3:25 ` [PATCH 1/3] ARM: omap3: evm: Power on MMC when setting up PMIC Derald D. Woods
2022-05-16 3:25 ` [PATCH 2/3] ARM: omap3: evm: Complete DM_I2C migration Derald D. Woods
@ 2022-05-16 3:25 ` Derald D. Woods
2022-06-10 21:39 ` Tom Rini
2022-06-06 15:09 ` [PATCH 0/3] Updates for omap3-evm Derald Woods
3 siblings, 1 reply; 10+ messages in thread
From: Derald D. Woods @ 2022-05-16 3:25 UTC (permalink / raw)
To: u-boot; +Cc: trini, Derald D. Woods
This commit sets two additional variables in the default BOOTCOMMAND.
Adding 'boot=mmc' and 'addr_fit=0x8b000000' removes the need for a
special 'uEnv.txt' to be created. The 'addr_fit' variable is the key
piece here. It is normally defined as 0x90000000, in the macro
DEFAULT_FIT_TI_ARGS. For this OMAP34XX board, 0x8b000000 works without
touching other varibles. This was tested with a 'fitImage' created
using the following FIT source:
----------------------------------------------------------------------
/dts-v1/;
/ {
description = "Simple image with single Linux kernel and FDT blob";
#address-cells = <1>;
images {
kernel {
description = "Linux kernel: omap2plus";
data = /incbin/("./zImage");
type = "kernel";
arch = "arm";
os = "linux";
compression = "none";
load = <0x80008000>;
entry = <0x80008000>;
hash-1 {
algo = "sha256";
};
};
fdt-omap3-evm.dtb {
description = "FDT: omap3-evm.dtb";
data = /incbin/("./omap3-evm.dtb");
type = "flat_dt";
arch = "arm";
compression = "none";
load = <0x8ff00000>;
hash-1 {
algo = "sha256";
};
};
};
configurations {
default = "conf-omap3-evm.dtb";
conf-omap3-evm.dtb {
description = "Boot Linux kernel with FDT blob";
kernel = "kernel";
fdt = "fdt-omap3-evm.dtb";
};
};
};
----------------------------------------------------------------------
Additionally, the default environment is now stored in "uboot.env" on
the FAT partition of MMC '0'.
Fixes: 11e2ab3f0b ("ARM: omap3: evm: Enable booting 'fitImage' with DEFAULT_FIT_TI_ARGS")
Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
---
configs/omap3_evm_defconfig | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
index 2d8e627171..e2e29e2eb6 100644
--- a/configs/omap3_evm_defconfig
+++ b/configs/omap3_evm_defconfig
@@ -10,7 +10,7 @@ CONFIG_TARGET_OMAP3_EVM=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x400
CONFIG_SPL=y
CONFIG_DISTRO_DEFAULTS=y
-CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run envboot; run distro_bootcmd"
+CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then setenv boot mmc; setenv addr_fit 0x8b000000; run update_to_fit; run mmcboot; fi; run envboot; run distro_bootcmd"
CONFIG_USE_PREBOOT=y
CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
@@ -48,7 +48,10 @@ CONFIG_OF_CONTROL=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_SPL_REMOVE_PROPS="clocks clock-names interrupt-parent"
CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_IS_IN_NAND=y
+CONFIG_ENV_IS_IN_FAT=y
+CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL_DM=y
CONFIG_SPL_DM_SEQ_ALIAS=y
--
2.36.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 0/3] Updates for omap3-evm
2022-05-16 3:25 [PATCH 0/3] Updates for omap3-evm Derald D. Woods
` (2 preceding siblings ...)
2022-05-16 3:25 ` [PATCH 3/3] ARM: omap3: evm: Fix 'fitImage' booting Derald D. Woods
@ 2022-06-06 15:09 ` Derald Woods
2022-06-06 15:16 ` Tom Rini
3 siblings, 1 reply; 10+ messages in thread
From: Derald Woods @ 2022-06-06 15:09 UTC (permalink / raw)
To: U-Boot Mailing List; +Cc: Tom Rini
On Sun, May 15, 2022 at 10:25 PM Derald D. Woods <woods.technical@gmail.com>
wrote:
> This patch set brings omap3-evm inline with similar boards and improves
> the ability to boot a 'fitImage' using DEFAULT_FIT_TI_ARGS.
>
> Derald D. Woods (3):
> ARM: omap3: evm: Power on MMC when setting up PMIC
> ARM: omap3: evm: Complete DM_I2C migration
> ARM: omap3: evm: Fix 'fitImage' booting
>
> board/ti/evm/evm.c | 8 +-------
> configs/omap3_evm_defconfig | 11 +++++++----
> 2 files changed, 8 insertions(+), 11 deletions(-)
>
> --
> 2.36.1
>
>
Ping.
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 0/3] Updates for omap3-evm
2022-06-06 15:09 ` [PATCH 0/3] Updates for omap3-evm Derald Woods
@ 2022-06-06 15:16 ` Tom Rini
2022-06-06 20:49 ` Derald Woods
0 siblings, 1 reply; 10+ messages in thread
From: Tom Rini @ 2022-06-06 15:16 UTC (permalink / raw)
To: Derald Woods; +Cc: U-Boot Mailing List
[-- Attachment #1: Type: text/plain, Size: 769 bytes --]
On Mon, Jun 06, 2022 at 10:09:16AM -0500, Derald Woods wrote:
> On Sun, May 15, 2022 at 10:25 PM Derald D. Woods <woods.technical@gmail.com>
> wrote:
>
> > This patch set brings omap3-evm inline with similar boards and improves
> > the ability to boot a 'fitImage' using DEFAULT_FIT_TI_ARGS.
> >
> > Derald D. Woods (3):
> > ARM: omap3: evm: Power on MMC when setting up PMIC
> > ARM: omap3: evm: Complete DM_I2C migration
> > ARM: omap3: evm: Fix 'fitImage' booting
> >
> > board/ti/evm/evm.c | 8 +-------
> > configs/omap3_evm_defconfig | 11 +++++++----
> > 2 files changed, 8 insertions(+), 11 deletions(-)
>
> Ping.
Now that -next is open, I'll pick these up soon. Unless they need to
be in v2022.07? Thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/3] Updates for omap3-evm
2022-06-06 15:16 ` Tom Rini
@ 2022-06-06 20:49 ` Derald Woods
0 siblings, 0 replies; 10+ messages in thread
From: Derald Woods @ 2022-06-06 20:49 UTC (permalink / raw)
To: Tom Rini; +Cc: U-Boot Mailing List
On Mon, Jun 6, 2022 at 10:16 AM Tom Rini <trini@konsulko.com> wrote:
> On Mon, Jun 06, 2022 at 10:09:16AM -0500, Derald Woods wrote:
> > On Sun, May 15, 2022 at 10:25 PM Derald D. Woods <
> woods.technical@gmail.com>
> > wrote:
> >
> > > This patch set brings omap3-evm inline with similar boards and improves
> > > the ability to boot a 'fitImage' using DEFAULT_FIT_TI_ARGS.
> > >
> > > Derald D. Woods (3):
> > > ARM: omap3: evm: Power on MMC when setting up PMIC
> > > ARM: omap3: evm: Complete DM_I2C migration
> > > ARM: omap3: evm: Fix 'fitImage' booting
> > >
> > > board/ti/evm/evm.c | 8 +-------
> > > configs/omap3_evm_defconfig | 11 +++++++----
> > > 2 files changed, 8 insertions(+), 11 deletions(-)
> >
> > Ping.
>
> Now that -next is open, I'll pick these up soon. Unless they need to
> be in v2022.07? Thanks!
>
> --
> Tom
>
That's fine. Thanks for the update.
Derald
^ permalink raw reply [flat|nested] 10+ messages in thread