From ce6a26cf0aa2af3a93b1183bd3543a9913e0656e Mon Sep 17 00:00:00 2001 From: Rabeeh Khoury Date: Tue, 5 May 2020 01:01:01 +0300 Subject: [PATCH 17/17] lx2160acex7: misc fixes to get booting from eMMC functional Upstream-Status: Inappropriate [Solid-Run BSP] Signed-off-by: Rabeeh Khoury --- include/configs/lx2160a_common.h | 10 ++++++++++ include/configs/lx2160acex7.h | 14 ++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index 91e9a2470f..f0c44a2368 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -235,6 +235,16 @@ int select_i2c_ch_pca9547_sec(unsigned char ch); "esbc_validate 0x80680000 ;" \ "fsl_mc start mc 0x80a00000 0x80e00000\0" +#define SD2_MC_INIT_CMD \ + "mmc dev 1; mmc read 0x80a00000 0x5000 0x1200;" \ + "mmc read 0x80e00000 0x7000 0x800;" \ + "env exists secureboot && " \ + "mmc read 0x80640000 0x3200 0x20 && " \ + "mmc read 0x80680000 0x3400 0x20 && " \ + "esbc_validate 0x80640000 && " \ + "esbc_validate 0x80680000 ;" \ + "fsl_mc start mc 0x80a00000 0x80e00000\0" + #define EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "ramdisk_addr=0x800000\0" \ diff --git a/include/configs/lx2160acex7.h b/include/configs/lx2160acex7.h index 7116e038a1..310168db47 100644 --- a/include/configs/lx2160acex7.h +++ b/include/configs/lx2160acex7.h @@ -46,11 +46,6 @@ #endif -/* EMC2301 */ -#define I2C_MUX_CH_EMC2301 0x01 -#define I2C_EMC2301_ADDR 0x2f -#define I2C_EMC2301_CMD 0x40 -#define I2C_EMC2301_PWM 0x80 /* EEPROM */ #undef CONFIG_ID_EEPROM /* Fixme */ @@ -73,7 +68,14 @@ "$kernelheader_size && esbc_validate ${kernelheader_addr_r}; "\ " bootm $load_addr#$BOARD\0" \ "sd_bootcmd=echo Trying load from sd card..;" \ - "mmc dev 0; mmcinfo; mmc read $load_addr " \ + "mmcinfo; mmc read $load_addr " \ + "$kernel_addr_sd $kernel_size_sd ;" \ + "env exists secureboot && mmc read $kernelheader_addr_r "\ + "$kernelhdr_addr_sd $kernelhdr_size_sd " \ + " && esbc_validate ${kernelheader_addr_r};" \ + "bootm $load_addr#$BOARD\0" \ + "emmc_bootcmd=echo Trying load from emmc card..;" \ + "mmc dev 1; mmcinfo; mmc read $load_addr " \ "$kernel_addr_sd $kernel_size_sd ;" \ "env exists secureboot && mmc read $kernelheader_addr_r "\ "$kernelhdr_addr_sd $kernelhdr_size_sd " \ -- 2.17.1