From 5cf12031a426d53f75b9add334641875797f636d Mon Sep 17 00:00:00 2001 From: BOUGH CHEN Date: Tue, 26 Mar 2019 06:24:17 +0000 Subject: [PATCH 1/5] mmc: correct the HS400 initialization process After the commit b9a2a0e2e9c0 ("mmc: Add support for downgrading HS200/HS400 to HS mode"), it add a parameter in mmc_set_card_speed() which indicates that the HS200/HS400 to HS downgrade is happening. During the HS400 initialization, first select to HS200, and config the related clock rate, then downgrade to HS mode. So here also need to config the downgrade value to be true for two reasons. First, make sure in the function mmc_set_card_speed(), after switch to HS mode, first config the clock rate, then read the EXT_CSD, avoid receiving data of EXT_CSD in HS mode at 200MHz. Second, after issue the MMC_CMD_SWITCH command, it need to wait a bit then switch bus properties. Test on i.MX8QM MEK board, some Micron eMMC will stuck in transfer mode in this case, and USDHC will never get data transfer complete status, cause the uboot hang. Signed-off-by: Haibo Chen Acked-by: Marek Vasut --- drivers/mmc/mmc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 89b255daf4..456c1b4cc9 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1892,8 +1892,7 @@ static int mmc_select_hs400(struct mmc *mmc) } /* Set back to HS */ - mmc_set_card_speed(mmc, MMC_HS, false); - mmc_set_clock(mmc, mmc_mode2freq(mmc, MMC_HS), false); + mmc_set_card_speed(mmc, MMC_HS, true); err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BUS_WIDTH, EXT_CSD_BUS_WIDTH_8 | EXT_CSD_DDR_FLAG); From 1abddd933f10fba3a11b278080568e7d7aa0e62d Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Tue, 26 Mar 2019 10:12:01 -0500 Subject: [PATCH 2/5] configs: ti: Move FIT image load address to avoid overwrite The FIT image is loaded to 0x8700_0000 followed by extracting from that several large images also into the 0x8x00_0000 range. Large images can end up overwriting the FIT image as it is being extracted from. Move the FIT load address clear out to 0x9000_0000, this will require a board to have at least 256MB of DRAM, if less then more careful planning will be required for that platform. Signed-off-by: Andrew F. Davis --- include/configs/ti_armv7_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 1e2a62dd6f..828fb1b2a5 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -52,7 +52,7 @@ #define DEFAULT_FIT_TI_ARGS \ "boot_fit=0\0" \ - "fit_loadaddr=0x87000000\0" \ + "fit_loadaddr=0x90000000\0" \ "fit_bootfile=fitImage\0" \ "update_to_fit=setenv loadaddr ${fit_loadaddr}; setenv bootfile ${fit_bootfile}\0" \ "loadfit=run args_mmc; bootm ${loadaddr}#${fdtfile};\0" \ From ab107279efff5481a8bcbf835489b8618465bb0e Mon Sep 17 00:00:00 2001 From: Matthias Brugger Date: Thu, 28 Mar 2019 14:47:39 +0100 Subject: [PATCH 3/5] RPi: Add mbrugger as board maintainer I took over maintainership from Alex Graf with commit 3157bbfa18 ("rpi: Make Matthias maintainer") But I forgot to update the board maintainer file. This patch adds myself to the game. Signed-off-by: Matthias Brugger Reviewed-by: Heinrich Schuchardt Reviewed-by: Alexander Graf --- board/raspberrypi/rpi/MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/raspberrypi/rpi/MAINTAINERS b/board/raspberrypi/rpi/MAINTAINERS index cce1a7ad76..4f1b23efc8 100644 --- a/board/raspberrypi/rpi/MAINTAINERS +++ b/board/raspberrypi/rpi/MAINTAINERS @@ -1,5 +1,5 @@ RPI BOARD -M: Alexander Graf +M: Matthias Brugger S: Maintained F: board/raspberrypi/rpi/ F: include/configs/rpi.h From 5ec072bb2b7aa9cb1696d172b605edac4ccc6e2a Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Thu, 28 Mar 2019 22:51:35 +0100 Subject: [PATCH 4/5] doc/git-mailrc: correct entry 'agraf' Correct Alex's email address. Signed-off-by: Heinrich Schuchardt Reviewed-by: Alexander Graf --- doc/git-mailrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/git-mailrc b/doc/git-mailrc index c2eee8c7d8..b75ebab02b 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -15,7 +15,7 @@ alias abiessmann Andreas Bießmann alias abrodkin Alexey Brodkin alias afleming Andy Fleming alias ag Anatolij Gustschin -alias agraf Alexander Graf +alias agraf Alexander Graf alias alisonwang Alison Wang alias angelo_ts Angelo Dureghello alias bmeng Bin Meng From f00c26284ec0aa3e9b01ebe4996aa8fc01526d03 Mon Sep 17 00:00:00 2001 From: Kever Yang Date: Fri, 29 Mar 2019 22:17:33 +0800 Subject: [PATCH 5/5] lib: time: update module enable MACRO We'd better use correct way to check if module has enabled. for we have 3 timer MACRO: - CONFIG_TIMER - CONFIG_SPL_TIMER - CONFIG_TPL_TIMER Signed-off-by: Kever Yang Reviewed-by: Philipp Tomsich --- lib/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/time.c b/lib/time.c index 3bf678a232..9c55da6f1b 100644 --- a/lib/time.c +++ b/lib/time.c @@ -56,7 +56,7 @@ ulong timer_get_boot_us(void) extern unsigned long __weak timer_read_counter(void); #endif -#ifdef CONFIG_TIMER +#if CONFIG_IS_ENABLED(TIMER) ulong notrace get_tbclk(void) { if (!gd->timer) {