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 tag 'u-boot-rockchip-20190809' of https://gitlab.denx.de/u-boot/custodians...
[platform/kernel/u-boot.git]
/
include
/
configs
/
cm_fx6.h
diff --git
a/include/configs/cm_fx6.h
b/include/configs/cm_fx6.h
index
f7e82df
..
60bac9a
100644
(file)
--- a/
include/configs/cm_fx6.h
+++ b/
include/configs/cm_fx6.h
@@
-39,10
+39,6
@@
#define CONFIG_SYS_BAUDRATE_TABLE {9600, 19200, 38400, 57600, 115200}
/* SPI flash */
#define CONFIG_SYS_BAUDRATE_TABLE {9600, 19200, 38400, 57600, 115200}
/* SPI flash */
-#define CONFIG_SF_DEFAULT_BUS 0
-#define CONFIG_SF_DEFAULT_CS 0
-#define CONFIG_SF_DEFAULT_SPEED 25000000
-#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0)
/* MTD support */
#ifndef CONFIG_SPL_BUILD
/* MTD support */
#ifndef CONFIG_SPL_BUILD
@@
-50,10
+46,6
@@
#endif
/* Environment */
#endif
/* Environment */
-#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
-#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE
-#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
-#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_SIZE (8 * 1024)
#define CONFIG_ENV_OFFSET (768 * 1024)
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_SIZE (8 * 1024)
#define CONFIG_ENV_OFFSET (768 * 1024)
@@
-152,8
+144,6
@@
"echo WARNING: Could not determine dtb to use; fi; \0" \
BOOTENV
"echo WARNING: Could not determine dtb to use; fi; \0" \
BOOTENV
-#define CONFIG_PREBOOT "usb start;sf probe"
-
#define BOOT_TARGET_DEVICES(func) \
func(USB, usb, 0) \
func(MMC, mmc, 2) \
#define BOOT_TARGET_DEVICES(func) \
func(USB, usb, 0) \
func(MMC, mmc, 2) \
@@
-220,7
+210,6
@@
#define CONFIG_SYS_SPI_U_BOOT_OFFS (64 * 1024)
/* Display */
#define CONFIG_SYS_SPI_U_BOOT_OFFS (64 * 1024)
/* Display */
-#define CONFIG_VIDEO_IPUV3
#define CONFIG_IMX_HDMI
#define CONFIG_SPLASH_SCREEN
#define CONFIG_IMX_HDMI
#define CONFIG_SPLASH_SCREEN