[U-Boot] [PATCH v1 1/2] doc: Fix CONFIG_OF_SEPARATE description

[U-Boot] [PATCH v1 1/2] doc: Fix CONFIG_OF_SEPARATE description

[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.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 doc/README.fdt-control | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/README.fdt-control b/doc/README.fdt-control
index 446401c9e9..e53cf51875 100644
--- a/doc/README.fdt-control
+++ b/doc/README.fdt-control
@@ -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.
 
-- 
2.19.2

[U-Boot] [PATCH v1 2/2] x86: edison: Switch to CONFIG_OF_SEPARATE

[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.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 configs/edison_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/edison_defconfig b/configs/edison_defconfig
index e376c0cea6..dc7d86aafe 100644
--- a/configs/edison_defconfig
+++ b/configs/edison_defconfig
@@ -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
-- 
2.19.2

[U-Boot] [PATCH v1 2/2] x86: edison: Switch to CONFIG_OF_SEPARATE

[Ferry Toth]

Op 08-01-19 om 15:17 schreef 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.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Ferry Toth <ftoth@exalondelft.nl>
> ---
>   configs/edison_defconfig | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configs/edison_defconfig b/configs/edison_defconfig
> index e376c0cea6..dc7d86aafe 100644
> --- a/configs/edison_defconfig
> +++ b/configs/edison_defconfig
> @@ -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
> 

[U-Boot] [PATCH v1 2/2] x86: edison: Switch to CONFIG_OF_SEPARATE

[Simon Glass]

On Tue, 8 Jan 2019 at 07:17, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
>
> 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.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  configs/edison_defconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH v1 2/2] x86: edison: Switch to CONFIG_OF_SEPARATE

[Ferry Toth]

Op 08-01-19 om 15:17 schreef 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.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Ferry Toth <ftoth@exalondelft.nl>
> ---
>   configs/edison_defconfig | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configs/edison_defconfig b/configs/edison_defconfig
> index e376c0cea6..dc7d86aafe 100644
> --- a/configs/edison_defconfig
> +++ b/configs/edison_defconfig
> @@ -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
> 

[U-Boot] [PATCH v1 2/2] x86: edison: Switch to CONFIG_OF_SEPARATE

[Bin Meng]

On Fri, Jan 11, 2019 at 5:48 AM Ferry Toth <ftoth@telfort.nl> wrote:
>
> Op 08-01-19 om 15:17 schreef 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.
> >
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Tested-by: Ferry Toth <ftoth@exalondelft.nl>
> > ---
> >   configs/edison_defconfig | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >

applied to u-boot-x86, thanks!

[U-Boot] [PATCH v1 1/2] doc: Fix CONFIG_OF_SEPARATE description

[Simon Glass]

On Tue, 8 Jan 2019 at 07:17, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
>
> 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.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  doc/README.fdt-control | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH v1 1/2] doc: Fix CONFIG_OF_SEPARATE description

[Andy Shevchenko]

On Tue, Jan 08, 2019 at 04:17:42PM +0200, Andy Shevchenko wrote:
> 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?

> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  doc/README.fdt-control | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/doc/README.fdt-control b/doc/README.fdt-control
> index 446401c9e9..e53cf51875 100644
> --- a/doc/README.fdt-control
> +++ b/doc/README.fdt-control
> @@ -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.
>  
> -- 
> 2.19.2
> 

-- 
With Best Regards,
Andy Shevchenko

[U-Boot] [PATCH v1 1/2] doc: Fix CONFIG_OF_SEPARATE description

[Bin Meng]

On Thu, Jan 31, 2019 at 3:54 AM Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
>
> On Tue, Jan 08, 2019 at 04:17:42PM +0200, Andy Shevchenko wrote:
> > 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!