diff options
| author | Tien Fong Chee <tfchee@pg-tfchee-lv.altera.com> | 2015-08-05 12:41:24 +0800 |
|---|---|---|
| committer | Tien Fong Chee <tfchee@pg-tfchee-lv.altera.com> | 2015-08-05 12:41:24 +0800 |
| commit | 353283b6e75eabdcc48dadf08507b4b86c229d78 (patch) | |
| tree | 8be26eaab6221425b3647d8dd75aaca141db9130 | |
| parent | 6aa6ebf988745e28f5bcf76bed4f49a81dab21b5 (diff) | |
| download | u-boot-socfpga-353283b6e75eabdcc48dadf08507b4b86c229d78.tar.gz | |
FogBugz #241114: Fixed the compilation issue when BOOT_FROM_NANDrel_socfpga_v2013.01.01_15.09.01_prrel_socfpga_v2013.01.01_15.08.02_prACDS15.1_REL_GSRD_RC7ACDS15.1_REL_GSRD_RC6ACDS15.1_REL_GSRD_RC5ACDS15.1_REL_GSRD_RC4ACDS15.1_REL_GSRD_RC3ACDS15.1_REL_GSRD_RC2ACDS15.1_REL_GSRD_PR
is checked on preloader.
The compilation having issue because some #define are not included
during compilation when BOOT_FROM_NAND is checked on preloader
support package setting. This patch fixed the issue by including
those missing #define when the BOOT_FROM_NAND is checked.
Signed-off-by: Tien Fong Chee <tfchee@pg-tfchee-lv.altera.com>
| -rw-r--r-- | include/configs/socfpga_common.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index fa1402cb30..6d1424a30a 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -1,5 +1,5 @@ /* - * Copyright Altera Corporation (C) 2013. All rights reserved + * Copyright Altera Corporation (C) 2013-2015. All rights reserved * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -507,7 +507,11 @@ #endif /* CONFIG_CADENCE_QSPI */ /* NAND */ +#if (CONFIG_PRELOADER_BOOT_FROM_NAND == 0) #undef CONFIG_NAND_DENALI +#else +#define CONFIG_NAND_DENALI +#endif #ifdef CONFIG_NAND_DENALI #define CONFIG_CMD_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 |