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 'master_sh/gen4/mmcfix' of https://source.denx.de/u-boot/custodians...
[platform/kernel/u-boot.git]
/
include
/
configs
/
zynq-common.h
diff --git
a/include/configs/zynq-common.h
b/include/configs/zynq-common.h
index
6574cf9
..
e372e90
100644
(file)
--- a/
include/configs/zynq-common.h
+++ b/
include/configs/zynq-common.h
@@
-11,13
+11,12
@@
/* Cache options */
#ifndef CONFIG_SYS_L2CACHE_OFF
/* Cache options */
#ifndef CONFIG_SYS_L2CACHE_OFF
-# define C
ONFIG_SYS_PL310_BASE
0xf8f02000
+# define C
FG_SYS_PL310_BASE
0xf8f02000
#endif
#define ZYNQ_SCUTIMER_BASEADDR 0xF8F00600
#endif
#define ZYNQ_SCUTIMER_BASEADDR 0xF8F00600
-#define CONFIG_SYS_TIMERBASE ZYNQ_SCUTIMER_BASEADDR
-#define CONFIG_SYS_TIMER_COUNTS_DOWN
-#define CONFIG_SYS_TIMER_COUNTER (CONFIG_SYS_TIMERBASE + 0x4)
+#define CFG_SYS_TIMERBASE ZYNQ_SCUTIMER_BASEADDR
+#define CFG_SYS_TIMER_COUNTER (CFG_SYS_TIMERBASE + 0x4)
/* GUIDs for capsule updatable firmware images */
#define XILINX_BOOT_IMAGE_GUID \
/* GUIDs for capsule updatable firmware images */
#define XILINX_BOOT_IMAGE_GUID \
@@
-30,19
+29,15
@@
/* Serial drivers */
/* The following table includes the supported baudrates */
/* Serial drivers */
/* The following table includes the supported baudrates */
-#define C
ONFI
G_SYS_BAUDRATE_TABLE \
+#define C
F
G_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
/* Ethernet driver */
/* NOR */
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
/* Ethernet driver */
/* NOR */
-#ifdef CONFIG_MTD_NOR_FLASH
-# define CONFIG_FLASH_SHOW_PROGRESS 10
-#endif
#ifdef CONFIG_USB_EHCI_ZYNQ
# define DFU_DEFAULT_POLL_TIMEOUT 300
#ifdef CONFIG_USB_EHCI_ZYNQ
# define DFU_DEFAULT_POLL_TIMEOUT 300
-# define CONFIG_THOR_RESET_OFF
#endif
/* enable preboot to be loaded before CONFIG_BOOTDELAY */
#endif
/* enable preboot to be loaded before CONFIG_BOOTDELAY */
@@
-175,8
+170,8
@@
#endif /* CONFIG_SPL_BUILD */
/* Default environment */
#endif /* CONFIG_SPL_BUILD */
/* Default environment */
-#ifndef C
ONFI
G_EXTRA_ENV_SETTINGS
-#define C
ONFIG_EXTRA_ENV_SETTINGS
\
+#ifndef C
F
G_EXTRA_ENV_SETTINGS
+#define C
FG_EXTRA_ENV_SETTINGS
\
"scriptaddr=0x20000\0" \
"script_size_f=0x40000\0" \
"fdt_addr_r=0x1f00000\0" \
"scriptaddr=0x20000\0" \
"script_size_f=0x40000\0" \
"fdt_addr_r=0x1f00000\0" \
@@
-189,8
+184,8
@@
/* Miscellaneous configurable options */
/* Miscellaneous configurable options */
-#define C
ONFIG_SYS_INIT_RAM_ADDR
0xFFFF0000
-#define C
ONFIG_SYS_INIT_RAM_SIZE
0x2000
+#define C
FG_SYS_INIT_RAM_ADDR
0xFFFF0000
+#define C
FG_SYS_INIT_RAM_SIZE
0x2000
/* Extend size of kernel image for uncompression */
/* Extend size of kernel image for uncompression */
@@
-201,10
+196,10
@@
/* qspi mode is working fine */
#ifdef CONFIG_ZYNQ_QSPI
/* qspi mode is working fine */
#ifdef CONFIG_ZYNQ_QSPI
-#define C
ONFIG_SYS_SPI_ARGS_OFFS
0x200000
-#define C
ONFIG_SYS_SPI_ARGS_SIZE
0x80000
-#define C
ONFIG_SYS_SPI_KERNEL_OFFS (CONFI
G_SYS_SPI_ARGS_OFFS + \
- C
ONFI
G_SYS_SPI_ARGS_SIZE)
+#define C
FG_SYS_SPI_ARGS_OFFS
0x200000
+#define C
FG_SYS_SPI_ARGS_SIZE
0x80000
+#define C
FG_SYS_SPI_KERNEL_OFFS (CF
G_SYS_SPI_ARGS_OFFS + \
+ C
F
G_SYS_SPI_ARGS_SIZE)
#endif
/* SP location before relocation, must use scratch RAM */
#endif
/* SP location before relocation, must use scratch RAM */