random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-17 14:18:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

board: freescale: p1_p2_rdb_pc: Fix env $vscfw_addr

Browse Source 
Do not stringify env $vscfw_addr two times (once implicitly via string
operator "" and second time explicitly via __stringify() macro) and allow
to compile U-Boot without CONFIG_VSC7385_ENET (when __VSCFW_ADDR was not
defined and so macro name was stringified into CONFIG_EXTRA_ENV_SETTINGS).

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
This commit is contained in:
Pali Rohár 2022-04-07 12:16:20 +02:00 committed by Priyanka Jain
parent 71dcf8128c
commit ac56055c41
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/configs/p1_p2_rdb_pc.h
View File

@ -325,7 +325,7 @@
/* Vsc7385 switch */ /* Vsc7385 switch */
#ifdef CONFIG_VSC7385_ENET #ifdef CONFIG_VSC7385_ENET
#define __VSCFW_ADDR "vscfw_addr=ef000000" #define __VSCFW_ADDR "vscfw_addr=ef000000\0"
#define CONFIG_SYS_VSC7385_BASE 0xffb00000 #define CONFIG_SYS_VSC7385_BASE 0xffb00000
#ifdef CONFIG_PHYS_64BIT #ifdef CONFIG_PHYS_64BIT
@ -344,6 +344,10 @@
#define CONFIG_VSC7385_IMAGE_SIZE 8192 #define CONFIG_VSC7385_IMAGE_SIZE 8192
#endif #endif
#ifndef __VSCFW_ADDR
#define __VSCFW_ADDR ""
#endif
/* /*
* Config the L2 Cache as L2 SRAM * Config the L2 Cache as L2 SRAM
*/ */
@ -581,7 +585,7 @@ i2c mw 18 3 __SW_BOOT_MASK 1; reset
"ramdisk_size=120000\0" \ "ramdisk_size=120000\0" \
"map_lowernorbank=i2c dev 1; i2c mw 18 1 02 1; i2c mw 18 3 fd 1\0" \ "map_lowernorbank=i2c dev 1; i2c mw 18 1 02 1; i2c mw 18 3 fd 1\0" \
"map_uppernorbank=i2c dev 1; i2c mw 18 1 00 1; i2c mw 18 3 fd 1\0" \ "map_uppernorbank=i2c dev 1; i2c mw 18 1 00 1; i2c mw 18 3 fd 1\0" \
__stringify(__VSCFW_ADDR)"\0" \ __VSCFW_ADDR \
__stringify(__NOR_RST_CMD)"\0" \ __stringify(__NOR_RST_CMD)"\0" \
__stringify(__SPI_RST_CMD)"\0" \ __stringify(__SPI_RST_CMD)"\0" \
__stringify(__SD_RST_CMD)"\0" \ __stringify(__SD_RST_CMD)"\0" \