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
configs: Resync with savedefconfig
[platform/kernel/u-boot.git]
/
configs
/
colibri-imx6ull_defconfig
diff --git
a/configs/colibri-imx6ull_defconfig
b/configs/colibri-imx6ull_defconfig
index
8cf62c2
..
5164374
100644
(file)
--- a/
configs/colibri-imx6ull_defconfig
+++ b/
configs/colibri-imx6ull_defconfig
@@
-10,7
+10,6
@@
CONFIG_TARGET_COLIBRI_IMX6ULL=y
CONFIG_DM_GPIO=y
CONFIG_TARGET_COLIBRI_IMX6ULL_NAND=y
CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri-eval-v3"
CONFIG_DM_GPIO=y
CONFIG_TARGET_COLIBRI_IMX6ULL_NAND=y
CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri-eval-v3"
-CONFIG_SYS_PROMPT="Colibri iMX6ULL # "
CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_SYS_LOAD_ADDR=0x84200000
CONFIG_SYS_MEMTEST_START=0x80000000
CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_SYS_LOAD_ADDR=0x84200000
CONFIG_SYS_MEMTEST_START=0x80000000
@@
-25,6
+24,7
@@
CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile imx6ull-colibri${variant}-$
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_SYS_PROMPT="Colibri iMX6ULL # "
CONFIG_SYS_MAXARGS=32
CONFIG_SYS_PBSIZE=547
# CONFIG_BOOTM_PLAN9 is not set
CONFIG_SYS_MAXARGS=32
CONFIG_SYS_PBSIZE=547
# CONFIG_BOOTM_PLAN9 is not set