projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
[platform/kernel/u-boot.git]
/
include
/
configs
/
bfin_adi_common.h
diff --git
a/include/configs/bfin_adi_common.h
b/include/configs/bfin_adi_common.h
index
bae2d76
..
ccdec0d
100644
(file)
--- a/
include/configs/bfin_adi_common.h
+++ b/
include/configs/bfin_adi_common.h
@@
-112,7
+112,6
@@
# define CONFIG_BAUDRATE 57600
#endif
#ifndef CONFIG_DEBUG_EARLY_SERIAL
# define CONFIG_BAUDRATE 57600
#endif
#ifndef CONFIG_DEBUG_EARLY_SERIAL
-# define CONFIG_SERIAL_MULTI
# define CONFIG_SYS_BFIN_UART
#endif
# define CONFIG_SYS_BFIN_UART
#endif
@@
-150,13
+149,14
@@
#endif
#define CONFIG_BOOTARGS \
"root=" CONFIG_BOOTARGS_ROOT " " \
#endif
#define CONFIG_BOOTARGS \
"root=" CONFIG_BOOTARGS_ROOT " " \
- "clkin_hz="
MK_STR
(CONFIG_CLKIN_HZ) " " \
+ "clkin_hz="
__stringify
(CONFIG_CLKIN_HZ) " " \
"earlyprintk=" \
"serial," \
"earlyprintk=" \
"serial," \
- "uart"
MK_STR
(CONFIG_UART_CONSOLE) "," \
-
MK_STR
(CONFIG_BAUDRATE) " " \
+ "uart"
__stringify
(CONFIG_UART_CONSOLE) "," \
+
__stringify
(CONFIG_BAUDRATE) " " \
CONFIG_BOOTARGS_VIDEO \
CONFIG_BOOTARGS_VIDEO \
- "console=ttyBF" MK_STR(CONFIG_UART_CONSOLE) "," MK_STR(CONFIG_BAUDRATE)
+ "console=ttyBF" __stringify(CONFIG_UART_CONSOLE) "," \
+ __stringify(CONFIG_BAUDRATE)
#if defined(CONFIG_CMD_NAND)
# define NAND_ENV_SETTINGS \
"nandargs=set bootargs " CONFIG_BOOTARGS "\0" \
#if defined(CONFIG_CMD_NAND)
# define NAND_ENV_SETTINGS \
"nandargs=set bootargs " CONFIG_BOOTARGS "\0" \
@@
-183,8
+183,8
@@
# define CONFIG_BFIN_SPI_IMG_SIZE 0x40000
# endif
# define UBOOT_ENV_UPDATE \
# define CONFIG_BFIN_SPI_IMG_SIZE 0x40000
# endif
# define UBOOT_ENV_UPDATE \
- "sf probe "
MK_STR
(BFIN_BOOT_SPI_SSEL) ";" \
- "sf erase 0 "
MK_STR
(CONFIG_BFIN_SPI_IMG_SIZE) ";" \
+ "sf probe "
__stringify
(BFIN_BOOT_SPI_SSEL) ";" \
+ "sf erase 0 "
__stringify
(CONFIG_BFIN_SPI_IMG_SIZE) ";" \
"sf write $(loadaddr) 0 $(filesize)"
# endif
# elif (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND)
"sf write $(loadaddr) 0 $(filesize)"
# endif
# elif (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND)
@@
-265,7
+265,7
@@
# define CONFIG_SERVERIP 192.168.0.2
# endif
# ifndef CONFIG_ROOTPATH
# define CONFIG_SERVERIP 192.168.0.2
# endif
# ifndef CONFIG_ROOTPATH
-# define CONFIG_ROOTPATH
/romfs
+# define CONFIG_ROOTPATH
"/romfs"
# endif
# ifdef CONFIG_CMD_DHCP
# ifndef CONFIG_SYS_AUTOLOAD
# endif
# ifdef CONFIG_CMD_DHCP
# ifndef CONFIG_SYS_AUTOLOAD