Re: [U-Boot] [U-boot-Users][GIT PULL] Please pull coldfire tree

On 22:43 Thu 14 Aug , Wolfgang Denk wrote:
Dear John Rigby,
In message 48A47C31.4010104@freescale.com you wrote:
The following changes since commit 855efd04e440754297769849f4d7fb52c7dc6bf4: Wolfgang Denk (1): Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
are available in the git repository at:
git://git.denx.de/u-boot-coldfire.git master
TsiChung Liew (13): ColdFire: Fix M5253EVB dram bring up issue ColdFire: Raise M5253EVBE uart baudrate to 115200 bps ColdFire: Add M5253DEMO platform support for MCF5253 ColdFire: Use CFI Flash driver for M54455EVB ColdFire: Add SSPI feature for MCF5445x ColdFire: Implement SBF feature for M5445EVB ColdFire: Add Serial Flash support for M54455EVB ColdFire: Add M54451EVB platform support for MCF5445x ColdFire: Move m5271evb from board to board/freescale ColdFire: Move m5272c3 from board to board/freescale ColdFire: Move m5282evb from board to board/freescale ColdFire: Multiple fixes for M5282EVB Change CFG_ENV_SIZE to CFG_ENV_SECT_SIZE for SPI sector erase
Hi TsiChung,
Note I've rename CFG_FLASH_CFI_DRIVER to CONFIG_FLASH_CFI_DRIVER
I'll send patch for your new boards
Best Regards, J.

rename CFG_FLASH_CFI_DRIVER to CONFIG_FLASH_CFI_DRIVER
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index b91d7d6..f2c2317 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -206,7 +206,7 @@ * Amd/Atmel use 0x30 for sector erase, SST use 0x50. * 0x30 is block erase in SST */ -# define CFG_FLASH_CFI_DRIVER 1 +# define CONFIG_FLASH_CFI_DRIVER 1 # define CFG_FLASH_SIZE 0x800000 # define CFG_FLASH_CFI_WIDTH FLASH_CFI_16BIT # define CONFIG_FLASH_CFI_LEGACY diff --git a/include/configs/ml507.h b/include/configs/ml507.h index c653a51..f8cd499 100644 --- a/include/configs/ml507.h +++ b/include/configs/ml507.h @@ -110,7 +110,7 @@ #define CFG_FLASH_BASE XPAR_FLASH_MEM0_BASEADDR #define CFG_FLASH_SIZE (32*1024*1024) #define CFG_FLASH_CFI 1 -#define CFG_FLASH_CFI_DRIVER 1 +#define CONFIG_FLASH_CFI_DRIVER 1 #define CFG_FLASH_EMPTY_INFO 1 #define CFG_MAX_FLASH_BANKS 1 #define CFG_MAX_FLASH_SECT 259 diff --git a/include/configs/redwood.h b/include/configs/redwood.h index 32ed574..78ca1b3 100644 --- a/include/configs/redwood.h +++ b/include/configs/redwood.h @@ -165,7 +165,7 @@ * FLASH related *----------------------------------------------------------------------*/ #define CFG_FLASH_CFI /* The flash is CFI compatible */ -#define CFG_FLASH_CFI_DRIVER /* Use common CFI driver */ +#define CONFIG_FLASH_CFI_DRIVER /* Use common CFI driver */ #define CFG_FLASH_CFI_AMD_RESET 1 /* Use AMD (Spansion) reset cmd */
#define CFG_MAX_FLASH_BANKS 3 /* number of banks */

On 18:32 Fri 15 Aug , Jean-Christophe PLAGNIOL-VILLARD wrote:
rename CFG_FLASH_CFI_DRIVER to CONFIG_FLASH_CFI_DRIVER
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com
Wolfgang, Could you apply this fix please?
Best Regards, J.

Dear Jean-Christophe PLAGNIOL-VILLARD,
In message 1218817961-7027-1-git-send-email-plagnioj@jcrosoft.com you wrote:
rename CFG_FLASH_CFI_DRIVER to CONFIG_FLASH_CFI_DRIVER
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com
Applied, thanks.
Best regards,
Wolfgang Denk
participants (3)
-
Jean-Christophe PLAGNIOL-VILLARD
-
Liew Tsi Chung
-
Wolfgang Denk