X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=arch%2Farm%2Fmach-zynqmp%2Fspl.c;h=b52ac1785352bfc4b39c9113d1397c25061e70b0;hb=88a87bcbb344ec63c62c001c356aaad8f60c84fa;hp=fb3955c93fdc175b334d56554fc0e3e9baa062c7;hpb=748ad078eefea2ee5a3c8e53ca46e9e93c2fc7f1;p=oweals%2Fu-boot.git diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c index fb3955c93f..b52ac17853 100644 --- a/arch/arm/mach-zynqmp/spl.c +++ b/arch/arm/mach-zynqmp/spl.c @@ -27,6 +27,7 @@ void board_init_f(ulong dummy) /* Delay is required for clocks to be propagated */ udelay(1000000); + debug("Clearing BSS 0x%p - 0x%p\n", __bss_start, __bss_end); /* Clear the BSS */ memset(__bss_start, 0, __bss_end - __bss_start); @@ -85,7 +86,7 @@ u32 spl_boot_device(void) case SD_MODE1: case SD1_LSHFT_MODE: /* not working on silicon v1 */ /* if both controllers enabled, then these two are the second controller */ -#if defined(CONFIG_ZYNQ_SDHCI0) && defined(CONFIG_ZYNQ_SDHCI1) +#ifdef CONFIG_SPL_ZYNQMP_TWO_SDHCI return BOOT_DEVICE_MMC2; /* else, fall through, the one SDHCI controller that is enabled is number 1 */ #endif