Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 2ee03c6e23237a29729b27457f69b22b2d7d4fe1

Authored by Alison Wang
Committed by Jason
1 parent 49b3962d20
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

ColdFire: Rename NANDFLASH_SIZE into CONFIG_NANDFLASH_SIZE for MCF537x 

This patch fixes the build error for MCF537x. As the NANDFLASH_SIZE is
redefined in boards.cfg, it is needed to rename NANDFLASH_SIZE into
CONFIG_NANDFLASH_SIZE in include/configs/M5373EVB.h.

Signed-off-by: Alison Wang <b18965@freescale.com>

Showing 1 changed file with 5 additions and 5 deletions Side-by-side Diff

include/configs/M5373EVB.h
Diff comments   View file @ 2ee03c6
1 1 /*
2 2 * Configuation settings for the Freescale MCF5373 FireEngine board.
3 3 *
4   - * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
  4 + * Copyright (C) 2004-2007, 2012 Freescale Semiconductor, Inc.
5 5 * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
6 6 *
7 7 * See file CREDITS for list of people who contributed to this
... ... @@ -59,7 +59,7 @@
59 59 #define CONFIG_CMD_PING
60 60 #define CONFIG_CMD_REGINFO
61 61  
62   -#ifdef NANDFLASH_SIZE
  62 +#ifdef CONFIG_NANDFLASH_SIZE
63 63 # define CONFIG_CMD_NAND
64 64 #endif
65 65  
... ... @@ -208,7 +208,7 @@
208 208 # define CONFIG_SYS_FLASH_PROTECTION /* "Real" (hardware) sectors protection */
209 209 #endif
210 210  
211   -#ifdef NANDFLASH_SIZE
  211 +#ifdef CONFIG_NANDFLASH_SIZE
212 212 # define CONFIG_SYS_MAX_NAND_DEVICE 1
213 213 # define CONFIG_SYS_NAND_BASE CONFIG_SYS_CS2_BASE
214 214 # define CONFIG_SYS_NAND_SIZE 1
215 215  
... ... @@ -264,9 +264,9 @@
264 264 #define CONFIG_SYS_CS1_MASK 0x001f0001
265 265 #define CONFIG_SYS_CS1_CTRL 0x002A3780
266 266  
267   -#ifdef NANDFLASH_SIZE
  267 +#ifdef CONFIG_NANDFLASH_SIZE
268 268 #define CONFIG_SYS_CS2_BASE 0x20000000
269   -#define CONFIG_SYS_CS2_MASK ((NANDFLASH_SIZE << 20) | 1)
  269 +#define CONFIG_SYS_CS2_MASK ((CONFIG_NANDFLASH_SIZE << 20) | 1)
270 270 #define CONFIG_SYS_CS2_CTRL 0x00001f60
271 271 #endif
272 272