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 git://git.denx.de/u-boot-fsl-qoriq
[platform/kernel/u-boot.git]
/
include
/
configs
/
ls1012a_common.h
diff --git
a/include/configs/ls1012a_common.h
b/include/configs/ls1012a_common.h
index
09f890d
..
bd9b0d3
100644
(file)
--- a/
include/configs/ls1012a_common.h
+++ b/
include/configs/ls1012a_common.h
@@
-55,9
+55,8
@@
#define CONFIG_FSL_QSPI
#define QSPI0_AMBA_BASE 0x40000000
#define CONFIG_SPI_FLASH_SPANSION
#define CONFIG_FSL_QSPI
#define QSPI0_AMBA_BASE 0x40000000
#define CONFIG_SPI_FLASH_SPANSION
-#define CONFIG_SPI_FLASH_BAR
-#define FSL_QSPI_FLASH_SIZE
(1 << 24)
+#define FSL_QSPI_FLASH_SIZE
SZ_64M
#define FSL_QSPI_FLASH_NUM 2
/*
#define FSL_QSPI_FLASH_NUM 2
/*
@@
-85,7
+84,6
@@
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
/* Command line configuration */
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
/* Command line configuration */
-#define CONFIG_CMD_ENV
#undef CONFIG_CMD_IMLS
#define CONFIG_SYS_HZ 1000
#undef CONFIG_CMD_IMLS
#define CONFIG_SYS_HZ 1000