From: Alison Wang Date: Tue, 9 Dec 2014 09:37:49 +0000 (+0800) Subject: arm: ls102xa: Fix SD/NAND/QSPI boot defination error for QE support X-Git-Tag: v2015.01-rc4~29^2~16 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4c59ab9cfbdd34f5ef1e960470accdc63e2483c1;p=oweals%2Fu-boot.git arm: ls102xa: Fix SD/NAND/QSPI boot defination error for QE support The SD/NAND/QSPI boot definations are wrong for QE support, this patch is to fix this error. Signed-off-by: Alison Wang Reviewed-by: York Sun --- diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index df6843c64b..4496871ff3 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -104,7 +104,8 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_FSL_CAAM /* Enable CAAM */ -#if !defined(CONFIG_SDCARD) && !defined(CONFIG_NAND) && !defined(CONFIG_SPI) +#if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_NAND_BOOT) && \ + !defined(CONFIG_QSPI_BOOT) #define CONFIG_U_QE #endif diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index aa9ec72fe6..972becd9a4 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -82,7 +82,8 @@ #define CONFIG_FSL_CAAM /* Enable CAAM */ -#if !defined(CONFIG_SDCARD) && !defined(CONFIG_NAND) && !defined(CONFIG_SPI) +#if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_NAND_BOOT) && \ + !defined(CONFIG_QSPI_BOOT) #define CONFIG_U_QE #endif