When booting from eMMC put the environment on the eMMC as well. Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> --- arch/arm/boards/am625-sk/board.c | 5 +++++ arch/arm/dts/k3-am625-sk.dts | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/arch/arm/boards/am625-sk/board.c b/arch/arm/boards/am625-sk/board.c index fd3bcdeac6..c716f30e69 100644 --- a/arch/arm/boards/am625-sk/board.c +++ b/arch/arm/boards/am625-sk/board.c @@ -11,6 +11,11 @@ static int am625_sk_probe(struct device *dev) { am625_enable_32k_crystal(); + k3_bbu_emmc_register("emmc", "/dev/mmc0", BBU_HANDLER_FLAG_DEFAULT); + + if (k3_boot_is_emmc()) + of_device_enable_path("/chosen/environment-emmc"); + return 0; } diff --git a/arch/arm/dts/k3-am625-sk.dts b/arch/arm/dts/k3-am625-sk.dts index 56d5681519..8d7a73babf 100644 --- a/arch/arm/dts/k3-am625-sk.dts +++ b/arch/arm/dts/k3-am625-sk.dts @@ -3,6 +3,16 @@ #include <arm64/ti/k3-am625-sk.dts> #include "k3-am625.dtsi" +/ { + chosen { + environment-emmc { + compatible = "barebox,environment"; + device-path = &env_emmc; + status = "disabled"; + }; + }; +}; + /* * DRAM size differs between board variants. Real size is read from DDRSS */ @@ -10,4 +20,9 @@ &sdhci0 { max-frequency = <26000000>; + + env_emmc: partition@e0000 { + label = "barebox-environment"; + reg = <0x0 0xe0000 0x0 0x20000>; + }; }; -- 2.39.5