* [U-Boot] [PATCH 01/10] kconfig: add blank Kconfig files
2014-09-07 8:43 [U-Boot] [PATCH 0/10] Move some CONFIGs to Kconfig Masahiro Yamada
@ 2014-09-07 8:43 ` Masahiro Yamada
2014-09-08 18:26 ` Simon Glass
2014-09-07 8:43 ` [U-Boot] [PATCH 02/10] kconfig: move CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED to Kconfig Masahiro Yamada
` (8 subsequent siblings)
9 siblings, 1 reply; 32+ messages in thread
From: Masahiro Yamada @ 2014-09-07 8:43 UTC (permalink / raw)
To: u-boot
This would be useful to start moving various config options.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
Kconfig | 12 +++++++++++-
common/Kconfig | 4 ++++
drivers/Kconfig | 51 ++++++++++++++++++++++++++++++++++++++++++++++++
drivers/block/Kconfig | 0
drivers/core/Kconfig | 0
drivers/crypto/Kconfig | 0
drivers/dfu/Kconfig | 0
drivers/dma/Kconfig | 0
drivers/gpio/Kconfig | 0
drivers/hwmon/Kconfig | 0
drivers/i2c/Kconfig | 0
drivers/input/Kconfig | 0
drivers/misc/Kconfig | 0
drivers/mmc/Kconfig | 0
drivers/mtd/Kconfig | 0
drivers/net/Kconfig | 0
drivers/pci/Kconfig | 0
drivers/pcmcia/Kconfig | 0
drivers/power/Kconfig | 0
drivers/rtc/Kconfig | 0
drivers/serial/Kconfig | 0
drivers/sound/Kconfig | 0
drivers/spi/Kconfig | 0
drivers/tpm/Kconfig | 0
drivers/usb/Kconfig | 0
drivers/video/Kconfig | 0
drivers/watchdog/Kconfig | 0
fs/Kconfig | 19 ++++++++++++++++++
fs/cramfs/Kconfig | 0
fs/ext4/Kconfig | 0
fs/fat/Kconfig | 0
fs/jffs2/Kconfig | 0
fs/reiserfs/Kconfig | 0
fs/ubifs/Kconfig | 0
lib/Kconfig | 3 +++
net/Kconfig | 10 ++++++++++
36 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 common/Kconfig
create mode 100644 drivers/Kconfig
create mode 100644 drivers/block/Kconfig
create mode 100644 drivers/core/Kconfig
create mode 100644 drivers/crypto/Kconfig
create mode 100644 drivers/dfu/Kconfig
create mode 100644 drivers/dma/Kconfig
create mode 100644 drivers/gpio/Kconfig
create mode 100644 drivers/hwmon/Kconfig
create mode 100644 drivers/i2c/Kconfig
create mode 100644 drivers/input/Kconfig
create mode 100644 drivers/misc/Kconfig
create mode 100644 drivers/mmc/Kconfig
create mode 100644 drivers/mtd/Kconfig
create mode 100644 drivers/net/Kconfig
create mode 100644 drivers/pci/Kconfig
create mode 100644 drivers/pcmcia/Kconfig
create mode 100644 drivers/power/Kconfig
create mode 100644 drivers/rtc/Kconfig
create mode 100644 drivers/serial/Kconfig
create mode 100644 drivers/sound/Kconfig
create mode 100644 drivers/spi/Kconfig
create mode 100644 drivers/tpm/Kconfig
create mode 100644 drivers/usb/Kconfig
create mode 100644 drivers/video/Kconfig
create mode 100644 drivers/watchdog/Kconfig
create mode 100644 fs/Kconfig
create mode 100644 fs/cramfs/Kconfig
create mode 100644 fs/ext4/Kconfig
create mode 100644 fs/fat/Kconfig
create mode 100644 fs/jffs2/Kconfig
create mode 100644 fs/reiserfs/Kconfig
create mode 100644 fs/ubifs/Kconfig
create mode 100644 lib/Kconfig
create mode 100644 net/Kconfig
diff --git a/Kconfig b/Kconfig
index cbb691e..fc5e7cd 100644
--- a/Kconfig
+++ b/Kconfig
@@ -91,7 +91,7 @@ config SYS_EXTRA_OPTIONS
depends on !SPL_BUILD
help
The old configuration infrastructure (= mkconfig + boards.cfg)
- provided the extra options field. It you have something like
+ provided the extra options field. If you have something like
"HAS_BAR,BAZ=64", the optional options
#define CONFIG_HAS
#define CONFIG_BAZ 64
@@ -103,3 +103,13 @@ config SYS_EXTRA_OPTIONS
endmenu # Boot images
source "arch/Kconfig"
+
+source "common/Kconfig"
+
+source "net/Kconfig"
+
+source "drivers/Kconfig"
+
+source "fs/Kconfig"
+
+source "lib/Kconfig"
diff --git a/common/Kconfig b/common/Kconfig
new file mode 100644
index 0000000..5ae7190
--- /dev/null
+++ b/common/Kconfig
@@ -0,0 +1,4 @@
+menu "Command line interface"
+ depends on !SPL_BUILD
+
+endmenu
diff --git a/drivers/Kconfig b/drivers/Kconfig
new file mode 100644
index 0000000..128736d
--- /dev/null
+++ b/drivers/Kconfig
@@ -0,0 +1,51 @@
+menu "Device Drivers"
+
+source "drivers/core/Kconfig"
+
+source "drivers/pci/Kconfig"
+
+source "drivers/pcmcia/Kconfig"
+
+source "drivers/mtd/Kconfig"
+
+source "drivers/block/Kconfig"
+
+source "drivers/misc/Kconfig"
+
+source "drivers/net/Kconfig"
+
+source "drivers/input/Kconfig"
+
+source "drivers/serial/Kconfig"
+
+source "drivers/tpm/Kconfig"
+
+source "drivers/i2c/Kconfig"
+
+source "drivers/spi/Kconfig"
+
+source "drivers/gpio/Kconfig"
+
+source "drivers/power/Kconfig"
+
+source "drivers/hwmon/Kconfig"
+
+source "drivers/watchdog/Kconfig"
+
+source "drivers/video/Kconfig"
+
+source "drivers/sound/Kconfig"
+
+source "drivers/usb/Kconfig"
+
+source "drivers/dfu/Kconfig"
+
+source "drivers/mmc/Kconfig"
+
+source "drivers/rtc/Kconfig"
+
+source "drivers/dma/Kconfig"
+
+source "drivers/crypto/Kconfig"
+
+endmenu
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/dfu/Kconfig b/drivers/dfu/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/sound/Kconfig b/drivers/sound/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/tpm/Kconfig b/drivers/tpm/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/fs/Kconfig b/fs/Kconfig
new file mode 100644
index 0000000..41bb0b9
--- /dev/null
+++ b/fs/Kconfig
@@ -0,0 +1,19 @@
+#
+# File system configuration
+#
+
+menu "File systems"
+
+source "fs/ext4/Kconfig"
+
+source "fs/reiserfs/Kconfig"
+
+source "fs/fat/Kconfig"
+
+source "fs/jffs2/Kconfig"
+
+source "fs/ubifs/Kconfig"
+
+source "fs/cramfs/Kconfig"
+
+endmenu
diff --git a/fs/cramfs/Kconfig b/fs/cramfs/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/fs/fat/Kconfig b/fs/fat/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/fs/jffs2/Kconfig b/fs/jffs2/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/fs/reiserfs/Kconfig b/fs/reiserfs/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/lib/Kconfig b/lib/Kconfig
new file mode 100644
index 0000000..9724eb8
--- /dev/null
+++ b/lib/Kconfig
@@ -0,0 +1,3 @@
+menu "Library routines"
+
+endmenu
diff --git a/net/Kconfig b/net/Kconfig
new file mode 100644
index 0000000..22b9eaa
--- /dev/null
+++ b/net/Kconfig
@@ -0,0 +1,10 @@
+#
+# Network configuration
+#
+
+menuconfig NET
+ bool "Networking support"
+
+if NET
+
+endif # if NET
--
1.9.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [U-Boot] [PATCH 02/10] kconfig: move CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED to Kconfig
2014-09-07 8:43 [U-Boot] [PATCH 0/10] Move some CONFIGs to Kconfig Masahiro Yamada
2014-09-07 8:43 ` [U-Boot] [PATCH 01/10] kconfig: add blank Kconfig files Masahiro Yamada
@ 2014-09-07 8:43 ` Masahiro Yamada
2014-09-08 18:29 ` Simon Glass
2014-09-07 8:43 ` [U-Boot] [PATCH 03/10] kconfig: move CONFIG_CMD_BOOTM " Masahiro Yamada
` (7 subsequent siblings)
9 siblings, 1 reply; 32+ messages in thread
From: Masahiro Yamada @ 2014-09-07 8:43 UTC (permalink / raw)
To: u-boot
If this option is enabled, the objects under lib/ directory
are compiled with speed optimization, not size optimization.
(Currently, only used by some Blackfin boards.)
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
configs/bct-brettl2_defconfig | 1 +
configs/bf518f-ezbrd_defconfig | 1 +
configs/bf526-ezbrd_defconfig | 1 +
configs/bf527-ad7160-eval_defconfig | 1 +
configs/bf527-ezkit-v2_defconfig | 1 +
configs/bf527-ezkit_defconfig | 1 +
configs/bf527-sdp_defconfig | 1 +
configs/bf533-ezkit_defconfig | 1 +
configs/bf533-stamp_defconfig | 1 +
configs/bf537-stamp_defconfig | 1 +
configs/bf538f-ezkit_defconfig | 1 +
configs/bf548-ezkit_defconfig | 1 +
configs/bf561-acvilon_defconfig | 1 +
configs/bf561-ezkit_defconfig | 1 +
configs/br4_defconfig | 1 +
configs/cm-bf527_defconfig | 1 +
configs/cm-bf533_defconfig | 1 +
configs/cm-bf537e_defconfig | 1 +
configs/cm-bf537u_defconfig | 1 +
configs/cm-bf548_defconfig | 1 +
configs/cm-bf561_defconfig | 1 +
configs/ip04_defconfig | 1 +
configs/pr1_defconfig | 1 +
configs/tcm-bf518_defconfig | 1 +
configs/tcm-bf537_defconfig | 1 +
include/configs/bct-brettl2.h | 1 -
include/configs/bf518f-ezbrd.h | 1 -
include/configs/bf526-ezbrd.h | 1 -
include/configs/bf527-ad7160-eval.h | 1 -
include/configs/bf527-ezkit.h | 1 -
include/configs/bf527-sdp.h | 1 -
include/configs/bf533-ezkit.h | 1 -
include/configs/bf533-stamp.h | 1 -
include/configs/bf537-stamp.h | 1 -
include/configs/bf538f-ezkit.h | 1 -
include/configs/bf548-ezkit.h | 1 -
include/configs/bf561-acvilon.h | 1 -
include/configs/bf561-ezkit.h | 1 -
include/configs/br4.h | 1 -
include/configs/cm-bf527.h | 1 -
include/configs/cm-bf533.h | 1 -
include/configs/cm-bf537e.h | 1 -
include/configs/cm-bf537u.h | 1 -
include/configs/cm-bf548.h | 1 -
include/configs/cm-bf561.h | 1 -
include/configs/ip04.h | 1 -
include/configs/pr1.h | 1 -
include/configs/tcm-bf518.h | 1 -
include/configs/tcm-bf537.h | 1 -
lib/Kconfig | 8 ++++++++
50 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/configs/bct-brettl2_defconfig b/configs/bct-brettl2_defconfig
index 3676306..26b145d 100644
--- a/configs/bct-brettl2_defconfig
+++ b/configs/bct-brettl2_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BCT_BRETTL2=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf518f-ezbrd_defconfig b/configs/bf518f-ezbrd_defconfig
index a93eed0..fb35ad0 100644
--- a/configs/bf518f-ezbrd_defconfig
+++ b/configs/bf518f-ezbrd_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF518F_EZBRD=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf526-ezbrd_defconfig b/configs/bf526-ezbrd_defconfig
index 4a45223..da06d3a 100644
--- a/configs/bf526-ezbrd_defconfig
+++ b/configs/bf526-ezbrd_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF526_EZBRD=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf527-ad7160-eval_defconfig b/configs/bf527-ad7160-eval_defconfig
index d9db715..47f53c9 100644
--- a/configs/bf527-ad7160-eval_defconfig
+++ b/configs/bf527-ad7160-eval_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF527_AD7160_EVAL=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf527-ezkit-v2_defconfig b/configs/bf527-ezkit-v2_defconfig
index aedbb96..e250e10 100644
--- a/configs/bf527-ezkit-v2_defconfig
+++ b/configs/bf527-ezkit-v2_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="BF527_EZKIT_REV_2_1"
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF527_EZKIT=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf527-ezkit_defconfig b/configs/bf527-ezkit_defconfig
index 3ed77a6..69f6ef7 100644
--- a/configs/bf527-ezkit_defconfig
+++ b/configs/bf527-ezkit_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF527_EZKIT=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf527-sdp_defconfig b/configs/bf527-sdp_defconfig
index 0f8c28c..57f47e9 100644
--- a/configs/bf527-sdp_defconfig
+++ b/configs/bf527-sdp_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF527_SDP=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf533-ezkit_defconfig b/configs/bf533-ezkit_defconfig
index 217d4c3..57f8da1 100644
--- a/configs/bf533-ezkit_defconfig
+++ b/configs/bf533-ezkit_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF533_EZKIT=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf533-stamp_defconfig b/configs/bf533-stamp_defconfig
index a99b3c7..1bcf3d3 100644
--- a/configs/bf533-stamp_defconfig
+++ b/configs/bf533-stamp_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF533_STAMP=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf537-stamp_defconfig b/configs/bf537-stamp_defconfig
index d9daf7e..9b9a92f 100644
--- a/configs/bf537-stamp_defconfig
+++ b/configs/bf537-stamp_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF537_STAMP=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf538f-ezkit_defconfig b/configs/bf538f-ezkit_defconfig
index 0507cb2..1892151 100644
--- a/configs/bf538f-ezkit_defconfig
+++ b/configs/bf538f-ezkit_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF538F_EZKIT=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf548-ezkit_defconfig b/configs/bf548-ezkit_defconfig
index 7bb4064..5236984 100644
--- a/configs/bf548-ezkit_defconfig
+++ b/configs/bf548-ezkit_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF548_EZKIT=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf561-acvilon_defconfig b/configs/bf561-acvilon_defconfig
index ba8a418..098f31f 100644
--- a/configs/bf561-acvilon_defconfig
+++ b/configs/bf561-acvilon_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF561_ACVILON=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/bf561-ezkit_defconfig b/configs/bf561-ezkit_defconfig
index 7ceb1d9..5665288 100644
--- a/configs/bf561-ezkit_defconfig
+++ b/configs/bf561-ezkit_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF561_EZKIT=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/br4_defconfig b/configs/br4_defconfig
index 9d91933..5655d54 100644
--- a/configs/br4_defconfig
+++ b/configs/br4_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BR4=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/cm-bf527_defconfig b/configs/cm-bf527_defconfig
index cb5110c..a6830b5 100644
--- a/configs/cm-bf527_defconfig
+++ b/configs/cm-bf527_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_CM_BF527=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/cm-bf533_defconfig b/configs/cm-bf533_defconfig
index aa38d0e..b9508ae 100644
--- a/configs/cm-bf533_defconfig
+++ b/configs/cm-bf533_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_CM_BF533=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/cm-bf537e_defconfig b/configs/cm-bf537e_defconfig
index b9deaae..a44eab7 100644
--- a/configs/cm-bf537e_defconfig
+++ b/configs/cm-bf537e_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_CM_BF537E=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/cm-bf537u_defconfig b/configs/cm-bf537u_defconfig
index 16f7ae1..29c33b9 100644
--- a/configs/cm-bf537u_defconfig
+++ b/configs/cm-bf537u_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_CM_BF537U=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/cm-bf548_defconfig b/configs/cm-bf548_defconfig
index e60306a..525f2e7 100644
--- a/configs/cm-bf548_defconfig
+++ b/configs/cm-bf548_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_CM_BF548=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/cm-bf561_defconfig b/configs/cm-bf561_defconfig
index 1b9301c..062bfeb 100644
--- a/configs/cm-bf561_defconfig
+++ b/configs/cm-bf561_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_CM_BF561=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/ip04_defconfig b/configs/ip04_defconfig
index 4f9895a..ba737ae 100644
--- a/configs/ip04_defconfig
+++ b/configs/ip04_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_IP04=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/pr1_defconfig b/configs/pr1_defconfig
index a8784c1..793a4e8 100644
--- a/configs/pr1_defconfig
+++ b/configs/pr1_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_PR1=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/tcm-bf518_defconfig b/configs/tcm-bf518_defconfig
index a9d5da0..0c9ae4d 100644
--- a/configs/tcm-bf518_defconfig
+++ b/configs/tcm-bf518_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_TCM_BF518=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/configs/tcm-bf537_defconfig b/configs/tcm-bf537_defconfig
index fe9de13..6d604b6 100644
--- a/configs/tcm-bf537_defconfig
+++ b/configs/tcm-bf537_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_TCM_BF537=y
+CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h
index c1eda96..d0828d5 100644
--- a/include/configs/bct-brettl2.h
+++ b/include/configs/bct-brettl2.h
@@ -137,7 +137,6 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/*
* Pull in common ADI header for remaining command/environment setup
diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h
index 9e374c4..20f6ed1 100644
--- a/include/configs/bf518f-ezbrd.h
+++ b/include/configs/bf518f-ezbrd.h
@@ -155,7 +155,6 @@
#define CONFIG_MISC_INIT_R
#define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 0
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/*
* Pull in common ADI header for remaining command/environment setup
diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h
index 972eca9..c33d035 100644
--- a/include/configs/bf526-ezbrd.h
+++ b/include/configs/bf526-ezbrd.h
@@ -153,7 +153,6 @@
#define CONFIG_MISC_INIT_R
#define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 1
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/* define to enable run status via led */
/* #define CONFIG_STATUS_LED */
diff --git a/include/configs/bf527-ad7160-eval.h b/include/configs/bf527-ad7160-eval.h
index c0dfe26..b497f26 100644
--- a/include/configs/bf527-ad7160-eval.h
+++ b/include/configs/bf527-ad7160-eval.h
@@ -136,7 +136,6 @@
*/
#define CONFIG_MISC_INIT_R
#define CONFIG_UART_CONSOLE 0
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/*
* Pull in common ADI header for remaining command/environment setup
diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h
index 92c183e..0bca53f 100644
--- a/include/configs/bf527-ezkit.h
+++ b/include/configs/bf527-ezkit.h
@@ -179,7 +179,6 @@
#define CONFIG_MISC_INIT_R
#define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 1
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/*
* Pull in common ADI header for remaining command/environment setup
diff --git a/include/configs/bf527-sdp.h b/include/configs/bf527-sdp.h
index 458868a..9d43b81 100644
--- a/include/configs/bf527-sdp.h
+++ b/include/configs/bf527-sdp.h
@@ -112,7 +112,6 @@
*/
#define CONFIG_MISC_INIT_R
#define CONFIG_UART_CONSOLE 0
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/*
* Pull in common ADI header for remaining command/environment setup
diff --git a/include/configs/bf533-ezkit.h b/include/configs/bf533-ezkit.h
index b503528..0fda967 100644
--- a/include/configs/bf533-ezkit.h
+++ b/include/configs/bf533-ezkit.h
@@ -110,7 +110,6 @@
#define CONFIG_MISC_INIT_R
#define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 0
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/*
* Pull in common ADI header for remaining command/environment setup
diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index 3d36d84..ae4d83a 100644
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -186,7 +186,6 @@
*/
#define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 0
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/* FLASH/ETHERNET uses the same async bank */
#define SHARED_RESOURCES 1
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index a302f83..29f9316 100644
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -254,7 +254,6 @@
#define CONFIG_MISC_INIT_R
#define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 0
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/* Define if want to do post memory test */
#undef CONFIG_POST
diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h
index 32df5ec..a655282 100644
--- a/include/configs/bf538f-ezkit.h
+++ b/include/configs/bf538f-ezkit.h
@@ -135,7 +135,6 @@
*/
#define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 0
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/*
* Pull in common ADI header for remaining command/environment setup
diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h
index 1a245a2..da5f029 100644
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@@ -181,7 +181,6 @@
#define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 1
#define CONFIG_BFIN_SPI_IMG_SIZE 0x50000
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
#define CONFIG_ADI_GPIO2
diff --git a/include/configs/bf561-acvilon.h b/include/configs/bf561-acvilon.h
index 3db917e..6871d8c 100644
--- a/include/configs/bf561-acvilon.h
+++ b/include/configs/bf561-acvilon.h
@@ -160,7 +160,6 @@
#define CONFIG_UART_CONSOLE 0
#define CONFIG_BAUDRATE 57600
#define CONFIG_SYS_PROMPT "Acvilon> "
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/*
* Pull in common ADI header for remaining command/environment setup
diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index 0a309d9..fb6f948 100644
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -102,7 +102,6 @@
* Misc Settings
*/
#define CONFIG_UART_CONSOLE 0
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/*
* Run core 1 from L1 SRAM start address when init uboot on core 0
diff --git a/include/configs/br4.h b/include/configs/br4.h
index f8d3158..3f24008 100644
--- a/include/configs/br4.h
+++ b/include/configs/br4.h
@@ -135,7 +135,6 @@
#define CONFIG_BOOTCOMMAND "run nandboot"
#define CONFIG_BOOTDELAY 2
#define CONFIG_LOADADDR 0x2000000
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/*
* Pull in common ADI header for remaining command/environment setup
diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h
index 8d3ae49..f5351ad 100644
--- a/include/configs/cm-bf527.h
+++ b/include/configs/cm-bf527.h
@@ -128,7 +128,6 @@
#define FLASHBOOT_ENV_SETTINGS \
"flashboot=flread 20040000 1000000 300000;" \
"bootm 0x1000000\0"
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/*
* Pull in common ADI header for remaining command/environment setup
diff --git a/include/configs/cm-bf533.h b/include/configs/cm-bf533.h
index 8bd499a..485f01a 100644
--- a/include/configs/cm-bf533.h
+++ b/include/configs/cm-bf533.h
@@ -97,7 +97,6 @@
#define CONFIG_UART_CONSOLE 0
#define CONFIG_BOOTCOMMAND "run flashboot"
#define FLASHBOOT_ENV_SETTINGS "flashboot=bootm 0x20040000\0"
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/*
* Pull in common ADI header for remaining command/environment setup
diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index 47967d7..1729b44 100644
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -146,7 +146,6 @@
"flashboot=flread 20040000 1000000 3c0000;" \
"bootm 0x1000000\0"
#define CONFIG_BOARD_SIZE_LIMIT $$((384 * 1024))
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/*
* Pull in common ADI header for remaining command/environment setup
diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h
index 88c9982..272aa74 100644
--- a/include/configs/cm-bf537u.h
+++ b/include/configs/cm-bf537u.h
@@ -143,7 +143,6 @@
"flashboot=flread 20040000 1000000 300000;" \
"bootm 0x1000000\0"
#define CONFIG_BOARD_SIZE_LIMIT $$((384 * 1024))
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/*
* Pull in common ADI header for remaining command/environment setup
diff --git a/include/configs/cm-bf548.h b/include/configs/cm-bf548.h
index 346e27f..7f27eda 100644
--- a/include/configs/cm-bf548.h
+++ b/include/configs/cm-bf548.h
@@ -117,7 +117,6 @@
#define CONFIG_UART_CONSOLE 1
#define CONFIG_BOOTCOMMAND "run flashboot"
#define FLASHBOOT_ENV_SETTINGS "flashboot=bootm 0x20040000\0"
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
#define CONFIG_ADI_GPIO2
diff --git a/include/configs/cm-bf561.h b/include/configs/cm-bf561.h
index 5265e5f..96910a7 100644
--- a/include/configs/cm-bf561.h
+++ b/include/configs/cm-bf561.h
@@ -99,7 +99,6 @@
#define CONFIG_UART_CONSOLE 0
#define CONFIG_BOOTCOMMAND "run flashboot"
#define FLASHBOOT_ENV_SETTINGS "flashboot=bootm 0x20040000\0"
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/*
* Pull in common ADI header for remaining command/environment setup
diff --git a/include/configs/ip04.h b/include/configs/ip04.h
index 3767502..ec510bd 100644
--- a/include/configs/ip04.h
+++ b/include/configs/ip04.h
@@ -133,7 +133,6 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_MISC_INIT_R /* needed for MAC address */
#define CONFIG_UART_CONSOLE 0
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
#undef CONFIG_SHOW_BOOT_PROGRESS
/* Enable this if bootretry required; currently it's disabled */
diff --git a/include/configs/pr1.h b/include/configs/pr1.h
index e96ed4b..0f57e86 100644
--- a/include/configs/pr1.h
+++ b/include/configs/pr1.h
@@ -135,7 +135,6 @@
#define CONFIG_BOOTCOMMAND "run nandboot"
#define CONFIG_BOOTDELAY 2
#define CONFIG_LOADADDR 0x2000000
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/*
* Pull in common ADI header for remaining command/environment setup
diff --git a/include/configs/tcm-bf518.h b/include/configs/tcm-bf518.h
index a77ba69..6673026 100644
--- a/include/configs/tcm-bf518.h
+++ b/include/configs/tcm-bf518.h
@@ -116,7 +116,6 @@
#define CONFIG_UART_CONSOLE 0
#define CONFIG_BOOTCOMMAND "run flashboot"
#define FLASHBOOT_ENV_SETTINGS "flashboot=bootm 0x20040000\0"
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/*
* Pull in common ADI header for remaining command/environment setup
diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index c4c1c57..9998343 100644
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -145,7 +145,6 @@
"flashboot=flread 20040000 1000000 300000;" \
"bootm 0x1000000\0"
#define CONFIG_BOARD_SIZE_LIMIT $$((384 * 1024))
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
/*
* Pull in common ADI header for remaining command/environment setup
diff --git a/lib/Kconfig b/lib/Kconfig
index 9724eb8..88e5da7 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -1,3 +1,11 @@
menu "Library routines"
+config CC_OPTIMIZE_LIBS_FOR_SPEED
+ bool "Optimize libraries for speed"
+ help
+ Enabling this option will pass "-O2" to gcc when compiling
+ under "lib" directory.
+
+ If unsure, say N.
+
endmenu
--
1.9.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [U-Boot] [PATCH 03/10] kconfig: move CONFIG_CMD_BOOTM to Kconfig
2014-09-07 8:43 [U-Boot] [PATCH 0/10] Move some CONFIGs to Kconfig Masahiro Yamada
2014-09-07 8:43 ` [U-Boot] [PATCH 01/10] kconfig: add blank Kconfig files Masahiro Yamada
2014-09-07 8:43 ` [U-Boot] [PATCH 02/10] kconfig: move CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED to Kconfig Masahiro Yamada
@ 2014-09-07 8:43 ` Masahiro Yamada
2014-09-08 18:32 ` Simon Glass
2014-09-07 8:43 ` [U-Boot] [PATCH 04/10] kconfig: move CONFIG_CMD_CRC32 " Masahiro Yamada
` (6 subsequent siblings)
9 siblings, 1 reply; 32+ messages in thread
From: Masahiro Yamada @ 2014-09-07 8:43 UTC (permalink / raw)
To: u-boot
CONFIG_CMD_BOOTM is defined in config_cmd_defaults.h
which is forcebly included from each board.
So, the default value of "config CMD_BOOTM" should be "y".
For some boards undefining it (bf506f-ezkit, controlcenterd_TRAILBLA,
controlcenterd_TRAILBLAZER_DEVELOP, controlcenterd_TRAILBLAZER),
"# CONFIG_CMD_BOOTM is not set" should be added to their defconfig.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
common/Kconfig | 4 ++++
configs/bf506f-ezkit_defconfig | 1 +
configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig | 1 +
configs/controlcenterd_TRAILBLAZER_defconfig | 1 +
include/config_cmd_defaults.h | 1 -
include/configs/bf506f-ezkit.h | 1 -
include/configs/controlcenterd.h | 1 -
7 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/common/Kconfig b/common/Kconfig
index 5ae7190..9ae8246 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1,4 +1,8 @@
menu "Command line interface"
depends on !SPL_BUILD
+config CMD_BOOTM
+ bool "Enable boom command"
+ default y
+
endmenu
diff --git a/configs/bf506f-ezkit_defconfig b/configs/bf506f-ezkit_defconfig
index f81f412..da25718 100644
--- a/configs/bf506f-ezkit_defconfig
+++ b/configs/bf506f-ezkit_defconfig
@@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF506F_EZKIT=y
+# CONFIG_CMD_BOOTM is not set
diff --git a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
index be1a371..c8695ab 100644
--- a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
+++ b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
@@ -2,3 +2,4 @@ CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH,DEVELOP"
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_CONTROLCENTERD=y
+# CONFIG_CMD_BOOTM is not set
diff --git a/configs/controlcenterd_TRAILBLAZER_defconfig b/configs/controlcenterd_TRAILBLAZER_defconfig
index ab548a6..730b96e 100644
--- a/configs/controlcenterd_TRAILBLAZER_defconfig
+++ b/configs/controlcenterd_TRAILBLAZER_defconfig
@@ -2,3 +2,4 @@ CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH"
CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_CONTROLCENTERD=y
+# CONFIG_CMD_BOOTM is not set
diff --git a/include/config_cmd_defaults.h b/include/config_cmd_defaults.h
index a55b268..8e3d5b4 100644
--- a/include/config_cmd_defaults.h
+++ b/include/config_cmd_defaults.h
@@ -9,7 +9,6 @@
#ifndef _CONFIG_CMD_DEFAULTS_H_
#define _CONFIG_CMD_DEFAULTS_H_
-#define CONFIG_CMD_BOOTM 1
#define CONFIG_CMD_CRC32 1
#define CONFIG_CMD_EXPORTENV 1
#define CONFIG_CMD_GO 1
diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h
index 5db1819..fdd10c3 100644
--- a/include/configs/bf506f-ezkit.h
+++ b/include/configs/bf506f-ezkit.h
@@ -102,7 +102,6 @@
#define CONFIG_CMD_MEMORY
#undef CONFIG_GZIP
#undef CONFIG_ZLIB
-#undef CONFIG_CMD_BOOTM
#undef CONFIG_BOOTM_RTEMS
#undef CONFIG_BOOTM_LINUX
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 7eaaf69..bfcfa0c 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -434,7 +434,6 @@
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_LAST_STAGE_INIT
-#undef CONFIG_CMD_BOOTM
#endif /* CONFIG_TRAILBLAZER */
--
1.9.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [U-Boot] [PATCH 03/10] kconfig: move CONFIG_CMD_BOOTM to Kconfig
2014-09-07 8:43 ` [U-Boot] [PATCH 03/10] kconfig: move CONFIG_CMD_BOOTM " Masahiro Yamada
@ 2014-09-08 18:32 ` Simon Glass
0 siblings, 0 replies; 32+ messages in thread
From: Simon Glass @ 2014-09-08 18:32 UTC (permalink / raw)
To: u-boot
Hi Masahiro,
On 7 September 2014 02:43, Masahiro Yamada <yamada.m@jp.panasonic.com> wrote:
> CONFIG_CMD_BOOTM is defined in config_cmd_defaults.h
> which is forcebly included from each board.
> So, the default value of "config CMD_BOOTM" should be "y".
>
> For some boards undefining it (bf506f-ezkit, controlcenterd_TRAILBLA,
> controlcenterd_TRAILBLAZER_DEVELOP, controlcenterd_TRAILBLAZER),
> "# CONFIG_CMD_BOOTM is not set" should be added to their defconfig.
>
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> ---
>
> common/Kconfig | 4 ++++
> configs/bf506f-ezkit_defconfig | 1 +
> configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig | 1 +
> configs/controlcenterd_TRAILBLAZER_defconfig | 1 +
> include/config_cmd_defaults.h | 1 -
> include/configs/bf506f-ezkit.h | 1 -
> include/configs/controlcenterd.h | 1 -
> 7 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/common/Kconfig b/common/Kconfig
> index 5ae7190..9ae8246 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -1,4 +1,8 @@
> menu "Command line interface"
> depends on !SPL_BUILD
>
> +config CMD_BOOTM
> + bool "Enable boom command"
nit: bootm
Also could add some help text - e.g. it enables the command to boot an OS image.
Regards,
Simon
^ permalink raw reply [flat|nested] 32+ messages in thread
* [U-Boot] [PATCH 04/10] kconfig: move CONFIG_CMD_CRC32 to Kconfig
2014-09-07 8:43 [U-Boot] [PATCH 0/10] Move some CONFIGs to Kconfig Masahiro Yamada
` (2 preceding siblings ...)
2014-09-07 8:43 ` [U-Boot] [PATCH 03/10] kconfig: move CONFIG_CMD_BOOTM " Masahiro Yamada
@ 2014-09-07 8:43 ` Masahiro Yamada
2014-09-08 18:33 ` Simon Glass
2014-09-07 8:43 ` [U-Boot] [PATCH 05/10] kconfig: move CONFIG_CMD_EXPORTENV " Masahiro Yamada
` (5 subsequent siblings)
9 siblings, 1 reply; 32+ messages in thread
From: Masahiro Yamada @ 2014-09-07 8:43 UTC (permalink / raw)
To: u-boot
Since CONFIG_CMD_CRC32 is defined in config_cmd_defaults.h,
it is enabled for all the boards except the ones undefining it
explicitly:
kwb
tseries_mmc
tseries_nand
tseries_spi
vct_platinum_onenand_small
vct_platinum_small
vct_platinumavc_onenand_small
vct_platinumavc_small
vct_premium_onenand_small
vct_premium_small
The default value of this config option should be "y" and
"# CONFIG_CMD_CRC32 is not set" should be added for those exceptions.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
common/Kconfig | 4 ++++
configs/kwb_defconfig | 1 +
configs/tseries_mmc_defconfig | 1 +
configs/tseries_nand_defconfig | 1 +
configs/tseries_spi_defconfig | 1 +
configs/vct_platinum_onenand_small_defconfig | 1 +
configs/vct_platinum_small_defconfig | 1 +
configs/vct_platinumavc_onenand_small_defconfig | 1 +
configs/vct_platinumavc_small_defconfig | 1 +
configs/vct_premium_onenand_small_defconfig | 1 +
configs/vct_premium_small_defconfig | 1 +
include/config_cmd_defaults.h | 1 -
include/configs/bur_am335x_common.h | 1 -
include/configs/kwb.h | 1 -
include/configs/vct.h | 1 -
15 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/common/Kconfig b/common/Kconfig
index 9ae8246..77c72a2 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -5,4 +5,8 @@ config CMD_BOOTM
bool "Enable boom command"
default y
+config CMD_CRC32
+ bool "Enable crc32 command"
+ default y
+
endmenu
diff --git a/configs/kwb_defconfig b/configs/kwb_defconfig
index 5082ff7..106a24f 100644
--- a/configs/kwb_defconfig
+++ b/configs/kwb_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_KWB=y
+# CONFIG_CMD_CRC32 is not set
diff --git a/configs/tseries_mmc_defconfig b/configs/tseries_mmc_defconfig
index ea70705..6eda869 100644
--- a/configs/tseries_mmc_defconfig
+++ b/configs/tseries_mmc_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT"
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_TSERIES=y
+# CONFIG_CMD_CRC32 is not set
diff --git a/configs/tseries_nand_defconfig b/configs/tseries_nand_defconfig
index 599d52c..bd06d83 100644
--- a/configs/tseries_nand_defconfig
+++ b/configs/tseries_nand_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_TSERIES=y
+# CONFIG_CMD_CRC32 is not set
diff --git a/configs/tseries_spi_defconfig b/configs/tseries_spi_defconfig
index 7e57020..32ccc4e 100644
--- a/configs/tseries_spi_defconfig
+++ b/configs/tseries_spi_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT"
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_TSERIES=y
+# CONFIG_CMD_CRC32 is not set
diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig
index f7b3a91..58c7995 100644
--- a/configs/vct_platinum_onenand_small_defconfig
+++ b/configs/vct_platinum_onenand_small_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="VCT_PLATINUM,VCT_ONENAND,VCT_SMALL_IMAGE"
CONFIG_MIPS=y
CONFIG_TARGET_VCT=y
+# CONFIG_CMD_CRC32 is not set
diff --git a/configs/vct_platinum_small_defconfig b/configs/vct_platinum_small_defconfig
index 15eef48..f4f56c4 100644
--- a/configs/vct_platinum_small_defconfig
+++ b/configs/vct_platinum_small_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="VCT_PLATINUM,VCT_SMALL_IMAGE"
CONFIG_MIPS=y
CONFIG_TARGET_VCT=y
+# CONFIG_CMD_CRC32 is not set
diff --git a/configs/vct_platinumavc_onenand_small_defconfig b/configs/vct_platinumavc_onenand_small_defconfig
index e0e8e44..31b4c9a 100644
--- a/configs/vct_platinumavc_onenand_small_defconfig
+++ b/configs/vct_platinumavc_onenand_small_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="VCT_PLATINUMAVC,VCT_ONENAND,VCT_SMALL_IMAGE"
CONFIG_MIPS=y
CONFIG_TARGET_VCT=y
+# CONFIG_CMD_CRC32 is not set
diff --git a/configs/vct_platinumavc_small_defconfig b/configs/vct_platinumavc_small_defconfig
index d8209d1..23f6561 100644
--- a/configs/vct_platinumavc_small_defconfig
+++ b/configs/vct_platinumavc_small_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="VCT_PLATINUMAVC,VCT_SMALL_IMAGE"
CONFIG_MIPS=y
CONFIG_TARGET_VCT=y
+# CONFIG_CMD_CRC32 is not set
diff --git a/configs/vct_premium_onenand_small_defconfig b/configs/vct_premium_onenand_small_defconfig
index 220f875..354793e 100644
--- a/configs/vct_premium_onenand_small_defconfig
+++ b/configs/vct_premium_onenand_small_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="VCT_PREMIUM,VCT_ONENAND,VCT_SMALL_IMAGE"
CONFIG_MIPS=y
CONFIG_TARGET_VCT=y
+# CONFIG_CMD_CRC32 is not set
diff --git a/configs/vct_premium_small_defconfig b/configs/vct_premium_small_defconfig
index 5335472..a23ddb7 100644
--- a/configs/vct_premium_small_defconfig
+++ b/configs/vct_premium_small_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="VCT_PREMIUM,VCT_SMALL_IMAGE"
CONFIG_MIPS=y
CONFIG_TARGET_VCT=y
+# CONFIG_CMD_CRC32 is not set
diff --git a/include/config_cmd_defaults.h b/include/config_cmd_defaults.h
index 8e3d5b4..896d4e5 100644
--- a/include/config_cmd_defaults.h
+++ b/include/config_cmd_defaults.h
@@ -9,7 +9,6 @@
#ifndef _CONFIG_CMD_DEFAULTS_H_
#define _CONFIG_CMD_DEFAULTS_H_
-#define CONFIG_CMD_CRC32 1
#define CONFIG_CMD_EXPORTENV 1
#define CONFIG_CMD_GO 1
#define CONFIG_CMD_IMPORTENV 1
diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h
index 3f889f8..e9d5d01 100644
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -151,7 +151,6 @@
#undef CONFIG_CMD_NFS
#undef CONFIG_CMD_SETGETDCR
#undef CONFIG_CMD_XIMG
-#undef CONFIG_CMD_CRC32
/* define command we need always */
#define CONFIG_CMD_ECHO
#define CONFIG_CMD_SOURCE
diff --git a/include/configs/kwb.h b/include/configs/kwb.h
index 0860434..29b263f 100644
--- a/include/configs/kwb.h
+++ b/include/configs/kwb.h
@@ -89,7 +89,6 @@
#undef CONFIG_BOOTM_RTEMS
#undef CONFIG_GZIP
#undef CONFIG_ZLIB
-#undef CONFIG_CMD_CRC32
/* USB configuration */
#define CONFIG_USB_MUSB_DSPS
diff --git a/include/configs/vct.h b/include/configs/vct.h
index 5ab4de3..217ba2f 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -296,7 +296,6 @@ int vct_gpio_get(int pin);
#undef CONFIG_CMD_BEDBUG
#undef CONFIG_CMD_CACHE
#undef CONFIG_CMD_CONSOLE
-#undef CONFIG_CMD_CRC32
#undef CONFIG_CMD_DHCP
#undef CONFIG_CMD_EEPROM
#undef CONFIG_CMD_EEPROM
--
1.9.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [U-Boot] [PATCH 05/10] kconfig: move CONFIG_CMD_EXPORTENV to Kconfig
2014-09-07 8:43 [U-Boot] [PATCH 0/10] Move some CONFIGs to Kconfig Masahiro Yamada
` (3 preceding siblings ...)
2014-09-07 8:43 ` [U-Boot] [PATCH 04/10] kconfig: move CONFIG_CMD_CRC32 " Masahiro Yamada
@ 2014-09-07 8:43 ` Masahiro Yamada
2014-09-08 18:35 ` Simon Glass
2014-09-07 8:43 ` [U-Boot] [PATCH 06/10] kconfig: move CONFIG_CMD_GO " Masahiro Yamada
` (4 subsequent siblings)
9 siblings, 1 reply; 32+ messages in thread
From: Masahiro Yamada @ 2014-09-07 8:43 UTC (permalink / raw)
To: u-boot
Since CONFIG_CMD_EXPORTENV is defined in config_cmd_defaults.h,
it should be enabled for all the boards except bf506f-ezkit
that undefs it explicitely.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
common/Kconfig | 4 ++++
configs/bf506f-ezkit_defconfig | 1 +
include/config_cmd_defaults.h | 1 -
include/configs/bf506f-ezkit.h | 1 -
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/common/Kconfig b/common/Kconfig
index 77c72a2..99164cd 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -9,4 +9,8 @@ config CMD_CRC32
bool "Enable crc32 command"
default y
+config CMD_EXPORTENV
+ bool "Enable env export command"
+ default y
+
endmenu
diff --git a/configs/bf506f-ezkit_defconfig b/configs/bf506f-ezkit_defconfig
index da25718..09c9899 100644
--- a/configs/bf506f-ezkit_defconfig
+++ b/configs/bf506f-ezkit_defconfig
@@ -1,3 +1,4 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF506F_EZKIT=y
# CONFIG_CMD_BOOTM is not set
+# CONFIG_CMD_EXPORTENV is not set
diff --git a/include/config_cmd_defaults.h b/include/config_cmd_defaults.h
index 896d4e5..5761d7c 100644
--- a/include/config_cmd_defaults.h
+++ b/include/config_cmd_defaults.h
@@ -9,7 +9,6 @@
#ifndef _CONFIG_CMD_DEFAULTS_H_
#define _CONFIG_CMD_DEFAULTS_H_
-#define CONFIG_CMD_EXPORTENV 1
#define CONFIG_CMD_GO 1
#define CONFIG_CMD_IMPORTENV 1
diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h
index fdd10c3..f9936a7 100644
--- a/include/configs/bf506f-ezkit.h
+++ b/include/configs/bf506f-ezkit.h
@@ -85,7 +85,6 @@
*/
#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_SIZE 0x400
-#undef CONFIG_CMD_EXPORTENV
#undef CONFIG_CMD_IMPORTENV
--
1.9.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [U-Boot] [PATCH 06/10] kconfig: move CONFIG_CMD_GO to Kconfig
2014-09-07 8:43 [U-Boot] [PATCH 0/10] Move some CONFIGs to Kconfig Masahiro Yamada
` (4 preceding siblings ...)
2014-09-07 8:43 ` [U-Boot] [PATCH 05/10] kconfig: move CONFIG_CMD_EXPORTENV " Masahiro Yamada
@ 2014-09-07 8:43 ` Masahiro Yamada
2014-09-08 18:35 ` Simon Glass
2014-09-07 8:43 ` [U-Boot] [PATCH 07/10] kconfig: move CONFIG_CMD_IMPORTENV " Masahiro Yamada
` (3 subsequent siblings)
9 siblings, 1 reply; 32+ messages in thread
From: Masahiro Yamada @ 2014-09-07 8:43 UTC (permalink / raw)
To: u-boot
Since CONFIG_CMD_GO is defined in config_cmd_defaults.h
(and no board undefs it its own header), it can be moved to
Kconfig with the default value "y".
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
common/Kconfig | 4 ++++
include/config_cmd_defaults.h | 1 -
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/common/Kconfig b/common/Kconfig
index 99164cd..fb14491 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -13,4 +13,8 @@ config CMD_EXPORTENV
bool "Enable env export command"
default y
+config CMD_GO
+ bool "Enable go command"
+ default y
+
endmenu
diff --git a/include/config_cmd_defaults.h b/include/config_cmd_defaults.h
index 5761d7c..0ef63ee 100644
--- a/include/config_cmd_defaults.h
+++ b/include/config_cmd_defaults.h
@@ -9,7 +9,6 @@
#ifndef _CONFIG_CMD_DEFAULTS_H_
#define _CONFIG_CMD_DEFAULTS_H_
-#define CONFIG_CMD_GO 1
#define CONFIG_CMD_IMPORTENV 1
#endif
--
1.9.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [U-Boot] [PATCH 07/10] kconfig: move CONFIG_CMD_IMPORTENV to Kconfig
2014-09-07 8:43 [U-Boot] [PATCH 0/10] Move some CONFIGs to Kconfig Masahiro Yamada
` (5 preceding siblings ...)
2014-09-07 8:43 ` [U-Boot] [PATCH 06/10] kconfig: move CONFIG_CMD_GO " Masahiro Yamada
@ 2014-09-07 8:43 ` Masahiro Yamada
2014-09-08 18:36 ` Simon Glass
2014-09-07 8:43 ` [U-Boot] [PATCH 08/10] kconfig: remove config_cmd_defaults.h Masahiro Yamada
` (2 subsequent siblings)
9 siblings, 1 reply; 32+ messages in thread
From: Masahiro Yamada @ 2014-09-07 8:43 UTC (permalink / raw)
To: u-boot
Since CONFIG_CMD_IMPORTENV is defined in config_cmd_defaults.h,
it should be enabled for all the boards except bf506f-ezkit
that undefs it explicitely.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
common/Kconfig | 4 ++++
configs/bf506f-ezkit_defconfig | 1 +
include/config_cmd_defaults.h | 1 -
include/configs/bf506f-ezkit.h | 1 -
include/configs/h2200.h | 1 -
5 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/common/Kconfig b/common/Kconfig
index fb14491..41c872c 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -13,6 +13,10 @@ config CMD_EXPORTENV
bool "Enable env export command"
default y
+config CMD_IMPORTENV
+ bool "Enable env import command"
+ default y
+
config CMD_GO
bool "Enable go command"
default y
diff --git a/configs/bf506f-ezkit_defconfig b/configs/bf506f-ezkit_defconfig
index 09c9899..f164e06 100644
--- a/configs/bf506f-ezkit_defconfig
+++ b/configs/bf506f-ezkit_defconfig
@@ -2,3 +2,4 @@ CONFIG_BLACKFIN=y
CONFIG_TARGET_BF506F_EZKIT=y
# CONFIG_CMD_BOOTM is not set
# CONFIG_CMD_EXPORTENV is not set
+# CONFIG_CMD_IMPORTENV is not set
diff --git a/include/config_cmd_defaults.h b/include/config_cmd_defaults.h
index 0ef63ee..d1b3af5 100644
--- a/include/config_cmd_defaults.h
+++ b/include/config_cmd_defaults.h
@@ -9,6 +9,5 @@
#ifndef _CONFIG_CMD_DEFAULTS_H_
#define _CONFIG_CMD_DEFAULTS_H_
-#define CONFIG_CMD_IMPORTENV 1
#endif
diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h
index f9936a7..0b66cdb 100644
--- a/include/configs/bf506f-ezkit.h
+++ b/include/configs/bf506f-ezkit.h
@@ -85,7 +85,6 @@
*/
#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_SIZE 0x400
-#undef CONFIG_CMD_IMPORTENV
/*
diff --git a/include/configs/h2200.h b/include/configs/h2200.h
index 9470ad6..109cee9 100644
--- a/include/configs/h2200.h
+++ b/include/configs/h2200.h
@@ -116,7 +116,6 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 38400, 115200 }
-#define CONFIG_CMD_IMPORTENV 1
#define CONFIG_CMD_LOADB
#define CONFIG_CMD_SOURCE
#define CONFIG_CMD_RUN
--
1.9.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [U-Boot] [PATCH 08/10] kconfig: remove config_cmd_defaults.h
2014-09-07 8:43 [U-Boot] [PATCH 0/10] Move some CONFIGs to Kconfig Masahiro Yamada
` (6 preceding siblings ...)
2014-09-07 8:43 ` [U-Boot] [PATCH 07/10] kconfig: move CONFIG_CMD_IMPORTENV " Masahiro Yamada
@ 2014-09-07 8:43 ` Masahiro Yamada
2014-09-08 18:39 ` Simon Glass
2014-09-07 8:43 ` [U-Boot] [PATCH 09/10] kconfig: move CONFIG_OF_* to Kconfig Masahiro Yamada
2014-09-07 8:43 ` [U-Boot] [PATCH 10/10] kconfig: CONFIG_DEFAULT_DEVICE_TREE to kconfig Masahiro Yamada
9 siblings, 1 reply; 32+ messages in thread
From: Masahiro Yamada @ 2014-09-07 8:43 UTC (permalink / raw)
To: u-boot
Now config_cmd_defaults.h is empty so it can be deleted safely.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
include/config_cmd_defaults.h | 13 -------------
scripts/Makefile.autoconf | 1 -
2 files changed, 14 deletions(-)
delete mode 100644 include/config_cmd_defaults.h
diff --git a/include/config_cmd_defaults.h b/include/config_cmd_defaults.h
deleted file mode 100644
index d1b3af5..0000000
--- a/include/config_cmd_defaults.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * config_cmd_defaults.h - sane defaults for everyone
- *
- * Copyright (c) 2010-2011 Analog Devices Inc.
- *
- * Licensed under the GPL-2 or later.
- */
-
-#ifndef _CONFIG_CMD_DEFAULTS_H_
-#define _CONFIG_CMD_DEFAULTS_H_
-
-
-#endif
diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index 44c3997..ced2b9a 100644
--- a/scripts/Makefile.autoconf
+++ b/scripts/Makefile.autoconf
@@ -74,7 +74,6 @@ define filechk_config_h
| sed '/=/ {s/=/ /;q; } ; { s/$$/ 1/; }'; \
done; \
echo \#define CONFIG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\
- echo \#include \<config_cmd_defaults.h\>; \
echo \#include \<config_defaults.h\>; \
echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \
echo \#include \<asm/config.h\>; \
--
1.9.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [U-Boot] [PATCH 09/10] kconfig: move CONFIG_OF_* to Kconfig
2014-09-07 8:43 [U-Boot] [PATCH 0/10] Move some CONFIGs to Kconfig Masahiro Yamada
` (7 preceding siblings ...)
2014-09-07 8:43 ` [U-Boot] [PATCH 08/10] kconfig: remove config_cmd_defaults.h Masahiro Yamada
@ 2014-09-07 8:43 ` Masahiro Yamada
2014-09-08 15:04 ` Stephen Warren
2014-09-08 19:23 ` Daniel Schwierzeck
2014-09-07 8:43 ` [U-Boot] [PATCH 10/10] kconfig: CONFIG_DEFAULT_DEVICE_TREE to kconfig Masahiro Yamada
9 siblings, 2 replies; 32+ messages in thread
From: Masahiro Yamada @ 2014-09-07 8:43 UTC (permalink / raw)
To: u-boot
This commit moves:
CONFIG_OF_CONTROL
CONFIG_OF_SEPARATE
CONFIG_OF_EMBED
CONFIG_OF_HOSTFILE
Because these options are currently not supported for SPL,
the "Device Tree Control" menu does not appear in the SPL
configuration.
Note:
zynq-common.h should be adjusted so as not to change the
default value of CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Michal Simek <michal.simek@xilinx.com>
---
Kconfig | 2 ++
configs/am335x_boneblack_vboot_defconfig | 1 +
configs/arndale_defconfig | 1 +
configs/beaver_defconfig | 1 +
configs/cardhu_defconfig | 1 +
configs/colibri_t20_iris_defconfig | 1 +
configs/colibri_t30_defconfig | 1 +
configs/coreboot-x86_defconfig | 1 +
configs/dalmore_defconfig | 1 +
configs/harmony_defconfig | 1 +
configs/jetson-tk1_defconfig | 1 +
configs/medcom-wide_defconfig | 1 +
configs/microblaze-generic_defconfig | 2 ++
configs/origen_defconfig | 1 +
configs/paz00_defconfig | 1 +
configs/peach-pit_defconfig | 1 +
configs/plutux_defconfig | 1 +
configs/s5pc210_universal_defconfig | 1 +
configs/sandbox_defconfig | 1 +
configs/seaboard_defconfig | 1 +
configs/smdk5250_defconfig | 1 +
configs/smdk5420_defconfig | 1 +
configs/snow_defconfig | 1 +
configs/tec-ng_defconfig | 1 +
configs/tec_defconfig | 1 +
configs/trats2_defconfig | 1 +
configs/trats_defconfig | 1 +
configs/trimslice_defconfig | 1 +
configs/venice2_defconfig | 1 +
configs/ventana_defconfig | 1 +
configs/whistler_defconfig | 1 +
configs/zynq_microzed_defconfig | 1 +
configs/zynq_zc70x_defconfig | 1 +
configs/zynq_zc770_xm010_defconfig | 1 +
configs/zynq_zc770_xm012_defconfig | 1 +
configs/zynq_zc770_xm013_defconfig | 1 +
configs/zynq_zed_defconfig | 1 +
dts/Kconfig | 46 ++++++++++++++++++++++++++++++++
include/configs/am335x_evm.h | 2 --
include/configs/arndale.h | 2 --
include/configs/beaver.h | 2 --
include/configs/cardhu.h | 2 --
include/configs/colibri_t20_iris.h | 2 --
include/configs/colibri_t30.h | 2 --
include/configs/coreboot.h | 2 --
include/configs/dalmore.h | 2 --
include/configs/exynos4-dt.h | 2 --
include/configs/exynos5-dt.h | 2 --
include/configs/harmony.h | 2 --
include/configs/jetson-tk1.h | 2 --
include/configs/medcom-wide.h | 2 --
include/configs/microblaze-generic.h | 2 --
include/configs/mx6qsabreauto.h | 1 -
include/configs/paz00.h | 2 --
include/configs/plutux.h | 2 --
include/configs/sandbox.h | 2 --
include/configs/seaboard.h | 2 --
include/configs/tec-ng.h | 2 --
include/configs/tec.h | 2 --
include/configs/tegra-common-post.h | 1 -
include/configs/trimslice.h | 2 --
include/configs/venice2.h | 2 --
include/configs/ventana.h | 2 --
include/configs/whistler.h | 2 --
include/configs/zynq-common.h | 9 +------
65 files changed, 86 insertions(+), 58 deletions(-)
create mode 100644 dts/Kconfig
diff --git a/Kconfig b/Kconfig
index fc5e7cd..e0c8992 100644
--- a/Kconfig
+++ b/Kconfig
@@ -106,6 +106,8 @@ source "arch/Kconfig"
source "common/Kconfig"
+source "dts/Kconfig"
+
source "net/Kconfig"
source "drivers/Kconfig"
diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index 00317c4..af7ceca 100644
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT,ENABLE_VBOOT"
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_AM335X_EVM=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index 7ea5c0d..737bb3e 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_EXYNOS=y
+S:CONFIG_TARGET_ARNDALE=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index 7c9d94b..9427faf 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -2,3 +2,4 @@
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA30=y
+S:CONFIG_TARGET_BEAVER=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index bb042b4..232a778 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -2,3 +2,4 @@
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA30=y
+S:CONFIG_TARGET_CARDHU=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/colibri_t20_iris_defconfig b/configs/colibri_t20_iris_defconfig
index b2a21e1..094fb9f 100644
--- a/configs/colibri_t20_iris_defconfig
+++ b/configs/colibri_t20_iris_defconfig
@@ -2,3 +2,4 @@
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_COLIBRI_T20_IRIS=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index abb41f3..5f35fa1 100644
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -2,3 +2,4 @@
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA30=y
+S:CONFIG_TARGET_COLIBRI_T30=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index a06c527..3cc034a 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x01110000"
CONFIG_X86=y
CONFIG_TARGET_COREBOOT=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
index 70677aa..ca6b664 100644
--- a/configs/dalmore_defconfig
+++ b/configs/dalmore_defconfig
@@ -2,3 +2,4 @@
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA114=y
+S:CONFIG_TARGET_DALMORE=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index a52231b..d29e8d2 100644
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -2,3 +2,4 @@
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_HARMONY=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 00eac92..1c385a6 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -2,3 +2,4 @@
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA124=y
+S:CONFIG_TARGET_JETSON_TK1=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig
index e9a3930..5674e9b 100644
--- a/configs/medcom-wide_defconfig
+++ b/configs/medcom-wide_defconfig
@@ -2,3 +2,4 @@
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_MEDCOM_WIDE=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 7f23786..1dc7441 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -1,3 +1,5 @@
CONFIG_SPL=y
+S:CONFIG_MICROBLAZE=y
+S:CONFIG_TARGET_MICROBLAZE_GENERIC=y
+CONFIG_OF_CONTROL=y
+CONFIG_OF_EMBED=y
diff --git a/configs/origen_defconfig b/configs/origen_defconfig
index aa92381..1d712e8 100644
--- a/configs/origen_defconfig
+++ b/configs/origen_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_EXYNOS=y
+S:CONFIG_TARGET_ORIGEN=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig
index 05974eb..a682f4c 100644
--- a/configs/paz00_defconfig
+++ b/configs/paz00_defconfig
@@ -2,3 +2,4 @@
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_PAZ00=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
index 797d5e0..9f3530a 100644
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_EXYNOS=y
+S:CONFIG_TARGET_PEACH_PIT=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig
index 60e80ff..03374fe 100644
--- a/configs/plutux_defconfig
+++ b/configs/plutux_defconfig
@@ -2,3 +2,4 @@
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_PLUTUX=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig
index a9a3446..0a3ad0d 100644
--- a/configs/s5pc210_universal_defconfig
+++ b/configs/s5pc210_universal_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_S5PC210_UNIVERSAL=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index e69de29..dd84281 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -0,0 +1 @@
+CONFIG_OF_CONTROL=y
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 516e760..9e2028b 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -2,3 +2,4 @@
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_SEABOARD=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 465a75a..5cdfa63 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_EXYNOS=y
+S:CONFIG_TARGET_SMDK5250=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
index 9dc43f2..4619c62 100644
--- a/configs/smdk5420_defconfig
+++ b/configs/smdk5420_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_EXYNOS=y
+S:CONFIG_TARGET_SMDK5420=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 2d59046..c201c84 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_EXYNOS=y
+S:CONFIG_TARGET_SNOW=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
index e4a31cc..501d449 100644
--- a/configs/tec-ng_defconfig
+++ b/configs/tec-ng_defconfig
@@ -2,3 +2,4 @@
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA30=y
+S:CONFIG_TARGET_TEC_NG=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/tec_defconfig b/configs/tec_defconfig
index 62a9542..fe743f9 100644
--- a/configs/tec_defconfig
+++ b/configs/tec_defconfig
@@ -2,3 +2,4 @@
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_TEC=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig
index fa82724..666011c 100644
--- a/configs/trats2_defconfig
+++ b/configs/trats2_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_TRATS2=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/trats_defconfig b/configs/trats_defconfig
index f888a51..6ef4b33 100644
--- a/configs/trats_defconfig
+++ b/configs/trats_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_TRATS=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index 94f23e3..8b1a13e 100644
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -2,3 +2,4 @@
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_TRIMSLICE=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
index dfc5407..3897862 100644
--- a/configs/venice2_defconfig
+++ b/configs/venice2_defconfig
@@ -2,3 +2,4 @@
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA124=y
+S:CONFIG_TARGET_VENICE2=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index 845e241..7398d11 100644
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -2,3 +2,4 @@
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_VENTANA=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/whistler_defconfig b/configs/whistler_defconfig
index 8c07c18..a275005 100644
--- a/configs/whistler_defconfig
+++ b/configs/whistler_defconfig
@@ -2,3 +2,4 @@
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_WHISTLER=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index 3aedb35..9767863 100644
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_MICROZED=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/zynq_zc70x_defconfig b/configs/zynq_zc70x_defconfig
index 04c8def..d303f97 100644
--- a/configs/zynq_zc70x_defconfig
+++ b/configs/zynq_zc70x_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZC70X=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig
index 1178b40..4e6660f 100644
--- a/configs/zynq_zc770_xm010_defconfig
+++ b/configs/zynq_zc770_xm010_defconfig
@@ -3,3 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
+S:CONFIG_ARM=y
+S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZC770=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig
index 52c2121..16d62e6 100644
--- a/configs/zynq_zc770_xm012_defconfig
+++ b/configs/zynq_zc770_xm012_defconfig
@@ -3,3 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
+S:CONFIG_ARM=y
+S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZC770=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig
index 836809a..7343a64 100644
--- a/configs/zynq_zc770_xm013_defconfig
+++ b/configs/zynq_zc770_xm013_defconfig
@@ -3,3 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
+S:CONFIG_ARM=y
+S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZC770=y
+CONFIG_OF_CONTROL=y
diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index 2337906..38d5fa6 100644
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZED=y
+CONFIG_OF_CONTROL=y
diff --git a/dts/Kconfig b/dts/Kconfig
new file mode 100644
index 0000000..98b2357
--- /dev/null
+++ b/dts/Kconfig
@@ -0,0 +1,46 @@
+#
+# Device Tree Control
+#
+# TODO:
+# This feature is not currently supported for SPL,
+# but this restriction should be removed in the future.
+
+menu "Device Tree Control"
+ depends on !SPL_BUILD
+ depends on ARM || MICROBLAZE || SANDBOX || X86
+
+config OF_CONTROL
+ bool "Run-time configuration via Device Tree"
+ help
+ This feature provides for run-time configuration of U-Boot
+ via a flattened device tree.
+
+choice
+ prompt "Provider of DTB for DT control"
+ depends on OF_CONTROL
+ default OF_HOSTFILE if SANDBOX
+ default OF_SEPARATE
+
+config OF_SEPARATE
+ bool "Separate DTB for DT control"
+ help
+ If this option is enabled, the device tree will be built and
+ placed as a separate u-boot.dtb file alongside the U-Boot image.
+
+config OF_EMBED
+ bool "Embedded DTB for DT control"
+ help
+ If this option is enabled, the device tree will be picked up and
+ built into the U-Boot image.
+
+config OF_HOSTFILE
+ bool "Host filed DTB for DT control"
+ depends on SANDBOX
+ help
+ If this option is enabled, DTB will be read from a file on startup.
+ This is only useful for Sandbox. Use the -d flag to U-Boot to
+ specify the file to read.
+
+endchoice
+
+endmenu
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index df1a6fc..47a173f 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -23,8 +23,6 @@
# define CONFIG_TIMESTAMP
# define CONFIG_LZO
# ifdef CONFIG_ENABLE_VBOOT
-# define CONFIG_OF_CONTROL
-# define CONFIG_OF_SEPARATE
# define CONFIG_DEFAULT_DEVICE_TREE am335x-boneblack
# define CONFIG_FIT_SIGNATURE
# define CONFIG_RSA
diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index 75f9933..7f06907 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -22,8 +22,6 @@
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
/* Allow tracing to be enabled */
#define CONFIG_TRACE
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index d8ed717..4c7cf5f 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -26,8 +26,6 @@
/* Enable fdt support for Beaver. Flash the image in u-boot-dtb.bin */
#define CONFIG_DEFAULT_DEVICE_TREE tegra30-beaver
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
/* High-level configuration options */
#define V_PROMPT "Tegra30 (Beaver) # "
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 59f429c..1616a54 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -26,8 +26,6 @@
/* Enable fdt support for Cardhu. Flash the image in u-boot-dtb.bin */
#define CONFIG_DEFAULT_DEVICE_TREE tegra30-cardhu
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
/* High-level configuration options */
#define V_PROMPT "Tegra30 (Cardhu) # "
diff --git a/include/configs/colibri_t20_iris.h b/include/configs/colibri_t20_iris.h
index 6f9e08c..3ce1f9b 100644
--- a/include/configs/colibri_t20_iris.h
+++ b/include/configs/colibri_t20_iris.h
@@ -11,8 +11,6 @@
/* Enable FDT support */
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-colibri_t20_iris
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
/* High-level configuration options */
#define V_PROMPT "Tegra20 (Colibri) # "
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index eacff5b..d9e2d86 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -12,8 +12,6 @@
#include "tegra30-common.h"
#define CONFIG_DEFAULT_DEVICE_TREE tegra30-colibri
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
#define V_PROMPT "Colibri T30 # "
#define CONFIG_TEGRA_BOARD_STRING "Toradex Colibri T30"
diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
index a1a63a0..915245e 100644
--- a/include/configs/coreboot.h
+++ b/include/configs/coreboot.h
@@ -28,8 +28,6 @@
#define CONFIG_LMB
#define CONFIG_OF_LIBFDT
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
#define CONFIG_DEFAULT_DEVICE_TREE link
#define CONFIG_BOOTSTAGE
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index fd774a3..e3bb27f 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -23,8 +23,6 @@
/* Enable fdt support for Dalmore. Flash the image in u-boot-dtb.bin */
#define CONFIG_DEFAULT_DEVICE_TREE tegra114-dalmore
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
/* High-level configuration options */
#define V_PROMPT "Tegra114 (Dalmore) # "
diff --git a/include/configs/exynos4-dt.h b/include/configs/exynos4-dt.h
index 7dac1a3..27e32da 100644
--- a/include/configs/exynos4-dt.h
+++ b/include/configs/exynos4-dt.h
@@ -23,8 +23,6 @@
#define CONFIG_SYS_GENERIC_BOARD
/* Enable fdt support */
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
#define CONFIG_SYS_CACHELINE_SIZE 32
diff --git a/include/configs/exynos5-dt.h b/include/configs/exynos5-dt.h
index a7c6292..5488363 100644
--- a/include/configs/exynos5-dt.h
+++ b/include/configs/exynos5-dt.h
@@ -25,8 +25,6 @@
#define CONFIG_EXYNOS_SPL
/* Enable fdt support for Exynos5250 */
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
/* Allow tracing to be enabled */
#define CONFIG_TRACE
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 3ec0e41..97db202 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -13,8 +13,6 @@
/* Enable fdt support for Harmony. Flash the image in u-boot-dtb.bin */
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-harmony
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
/* High-level configuration options */
#define V_PROMPT "Tegra20 (Harmony) # "
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index d03a66c..dc7e324 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -14,8 +14,6 @@
/* Enable fdt support for Jetson TK1. Flash the image in u-boot-dtb.bin */
#define CONFIG_DEFAULT_DEVICE_TREE tegra124-jetson-tk1
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
/* High-level configuration options */
#define V_PROMPT "Tegra124 (Jetson TK1) # "
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index 40155c3..5e52574 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -14,8 +14,6 @@
/* Enable fdt support for Medcom-Wide. Flash the image in u-boot-dtb.bin */
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-medcom-wide
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
/* High-level configuration options */
#define V_PROMPT "Tegra20 (Medcom-Wide) # "
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 1a82a57..f5e83ff 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -15,8 +15,6 @@
#define MICROBLAZE_V5 1
/* Open Firmware DTS */
-#define CONFIG_OF_CONTROL 1
-#define CONFIG_OF_EMBED 1
#define CONFIG_DEFAULT_DEVICE_TREE microblaze-generic
/* linear and spi flash memory */
diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
index d1639c4..95f4600 100644
--- a/include/configs/mx6qsabreauto.h
+++ b/include/configs/mx6qsabreauto.h
@@ -45,7 +45,6 @@
#define CONFIG_SYS_I2C_MXC
#define CONFIG_SYS_I2C_SPEED 100000
-#define CONFIG_OF_SEPARATE
#define CONFIG_DEFAULT_DEVICE_TREE imx6q-sabreauto
#endif /* __MX6QSABREAUTO_CONFIG_H */
diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index dd0abf8..01cb649 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -22,8 +22,6 @@
/* Enable fdt support for Paz00. Flash the image in u-boot-dtb.bin */
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-paz00
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
/* High-level configuration options */
#define V_PROMPT "Tegra20 (Paz00) MOD # "
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index a473f23..719d81a 100644
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -14,8 +14,6 @@
/* Enable fdt support for Plutux. Flash the image in u-boot-dtb.bin */
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-plutux
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
/* High-level configuration options */
#define V_PROMPT "Tegra20 (Plutux) # "
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index bf2d25c..4998152 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -35,8 +35,6 @@
/* Number of bits in a C 'long' on this architecture */
#define CONFIG_SANDBOX_BITS_PER_LONG 64
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_HOSTFILE
#define CONFIG_OF_LIBFDT
#define CONFIG_LMB
#define CONFIG_FIT
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index fc4f976..e61811d 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -21,8 +21,6 @@
/* Enable fdt support for Seaboard. Flash the image in u-boot-dtb.bin */
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-seaboard
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
/* High-level configuration options */
#define V_PROMPT "Tegra20 (SeaBoard) # "
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index 13baa76..5b4c255 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -12,8 +12,6 @@
/* Enable fdt support for tec-ng. Flash the image in u-boot-dtb.bin */
#define CONFIG_DEFAULT_DEVICE_TREE tegra30-tec-ng
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
/* High-level configuration options */
#define V_PROMPT "Tegra30 (TEC-NG) # "
diff --git a/include/configs/tec.h b/include/configs/tec.h
index 90e7b7a..0598d5d 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -14,8 +14,6 @@
/* Enable fdt support for TEC. Flash the image in u-boot-dtb.bin */
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-tec
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
/* High-level configuration options */
#define V_PROMPT "Tegra20 (TEC) # "
diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index c337e30..23e3c8a 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -69,7 +69,6 @@
/* remove devicetree support */
#ifdef CONFIG_OF_CONTROL
-#undef CONFIG_OF_CONTROL
#endif
/* remove I2C support */
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index f81cfa2..2ef010c 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -13,8 +13,6 @@
/* Enable fdt support for TrimSlice. Flash the image in u-boot-dtb.bin */
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-trimslice
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
/* High-level configuration options */
#define V_PROMPT "Tegra20 (TrimSlice) # "
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index 6d4e999..b516d92 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -14,8 +14,6 @@
/* Enable fdt support for Venice2. Flash the image in u-boot-dtb.bin */
#define CONFIG_DEFAULT_DEVICE_TREE tegra124-venice2
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
/* High-level configuration options */
#define V_PROMPT "Tegra124 (Venice2) # "
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index edf3720..3b9d142 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -13,8 +13,6 @@
/* Enable fdt support for Ventana. Flash the image in u-boot-dtb.bin */
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-ventana
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
/* High-level configuration options */
#define V_PROMPT "Tegra20 (Ventana) # "
diff --git a/include/configs/whistler.h b/include/configs/whistler.h
index 9e09f03..f3bf806 100644
--- a/include/configs/whistler.h
+++ b/include/configs/whistler.h
@@ -13,8 +13,6 @@
/* Enable fdt support for Whistler. Flash the image in u-boot-dtb.bin */
#define CONFIG_DEFAULT_DEVICE_TREE tegra20-whistler
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
/* High-level configuration options */
#define V_PROMPT "Tegra20 (Whistler) # "
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 875cb43..5d6472f 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -227,8 +227,6 @@
#define CONFIG_IMAGE_FORMAT_LEGACY /* enable also legacy image format */
/* FDT support */
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
#define CONFIG_DISPLAY_BOARDINFO_LATE
/* RSA support */
@@ -273,18 +271,13 @@
#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
#define CONFIG_SPL_LIBDISK_SUPPORT
#define CONFIG_SPL_FAT_SUPPORT
-#if defined(CONFIG_OF_CONTROL) && defined(CONFIG_OF_SEPARATE)
-# define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot-dtb.img"
-#else
-# define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
-#endif
+#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot-dtb.img"
#endif
/* Disable dcache for SPL just for sure */
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_DCACHE_OFF
#undef CONFIG_FPGA
-#undef CONFIG_OF_CONTROL
#endif
/* Address in RAM where the parameters must be copied by SPL. */
--
1.9.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [U-Boot] [PATCH 09/10] kconfig: move CONFIG_OF_* to Kconfig
2014-09-07 8:43 ` [U-Boot] [PATCH 09/10] kconfig: move CONFIG_OF_* to Kconfig Masahiro Yamada
@ 2014-09-08 15:04 ` Stephen Warren
2014-09-08 15:57 ` Masahiro YAMADA
2014-09-08 19:23 ` Daniel Schwierzeck
1 sibling, 1 reply; 32+ messages in thread
From: Stephen Warren @ 2014-09-08 15:04 UTC (permalink / raw)
To: u-boot
On 09/07/2014 02:43 AM, Masahiro Yamada wrote:
> This commit moves:
> CONFIG_OF_CONTROL
> CONFIG_OF_SEPARATE
> CONFIG_OF_EMBED
> CONFIG_OF_HOSTFILE
>
> Because these options are currently not supported for SPL,
> the "Device Tree Control" menu does not appear in the SPL
> configuration.
>
> Note:
> zynq-common.h should be adjusted so as not to change the
> default value of CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME.
I don't believe this is the correct approach; CONFIG_OF_CONTROL isn't a
user-configurable option, and hence shouldn't show up in *_defconfig.
"select OF_CONTROL" in a Kconfig file probably makes sense though.
^ permalink raw reply [flat|nested] 32+ messages in thread
* [U-Boot] [PATCH 09/10] kconfig: move CONFIG_OF_* to Kconfig
2014-09-08 15:04 ` Stephen Warren
@ 2014-09-08 15:57 ` Masahiro YAMADA
2014-09-08 15:58 ` Stephen Warren
2014-09-16 12:05 ` Michal Simek
0 siblings, 2 replies; 32+ messages in thread
From: Masahiro YAMADA @ 2014-09-08 15:57 UTC (permalink / raw)
To: u-boot
Hi Stephen,
2014-09-09 0:04 GMT+09:00 Stephen Warren <swarren@wwwdotorg.org>:
> I don't believe this is the correct approach; CONFIG_OF_CONTROL isn't a
> user-configurable option, and hence shouldn't show up in *_defconfig.
> "select OF_CONTROL" in a Kconfig file probably makes sense though.
I think it depends on the board (SoC).
In my understanding, Zynq boards should work with/without Device Tree control.
(Moreover, Zynq boards work with/without SPL)
At least as for Zynq,
CONFIG_OF_CONTROL ( and CONFIG_SPL too) is a user-configurable option.
(Michal, please correct me if I am wrong.)
I am not familiar with Tegra SoCs, but
do Tegra boards always Device Tree? ( and only work with SPL ?)
If so,
config TEGRA
select SPL
select OF_CONTROL
looks better?
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 32+ messages in thread* [U-Boot] [PATCH 09/10] kconfig: move CONFIG_OF_* to Kconfig
2014-09-08 15:57 ` Masahiro YAMADA
@ 2014-09-08 15:58 ` Stephen Warren
2014-09-08 16:10 ` Masahiro YAMADA
2014-09-16 12:05 ` Michal Simek
1 sibling, 1 reply; 32+ messages in thread
From: Stephen Warren @ 2014-09-08 15:58 UTC (permalink / raw)
To: u-boot
On 09/08/2014 09:57 AM, Masahiro YAMADA wrote:
> Hi Stephen,
>
>
>
> 2014-09-09 0:04 GMT+09:00 Stephen Warren <swarren@wwwdotorg.org>:
>
>> I don't believe this is the correct approach; CONFIG_OF_CONTROL isn't a
>> user-configurable option, and hence shouldn't show up in *_defconfig.
>> "select OF_CONTROL" in a Kconfig file probably makes sense though.
>
>
> I think it depends on the board (SoC).
>
> In my understanding, Zynq boards should work with/without Device Tree control.
> (Moreover, Zynq boards work with/without SPL)
>
> At least as for Zynq,
> CONFIG_OF_CONTROL ( and CONFIG_SPL too) is a user-configurable option.
>
> (Michal, please correct me if I am wrong.)
>
>
> I am not familiar with Tegra SoCs, but
> do Tegra boards always Device Tree? ( and only work with SPL ?)
>
> If so,
>
> config TEGRA
> select SPL
> select OF_CONTROL
>
> looks better?
That looks correct for Tegra.
^ permalink raw reply [flat|nested] 32+ messages in thread
* [U-Boot] [PATCH 09/10] kconfig: move CONFIG_OF_* to Kconfig
2014-09-08 15:58 ` Stephen Warren
@ 2014-09-08 16:10 ` Masahiro YAMADA
2014-09-08 16:25 ` Masahiro YAMADA
0 siblings, 1 reply; 32+ messages in thread
From: Masahiro YAMADA @ 2014-09-08 16:10 UTC (permalink / raw)
To: u-boot
Hi Stephen,
2014-09-09 0:58 GMT+09:00 Stephen Warren <swarren@wwwdotorg.org>:
> On 09/08/2014 09:57 AM, Masahiro YAMADA wrote:
>>
>> Hi Stephen,
>>
>>
>>
>> 2014-09-09 0:04 GMT+09:00 Stephen Warren <swarren@wwwdotorg.org>:
>>
>>> I don't believe this is the correct approach; CONFIG_OF_CONTROL isn't a
>>> user-configurable option, and hence shouldn't show up in *_defconfig.
>>> "select OF_CONTROL" in a Kconfig file probably makes sense though.
>>
>>
>>
>> I think it depends on the board (SoC).
>>
>> In my understanding, Zynq boards should work with/without Device Tree
>> control.
>> (Moreover, Zynq boards work with/without SPL)
>>
>> At least as for Zynq,
>> CONFIG_OF_CONTROL ( and CONFIG_SPL too) is a user-configurable option.
>>
>> (Michal, please correct me if I am wrong.)
>>
>>
>> I am not familiar with Tegra SoCs, but
>> do Tegra boards always Device Tree? ( and only work with SPL ?)
>>
>> If so,
>>
>> config TEGRA
>> select SPL
>> select OF_CONTROL
>>
>> looks better?
>
>
> That looks correct for Tegra.
>
OK. I will send v2.
CONFIG_OF_CONTROL in tegra defconfigs will go away.
(BTW, I forgot to mention a famous board; beaglebone black.
am335_boneblack_defconfig disables CONFIG_OF_CONTROL,
whereas am335_boneblack_vboot_defconfig enables it. )
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 32+ messages in thread
* [U-Boot] [PATCH 09/10] kconfig: move CONFIG_OF_* to Kconfig
2014-09-08 16:10 ` Masahiro YAMADA
@ 2014-09-08 16:25 ` Masahiro YAMADA
0 siblings, 0 replies; 32+ messages in thread
From: Masahiro YAMADA @ 2014-09-08 16:25 UTC (permalink / raw)
To: u-boot
Hi Samsung developers,
Simon Glass,
2014-09-09 1:10 GMT+09:00 Masahiro YAMADA <yamada.m@jp.panasonic.com>:
> Hi Stephen,
>
>
> 2014-09-09 0:58 GMT+09:00 Stephen Warren <swarren@wwwdotorg.org>:
>> On 09/08/2014 09:57 AM, Masahiro YAMADA wrote:
>>>
>>> Hi Stephen,
>>>
>>>
>>>
>>> 2014-09-09 0:04 GMT+09:00 Stephen Warren <swarren@wwwdotorg.org>:
>>>
>>>> I don't believe this is the correct approach; CONFIG_OF_CONTROL isn't a
>>>> user-configurable option, and hence shouldn't show up in *_defconfig.
>>>> "select OF_CONTROL" in a Kconfig file probably makes sense though.
>>>
>>>
>>>
>>> I think it depends on the board (SoC).
>>>
>>> In my understanding, Zynq boards should work with/without Device Tree
>>> control.
>>> (Moreover, Zynq boards work with/without SPL)
>>>
>>> At least as for Zynq,
>>> CONFIG_OF_CONTROL ( and CONFIG_SPL too) is a user-configurable option.
>>>
>>> (Michal, please correct me if I am wrong.)
>>>
>>>
>>> I am not familiar with Tegra SoCs, but
>>> do Tegra boards always Device Tree? ( and only work with SPL ?)
>>>
>>> If so,
>>>
>>> config TEGRA
>>> select SPL
>>> select OF_CONTROL
>>>
>>> looks better?
>>
>>
>> That looks correct for Tegra.
>>
>
> OK. I will send v2.
> CONFIG_OF_CONTROL in tegra defconfigs will go away.
>
>
> (BTW, I forgot to mention a famous board; beaglebone black.
>
> am335_boneblack_defconfig disables CONFIG_OF_CONTROL,
> whereas am335_boneblack_vboot_defconfig enables it. )
>
Before posting v2 of this series,
please let me ask the same question on Exynos and Sandbox
Do Exynos boards always need Device Tree to run U-Boot?
(that is, CONFIG_OF_CONTROL must be "select"ed.)
or
Do they work with/without Device Tree?
(that is, users can enable/disable via "make menuconfig" or friends.)
What about Sandbox?
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 32+ messages in thread
* [U-Boot] [PATCH 09/10] kconfig: move CONFIG_OF_* to Kconfig
2014-09-08 15:57 ` Masahiro YAMADA
2014-09-08 15:58 ` Stephen Warren
@ 2014-09-16 12:05 ` Michal Simek
1 sibling, 0 replies; 32+ messages in thread
From: Michal Simek @ 2014-09-16 12:05 UTC (permalink / raw)
To: u-boot
On 09/08/2014 05:57 PM, Masahiro YAMADA wrote:
> Hi Stephen,
>
>
>
> 2014-09-09 0:04 GMT+09:00 Stephen Warren <swarren@wwwdotorg.org>:
>
>> I don't believe this is the correct approach; CONFIG_OF_CONTROL isn't a
>> user-configurable option, and hence shouldn't show up in *_defconfig.
>> "select OF_CONTROL" in a Kconfig file probably makes sense though.
>
>
> I think it depends on the board (SoC).
>
> In my understanding, Zynq boards should work with/without Device Tree control.
> (Moreover, Zynq boards work with/without SPL)
>
> At least as for Zynq,
> CONFIG_OF_CONTROL ( and CONFIG_SPL too) is a user-configurable option.
>
> (Michal, please correct me if I am wrong.)
I don't want to restrict people with thing which they want to do that's why
both options are just there.
Thanks,
Michal
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140916/630ae338/attachment.pgp>
^ permalink raw reply [flat|nested] 32+ messages in thread
* [U-Boot] [PATCH 09/10] kconfig: move CONFIG_OF_* to Kconfig
2014-09-07 8:43 ` [U-Boot] [PATCH 09/10] kconfig: move CONFIG_OF_* to Kconfig Masahiro Yamada
2014-09-08 15:04 ` Stephen Warren
@ 2014-09-08 19:23 ` Daniel Schwierzeck
2014-09-09 2:45 ` Masahiro Yamada
1 sibling, 1 reply; 32+ messages in thread
From: Daniel Schwierzeck @ 2014-09-08 19:23 UTC (permalink / raw)
To: u-boot
Hi Masahiro,
On 07.09.2014 10:43, Masahiro Yamada wrote:
> This commit moves:
> CONFIG_OF_CONTROL
> CONFIG_OF_SEPARATE
> CONFIG_OF_EMBED
> CONFIG_OF_HOSTFILE
>
> Because these options are currently not supported for SPL,
> the "Device Tree Control" menu does not appear in the SPL
> configuration.
>
> Note:
> zynq-common.h should be adjusted so as not to change the
> default value of CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME.
>
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Stephen Warren <swarren@nvidia.com>
> Cc: Minkyu Kang <mk7.kang@samsung.com>
> Cc: Michal Simek <michal.simek@xilinx.com>
> ---
[...]
> diff --git a/dts/Kconfig b/dts/Kconfig
> new file mode 100644
> index 0000000..98b2357
> --- /dev/null
> +++ b/dts/Kconfig
> @@ -0,0 +1,46 @@
> +#
> +# Device Tree Control
> +#
> +# TODO:
> +# This feature is not currently supported for SPL,
> +# but this restriction should be removed in the future.
> +
> +menu "Device Tree Control"
> + depends on !SPL_BUILD
> + depends on ARM || MICROBLAZE || SANDBOX || X86
I suggest to use boolean symbols HAS_* or SUPPORTS_* like the kernel
does. For example:
config SUPPORTS_OF_CONTROL
bool
menu "Device Tree Control"
depends on !SPL_BUILD
depends on SUPPORTS_OF_CONTROL
arch/Kconfig:
config ARM
bool "ARM architecture"
select SUPPORTS_OF_CONTROL
> +
> +config OF_CONTROL
> + bool "Run-time configuration via Device Tree"
> + help
> + This feature provides for run-time configuration of U-Boot
> + via a flattened device tree.
> +
> +choice
> + prompt "Provider of DTB for DT control"
> + depends on OF_CONTROL
> + default OF_HOSTFILE if SANDBOX
> + default OF_SEPARATE
> +
> +config OF_SEPARATE
> + bool "Separate DTB for DT control"
> + help
> + If this option is enabled, the device tree will be built and
> + placed as a separate u-boot.dtb file alongside the U-Boot image.
> +
> +config OF_EMBED
> + bool "Embedded DTB for DT control"
> + help
> + If this option is enabled, the device tree will be picked up and
> + built into the U-Boot image.
> +
> +config OF_HOSTFILE
> + bool "Host filed DTB for DT control"
> + depends on SANDBOX
> + help
> + If this option is enabled, DTB will be read from a file on startup.
> + This is only useful for Sandbox. Use the -d flag to U-Boot to
> + specify the file to read.
> +
> +endchoice
> +
> +endmenu
>
--
- Daniel
^ permalink raw reply [flat|nested] 32+ messages in thread* [U-Boot] [PATCH 09/10] kconfig: move CONFIG_OF_* to Kconfig
2014-09-08 19:23 ` Daniel Schwierzeck
@ 2014-09-09 2:45 ` Masahiro Yamada
0 siblings, 0 replies; 32+ messages in thread
From: Masahiro Yamada @ 2014-09-09 2:45 UTC (permalink / raw)
To: u-boot
Hi Daniel,
On Mon, 08 Sep 2014 21:23:05 +0200
Daniel Schwierzeck <daniel.schwierzeck@gmail.com> wrote:
>
> > diff --git a/dts/Kconfig b/dts/Kconfig
> > new file mode 100644
> > index 0000000..98b2357
> > --- /dev/null
> > +++ b/dts/Kconfig
> > @@ -0,0 +1,46 @@
> > +#
> > +# Device Tree Control
> > +#
> > +# TODO:
> > +# This feature is not currently supported for SPL,
> > +# but this restriction should be removed in the future.
> > +
> > +menu "Device Tree Control"
> > + depends on !SPL_BUILD
> > + depends on ARM || MICROBLAZE || SANDBOX || X86
>
> I suggest to use boolean symbols HAS_* or SUPPORTS_* like the kernel
> does. For example:
>
> config SUPPORTS_OF_CONTROL
> bool
>
> menu "Device Tree Control"
> depends on !SPL_BUILD
> depends on SUPPORTS_OF_CONTROL
>
>
> arch/Kconfig:
> config ARM
> bool "ARM architecture"
> select SUPPORTS_OF_CONTROL
>
Good idea,
altough HAVE_* seems more common:
In Linux 3.17-rc4,
$ find . -name 'Kconfig*' | xargs grep HAVE_ | wc
1332 4394 71649
$ find . -name 'Kconfig*' | xargs grep HAS_ | wc
760 2744 40496
$ find . -name 'Kconfig*' | xargs grep SUPPORTS_ | wc
487 1571 26996
Besides, Documentation/kbuild/kconfig-language.txt
suggests to do so.
---------------------------8<---------------------------
Adding common features and make the usage configurable
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
It is a common idiom to implement a feature/functionality that are
relevant for some architectures but not all.
The recommended way to do so is to use a config variable named HAVE_*
that is defined in a common Kconfig file and selected by the relevant
architectures.
An example is the generic IOMAP functionality.
We would in lib/Kconfig see:
# Generic IOMAP is used to ...
config HAVE_GENERIC_IOMAP
config GENERIC_IOMAP
depends on HAVE_GENERIC_IOMAP && FOO
And in lib/Makefile we would see:
obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
For each architecture using the generic IOMAP functionality we would see:
config X86
select ...
select HAVE_GENERIC_IOMAP
select ...
Note: we use the existing config option and avoid creating a new
config variable to select HAVE_GENERIC_IOMAP.
Note: the use of the internal config variable HAVE_GENERIC_IOMAP, it is
introduced to overcome the limitation of select which will force a
config option to 'y' no matter the dependencies.
The dependencies are moved to the symbol GENERIC_IOMAP and we avoid the
situation where select forces a symbol equals to 'y'.
---------------------------->8----------------------------
I was also thinking to add HAVE_SPL_SUPPORT.
config SPL
bool "Enable SPL"
depends on HAVE_SPL_SUPPORT
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 32+ messages in thread
* [U-Boot] [PATCH 10/10] kconfig: CONFIG_DEFAULT_DEVICE_TREE to kconfig
2014-09-07 8:43 [U-Boot] [PATCH 0/10] Move some CONFIGs to Kconfig Masahiro Yamada
` (8 preceding siblings ...)
2014-09-07 8:43 ` [U-Boot] [PATCH 09/10] kconfig: move CONFIG_OF_* to Kconfig Masahiro Yamada
@ 2014-09-07 8:43 ` Masahiro Yamada
2014-09-08 15:04 ` Stephen Warren
2014-09-08 16:28 ` Fabio Estevam
9 siblings, 2 replies; 32+ messages in thread
From: Masahiro Yamada @ 2014-09-07 8:43 UTC (permalink / raw)
To: u-boot
This option specifies the default Device Tree used for the run-time
configuration of U-Boot.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Michal Simek <michal.simek@xilinx.com>
---
configs/am335x_boneblack_vboot_defconfig | 1 +
configs/arndale_defconfig | 1 +
configs/beaver_defconfig | 1 +
configs/cardhu_defconfig | 1 +
configs/colibri_t20_iris_defconfig | 1 +
configs/colibri_t30_defconfig | 1 +
configs/coreboot-x86_defconfig | 1 +
configs/dalmore_defconfig | 1 +
configs/harmony_defconfig | 1 +
configs/jetson-tk1_defconfig | 1 +
configs/medcom-wide_defconfig | 1 +
configs/microblaze-generic_defconfig | 1 +
configs/mx6dlsabreauto_defconfig | 1 +
configs/mx6qsabreauto_defconfig | 1 +
configs/origen_defconfig | 1 +
configs/paz00_defconfig | 1 +
configs/peach-pit_defconfig | 1 +
configs/plutux_defconfig | 1 +
configs/s5pc210_universal_defconfig | 1 +
configs/sandbox_defconfig | 1 +
configs/seaboard_defconfig | 1 +
configs/smdk5250_defconfig | 1 +
configs/smdk5420_defconfig | 1 +
configs/snow_defconfig | 1 +
configs/tec-ng_defconfig | 1 +
configs/tec_defconfig | 1 +
configs/trats2_defconfig | 1 +
configs/trats_defconfig | 1 +
configs/trimslice_defconfig | 1 +
configs/venice2_defconfig | 1 +
configs/ventana_defconfig | 1 +
configs/vexpress_aemv8a_defconfig | 1 +
configs/vexpress_aemv8a_semi_defconfig | 1 +
configs/whistler_defconfig | 1 +
configs/zynq_microzed_defconfig | 1 +
configs/zynq_zc70x_defconfig | 1 +
configs/zynq_zc770_xm010_defconfig | 1 +
configs/zynq_zc770_xm012_defconfig | 1 +
configs/zynq_zc770_xm013_defconfig | 1 +
configs/zynq_zed_defconfig | 1 +
dts/Kconfig | 8 ++++++++
include/configs/am335x_evm.h | 1 -
include/configs/arndale.h | 1 -
include/configs/beaver.h | 1 -
include/configs/cardhu.h | 1 -
include/configs/colibri_t20_iris.h | 1 -
include/configs/colibri_t30.h | 1 -
include/configs/coreboot.h | 1 -
include/configs/dalmore.h | 1 -
include/configs/harmony.h | 1 -
include/configs/jetson-tk1.h | 1 -
include/configs/medcom-wide.h | 1 -
include/configs/microblaze-generic.h | 1 -
include/configs/mx6qsabreauto.h | 1 -
include/configs/origen.h | 2 --
include/configs/paz00.h | 1 -
include/configs/peach-pit.h | 2 --
include/configs/plutux.h | 1 -
include/configs/s5pc210_universal.h | 2 --
include/configs/sandbox.h | 1 -
include/configs/seaboard.h | 1 -
include/configs/smdk5250.h | 2 --
include/configs/smdk5420.h | 2 --
include/configs/snow.h | 2 --
include/configs/tec-ng.h | 1 -
include/configs/tec.h | 1 -
include/configs/trats.h | 2 --
include/configs/trats2.h | 2 --
include/configs/trimslice.h | 1 -
include/configs/venice2.h | 1 -
include/configs/ventana.h | 1 -
include/configs/vexpress_aemv8a.h | 1 -
include/configs/whistler.h | 1 -
include/configs/zynq_microzed.h | 1 -
include/configs/zynq_zc70x.h | 1 -
include/configs/zynq_zc770.h | 3 ---
include/configs/zynq_zed.h | 1 -
77 files changed, 48 insertions(+), 46 deletions(-)
diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index af7ceca..e257143 100644
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -3,3 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT,ENABLE_VBOOT"
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_AM335X_EVM=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack"
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index 737bb3e..d83bf53 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -3,3 +3,4 @@ CONFIG_SPL=y
+S:CONFIG_ARCH_EXYNOS=y
+S:CONFIG_TARGET_ARNDALE=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index 9427faf..ba510d2 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -3,3 +3,4 @@
+S:CONFIG_TEGRA30=y
+S:CONFIG_TARGET_BEAVER=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra30-beaver"
diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index 232a778..5731036 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -3,3 +3,4 @@
+S:CONFIG_TEGRA30=y
+S:CONFIG_TARGET_CARDHU=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra30-cardhu"
diff --git a/configs/colibri_t20_iris_defconfig b/configs/colibri_t20_iris_defconfig
index 094fb9f..c505497 100644
--- a/configs/colibri_t20_iris_defconfig
+++ b/configs/colibri_t20_iris_defconfig
@@ -3,3 +3,4 @@
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_COLIBRI_T20_IRIS=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri_t20_iris"
diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index 5f35fa1..453d783 100644
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -3,3 +3,4 @@
+S:CONFIG_TEGRA30=y
+S:CONFIG_TARGET_COLIBRI_T30=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri"
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index 3cc034a..6249db7 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -2,3 +2,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x01110000"
CONFIG_X86=y
CONFIG_TARGET_COREBOOT=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="link"
diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
index ca6b664..9eaea53 100644
--- a/configs/dalmore_defconfig
+++ b/configs/dalmore_defconfig
@@ -3,3 +3,4 @@
+S:CONFIG_TEGRA114=y
+S:CONFIG_TARGET_DALMORE=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore"
diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index d29e8d2..866ec6d 100644
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -3,3 +3,4 @@
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_HARMONY=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-harmony"
diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 1c385a6..04578dc 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -3,3 +3,4 @@
+S:CONFIG_TEGRA124=y
+S:CONFIG_TARGET_JETSON_TK1=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1"
diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig
index 5674e9b..6c595ac 100644
--- a/configs/medcom-wide_defconfig
+++ b/configs/medcom-wide_defconfig
@@ -3,3 +3,4 @@
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_MEDCOM_WIDE=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-medcom-wide"
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 1dc7441..5cfd596 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -3,3 +3,4 @@ CONFIG_SPL=y
+S:CONFIG_TARGET_MICROBLAZE_GENERIC=y
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y
+CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic"
diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig
index b649935..c49dbf5 100644
--- a/configs/mx6dlsabreauto_defconfig
+++ b/configs/mx6dlsabreauto_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL"
CONFIG_ARM=y
CONFIG_TARGET_MX6QSABREAUTO=y
+CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabreauto"
diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig
index 7d86700..eb635fb 100644
--- a/configs/mx6qsabreauto_defconfig
+++ b/configs/mx6qsabreauto_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q"
CONFIG_ARM=y
CONFIG_TARGET_MX6QSABREAUTO=y
+CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabreauto"
diff --git a/configs/origen_defconfig b/configs/origen_defconfig
index 1d712e8..2a7f83b 100644
--- a/configs/origen_defconfig
+++ b/configs/origen_defconfig
@@ -3,3 +3,4 @@ CONFIG_SPL=y
+S:CONFIG_ARCH_EXYNOS=y
+S:CONFIG_TARGET_ORIGEN=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="exynos4210-origen"
diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig
index a682f4c..3c3b20c 100644
--- a/configs/paz00_defconfig
+++ b/configs/paz00_defconfig
@@ -3,3 +3,4 @@
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_PAZ00=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-paz00"
diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
index 9f3530a..c51ac76 100644
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -3,3 +3,4 @@ CONFIG_SPL=y
+S:CONFIG_ARCH_EXYNOS=y
+S:CONFIG_TARGET_PEACH_PIT=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="exynos5420-peach-pit"
diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig
index 03374fe..9e8303f 100644
--- a/configs/plutux_defconfig
+++ b/configs/plutux_defconfig
@@ -3,3 +3,4 @@
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_PLUTUX=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-plutux"
diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig
index 0a3ad0d..cdce39f 100644
--- a/configs/s5pc210_universal_defconfig
+++ b/configs/s5pc210_universal_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_S5PC210_UNIVERSAL=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="exynos4210-universal_c210"
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index dd84281..79c9893 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -1 +1,2 @@
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="sandbox"
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 9e2028b..56fc55c 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -3,3 +3,4 @@
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_SEABOARD=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard"
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 5cdfa63..5d6000e 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -3,3 +3,4 @@ CONFIG_SPL=y
+S:CONFIG_ARCH_EXYNOS=y
+S:CONFIG_TARGET_SMDK5250=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
index 4619c62..370a59b 100644
--- a/configs/smdk5420_defconfig
+++ b/configs/smdk5420_defconfig
@@ -3,3 +3,4 @@ CONFIG_SPL=y
+S:CONFIG_ARCH_EXYNOS=y
+S:CONFIG_TARGET_SMDK5420=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="exynos5420-smdk5420"
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index c201c84..35c9596 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -3,3 +3,4 @@ CONFIG_SPL=y
+S:CONFIG_ARCH_EXYNOS=y
+S:CONFIG_TARGET_SNOW=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="exynos5250-snow"
diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
index 501d449..d3ec3b8 100644
--- a/configs/tec-ng_defconfig
+++ b/configs/tec-ng_defconfig
@@ -3,3 +3,4 @@
+S:CONFIG_TEGRA30=y
+S:CONFIG_TARGET_TEC_NG=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra30-tec-ng"
diff --git a/configs/tec_defconfig b/configs/tec_defconfig
index fe743f9..3e6c37e 100644
--- a/configs/tec_defconfig
+++ b/configs/tec_defconfig
@@ -3,3 +3,4 @@
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_TEC=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-tec"
diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig
index 666011c..1b98b73 100644
--- a/configs/trats2_defconfig
+++ b/configs/trats2_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_TRATS2=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="exynos4412-trats2"
diff --git a/configs/trats_defconfig b/configs/trats_defconfig
index 6ef4b33..901a014 100644
--- a/configs/trats_defconfig
+++ b/configs/trats_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_TRATS=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="exynos4210-trats"
diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index 8b1a13e..7d849d82 100644
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -3,3 +3,4 @@
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_TRIMSLICE=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-trimslice"
diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
index 3897862..6c08d5a 100644
--- a/configs/venice2_defconfig
+++ b/configs/venice2_defconfig
@@ -3,3 +3,4 @@
+S:CONFIG_TEGRA124=y
+S:CONFIG_TARGET_VENICE2=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2"
diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index 7398d11..b3f30ae 100644
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -3,3 +3,4 @@
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_VENTANA=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-ventana"
diff --git a/configs/vexpress_aemv8a_defconfig b/configs/vexpress_aemv8a_defconfig
index a335abc..fa9da00 100644
--- a/configs/vexpress_aemv8a_defconfig
+++ b/configs/vexpress_aemv8a_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="ARM64"
CONFIG_ARM=y
CONFIG_TARGET_VEXPRESS_AEMV8A=y
+CONFIG_DEFAULT_DEVICE_TREE="vexpress64"
diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig
index e6dd8e7..c088278 100644
--- a/configs/vexpress_aemv8a_semi_defconfig
+++ b/configs/vexpress_aemv8a_semi_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="ARM64,SEMIHOSTING,BASE_FVP"
CONFIG_ARM=y
CONFIG_TARGET_VEXPRESS_AEMV8A_SEMI=y
+CONFIG_DEFAULT_DEVICE_TREE="vexpress64"
diff --git a/configs/whistler_defconfig b/configs/whistler_defconfig
index a275005..2027abd 100644
--- a/configs/whistler_defconfig
+++ b/configs/whistler_defconfig
@@ -3,3 +3,4 @@
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_WHISTLER=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-whistler"
diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index 9767863..9588849 100644
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -3,3 +3,4 @@ CONFIG_SPL=y
+S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_MICROZED=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="zynq-microzed"
diff --git a/configs/zynq_zc70x_defconfig b/configs/zynq_zc70x_defconfig
index d303f97..cf50730 100644
--- a/configs/zynq_zc70x_defconfig
+++ b/configs/zynq_zc70x_defconfig
@@ -3,3 +3,4 @@ CONFIG_SPL=y
+S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZC70X=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702"
diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig
index 4e6660f..8bb405d 100644
--- a/configs/zynq_zc770_xm010_defconfig
+++ b/configs/zynq_zc770_xm010_defconfig
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
+S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZC770=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010"
diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig
index 16d62e6..0ba5da5 100644
--- a/configs/zynq_zc770_xm012_defconfig
+++ b/configs/zynq_zc770_xm012_defconfig
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
+S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZC770=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012"
diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig
index 7343a64..13f8112 100644
--- a/configs/zynq_zc770_xm013_defconfig
+++ b/configs/zynq_zc770_xm013_defconfig
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
+S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZC770=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013"
diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index 38d5fa6..eb057fa 100644
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -3,3 +3,4 @@ CONFIG_SPL=y
+S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZED=y
CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"
diff --git a/dts/Kconfig b/dts/Kconfig
index 98b2357..cca9f48 100644
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -43,4 +43,12 @@ config OF_HOSTFILE
endchoice
+config DEFAULT_DEVICE_TREE
+ string "Default Device Tree for the run-time configuration"
+ help
+ This option specifies the default Device Tree used for the run-time
+ configuration of U-Boot.
+ It can be overrided from the command line:
+ $ make DEVICE_TREE=<device-tree-name>
+
endmenu
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 47a173f..4d4423f 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -23,7 +23,6 @@
# define CONFIG_TIMESTAMP
# define CONFIG_LZO
# ifdef CONFIG_ENABLE_VBOOT
-# define CONFIG_DEFAULT_DEVICE_TREE am335x-boneblack
# define CONFIG_FIT_SIGNATURE
# define CONFIG_RSA
# endif
diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index 7f06907..43077cf 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -224,7 +224,6 @@
#define CONFIG_POWER_I2C
#define CONFIG_POWER_MAX77686
-#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-arndale
#define CONFIG_PREBOOT
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 4c7cf5f..b089f13 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -25,7 +25,6 @@
#define CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
/* Enable fdt support for Beaver. Flash the image in u-boot-dtb.bin */
-#define CONFIG_DEFAULT_DEVICE_TREE tegra30-beaver
/* High-level configuration options */
#define V_PROMPT "Tegra30 (Beaver) # "
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 1616a54..3a7ccc3 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -25,7 +25,6 @@
#define CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3
/* Enable fdt support for Cardhu. Flash the image in u-boot-dtb.bin */
-#define CONFIG_DEFAULT_DEVICE_TREE tegra30-cardhu
/* High-level configuration options */
#define V_PROMPT "Tegra30 (Cardhu) # "
diff --git a/include/configs/colibri_t20_iris.h b/include/configs/colibri_t20_iris.h
index 3ce1f9b..5addd34 100644
--- a/include/configs/colibri_t20_iris.h
+++ b/include/configs/colibri_t20_iris.h
@@ -10,7 +10,6 @@
#include "tegra20-common.h"
/* Enable FDT support */
-#define CONFIG_DEFAULT_DEVICE_TREE tegra20-colibri_t20_iris
/* High-level configuration options */
#define V_PROMPT "Tegra20 (Colibri) # "
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index d9e2d86..782b9d1 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -11,7 +11,6 @@
#include "tegra30-common.h"
-#define CONFIG_DEFAULT_DEVICE_TREE tegra30-colibri
#define V_PROMPT "Colibri T30 # "
#define CONFIG_TEGRA_BOARD_STRING "Toradex Colibri T30"
diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
index 915245e..936be14 100644
--- a/include/configs/coreboot.h
+++ b/include/configs/coreboot.h
@@ -28,7 +28,6 @@
#define CONFIG_LMB
#define CONFIG_OF_LIBFDT
-#define CONFIG_DEFAULT_DEVICE_TREE link
#define CONFIG_BOOTSTAGE
#define CONFIG_BOOTSTAGE_REPORT
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index e3bb27f..3e6daf8 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -22,7 +22,6 @@
#include "tegra114-common.h"
/* Enable fdt support for Dalmore. Flash the image in u-boot-dtb.bin */
-#define CONFIG_DEFAULT_DEVICE_TREE tegra114-dalmore
/* High-level configuration options */
#define V_PROMPT "Tegra114 (Dalmore) # "
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 97db202..6f9fde8 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -12,7 +12,6 @@
#include "tegra20-common.h"
/* Enable fdt support for Harmony. Flash the image in u-boot-dtb.bin */
-#define CONFIG_DEFAULT_DEVICE_TREE tegra20-harmony
/* High-level configuration options */
#define V_PROMPT "Tegra20 (Harmony) # "
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index dc7e324..655d5a3 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -13,7 +13,6 @@
#include "tegra124-common.h"
/* Enable fdt support for Jetson TK1. Flash the image in u-boot-dtb.bin */
-#define CONFIG_DEFAULT_DEVICE_TREE tegra124-jetson-tk1
/* High-level configuration options */
#define V_PROMPT "Tegra124 (Jetson TK1) # "
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index 5e52574..8f7e97b 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -13,7 +13,6 @@
#include "tegra20-common.h"
/* Enable fdt support for Medcom-Wide. Flash the image in u-boot-dtb.bin */
-#define CONFIG_DEFAULT_DEVICE_TREE tegra20-medcom-wide
/* High-level configuration options */
#define V_PROMPT "Tegra20 (Medcom-Wide) # "
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index f5e83ff..0b48e02 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -15,7 +15,6 @@
#define MICROBLAZE_V5 1
/* Open Firmware DTS */
-#define CONFIG_DEFAULT_DEVICE_TREE microblaze-generic
/* linear and spi flash memory */
#ifdef XILINX_FLASH_START
diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
index 95f4600..93daddc 100644
--- a/include/configs/mx6qsabreauto.h
+++ b/include/configs/mx6qsabreauto.h
@@ -45,6 +45,5 @@
#define CONFIG_SYS_I2C_MXC
#define CONFIG_SYS_I2C_SPEED 100000
-#define CONFIG_DEFAULT_DEVICE_TREE imx6q-sabreauto
#endif /* __MX6QSABREAUTO_CONFIG_H */
diff --git a/include/configs/origen.h b/include/configs/origen.h
index 5d24916..fb1536c 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -13,8 +13,6 @@
#define CONFIG_SYS_PROMPT "ORIGEN # "
-#undef CONFIG_DEFAULT_DEVICE_TREE
-#define CONFIG_DEFAULT_DEVICE_TREE exynos4210-origen
/* High Level Configuration Options */
#define CONFIG_EXYNOS4210 1 /* which is a EXYNOS4210 SoC */
diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index 01cb649..5edbc4a 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -21,7 +21,6 @@
#include "tegra20-common.h"
/* Enable fdt support for Paz00. Flash the image in u-boot-dtb.bin */
-#define CONFIG_DEFAULT_DEVICE_TREE tegra20-paz00
/* High-level configuration options */
#define V_PROMPT "Tegra20 (Paz00) MOD # "
diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h
index 76b8d7a..437b706 100644
--- a/include/configs/peach-pit.h
+++ b/include/configs/peach-pit.h
@@ -13,8 +13,6 @@
#include <configs/exynos5420.h>
-#undef CONFIG_DEFAULT_DEVICE_TREE
-#define CONFIG_DEFAULT_DEVICE_TREE exynos5420-peach-pit
/* select serial console configuration */
#define CONFIG_SERIAL3 /* use SERIAL 3 */
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index 719d81a..30b841a 100644
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -13,7 +13,6 @@
#include "tegra20-common.h"
/* Enable fdt support for Plutux. Flash the image in u-boot-dtb.bin */
-#define CONFIG_DEFAULT_DEVICE_TREE tegra20-plutux
/* High-level configuration options */
#define V_PROMPT "Tegra20 (Plutux) # "
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index eb046cd..3c95810 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -14,8 +14,6 @@
#define CONFIG_SYS_PROMPT "Universal # " /* Monitor Command Prompt */
-#undef CONFIG_DEFAULT_DEVICE_TREE
-#define CONFIG_DEFAULT_DEVICE_TREE exynos4210-universal_c210
#define CONFIG_TIZEN /* TIZEN lib */
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 4998152..64452e2 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -41,7 +41,6 @@
#define CONFIG_FIT_SIGNATURE
#define CONFIG_RSA
#define CONFIG_CMD_FDT
-#define CONFIG_DEFAULT_DEVICE_TREE sandbox
#define CONFIG_ANDROID_BOOT_IMAGE
#define CONFIG_FS_FAT
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index e61811d..7f84b35 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -20,7 +20,6 @@
#include "tegra20-common.h"
/* Enable fdt support for Seaboard. Flash the image in u-boot-dtb.bin */
-#define CONFIG_DEFAULT_DEVICE_TREE tegra20-seaboard
/* High-level configuration options */
#define V_PROMPT "Tegra20 (SeaBoard) # "
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index 66fa179..6117094 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -11,8 +11,6 @@
#include <configs/exynos5250-dt.h>
-#undef CONFIG_DEFAULT_DEVICE_TREE
-#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-smdk5250
/* Enable FIT support and comparison */
#define CONFIG_FIT
diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
index 606739b..36a156f 100644
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.h
@@ -15,8 +15,6 @@
#define CONFIG_SMDK5420 /* which is in a SMDK5420 */
-#undef CONFIG_DEFAULT_DEVICE_TREE
-#define CONFIG_DEFAULT_DEVICE_TREE exynos5420-smdk5420
/* select serial console configuration */
#define CONFIG_SERIAL3 /* use SERIAL 3 */
diff --git a/include/configs/snow.h b/include/configs/snow.h
index 673fa14..fbaaa59 100644
--- a/include/configs/snow.h
+++ b/include/configs/snow.h
@@ -11,8 +11,6 @@
#include <configs/exynos5250-dt.h>
-#undef CONFIG_DEFAULT_DEVICE_TREE
-#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-snow
/* Enable FIT support and comparison */
#define CONFIG_FIT
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index 5b4c255..dbcd87b 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -11,7 +11,6 @@
#include "tegra30-common.h"
/* Enable fdt support for tec-ng. Flash the image in u-boot-dtb.bin */
-#define CONFIG_DEFAULT_DEVICE_TREE tegra30-tec-ng
/* High-level configuration options */
#define V_PROMPT "Tegra30 (TEC-NG) # "
diff --git a/include/configs/tec.h b/include/configs/tec.h
index 0598d5d..1cfcd04 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -13,7 +13,6 @@
#include "tegra20-common.h"
/* Enable fdt support for TEC. Flash the image in u-boot-dtb.bin */
-#define CONFIG_DEFAULT_DEVICE_TREE tegra20-tec
/* High-level configuration options */
#define V_PROMPT "Tegra20 (TEC) # "
diff --git a/include/configs/trats.h b/include/configs/trats.h
index 7db1db6..da61087 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -16,8 +16,6 @@
#define CONFIG_TRATS
-#undef CONFIG_DEFAULT_DEVICE_TREE
-#define CONFIG_DEFAULT_DEVICE_TREE exynos4210-trats
#define CONFIG_TIZEN /* TIZEN lib */
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index f537e4f..b469f4a 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -15,8 +15,6 @@
#define CONFIG_SYS_PROMPT "Trats2 # " /* Monitor Command Prompt */
-#undef CONFIG_DEFAULT_DEVICE_TREE
-#define CONFIG_DEFAULT_DEVICE_TREE exynos4412-trats2
#define CONFIG_TIZEN /* TIZEN lib */
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 2ef010c..f212705 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -12,7 +12,6 @@
#include "tegra20-common.h"
/* Enable fdt support for TrimSlice. Flash the image in u-boot-dtb.bin */
-#define CONFIG_DEFAULT_DEVICE_TREE tegra20-trimslice
/* High-level configuration options */
#define V_PROMPT "Tegra20 (TrimSlice) # "
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index b516d92..06c672c 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -13,7 +13,6 @@
#include "tegra124-common.h"
/* Enable fdt support for Venice2. Flash the image in u-boot-dtb.bin */
-#define CONFIG_DEFAULT_DEVICE_TREE tegra124-venice2
/* High-level configuration options */
#define V_PROMPT "Tegra124 (Venice2) # "
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index 3b9d142..b96aa8d 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -12,7 +12,6 @@
#include "tegra20-common.h"
/* Enable fdt support for Ventana. Flash the image in u-boot-dtb.bin */
-#define CONFIG_DEFAULT_DEVICE_TREE tegra20-ventana
/* High-level configuration options */
#define V_PROMPT "Tegra20 (Ventana) # "
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 0897932..f3af971 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -51,7 +51,6 @@
/* Flat Device Tree Definitions */
#define CONFIG_OF_LIBFDT
-#define CONFIG_DEFAULT_DEVICE_TREE vexpress64
/* SMP Spin Table Definitions */
#ifdef CONFIG_BASE_FVP
diff --git a/include/configs/whistler.h b/include/configs/whistler.h
index f3bf806..a3e0584 100644
--- a/include/configs/whistler.h
+++ b/include/configs/whistler.h
@@ -12,7 +12,6 @@
#include "tegra20-common.h"
/* Enable fdt support for Whistler. Flash the image in u-boot-dtb.bin */
-#define CONFIG_DEFAULT_DEVICE_TREE tegra20-whistler
/* High-level configuration options */
#define V_PROMPT "Tegra20 (Whistler) # "
diff --git a/include/configs/zynq_microzed.h b/include/configs/zynq_microzed.h
index b0328a2..549a664 100644
--- a/include/configs/zynq_microzed.h
+++ b/include/configs/zynq_microzed.h
@@ -19,7 +19,6 @@
#define CONFIG_SYS_NO_FLASH
#define CONFIG_ZYNQ_SDHCI0
-#define CONFIG_DEFAULT_DEVICE_TREE zynq-microzed
#include <configs/zynq-common.h>
diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
index 291a5fe..b659054 100644
--- a/include/configs/zynq_zc70x.h
+++ b/include/configs/zynq_zc70x.h
@@ -23,7 +23,6 @@
#define CONFIG_ZYNQ_I2C0
#define CONFIG_ZYNQ_EEPROM
#define CONFIG_ZYNQ_BOOT_FREEBSD
-#define CONFIG_DEFAULT_DEVICE_TREE zynq-zc702
#include <configs/zynq-common.h>
diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
index 8aa96e7..16b9047 100644
--- a/include/configs/zynq_zc770.h
+++ b/include/configs/zynq_zc770.h
@@ -20,18 +20,15 @@
# define CONFIG_ZYNQ_GEM_PHY_ADDR0 7
# define CONFIG_ZYNQ_SDHCI0
# define CONFIG_ZYNQ_SPI
-# define CONFIG_DEFAULT_DEVICE_TREE zynq-zc770-xm010
#elif defined(CONFIG_ZC770_XM012)
# define CONFIG_ZYNQ_SERIAL_UART1
# undef CONFIG_SYS_NO_FLASH
-# define CONFIG_DEFAULT_DEVICE_TREE zynq-zc770-xm012
#elif defined(CONFIG_ZC770_XM013)
# define CONFIG_ZYNQ_SERIAL_UART0
# define CONFIG_ZYNQ_GEM1
# define CONFIG_ZYNQ_GEM_PHY_ADDR1 7
-# define CONFIG_DEFAULT_DEVICE_TREE zynq-zc770-xm013
#else
# define CONFIG_ZYNQ_SERIAL_UART0
diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
index ce17d40..946de95 100644
--- a/include/configs/zynq_zed.h
+++ b/include/configs/zynq_zed.h
@@ -21,7 +21,6 @@
#define CONFIG_ZYNQ_USB
#define CONFIG_ZYNQ_SDHCI0
#define CONFIG_ZYNQ_BOOT_FREEBSD
-#define CONFIG_DEFAULT_DEVICE_TREE zynq-zed
#include <configs/zynq-common.h>
--
1.9.1
^ permalink raw reply related [flat|nested] 32+ messages in thread* [U-Boot] [PATCH 10/10] kconfig: CONFIG_DEFAULT_DEVICE_TREE to kconfig
2014-09-07 8:43 ` [U-Boot] [PATCH 10/10] kconfig: CONFIG_DEFAULT_DEVICE_TREE to kconfig Masahiro Yamada
@ 2014-09-08 15:04 ` Stephen Warren
2014-09-08 16:29 ` Masahiro YAMADA
2014-09-08 16:28 ` Fabio Estevam
1 sibling, 1 reply; 32+ messages in thread
From: Stephen Warren @ 2014-09-08 15:04 UTC (permalink / raw)
To: u-boot
On 09/07/2014 02:43 AM, Masahiro Yamada wrote:
> This option specifies the default Device Tree used for the run-time
> configuration of U-Boot.
Same comment here.
^ permalink raw reply [flat|nested] 32+ messages in thread
* [U-Boot] [PATCH 10/10] kconfig: CONFIG_DEFAULT_DEVICE_TREE to kconfig
2014-09-08 15:04 ` Stephen Warren
@ 2014-09-08 16:29 ` Masahiro YAMADA
0 siblings, 0 replies; 32+ messages in thread
From: Masahiro YAMADA @ 2014-09-08 16:29 UTC (permalink / raw)
To: u-boot
Hi Stephen
2014-09-09 0:04 GMT+09:00 Stephen Warren <swarren@wwwdotorg.org>:
> On 09/07/2014 02:43 AM, Masahiro Yamada wrote:
>>
>> This option specifies the default Device Tree used for the run-time
>> configuration of U-Boot.
>
>
> Same comment here.
I will rephrase the help comment in v2.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 32+ messages in thread
* [U-Boot] [PATCH 10/10] kconfig: CONFIG_DEFAULT_DEVICE_TREE to kconfig
2014-09-07 8:43 ` [U-Boot] [PATCH 10/10] kconfig: CONFIG_DEFAULT_DEVICE_TREE to kconfig Masahiro Yamada
2014-09-08 15:04 ` Stephen Warren
@ 2014-09-08 16:28 ` Fabio Estevam
2014-09-08 16:37 ` Masahiro YAMADA
1 sibling, 1 reply; 32+ messages in thread
From: Fabio Estevam @ 2014-09-08 16:28 UTC (permalink / raw)
To: u-boot
On Sun, Sep 7, 2014 at 5:43 AM, Masahiro Yamada
<yamada.m@jp.panasonic.com> wrote:
> --- a/configs/mx6dlsabreauto_defconfig
> +++ b/configs/mx6dlsabreauto_defconfig
> @@ -1,3 +1,4 @@
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL"
> CONFIG_ARM=y
> CONFIG_TARGET_MX6QSABREAUTO=y
> +CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabreauto"
It is not correct to use imx6q-sabreauto for a mx6dlsabreauto board.
I have also sent a patch removing dts usage for mx6qsabreauto.
^ permalink raw reply [flat|nested] 32+ messages in thread
* [U-Boot] [PATCH 10/10] kconfig: CONFIG_DEFAULT_DEVICE_TREE to kconfig
2014-09-08 16:28 ` Fabio Estevam
@ 2014-09-08 16:37 ` Masahiro YAMADA
0 siblings, 0 replies; 32+ messages in thread
From: Masahiro YAMADA @ 2014-09-08 16:37 UTC (permalink / raw)
To: u-boot
Hi Fabio,
2014-09-09 1:28 GMT+09:00 Fabio Estevam <festevam@gmail.com>:
> On Sun, Sep 7, 2014 at 5:43 AM, Masahiro Yamada
> <yamada.m@jp.panasonic.com> wrote:
>
>> --- a/configs/mx6dlsabreauto_defconfig
>> +++ b/configs/mx6dlsabreauto_defconfig
>> @@ -1,3 +1,4 @@
>> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL"
>> CONFIG_ARM=y
>> CONFIG_TARGET_MX6QSABREAUTO=y
>> +CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabreauto"
>
> It is not correct to use imx6q-sabreauto for a mx6dlsabreauto board.
>
> I have also sent a patch removing dts usage for mx6qsabreauto.
I noticed that this board has CONFIG_DEFAULT_DEVICE_TREE,
but no CONFIG_OF_CONTROL.
Just in case, I moved it verbatim so as not to lose the information.
I will remove it in v2.
Thanks for pointing this out.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 32+ messages in thread