Skip to contentSkip to conversation

doc: Fix CONFIG_OF_SEPARATE description

PATCH New Andy Shevchenko 4 participants 9 messages Jan 8, 2019 – Jan 31, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 doc: Fix CONFIG_OF_SEPARATE description

CONFIG_OF_SEPARATE description is not in align with actual code in Makefile and thus has misleading instructions and explanation.

Make it aligned with the actual code.

---
 doc/README.fdt-control | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
doc/README.fdt-control +4 -3
index 446401c9e9..e53cf51875 100644
@@ -122,13 +122,14 @@ the U-Boot image (including u-boot.bin). This is suitable for debugging
 and development only and is not recommended for production devices.
 
 If CONFIG_OF_SEPARATE is defined, then it will be built and placed in
-a u-boot.dtb file alongside u-boot.bin. A common approach is then to
+a u-boot.dtb file alongside u-boot-nodtb.bin. A common approach is then to
 join the two:
 
-	cat u-boot.bin u-boot.dtb >image.bin
+	cat u-boot-nodtb.bin u-boot.dtb >image.bin
 
 and then flash image.bin onto your board. Note that U-Boot creates
-u-boot-dtb.bin which does the above step for you also. If you are using
+u-boot-dtb.bin which does the above step for you also. Resulting
+u-boot.bin is a copy of u-boot-dtb.bin in this case. If you are using
 CONFIG_SPL_FRAMEWORK, then u-boot.img will be built to include the device
 tree binary.
 
Signature · 1 line
2.19.2
#1 lore raw

PATCH 1/2 doc: Fix CONFIG_OF_SEPARATE description

Quoted 4 lines · Andy Shevchenko

CONFIG_OF_SEPARATE description is not in align with actual code in Makefile and thus has misleading instructions and explanation.

Make it aligned with the actual code.

Bin, is it possible to see this for the next release?

Quoted 31 lines
---
 doc/README.fdt-control | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
doc/README.fdt-control +4 -3
index 446401c9e9..e53cf51875 100644
@@ -122,13 +122,14 @@ the U-Boot image (including u-boot.bin). This is suitable for debugging
 and development only and is not recommended for production devices.
 
 If CONFIG_OF_SEPARATE is defined, then it will be built and placed in
-a u-boot.dtb file alongside u-boot.bin. A common approach is then to
+a u-boot.dtb file alongside u-boot-nodtb.bin. A common approach is then to
 join the two:
 
-	cat u-boot.bin u-boot.dtb >image.bin
+	cat u-boot-nodtb.bin u-boot.dtb >image.bin
 
 and then flash image.bin onto your board. Note that U-Boot creates
-u-boot-dtb.bin which does the above step for you also. If you are using
+u-boot-dtb.bin which does the above step for you also. Resulting
+u-boot.bin is a copy of u-boot-dtb.bin in this case. If you are using
 CONFIG_SPL_FRAMEWORK, then u-boot.img will be built to include the device
 tree binary.
 
Signature · 1 line
2.19.2
Signature · 2 lines
With Best Regards,
Andy Shevchenko
#2 lore raw

PATCH 1/2 doc: Fix CONFIG_OF_SEPARATE description

Quoted 9 lines · Andy Shevchenko
Quoted 4 lines · Andy Shevchenko

CONFIG_OF_SEPARATE description is not in align with actual code in Makefile and thus has misleading instructions and explanation.

Make it aligned with the actual code.

Bin, is it possible to see this for the next release?

applied to u-boot-x86, thanks!

#3 lore raw

PATCH 1/2 doc: Fix CONFIG_OF_SEPARATE description

In reply to Andy Shevchenko
Quoted 10 lines · Andy Shevchenko

CONFIG_OF_SEPARATE description is not in align with actual code in Makefile and thus has misleading instructions and explanation.

Make it aligned with the actual code.

---
 doc/README.fdt-control | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
#4 lore raw

PATCH 2/2 x86: edison: Switch to CONFIG_OF_SEPARATE

In reply to Andy Shevchenko

There is no need for Intel Edison to have CONFIG_OF_EMBED to be enabled. Replace it with CONFIG_OF_SEPARATE.

There is no functional change since u-boot.bin always contains DTB either embedded or attached.

---
 configs/edison_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configs/edison_defconfig +1 -1
index e376c0cea6..dc7d86aafe 100644
@@ -26,7 +26,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
-CONFIG_OF_EMBED=y
+CONFIG_OF_SEPARATE=y
 CONFIG_DEFAULT_DEVICE_TREE="edison"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_CPU=y
Signature · 1 line
2.19.2
#5 lore raw

PATCH 2/2 x86: edison: Switch to CONFIG_OF_SEPARATE

Op 08-01-19 om 15:17 schreef Andy Shevchenko:

Quoted 7 lines

There is no need for Intel Edison to have CONFIG_OF_EMBED to be enabled. Replace it with CONFIG_OF_SEPARATE.

There is no functional change since u-boot.bin always contains DTB either embedded or attached.

Quoted 18 lines
---
  configs/edison_defconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
configs/edison_defconfig +1 -1
index e376c0cea6..dc7d86aafe 100644
@@ -26,7 +26,7 @@ CONFIG_CMD_EXT4=y
  CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_FAT=y
  CONFIG_CMD_FS_GENERIC=y
-CONFIG_OF_EMBED=y
+CONFIG_OF_SEPARATE=y
  CONFIG_DEFAULT_DEVICE_TREE="edison"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_CPU=y
#6 lore raw

PATCH 2/2 x86: edison: Switch to CONFIG_OF_SEPARATE

In reply to Andy Shevchenko
Quoted 11 lines · Andy Shevchenko

There is no need for Intel Edison to have CONFIG_OF_EMBED to be enabled. Replace it with CONFIG_OF_SEPARATE.

There is no functional change since u-boot.bin always contains DTB either embedded or attached.

---
 configs/edison_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
#7 lore raw

PATCH 2/2 x86: edison: Switch to CONFIG_OF_SEPARATE

In reply to Andy Shevchenko

Op 08-01-19 om 15:17 schreef Andy Shevchenko:

Quoted 7 lines

There is no need for Intel Edison to have CONFIG_OF_EMBED to be enabled. Replace it with CONFIG_OF_SEPARATE.

There is no functional change since u-boot.bin always contains DTB either embedded or attached.

Quoted 18 lines
---
  configs/edison_defconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
configs/edison_defconfig +1 -1
index e376c0cea6..dc7d86aafe 100644
@@ -26,7 +26,7 @@ CONFIG_CMD_EXT4=y
  CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_FAT=y
  CONFIG_CMD_FS_GENERIC=y
-CONFIG_OF_EMBED=y
+CONFIG_OF_SEPARATE=y
  CONFIG_DEFAULT_DEVICE_TREE="edison"
  CONFIG_ENV_IS_IN_MMC=y
  CONFIG_CPU=y
#8 lore raw

PATCH 2/2 x86: edison: Switch to CONFIG_OF_SEPARATE

Quoted 14 lines · Ferry Toth

Op 08-01-19 om 15:17 schreef Andy Shevchenko:

Quoted 7 lines

There is no need for Intel Edison to have CONFIG_OF_EMBED to be enabled. Replace it with CONFIG_OF_SEPARATE.

There is no functional change since u-boot.bin always contains DTB either embedded or attached.

Quoted 4 lines
---
  configs/edison_defconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

applied to u-boot-x86, thanks!