From: Alexander Kurz <[email protected]> Both flags handle BBU behavior and should be bbu_flags.
Signed-off-by: Alexander Kurz <[email protected]> --- arch/arm/boards/nxp-imx8mm-evk/board.c | 6 +++--- arch/arm/boards/nxp-imx8mp-evk/board.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boards/nxp-imx8mm-evk/board.c b/arch/arm/boards/nxp-imx8mm-evk/board.c index 2603a2ab0..6e4df6006 100644 --- a/arch/arm/boards/nxp-imx8mm-evk/board.c +++ b/arch/arm/boards/nxp-imx8mm-evk/board.c @@ -33,7 +33,7 @@ static int ar8031_phy_fixup(struct phy_device *phydev) static int nxp_imx8mm_evk_init(void) { int emmc_bbu_flag = 0; - int emmc_sd_flag = 0; + int sd_bbu_flag = 0; if (!of_machine_is_compatible("fsl,imx8mm-evk")) return 0; @@ -46,14 +46,14 @@ static int nxp_imx8mm_evk_init(void) emmc_bbu_flag = BBU_HANDLER_FLAG_DEFAULT; } else { of_device_enable_path("/chosen/environment-sd"); - emmc_sd_flag = BBU_HANDLER_FLAG_DEFAULT; + sd_bbu_flag = BBU_HANDLER_FLAG_DEFAULT; } } else { of_device_enable_path("/chosen/environment-emmc"); emmc_bbu_flag = BBU_HANDLER_FLAG_DEFAULT; } - imx8m_bbu_internal_mmc_register_handler("SD", "/dev/mmc1.barebox", emmc_sd_flag); + imx8m_bbu_internal_mmc_register_handler("SD", "/dev/mmc1.barebox", sd_bbu_flag); imx8m_bbu_internal_mmcboot_register_handler("eMMC", "/dev/mmc2", emmc_bbu_flag); phy_register_fixup_for_uid(PHY_ID_AR8031, AR_PHY_ID_MASK, diff --git a/arch/arm/boards/nxp-imx8mp-evk/board.c b/arch/arm/boards/nxp-imx8mp-evk/board.c index f64f46681..a3ff59810 100644 --- a/arch/arm/boards/nxp-imx8mp-evk/board.c +++ b/arch/arm/boards/nxp-imx8mp-evk/board.c @@ -17,7 +17,7 @@ static int nxp_imx8mp_evk_init(void) { int emmc_bbu_flag = 0; - int emmc_sd_flag = 0; + int sd_bbu_flag = 0; u32 val; if (!of_machine_is_compatible("fsl,imx8mp-evk")) @@ -29,14 +29,14 @@ static int nxp_imx8mp_evk_init(void) emmc_bbu_flag = BBU_HANDLER_FLAG_DEFAULT; } else { of_device_enable_path("/chosen/environment-sd"); - emmc_sd_flag = BBU_HANDLER_FLAG_DEFAULT; + sd_bbu_flag = BBU_HANDLER_FLAG_DEFAULT; } } else { of_device_enable_path("/chosen/environment-emmc"); emmc_bbu_flag = BBU_HANDLER_FLAG_DEFAULT; } - imx8m_bbu_internal_mmc_register_handler("SD", "/dev/mmc1.barebox", emmc_sd_flag); + imx8m_bbu_internal_mmc_register_handler("SD", "/dev/mmc1.barebox", sd_bbu_flag); imx8m_bbu_internal_mmc_register_handler("eMMC", "/dev/mmc2", emmc_bbu_flag); val = readl(MX8MP_IOMUXC_GPR_BASE_ADDR + MX8MP_IOMUXC_GPR1); -- 2.20.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
