[PATCH 00/19] Kconfig: Tidy up some options

[PATCH 00/19] Kconfig: Tidy up some options

[Simon Glass]

The view from 'make menuconfig' is confusing in places. This series aims
to improve the top-level menu and also the boot menu.

It also groups FDT-fixup options tegether, at least the ones I could fine.

Finally this series marks the distro scripts as deprecated, so people have
a pointer to standard boot.


Simon Glass (19):
  lib: rational: Move the Kconfigs into the correct place
  Kconfig: Move API into general setup
  video: Hide the BMP options
  video: Move BMP options and code to video directory
  net: Move SYS_RX_ETH_BUFFER into the network menu
  FMU: Avoid showing an unselectable menu option
  test: Move POST under a renamed Testing section
  boot: Move fdt_support to boot/
  Move fdt_simplefb to boot/
  boot: Move some other fdt-fixup options to the same menu
  boot: Rename Android-boot text
  Kconfig: Create a menu for FIT
  Kconfig: Move SPL_FIT under FIT
  spl: Tidy up load address in spl_ram
  boot: Make standard boot a menu
  Kconfig: Move TEXT_BASE et al under general setup
  Make DISTRO_DEFAULTS as deprecated
  boot: Join FDT_FIXUP_PARTITIONS with related options
  boot: Join ARCH_FIXUP_FDT_MEMORY with related options

 Kconfig                         |  67 ++++++++++-
 boot/Kconfig                    | 202 +++++++++++++-------------------
 boot/Makefile                   |   4 +
 {common => boot}/fdt_simplefb.c |   0
 {common => boot}/fdt_support.c  |   0
 common/Kconfig                  |  20 ----
 common/Makefile                 |   4 -
 common/spl/spl_ram.c            |  19 ++-
 doc/develop/bootstd.rst         |  23 ++++
 drivers/video/Kconfig           |  11 ++
 drivers/video/Makefile          |   2 +
 {common => drivers/video}/bmp.c |   0
 include/net.h                   |   9 +-
 lib/Kconfig                     |  17 +--
 lib/fwu_updates/Kconfig         |   6 +-
 net/Kconfig                     |   4 +-
 test/Kconfig                    |  12 +-
 17 files changed, 220 insertions(+), 180 deletions(-)
 rename {common => boot}/fdt_simplefb.c (100%)
 rename {common => boot}/fdt_support.c (100%)
 rename {common => drivers/video}/bmp.c (100%)

-- 
2.42.0.rc1.204.g551eb34607-goog

[PATCH 01/19] lib: rational: Move the Kconfigs into the correct place

[Simon Glass]

These should not be part of the 'system tables' menu. Move them outside
on their own.

Signed-off-by: Simon Glass <sjg@chromium.org>
Fixes: 7d0f3fbb93c ("lib: rational: copy the rational fraction lib...")
---

 lib/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Kconfig b/lib/Kconfig
index 42e559ad0b51..9addcfab3734 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -989,6 +989,8 @@ config GENERATE_SMBIOS_TABLE
 	  See also SMBIOS_SYSINFO which allows SMBIOS values to be provided in
 	  the devicetree.
 
+endmenu
+
 config LIB_RATIONAL
 	bool "enable continued fraction calculation routines"
 
@@ -996,8 +998,6 @@ config SPL_LIB_RATIONAL
 	bool "enable continued fraction calculation routines for SPL"
 	depends on SPL
 
-endmenu
-
 config ASN1_COMPILER
 	bool
 	help
-- 
2.42.0.rc1.204.g551eb34607-goog

[PATCH 02/19] Kconfig: Move API into general setup

[Simon Glass]

This is perhaps not a commonly used feature so should not have its own
option in the main menu. Move it under general setup.

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

 Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Kconfig b/Kconfig
index 91170bf8d223..0a2e97578dfc 100644
--- a/Kconfig
+++ b/Kconfig
@@ -585,10 +585,10 @@ config MP
 	  This provides an option to bringup different processors
 	  in multiprocessor cases.
 
-endmenu		# General setup
-
 source "api/Kconfig"
 
+endmenu		# General setup
+
 source "boot/Kconfig"
 
 source "common/Kconfig"
-- 
2.42.0.rc1.204.g551eb34607-goog

[PATCH 03/19] video: Hide the BMP options

[Simon Glass]

These appear prominently in the main menu at present. However they are
selected when needed so do not need to be visible.

Make them hidden.

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

 common/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/Kconfig b/common/Kconfig
index 0b09bd68bd13..844531a59eda 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1169,12 +1169,12 @@ config IO_TRACE
 	bool
 
 config BMP
-	bool "Enable bmp image display"
+	bool # Enable bmp image display
 	help
 	  Enable bmp functions to display bmp image and get bmp info.
 
 config SPL_BMP
-	bool "Enable bmp image display at SPL"
+	bool # Enable bmp image display at SPL
 	depends on SPL_VIDEO
 	help
 	  Enable bmp functions to display bmp image and get bmp info at SPL.
-- 
2.42.0.rc1.204.g551eb34607-goog

[PATCH 04/19] video: Move BMP options and code to video directory

[Simon Glass]

Put the options and the common BMP code with the other related Kconfig
options in the drivers/video directory.

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

 common/Kconfig                  | 11 -----------
 common/Makefile                 |  1 -
 drivers/video/Kconfig           | 11 +++++++++++
 drivers/video/Makefile          |  2 ++
 {common => drivers/video}/bmp.c |  0
 5 files changed, 13 insertions(+), 12 deletions(-)
 rename {common => drivers/video}/bmp.c (100%)

diff --git a/common/Kconfig b/common/Kconfig
index 844531a59eda..2f46fdb3f62c 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1167,14 +1167,3 @@ config FDT_SIMPLEFB
 
 config IO_TRACE
 	bool
-
-config BMP
-	bool # Enable bmp image display
-	help
-	  Enable bmp functions to display bmp image and get bmp info.
-
-config SPL_BMP
-	bool # Enable bmp image display at SPL
-	depends on SPL_VIDEO
-	help
-	  Enable bmp functions to display bmp image and get bmp info at SPL.
diff --git a/common/Makefile b/common/Makefile
index f5c3d90f0675..0a3f75f2f1c8 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -45,7 +45,6 @@ endif # !CONFIG_SPL_BUILD
 
 obj-$(CONFIG_$(SPL_TPL_)BOOTSTAGE) += bootstage.o
 obj-$(CONFIG_$(SPL_TPL_)BLOBLIST) += bloblist.o
-obj-$(CONFIG_$(SPL_)BMP) += bmp.o
 
 ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_DFU
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 09f2cb1a7321..a4befd6b655c 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -682,6 +682,11 @@ config BACKLIGHT_LM3533
 	  LM3533 Lighting Power chip. Only Bank A is supported as for now.
 	  Supported backlight level range is from 2 to 255 with step of 1.
 
+config BMP
+	bool # Enable bmp image display
+	help
+	  Enable bmp functions to display bmp image and get bmp info.
+
 source "drivers/video/ti/Kconfig"
 
 source "drivers/video/exynos/Kconfig"
@@ -1117,6 +1122,12 @@ config SPL_VIDEO_REMOVE
 	  if this  option is enabled video driver will be removed at the end of
 	  SPL stage, before loading the next stage.
 
+config SPL_BMP
+	bool # Enable bmp image display at SPL
+	depends on SPL_VIDEO
+	help
+	  Enable bmp functions to display bmp image and get bmp info at SPL.
+
 if SPL_SPLASH_SCREEN
 
 config SPL_SPLASH_SCREEN_ALIGN
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index d13af9f3b19b..a3182dca734b 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -3,6 +3,8 @@
 # (C) Copyright 2000-2007
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 
+obj-$(CONFIG_$(SPL_)BMP) += bmp.o
+
 ifdef CONFIG_DM
 obj-$(CONFIG_$(SPL_TPL_)BACKLIGHT) += backlight-uclass.o
 obj-$(CONFIG_BACKLIGHT_GPIO) += backlight_gpio.o
diff --git a/common/bmp.c b/drivers/video/bmp.c
similarity index 100%
rename from common/bmp.c
rename to drivers/video/bmp.c
-- 
2.42.0.rc1.204.g551eb34607-goog

Re: [PATCH 04/19] video: Move BMP options and code to video directory

[Devarsh Thakkar]

On 25/08/23 01:28, Simon Glass wrote:
> Put the options and the common BMP code with the other related Kconfig
> options in the drivers/video directory.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>

Reviewed-by: Devarsh Thakkar <devarsht@ti.com>
> ---
> 
>  common/Kconfig                  | 11 -----------
>  common/Makefile                 |  1 -
>  drivers/video/Kconfig           | 11 +++++++++++
>  drivers/video/Makefile          |  2 ++
>  {common => drivers/video}/bmp.c |  0
>  5 files changed, 13 insertions(+), 12 deletions(-)
>  rename {common => drivers/video}/bmp.c (100%)
> 
> diff --git a/common/Kconfig b/common/Kconfig
> index 844531a59eda..2f46fdb3f62c 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -1167,14 +1167,3 @@ config FDT_SIMPLEFB
>  
>  config IO_TRACE
>  	bool
> -
> -config BMP
> -	bool # Enable bmp image display
> -	help
> -	  Enable bmp functions to display bmp image and get bmp info.
> -
> -config SPL_BMP
> -	bool # Enable bmp image display at SPL
> -	depends on SPL_VIDEO
> -	help
> -	  Enable bmp functions to display bmp image and get bmp info at SPL.
> diff --git a/common/Makefile b/common/Makefile
> index f5c3d90f0675..0a3f75f2f1c8 100644
> --- a/common/Makefile
> +++ b/common/Makefile
> @@ -45,7 +45,6 @@ endif # !CONFIG_SPL_BUILD
>  
>  obj-$(CONFIG_$(SPL_TPL_)BOOTSTAGE) += bootstage.o
>  obj-$(CONFIG_$(SPL_TPL_)BLOBLIST) += bloblist.o
> -obj-$(CONFIG_$(SPL_)BMP) += bmp.o
>  
>  ifdef CONFIG_SPL_BUILD
>  ifdef CONFIG_SPL_DFU
> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
> index 09f2cb1a7321..a4befd6b655c 100644
> --- a/drivers/video/Kconfig
> +++ b/drivers/video/Kconfig
> @@ -682,6 +682,11 @@ config BACKLIGHT_LM3533
>  	  LM3533 Lighting Power chip. Only Bank A is supported as for now.
>  	  Supported backlight level range is from 2 to 255 with step of 1.
>  
> +config BMP
> +	bool # Enable bmp image display
> +	help
> +	  Enable bmp functions to display bmp image and get bmp info.
> +
>  source "drivers/video/ti/Kconfig"
>  
>  source "drivers/video/exynos/Kconfig"
> @@ -1117,6 +1122,12 @@ config SPL_VIDEO_REMOVE
>  	  if this  option is enabled video driver will be removed at the end of
>  	  SPL stage, before loading the next stage.
>  
> +config SPL_BMP
> +	bool # Enable bmp image display at SPL
> +	depends on SPL_VIDEO
> +	help
> +	  Enable bmp functions to display bmp image and get bmp info at SPL.
> +
>  if SPL_SPLASH_SCREEN
>  
>  config SPL_SPLASH_SCREEN_ALIGN
> diff --git a/drivers/video/Makefile b/drivers/video/Makefile
> index d13af9f3b19b..a3182dca734b 100644
> --- a/drivers/video/Makefile
> +++ b/drivers/video/Makefile
> @@ -3,6 +3,8 @@
>  # (C) Copyright 2000-2007
>  # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
>  
> +obj-$(CONFIG_$(SPL_)BMP) += bmp.o
> +
>  ifdef CONFIG_DM
>  obj-$(CONFIG_$(SPL_TPL_)BACKLIGHT) += backlight-uclass.o
>  obj-$(CONFIG_BACKLIGHT_GPIO) += backlight_gpio.o
> diff --git a/common/bmp.c b/drivers/video/bmp.c
> similarity index 100%
> rename from common/bmp.c
> rename to drivers/video/bmp.c

[PATCH 05/19] net: Move SYS_RX_ETH_BUFFER into the network menu

[Simon Glass]

Move this Kconfig option into the correct place, so it doesn't show up
in the top-level menu.

Unfortunately this makes the CONFIG undefined on some boards which don't
enable CONFIG_NET but do include the net.h header file. In fact that
header is included from a lot of common places. So use a fallback in the
header file.

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

 include/net.h | 9 ++++++---
 net/Kconfig   | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/include/net.h b/include/net.h
index e254df7d7f43..f70396c74ba5 100644
--- a/include/net.h
+++ b/include/net.h
@@ -31,11 +31,14 @@ struct udevice;
 #define DEBUG_INT_STATE 0	/* Internal network state changes */
 
 /*
- *	The number of receive packet buffers, and the required packet buffer
- *	alignment in memory.
- *
+ * The number of receive packet buffers, and the required packet buffer
+ * alignment in memory.
  */
+#ifdef CONFIG_SYS_RX_ETH_BUFFER
 #define PKTBUFSRX	CONFIG_SYS_RX_ETH_BUFFER
+#else
+#define PKTBUFSRX	4
+#endif
 #define PKTALIGN	ARCH_DMA_MINALIGN
 
 /* Number of packets processed together */
diff --git a/net/Kconfig b/net/Kconfig
index 4215889127c9..a13ab1d80a0d 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -252,8 +252,6 @@ config IPV6
 	  ip6addr, serverip6. If a u-boot command is capable to parse an IPv6
 	  address and find it, it will force using IPv6 in the network stack.
 
-endif   # if NET
-
 config SYS_RX_ETH_BUFFER
 	int "Number of receive packet buffers"
 	default 4
@@ -262,3 +260,5 @@ config SYS_RX_ETH_BUFFER
 	  controllers it is recommended to set this value to 8 or even higher,
 	  since all buffers can be full shortly after enabling the interface on
 	  high Ethernet traffic.
+
+endif   # if NET
-- 
2.42.0.rc1.204.g551eb34607-goog

[PATCH 06/19] FMU: Avoid showing an unselectable menu option

[Simon Glass]

Use a menuconfig to avoid showing a menu which cannot be selected in many
cases.

This option should really go with the other 'Update support'.

Perhaps we should even consider a top-level update/ directory?

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

 lib/Kconfig             | 4 ----
 lib/fwu_updates/Kconfig | 6 +++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/Kconfig b/lib/Kconfig
index 9addcfab3734..bfab2f3165a7 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -1118,8 +1118,4 @@ config PHANDLE_CHECK_SEQ
 
 endmenu
 
-menu "FWU Multi Bank Updates"
-
 source lib/fwu_updates/Kconfig
-
-endmenu
diff --git a/lib/fwu_updates/Kconfig b/lib/fwu_updates/Kconfig
index 71f34793d926..be35ad29fa32 100644
--- a/lib/fwu_updates/Kconfig
+++ b/lib/fwu_updates/Kconfig
@@ -1,4 +1,4 @@
-config FWU_MULTI_BANK_UPDATE
+menuconfig FWU_MULTI_BANK_UPDATE
 	bool "Enable FWU Multi Bank Update Feature"
 	depends on EFI_CAPSULE_ON_DISK
 	select PARTITION_TYPE_GUID
@@ -10,6 +10,8 @@ config FWU_MULTI_BANK_UPDATE
 	  multiple banks(copies) of the firmware images. One of the
 	  bank is selected for updating all the firmware components
 
+if FWU_MULTI_BANK_UPDATE
+
 config FWU_NUM_BANKS
 	int "Number of Banks defined by the platform"
 	depends on FWU_MULTI_BANK_UPDATE
@@ -31,3 +33,5 @@ config FWU_TRIAL_STATE_CNT
 	  With FWU Multi Bank Update feature enabled, number of times
 	  the platform is allowed to boot in Trial State after an
 	  update.
+
+endif
-- 
2.42.0.rc1.204.g551eb34607-goog

Re: [PATCH 06/19] FMU: Avoid showing an unselectable menu option

[Sughosh Ganu]

On Fri, 25 Aug 2023 at 01:29, Simon Glass <sjg@chromium.org> wrote:
>
> Use a menuconfig to avoid showing a menu which cannot be selected in many
> cases.
>
> This option should really go with the other 'Update support'.
>
> Perhaps we should even consider a top-level update/ directory?
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---

nit: s/FMU/FWU in the commit header.

Acked-by: Sughosh Ganu <sughosh.ganu@linaro.org>

-sughosh

>
>  lib/Kconfig             | 4 ----
>  lib/fwu_updates/Kconfig | 6 +++++-
>  2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/lib/Kconfig b/lib/Kconfig
> index 9addcfab3734..bfab2f3165a7 100644
> --- a/lib/Kconfig
> +++ b/lib/Kconfig
> @@ -1118,8 +1118,4 @@ config PHANDLE_CHECK_SEQ
>
>  endmenu
>
> -menu "FWU Multi Bank Updates"
> -
>  source lib/fwu_updates/Kconfig
> -
> -endmenu
> diff --git a/lib/fwu_updates/Kconfig b/lib/fwu_updates/Kconfig
> index 71f34793d926..be35ad29fa32 100644
> --- a/lib/fwu_updates/Kconfig
> +++ b/lib/fwu_updates/Kconfig
> @@ -1,4 +1,4 @@
> -config FWU_MULTI_BANK_UPDATE
> +menuconfig FWU_MULTI_BANK_UPDATE
>         bool "Enable FWU Multi Bank Update Feature"
>         depends on EFI_CAPSULE_ON_DISK
>         select PARTITION_TYPE_GUID
> @@ -10,6 +10,8 @@ config FWU_MULTI_BANK_UPDATE
>           multiple banks(copies) of the firmware images. One of the
>           bank is selected for updating all the firmware components
>
> +if FWU_MULTI_BANK_UPDATE
> +
>  config FWU_NUM_BANKS
>         int "Number of Banks defined by the platform"
>         depends on FWU_MULTI_BANK_UPDATE
> @@ -31,3 +33,5 @@ config FWU_TRIAL_STATE_CNT
>           With FWU Multi Bank Update feature enabled, number of times
>           the platform is allowed to boot in Trial State after an
>           update.
> +
> +endif
> --
> 2.42.0.rc1.204.g551eb34607-goog
>

Re: [PATCH 06/19] FMU: Avoid showing an unselectable menu option

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 1966 bytes --]

On Fri, Aug 25, 2023 at 05:30:17PM +0530, Sughosh Ganu wrote:
> On Fri, 25 Aug 2023 at 01:29, Simon Glass <sjg@chromium.org> wrote:
> >
> > Use a menuconfig to avoid showing a menu which cannot be selected in many
> > cases.
> >
> > This option should really go with the other 'Update support'.
> >
> > Perhaps we should even consider a top-level update/ directory?
> >
> > Signed-off-by: Simon Glass <sjg@chromium.org>
> > ---
> 
> nit: s/FMU/FWU in the commit header.
> 
> Acked-by: Sughosh Ganu <sughosh.ganu@linaro.org>
> 
> -sughosh
> 
> >
> >  lib/Kconfig             | 4 ----
> >  lib/fwu_updates/Kconfig | 6 +++++-
> >  2 files changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/lib/Kconfig b/lib/Kconfig
> > index 9addcfab3734..bfab2f3165a7 100644
> > --- a/lib/Kconfig
> > +++ b/lib/Kconfig
> > @@ -1118,8 +1118,4 @@ config PHANDLE_CHECK_SEQ
> >
> >  endmenu
> >
> > -menu "FWU Multi Bank Updates"
> > -
> >  source lib/fwu_updates/Kconfig
> > -
> > -endmenu
> > diff --git a/lib/fwu_updates/Kconfig b/lib/fwu_updates/Kconfig
> > index 71f34793d926..be35ad29fa32 100644
> > --- a/lib/fwu_updates/Kconfig
> > +++ b/lib/fwu_updates/Kconfig
> > @@ -1,4 +1,4 @@
> > -config FWU_MULTI_BANK_UPDATE
> > +menuconfig FWU_MULTI_BANK_UPDATE
> >         bool "Enable FWU Multi Bank Update Feature"
> >         depends on EFI_CAPSULE_ON_DISK
> >         select PARTITION_TYPE_GUID
> > @@ -10,6 +10,8 @@ config FWU_MULTI_BANK_UPDATE
> >           multiple banks(copies) of the firmware images. One of the
> >           bank is selected for updating all the firmware components
> >
> > +if FWU_MULTI_BANK_UPDATE
> > +
> >  config FWU_NUM_BANKS
> >         int "Number of Banks defined by the platform"
> >         depends on FWU_MULTI_BANK_UPDATE

Looks like the rest of this Kconfig needs to be updated to not have
depends on FWU_MULTI_BANK_UPDATE if it's all guarded with an if on that.

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[PATCH 07/19] test: Move POST under a renamed Testing section

[Simon Glass]

Rename Unit tests to Testing, since it is a stretch to describe some of
the tests as unit tests. Move POST there as well, so it doesn't show up
by itself in the top-level menu.

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

 test/Kconfig | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/Kconfig b/test/Kconfig
index 6e859fb7d0db..830245b6f9a9 100644
--- a/test/Kconfig
+++ b/test/Kconfig
@@ -1,9 +1,4 @@
-config POST
-	bool "Power On Self Test support"
-	help
-	  See doc/README.POST for more details
-
-menu "Unit tests"
+menu "Testing"
 
 config UNIT_TEST
 	bool "Unit tests"
@@ -110,4 +105,9 @@ source "test/lib/Kconfig"
 source "test/optee/Kconfig"
 source "test/overlay/Kconfig"
 
+config POST
+	bool "Power On Self Test support"
+	help
+	  See doc/README.POST for more details
+
 endmenu
-- 
2.42.0.rc1.204.g551eb34607-goog

[PATCH 08/19] boot: Move fdt_support to boot/

[Simon Glass]

This relates to booting since it fixes up the devicetree for the OS. Move
it into the boot/ directory.

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

 boot/Makefile                  | 3 +++
 {common => boot}/fdt_support.c | 0
 common/Makefile                | 2 --
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename {common => boot}/fdt_support.c (100%)

diff --git a/boot/Makefile b/boot/Makefile
index 10f015722378..f15a161614ff 100644
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_QFW) += bootmeth_qfw.o
 endif
 
 obj-y += image.o image-board.o
+
 obj-$(CONFIG_ANDROID_AB) += android_ab.o
 obj-$(CONFIG_ANDROID_BOOT_IMAGE) += image-android.o image-android-dt.o
 
@@ -37,6 +38,8 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootflow_menu.o
 obj-$(CONFIG_$(SPL_TPL_)CEDIT) += cedit.o
 endif
 
+obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
+
 obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o
 obj-$(CONFIG_$(SPL_TPL_)FIT_SIGNATURE) += fdt_region.o
 obj-$(CONFIG_$(SPL_TPL_)FIT) += image-fit.o
diff --git a/common/fdt_support.c b/boot/fdt_support.c
similarity index 100%
rename from common/fdt_support.c
rename to boot/fdt_support.c
diff --git a/common/Makefile b/common/Makefile
index 0a3f75f2f1c8..0948721d0b47 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -18,7 +18,6 @@ obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o
 obj-$(CONFIG_DISPLAY_BOARDINFO_LATE) += board_info.o
 
 obj-$(CONFIG_FDT_SIMPLEFB) += fdt_simplefb.o
-obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
 obj-$(CONFIG_MII) += miiphyutil.o
 obj-$(CONFIG_CMD_MII) += miiphyutil.o
 obj-$(CONFIG_PHYLIB) += miiphyutil.o
@@ -51,7 +50,6 @@ ifdef CONFIG_SPL_DFU
 obj-$(CONFIG_DFU_OVER_USB) += dfu.o
 endif
 obj-$(CONFIG_SPL_NET) += miiphyutil.o
-obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
 
 obj-$(CONFIG_SPL_USB_HOST) += usb.o usb_hub.o
 obj-$(CONFIG_SPL_USB_STORAGE) += usb_storage.o
-- 
2.42.0.rc1.204.g551eb34607-goog

Re: [PATCH 08/19] boot: Move fdt_support to boot/

[Devarsh Thakkar]

Hi Simon,

On 25/08/23 01:28, Simon Glass wrote:
> This relates to booting since it fixes up the devicetree for the OS. Move
> it into the boot/ directory.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
> 
>  boot/Makefile                  | 3 +++
>  {common => boot}/fdt_support.c | 0
>  common/Makefile                | 2 --
>  3 files changed, 3 insertions(+), 2 deletions(-)
>  rename {common => boot}/fdt_support.c (100%)
> 
> diff --git a/boot/Makefile b/boot/Makefile
> index 10f015722378..f15a161614ff 100644
> --- a/boot/Makefile
> +++ b/boot/Makefile
> @@ -16,6 +16,7 @@ obj-$(CONFIG_QFW) += bootmeth_qfw.o
>  endif
>  
>  obj-y += image.o image-board.o
> +
>  obj-$(CONFIG_ANDROID_AB) += android_ab.o
>  obj-$(CONFIG_ANDROID_BOOT_IMAGE) += image-android.o image-android-dt.o
>  
> @@ -37,6 +38,8 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootflow_menu.o
>  obj-$(CONFIG_$(SPL_TPL_)CEDIT) += cedit.o
>  endif
>  
> +obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
> +
>  obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o

Can this be,
obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o image-fdt.o ?

Regards
Devarsh

>  obj-$(CONFIG_$(SPL_TPL_)FIT_SIGNATURE) += fdt_region.o
>  obj-$(CONFIG_$(SPL_TPL_)FIT) += image-fit.o
> diff --git a/common/fdt_support.c b/boot/fdt_support.c
> similarity index 100%
> rename from common/fdt_support.c
> rename to boot/fdt_support.c
> diff --git a/common/Makefile b/common/Makefile
> index 0a3f75f2f1c8..0948721d0b47 100644
> --- a/common/Makefile
> +++ b/common/Makefile
> @@ -18,7 +18,6 @@ obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o
>  obj-$(CONFIG_DISPLAY_BOARDINFO_LATE) += board_info.o
>  
>  obj-$(CONFIG_FDT_SIMPLEFB) += fdt_simplefb.o
> -obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
>  obj-$(CONFIG_MII) += miiphyutil.o
>  obj-$(CONFIG_CMD_MII) += miiphyutil.o
>  obj-$(CONFIG_PHYLIB) += miiphyutil.o
> @@ -51,7 +50,6 @@ ifdef CONFIG_SPL_DFU
>  obj-$(CONFIG_DFU_OVER_USB) += dfu.o
>  endif
>  obj-$(CONFIG_SPL_NET) += miiphyutil.o
> -obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
>  
>  obj-$(CONFIG_SPL_USB_HOST) += usb.o usb_hub.o
>  obj-$(CONFIG_SPL_USB_STORAGE) += usb_storage.o

Re: [PATCH 08/19] boot: Move fdt_support to boot/

[Simon Glass]

Hi Devarsh,

On Thu, 31 Aug 2023 at 00:02, Devarsh Thakkar <devarsht@ti.com> wrote:
>
> Hi Simon,
>
> On 25/08/23 01:28, Simon Glass wrote:
> > This relates to booting since it fixes up the devicetree for the OS. Move
> > it into the boot/ directory.
> >
> > Signed-off-by: Simon Glass <sjg@chromium.org>
> > ---
> >
> >  boot/Makefile                  | 3 +++
> >  {common => boot}/fdt_support.c | 0
> >  common/Makefile                | 2 --
> >  3 files changed, 3 insertions(+), 2 deletions(-)
> >  rename {common => boot}/fdt_support.c (100%)
> >
> > diff --git a/boot/Makefile b/boot/Makefile
> > index 10f015722378..f15a161614ff 100644
> > --- a/boot/Makefile
> > +++ b/boot/Makefile
> > @@ -16,6 +16,7 @@ obj-$(CONFIG_QFW) += bootmeth_qfw.o
> >  endif
> >
> >  obj-y += image.o image-board.o
> > +
> >  obj-$(CONFIG_ANDROID_AB) += android_ab.o
> >  obj-$(CONFIG_ANDROID_BOOT_IMAGE) += image-android.o image-android-dt.o
> >
> > @@ -37,6 +38,8 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootflow_menu.o
> >  obj-$(CONFIG_$(SPL_TPL_)CEDIT) += cedit.o
> >  endif
> >
> > +obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
> > +
> >  obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o
>
> Can this be,
> obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o image-fdt.o ?

Yes...unfortunately I missed this when sending v3

Regards,
Simon

[PATCH 09/19] Move fdt_simplefb to boot/

[Simon Glass]

This relates to booting, so move it there. Create a new Kconfig menu for
things related to devicetree fixup.

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

 boot/Kconfig                    | 16 ++++++++++++++++
 boot/Makefile                   |  1 +
 {common => boot}/fdt_simplefb.c |  0
 common/Kconfig                  |  9 ---------
 common/Makefile                 |  1 -
 5 files changed, 17 insertions(+), 10 deletions(-)
 rename {common => boot}/fdt_simplefb.c (100%)

diff --git a/boot/Kconfig b/boot/Kconfig
index 5e2d4286aeaa..1b2ac7451a61 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -1535,6 +1535,22 @@ config SPL_IMAGE_PRE_LOAD_SIG
 
 endmenu
 
+if OF_LIBFDT
+
+menu "Devicetree fixup"
+
+config FDT_SIMPLEFB
+	bool "FDT tools for simplefb support"
+	help
+	  Enable the fdt tools to manage the simple fb nodes in device tree.
+	  These functions can be used by board to indicate to the OS
+	  the presence of the simple frame buffer with associated reserved
+	  memory
+
+endmenu
+
+endif # OF_LIBFDT
+
 config USE_BOOTARGS
 	bool "Enable boot arguments"
 	help
diff --git a/boot/Makefile b/boot/Makefile
index f15a161614ff..6ce983b83fa4 100644
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_$(SPL_TPL_)CEDIT) += cedit.o
 endif
 
 obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
+obj-$(CONFIG_$(SPL_TPL_)FDT_SIMPLEFB) += fdt_simplefb.o
 
 obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o
 obj-$(CONFIG_$(SPL_TPL_)FIT_SIGNATURE) += fdt_region.o
diff --git a/common/fdt_simplefb.c b/boot/fdt_simplefb.c
similarity index 100%
rename from common/fdt_simplefb.c
rename to boot/fdt_simplefb.c
diff --git a/common/Kconfig b/common/Kconfig
index 2f46fdb3f62c..9693c0ac426f 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1156,14 +1156,5 @@ config VPL_IMAGE_SIGN_INFO
 
 endif
 
-config FDT_SIMPLEFB
-	bool "FDT tools for simplefb support"
-	depends on OF_LIBFDT
-	help
-	  Enable the fdt tools to manage the simple fb nodes in device tree.
-	  These functions can be used by board to indicate to the OS
-	  the presence of the simple frame buffer with associated reserved
-	  memory
-
 config IO_TRACE
 	bool
diff --git a/common/Makefile b/common/Makefile
index 0948721d0b47..5c1617206f07 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -17,7 +17,6 @@ obj-y += board_r.o
 obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o
 obj-$(CONFIG_DISPLAY_BOARDINFO_LATE) += board_info.o
 
-obj-$(CONFIG_FDT_SIMPLEFB) += fdt_simplefb.o
 obj-$(CONFIG_MII) += miiphyutil.o
 obj-$(CONFIG_CMD_MII) += miiphyutil.o
 obj-$(CONFIG_PHYLIB) += miiphyutil.o
-- 
2.42.0.rc1.204.g551eb34607-goog

Re: [PATCH 09/19] Move fdt_simplefb to boot/

[Devarsh Thakkar]

On 25/08/23 01:29, Simon Glass wrote:
> This relates to booting, so move it there. Create a new Kconfig menu for
> things related to devicetree fixup.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>

Reviewed-by: Devarsh Thakkar <devarsht@ti.com>
> ---
> 
>  boot/Kconfig                    | 16 ++++++++++++++++
>  boot/Makefile                   |  1 +
>  {common => boot}/fdt_simplefb.c |  0
>  common/Kconfig                  |  9 ---------
>  common/Makefile                 |  1 -
>  5 files changed, 17 insertions(+), 10 deletions(-)
>  rename {common => boot}/fdt_simplefb.c (100%)
> 
> diff --git a/boot/Kconfig b/boot/Kconfig
> index 5e2d4286aeaa..1b2ac7451a61 100644
> --- a/boot/Kconfig
> +++ b/boot/Kconfig
> @@ -1535,6 +1535,22 @@ config SPL_IMAGE_PRE_LOAD_SIG
>  
>  endmenu
>  
> +if OF_LIBFDT
> +
> +menu "Devicetree fixup"
> +
> +config FDT_SIMPLEFB
> +	bool "FDT tools for simplefb support"
> +	help
> +	  Enable the fdt tools to manage the simple fb nodes in device tree.
> +	  These functions can be used by board to indicate to the OS
> +	  the presence of the simple frame buffer with associated reserved
> +	  memory
> +
> +endmenu
> +
> +endif # OF_LIBFDT
> +
>  config USE_BOOTARGS
>  	bool "Enable boot arguments"
>  	help
> diff --git a/boot/Makefile b/boot/Makefile
> index f15a161614ff..6ce983b83fa4 100644
> --- a/boot/Makefile
> +++ b/boot/Makefile
> @@ -39,6 +39,7 @@ obj-$(CONFIG_$(SPL_TPL_)CEDIT) += cedit.o
>  endif
>  
>  obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
> +obj-$(CONFIG_$(SPL_TPL_)FDT_SIMPLEFB) += fdt_simplefb.o
>  
>  obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o
>  obj-$(CONFIG_$(SPL_TPL_)FIT_SIGNATURE) += fdt_region.o
> diff --git a/common/fdt_simplefb.c b/boot/fdt_simplefb.c
> similarity index 100%
> rename from common/fdt_simplefb.c
> rename to boot/fdt_simplefb.c
> diff --git a/common/Kconfig b/common/Kconfig
> index 2f46fdb3f62c..9693c0ac426f 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -1156,14 +1156,5 @@ config VPL_IMAGE_SIGN_INFO
>  
>  endif
>  
> -config FDT_SIMPLEFB
> -	bool "FDT tools for simplefb support"
> -	depends on OF_LIBFDT
> -	help
> -	  Enable the fdt tools to manage the simple fb nodes in device tree.
> -	  These functions can be used by board to indicate to the OS
> -	  the presence of the simple frame buffer with associated reserved
> -	  memory
> -
>  config IO_TRACE
>  	bool
> diff --git a/common/Makefile b/common/Makefile
> index 0948721d0b47..5c1617206f07 100644
> --- a/common/Makefile
> +++ b/common/Makefile
> @@ -17,7 +17,6 @@ obj-y += board_r.o
>  obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o
>  obj-$(CONFIG_DISPLAY_BOARDINFO_LATE) += board_info.o
>  
> -obj-$(CONFIG_FDT_SIMPLEFB) += fdt_simplefb.o
>  obj-$(CONFIG_MII) += miiphyutil.o
>  obj-$(CONFIG_CMD_MII) += miiphyutil.o
>  obj-$(CONFIG_PHYLIB) += miiphyutil.o

[PATCH 10/19] boot: Move some other fdt-fixup options to the same menu

[Simon Glass]

Move more options relating to fixing up a device tree into the new
devicetree-fixup menu.

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

 boot/Kconfig | 55 +++++++++++++++++++++++++---------------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/boot/Kconfig b/boot/Kconfig
index 1b2ac7451a61..daec68034c72 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -693,35 +693,6 @@ config SUPPORT_RAW_INITRD
 	  address of the initrd must be augmented by it's size, in the following
 	  format: "<initrd address>:<initrd size>".
 
-config OF_BOARD_SETUP
-	bool "Set up board-specific details in device tree before boot"
-	depends on OF_LIBFDT
-	help
-	  This causes U-Boot to call ft_board_setup() before booting into
-	  the Operating System. This function can set up various
-	  board-specific information in the device tree for use by the OS.
-	  The device tree is then passed to the OS.
-
-config OF_SYSTEM_SETUP
-	bool "Set up system-specific details in device tree before boot"
-	depends on OF_LIBFDT
-	help
-	  This causes U-Boot to call ft_system_setup() before booting into
-	  the Operating System. This function can set up various
-	  system-specific information in the device tree for use by the OS.
-	  The device tree is then passed to the OS.
-
-config OF_STDOUT_VIA_ALIAS
-	bool "Update the device-tree stdout alias from U-Boot"
-	depends on OF_LIBFDT
-	help
-	  This uses U-Boot's serial alias from the aliases node to update
-	  the device tree passed to the OS. The "linux,stdout-path" property
-	  in the chosen node is set to point to the correct serial node.
-	  This option currently references CONFIG_CONS_INDEX, which is
-	  incorrect when used with device tree as this option does not
-	  exist / should not be used.
-
 config HAVE_TEXT_BASE
 	bool
 	depends on !NIOS2 && !XTENSA
@@ -1539,6 +1510,32 @@ if OF_LIBFDT
 
 menu "Devicetree fixup"
 
+config OF_BOARD_SETUP
+	bool "Set up board-specific details in device tree before boot"
+	help
+	  This causes U-Boot to call ft_board_setup() before booting into
+	  the Operating System. This function can set up various
+	  board-specific information in the device tree for use by the OS.
+	  The device tree is then passed to the OS.
+
+config OF_SYSTEM_SETUP
+	bool "Set up system-specific details in device tree before boot"
+	help
+	  This causes U-Boot to call ft_system_setup() before booting into
+	  the Operating System. This function can set up various
+	  system-specific information in the device tree for use by the OS.
+	  The device tree is then passed to the OS.
+
+config OF_STDOUT_VIA_ALIAS
+	bool "Update the device-tree stdout alias from U-Boot"
+	help
+	  This uses U-Boot's serial alias from the aliases node to update
+	  the device tree passed to the OS. The "linux,stdout-path" property
+	  in the chosen node is set to point to the correct serial node.
+	  This option currently references CONFIG_CONS_INDEX, which is
+	  incorrect when used with device tree as this option does not
+	  exist / should not be used.
+
 config FDT_SIMPLEFB
 	bool "FDT tools for simplefb support"
 	help
-- 
2.42.0.rc1.204.g551eb34607-goog

[PATCH 11/19] boot: Rename Android-boot text

[Simon Glass]

Phrases like 'Enable support for' are pointless since this is an option
which enables things. Drop that part so it is easier to follow.

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

 boot/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/Kconfig b/boot/Kconfig
index daec68034c72..e378d9cdb4ff 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -3,7 +3,7 @@ menu "Boot options"
 menu "Boot images"
 
 config ANDROID_BOOT_IMAGE
-	bool "Enable support for Android Boot Images"
+	bool "Android Boot Images"
 	default y if FASTBOOT
 	help
 	  This enables support for booting images which use the Android
-- 
2.42.0.rc1.204.g551eb34607-goog

[PATCH 12/19] Kconfig: Create a menu for FIT

[Simon Glass]

This is a major feature with a lot of options. Give it its own menu to
tidy up the 'make menuconfig' display. Drop the 'depends on FIT' pieces
which are now unnecessary, since they are now bracketed by an 'if FIT'.

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

 boot/Kconfig | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/boot/Kconfig b/boot/Kconfig
index e378d9cdb4ff..bc3a68402a15 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -9,8 +9,8 @@ config ANDROID_BOOT_IMAGE
 	  This enables support for booting images which use the Android
 	  image format header.
 
-config FIT
-	bool "Support Flattened Image Tree"
+menuconfig FIT
+	bool "Flattened Image Tree (FIT)"
 	select HASH
 	select MD5
 	select SHA1
@@ -25,6 +25,8 @@ config FIT
 	  multiple configurations, verification through hashing and also
 	  verified boot (secure boot using RSA).
 
+if FIT
+
 config TIMESTAMP
 	bool "Show image date and time when displaying image information"
 	default y if CMD_DATE
@@ -38,7 +40,6 @@ config TIMESTAMP
 
 config FIT_EXTERNAL_OFFSET
 	hex "FIT external data offset"
-	depends on FIT
 	default 0x0
 	help
 	  This specifies a data offset in fit image.
@@ -49,7 +50,6 @@ config FIT_EXTERNAL_OFFSET
 
 config FIT_FULL_CHECK
 	bool "Do a full check of the FIT before using it"
-	depends on FIT
 	default y
 	help
 	  Enable this do a full check of the FIT to make sure it is valid. This
@@ -59,7 +59,7 @@ config FIT_FULL_CHECK
 
 config FIT_SIGNATURE
 	bool "Enable signature verification of FIT uImages"
-	depends on DM && FIT
+	depends on DM
 	select HASH
 	imply RSA
 	imply RSA_VERIFY
@@ -97,7 +97,7 @@ config FIT_RSASSA_PSS
 
 config FIT_CIPHER
 	bool "Enable ciphering data in a FIT uImages"
-	depends on DM && FIT
+	depends on DM
 	select AES
 	help
 	  Enable the feature of data ciphering/unciphering in the tool mkimage
@@ -105,7 +105,6 @@ config FIT_CIPHER
 
 config FIT_VERBOSE
 	bool "Show verbose messages when FIT images fail"
-	depends on FIT
 	help
 	  Generally a system will have valid FIT images so debug messages
 	  are a waste of code space. If you are debugging your images then
@@ -114,7 +113,6 @@ config FIT_VERBOSE
 
 config FIT_BEST_MATCH
 	bool "Select the best match for the kernel device tree"
-	depends on FIT
 	help
 	  When no configuration is explicitly selected, default to the
 	  one whose fdt's compatibility field best matches that of
@@ -124,7 +122,6 @@ config FIT_BEST_MATCH
 
 config FIT_IMAGE_POST_PROCESS
 	bool "Enable post-processing of FIT artifacts after loading by U-Boot"
-	depends on FIT
 	depends on SOCFPGA_SECURE_VAB_AUTH
 	help
 	  Allows doing any sort of manipulation to blobs after they got extracted
@@ -139,11 +136,12 @@ config FIT_IMAGE_POST_PROCESS
 
 config FIT_PRINT
         bool "Support FIT printing"
-	depends on FIT
         default y
         help
           Support printing the content of the fitImage in a verbose manner.
 
+endif # FIT
+
 config SPL_FIT
 	bool "Support Flattened Image Tree within SPL"
 	depends on SPL && FIT
-- 
2.42.0.rc1.204.g551eb34607-goog

[PATCH 13/19] Kconfig: Move SPL_FIT under FIT

[Simon Glass]

This option already depends on FIT, so put it under the same umbrella, so
that it appears in the FIT menu.

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

 boot/Kconfig | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/boot/Kconfig b/boot/Kconfig
index bc3a68402a15..af08703ea1e5 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -140,11 +140,9 @@ config FIT_PRINT
         help
           Support printing the content of the fitImage in a verbose manner.
 
-endif # FIT
-
 config SPL_FIT
 	bool "Support Flattened Image Tree within SPL"
-	depends on SPL && FIT
+	depends on SPL
 	select SPL_HASH
 	select SPL_OF_LIBFDT
 
@@ -195,7 +193,7 @@ config SPL_FIT_RSASSA_PSS
 
 config SPL_LOAD_FIT
 	bool "Enable SPL loading U-Boot as a FIT (basic fitImage features)"
-	depends on SPL && FIT
+	depends on SPL
 	select SPL_FIT
 	help
 	  Normally with the SPL framework a legacy image is generated as part
@@ -243,7 +241,6 @@ config SPL_LOAD_FIT_APPLY_OVERLAY_BUF_SZ
 
 config SPL_LOAD_FIT_FULL
 	bool "Enable SPL loading U-Boot as a FIT (full fitImage features)"
-	depends on FIT
 	select SPL_FIT
 	help
 	  Normally with the SPL framework a legacy image is generated as part
@@ -341,6 +338,8 @@ config VPL_FIT_SIGNATURE_MAX_SIZE
 
 endif # VPL
 
+endif # FIT
+
 config PXE_UTILS
 	bool
 	select MENU
-- 
2.42.0.rc1.204.g551eb34607-goog

[PATCH 14/19] spl: Tidy up load address in spl_ram

[Simon Glass]

This CONFIG is used but is not given a value by some boards. Use
a default value of 0 explicitly, rather than relying on the 0 value
provided by CONFIG_SPL_LOAD_FIT_ADDRESS

This will allow us to make SPL_LOAD_FIT_ADDRESS depend on SPL_LOAD_FIT
as it should.

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

 common/spl/spl_ram.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c
index 93cf420d810a..4158ed1c32d7 100644
--- a/common/spl/spl_ram.c
+++ b/common/spl/spl_ram.c
@@ -20,12 +20,16 @@
 static ulong spl_ram_load_read(struct spl_load_info *load, ulong sector,
 			       ulong count, void *buf)
 {
-	ulong addr;
+	ulong addr = 0;
 
 	debug("%s: sector %lx, count %lx, buf %lx\n",
 	      __func__, sector, count, (ulong)buf);
 
-	addr = (ulong)CONFIG_SPL_LOAD_FIT_ADDRESS + sector;
+	if (IS_ENABLED(CONFIG_SPL_LOAD_FIT)) {
+		addr = IF_ENABLED_INT(CONFIG_SPL_LOAD_FIT,
+				      CONFIG_SPL_LOAD_FIT_ADDRESS);
+	}
+	addr += sector;
 	if (CONFIG_IS_ENABLED(IMAGE_PRE_LOAD))
 		addr += image_load_offset;
 
@@ -38,20 +42,23 @@ static int spl_ram_load_image(struct spl_image_info *spl_image,
 			      struct spl_boot_device *bootdev)
 {
 	struct legacy_img_hdr *header;
+	ulong addr = 0;
 	int ret;
 
-	header = (struct legacy_img_hdr *)CONFIG_SPL_LOAD_FIT_ADDRESS;
+	if (IS_ENABLED(CONFIG_SPL_LOAD_FIT)) {
+		addr = IF_ENABLED_INT(CONFIG_SPL_LOAD_FIT,
+				      CONFIG_SPL_LOAD_FIT_ADDRESS);
+	}
 
 	if (CONFIG_IS_ENABLED(IMAGE_PRE_LOAD)) {
-		unsigned long addr = (unsigned long)header;
 		ret = image_pre_load(addr);
 
 		if (ret)
 			return ret;
 
 		addr += image_load_offset;
-		header = (struct legacy_img_hdr *)addr;
 	}
+	header = map_sysmem(addr, 0);
 
 #if CONFIG_IS_ENABLED(DFU)
 	if (bootdev->boot_device == BOOT_DEVICE_DFU)
@@ -84,7 +91,7 @@ static int spl_ram_load_image(struct spl_image_info *spl_image,
 			u_boot_pos = (ulong)spl_get_load_buffer(-sizeof(*header),
 								sizeof(*header));
 		}
-		header = (struct legacy_img_hdr *)map_sysmem(u_boot_pos, 0);
+		header = map_sysmem(u_boot_pos, 0);
 
 		ret = spl_parse_image_header(spl_image, bootdev, header);
 	}
-- 
2.42.0.rc1.204.g551eb34607-goog

[PATCH 15/19] boot: Make standard boot a menu

[Simon Glass]

Collect these options into a menu for easier viewing.

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

 boot/Kconfig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/boot/Kconfig b/boot/Kconfig
index af08703ea1e5..8343eba10531 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -372,8 +372,8 @@ config BOOT_DEFAULTS
 	  of U-Boot to boot various images. Currently much functionality is
 	  tied to enabling the command that exercises it.
 
-config BOOTSTD
-	bool "Standard boot support"
+menuconfig BOOTSTD
+	bool "Standard boot"
 	default y
 	depends on DM && OF_CONTROL && BLK
 	help
@@ -393,6 +393,8 @@ config BOOTSTD
 	        U-Boot)
 	    - bootflow - a description of how to boot (owned by the distro)
 
+if BOOTSTD
+
 config SPL_BOOTSTD
 	bool "Standard boot support in SPL"
 	depends on SPL && SPL_DM && SPL_OF_CONTROL && SPL_BLK
@@ -413,8 +415,6 @@ config VPL_BOOTSTD
 	  boot. It is enabled by default since the main purpose of VPL is to
 	  handle the firmware part of VBE.
 
-if BOOTSTD
-
 config BOOTSTD_FULL
 	bool "Enhanced features for standard boot"
 	default y if SANDBOX
@@ -670,7 +670,7 @@ config BOOTMETH_SCRIPT
 	  This provides a way to try out standard boot on an existing boot flow.
 	  It is not enabled by default to save space.
 
-endif
+endif # BOOTSTD
 
 config LEGACY_IMAGE_FORMAT
 	bool "Enable support for the legacy image format"
-- 
2.42.0.rc1.204.g551eb34607-goog

[PATCH 16/19] Kconfig: Move TEXT_BASE et al under general setup

[Simon Glass]

These don't relate to booting. Move them out of there and into the same
place as the other related settings.

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

 Kconfig      | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 boot/Kconfig | 65 ----------------------------------------------------
 2 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/Kconfig b/Kconfig
index 0a2e97578dfc..2d4b82149860 100644
--- a/Kconfig
+++ b/Kconfig
@@ -585,6 +585,71 @@ config MP
 	  This provides an option to bringup different processors
 	  in multiprocessor cases.
 
+config HAVE_TEXT_BASE
+	bool
+	depends on !NIOS2 && !XTENSA
+	depends on !EFI_APP
+	default y
+
+config TEXT_BASE
+	depends on HAVE_TEXT_BASE
+	default 0x0 if POSITION_INDEPENDENT
+	default 0x80800000 if ARCH_OMAP2PLUS || ARCH_K3
+	default 0x81700000 if MACH_SUNIV
+	default 0x2a000000 if MACH_SUN9I
+	default 0x4a000000 if SUNXI_MINIMUM_DRAM_MB >= 256
+	default 0x42e00000 if SUNXI_MINIMUM_DRAM_MB >= 64
+	hex "Text Base"
+	help
+	  The address in memory that U-Boot will be running from, initially.
+
+config HAVE_SYS_MONITOR_BASE
+	bool
+	depends on ARC || MIPS || M68K || NIOS2 || PPC || XTENSA || X86 \
+		|| ENV_IS_IN_FLASH || MTD_NOR_FLASH
+	depends on !EFI_APP
+	default y
+
+config SYS_MONITOR_BASE
+	depends on HAVE_SYS_MONITOR_BASE
+	hex "Physical start address of boot monitor code"
+	default TEXT_BASE
+	help
+	  The physical start address of boot monitor code (which is the same as
+	  CONFIG_TEXT_BASE when linking) and the same as CFG_SYS_FLASH_BASE
+	  when booting from flash.
+
+config SPL_SYS_MONITOR_BASE
+	depends on MPC85xx && SPL && HAVE_SYS_MONITOR_BASE
+	hex "Physical start address of SPL monitor code"
+	default SPL_TEXT_BASE
+
+config TPL_SYS_MONITOR_BASE
+	depends on MPC85xx && TPL && HAVE_SYS_MONITOR_BASE
+	hex "Physical start address of TPL monitor code"
+
+config DYNAMIC_SYS_CLK_FREQ
+	bool "Determine CPU clock frequency at run-time"
+	help
+	  Implement a get_board_sys_clk function that will determine the CPU
+	  clock frequency at run time, rather than define it statically.
+
+config SYS_CLK_FREQ
+	depends on !DYNAMIC_SYS_CLK_FREQ
+	int "CPU clock frequency"
+	default 125000000 if ARCH_LS1012A
+	default 100000000 if ARCH_P2020 || ARCH_T1024 || ARCH_T1042 || \
+			     ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3
+	default 66666666 if ARCH_P1010 || ARCH_P1020 || ARCH_T4240
+	default 66660000 if ARCH_T2080
+	default 33333333 if RCAR_GEN3
+	default 24000000 if ARCH_EXYNOS
+	default 20000000 if RCAR_GEN2
+	default 0
+	help
+	  A static value for the CPU frequency.  Note that if not required
+	  for a given SoC, this can be left at 0.
+
 source "api/Kconfig"
 
 endmenu		# General setup
diff --git a/boot/Kconfig b/boot/Kconfig
index 8343eba10531..02b33323d726 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -690,71 +690,6 @@ config SUPPORT_RAW_INITRD
 	  address of the initrd must be augmented by it's size, in the following
 	  format: "<initrd address>:<initrd size>".
 
-config HAVE_TEXT_BASE
-	bool
-	depends on !NIOS2 && !XTENSA
-	depends on !EFI_APP
-	default y
-
-config TEXT_BASE
-	depends on HAVE_TEXT_BASE
-	default 0x0 if POSITION_INDEPENDENT
-	default 0x80800000 if ARCH_OMAP2PLUS || ARCH_K3
-	default 0x81700000 if MACH_SUNIV
-	default 0x2a000000 if MACH_SUN9I
-	default 0x4a000000 if SUNXI_MINIMUM_DRAM_MB >= 256
-	default 0x42e00000 if SUNXI_MINIMUM_DRAM_MB >= 64
-	hex "Text Base"
-	help
-	  The address in memory that U-Boot will be running from, initially.
-
-config HAVE_SYS_MONITOR_BASE
-	bool
-	depends on ARC || MIPS || M68K || NIOS2 || PPC || XTENSA || X86 \
-		|| ENV_IS_IN_FLASH || MTD_NOR_FLASH
-	depends on !EFI_APP
-	default y
-
-config SYS_MONITOR_BASE
-	depends on HAVE_SYS_MONITOR_BASE
-	hex "Physical start address of boot monitor code"
-	default TEXT_BASE
-	help
-	  The physical start address of boot monitor code (which is the same as
-	  CONFIG_TEXT_BASE when linking) and the same as CFG_SYS_FLASH_BASE
-	  when booting from flash.
-
-config SPL_SYS_MONITOR_BASE
-	depends on MPC85xx && SPL && HAVE_SYS_MONITOR_BASE
-	hex "Physical start address of SPL monitor code"
-	default SPL_TEXT_BASE
-
-config TPL_SYS_MONITOR_BASE
-	depends on MPC85xx && TPL && HAVE_SYS_MONITOR_BASE
-	hex "Physical start address of TPL monitor code"
-
-config DYNAMIC_SYS_CLK_FREQ
-	bool "Determine CPU clock frequency at run-time"
-	help
-	  Implement a get_board_sys_clk function that will determine the CPU
-	  clock frequency at run time, rather than define it statically.
-
-config SYS_CLK_FREQ
-	depends on !DYNAMIC_SYS_CLK_FREQ
-	int "CPU clock frequency"
-	default 125000000 if ARCH_LS1012A
-	default 100000000 if ARCH_P2020 || ARCH_T1024 || ARCH_T1042 || \
-			     ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3
-	default 66666666 if ARCH_P1010 || ARCH_P1020 || ARCH_T4240
-	default 66660000 if ARCH_T2080
-	default 33333333 if RCAR_GEN3
-	default 24000000 if ARCH_EXYNOS
-	default 20000000 if RCAR_GEN2
-	default 0
-	help
-	  A static value for the CPU frequency.  Note that if not required
-	  for a given SoC, this can be left at 0.
-
 config ARCH_FIXUP_FDT_MEMORY
 	bool "Enable arch_fixup_memory_banks() call"
 	default y
-- 
2.42.0.rc1.204.g551eb34607-goog

[PATCH 17/19] Make DISTRO_DEFAULTS as deprecated

[Simon Glass]

Encourage people to move to distro boot. Add a short migration guide.

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

 boot/Kconfig            |  7 ++++++-
 doc/develop/bootstd.rst | 23 +++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/boot/Kconfig b/boot/Kconfig
index 02b33323d726..4742ee2027bd 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -781,7 +781,7 @@ config SYS_BOOT_RAMDISK_HIGH
 endmenu		# Boot images
 
 config DISTRO_DEFAULTS
-	bool "Select defaults suitable for booting general purpose Linux distributions"
+	bool "(deprecated) 'Defaults suitable for booting general purpose Linux distributions"
 	select BOOT_DEFAULTS
 	select AUTO_COMPLETE
 	select CMDLINE_EDITING
@@ -789,6 +789,11 @@ config DISTRO_DEFAULTS
 	select HUSH_PARSER
 	select SYS_LONGHELP
 	help
+	  Note: These scripts have been replaced by Standard Boot. Do not use
+	  them on new boards. See 'Migrating from distro_boot' at
+	  doc/develop/bootstd.rst
+
+
 	  Select this to enable various options and commands which are suitable
 	  for building u-boot for booting general purpose Linux distributions.
 
diff --git a/doc/develop/bootstd.rst b/doc/develop/bootstd.rst
index ec3136535783..8b2f0849a1c0 100644
--- a/doc/develop/bootstd.rst
+++ b/doc/develop/bootstd.rst
@@ -458,6 +458,28 @@ ready    File was loaded and is ready for use. In this state the bootflow is
 =======  =======================================================================
 
 
+Migrating from distro_boot
+--------------------------
+
+To migrate from distro_boot:
+
+#. Update your board header files to remove the BOOTENV and BOOT_TARGET_xxx
+   defines. Standard boot finds available boot devices automatically.
+
+#. Remove the "boot_targets" variable unless you need it. Standard boot uses a
+   default order from fastest to slowest, which generally matches the order used
+   by boards.
+
+#. Make sure that CONFIG_BOOTSTD_DEFAULTS is enabled by your board, so it can
+   boot common Linux distributions.
+
+An example patch is at migrate_patch_.
+
+If you are using custom boot scripts for your board, consider creating your
+own bootmeth to hold the logic. There are various examples at
+`boot/bootmeth_...`.
+
+
 Theory of operation
 -------------------
 
@@ -768,3 +790,4 @@ Other ideas:
 .. _BootLoaderSpec: http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec/
 .. _distro_boot: https://github.com/u-boot/u-boot/blob/master/boot/distro.c
 .. _bootflow_h: https://github.com/u-boot/u-boot/blob/master/include/bootflow.h
+.. _migrate_patch: https://patchwork.ozlabs.org/project/uboot/patch/20230727215433.578830-2-sjg@chromium.org/
-- 
2.42.0.rc1.204.g551eb34607-goog

Re: [PATCH 17/19] Make DISTRO_DEFAULTS as deprecated

[Mark Kettenis]

> From: Simon Glass <sjg@chromium.org>
> Date: Thu, 24 Aug 2023 13:59:08 -0600
> 
> Encourage people to move to distro boot. Add a short migration guide.

Doesn't this commit message say the exact opposite of what the patch does?

> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
> 
>  boot/Kconfig            |  7 ++++++-
>  doc/develop/bootstd.rst | 23 +++++++++++++++++++++++
>  2 files changed, 29 insertions(+), 1 deletion(-)
> 
> diff --git a/boot/Kconfig b/boot/Kconfig
> index 02b33323d726..4742ee2027bd 100644
> --- a/boot/Kconfig
> +++ b/boot/Kconfig
> @@ -781,7 +781,7 @@ config SYS_BOOT_RAMDISK_HIGH
>  endmenu		# Boot images
>  
>  config DISTRO_DEFAULTS
> -	bool "Select defaults suitable for booting general purpose Linux distributions"
> +	bool "(deprecated) 'Defaults suitable for booting general purpose Linux distributions"
>  	select BOOT_DEFAULTS
>  	select AUTO_COMPLETE
>  	select CMDLINE_EDITING
> @@ -789,6 +789,11 @@ config DISTRO_DEFAULTS
>  	select HUSH_PARSER
>  	select SYS_LONGHELP
>  	help
> +	  Note: These scripts have been replaced by Standard Boot. Do not use
> +	  them on new boards. See 'Migrating from distro_boot' at
> +	  doc/develop/bootstd.rst
> +
> +
>  	  Select this to enable various options and commands which are suitable
>  	  for building u-boot for booting general purpose Linux distributions.
>  
> diff --git a/doc/develop/bootstd.rst b/doc/develop/bootstd.rst
> index ec3136535783..8b2f0849a1c0 100644
> --- a/doc/develop/bootstd.rst
> +++ b/doc/develop/bootstd.rst
> @@ -458,6 +458,28 @@ ready    File was loaded and is ready for use. In this state the bootflow is
>  =======  =======================================================================
>  
>  
> +Migrating from distro_boot
> +--------------------------
> +
> +To migrate from distro_boot:
> +
> +#. Update your board header files to remove the BOOTENV and BOOT_TARGET_xxx
> +   defines. Standard boot finds available boot devices automatically.
> +
> +#. Remove the "boot_targets" variable unless you need it. Standard boot uses a
> +   default order from fastest to slowest, which generally matches the order used
> +   by boards.
> +
> +#. Make sure that CONFIG_BOOTSTD_DEFAULTS is enabled by your board, so it can
> +   boot common Linux distributions.
> +
> +An example patch is at migrate_patch_.
> +
> +If you are using custom boot scripts for your board, consider creating your
> +own bootmeth to hold the logic. There are various examples at
> +`boot/bootmeth_...`.
> +
> +
>  Theory of operation
>  -------------------
>  
> @@ -768,3 +790,4 @@ Other ideas:
>  .. _BootLoaderSpec: http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec/
>  .. _distro_boot: https://github.com/u-boot/u-boot/blob/master/boot/distro.c
>  .. _bootflow_h: https://github.com/u-boot/u-boot/blob/master/include/bootflow.h
> +.. _migrate_patch: https://patchwork.ozlabs.org/project/uboot/patch/20230727215433.578830-2-sjg@chromium.org/
> -- 
> 2.42.0.rc1.204.g551eb34607-goog
> 
> 

Re: [PATCH 17/19] Make DISTRO_DEFAULTS as deprecated

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 681 bytes --]

On Mon, Aug 28, 2023 at 04:41:08PM +0200, Mark Kettenis wrote:
> > From: Simon Glass <sjg@chromium.org>
> > Date: Thu, 24 Aug 2023 13:59:08 -0600
> > 
> > Encourage people to move to distro boot. Add a short migration guide.
> 
> Doesn't this commit message say the exact opposite of what the patch does?

Given the unintentionally vague wording everything has, yes and no.
The prompted question needs to be reworded, not just prepended with
"deprecated". And yes, the commit message expanded upon too. As the rest
of the patch explains and documents, platforms should use Standard Boot
in order to boot arbitrary off the shelf stock distributions easily.

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[PATCH 18/19] boot: Join FDT_FIXUP_PARTITIONS with related options

[Simon Glass]

Move this to be with the other devicetree-fixup options.

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

 boot/Kconfig | 8 ++++++++
 lib/Kconfig  | 9 ---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/boot/Kconfig b/boot/Kconfig
index 4742ee2027bd..32d3a7306139 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -1473,6 +1473,14 @@ config OF_STDOUT_VIA_ALIAS
 	  incorrect when used with device tree as this option does not
 	  exist / should not be used.
 
+config FDT_FIXUP_PARTITIONS
+	bool "overwrite MTD partitions in DTS through defined in 'mtdparts'"
+	depends on CMD_MTDPARTS
+	help
+	  Allow overwriting defined partitions in the device tree blob
+	  using partition info defined in the 'mtdparts' environment
+	  variable.
+
 config FDT_SIMPLEFB
 	bool "FDT tools for simplefb support"
 	help
diff --git a/lib/Kconfig b/lib/Kconfig
index bfab2f3165a7..eb2b10161824 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -953,15 +953,6 @@ config VPL_OF_LIBFDT_ASSUME_MASK
 	  0xff means all assumptions are made and any invalid data may cause
 	  unsafe execution. See FDT_ASSUME_PERFECT, etc. in libfdt_internal.h
 
-config FDT_FIXUP_PARTITIONS
-	bool "overwrite MTD partitions in DTS through defined in 'mtdparts'"
-	depends on OF_LIBFDT
-	depends on CMD_MTDPARTS
-	help
-	  Allow overwriting defined partitions in the device tree blob
-	  using partition info defined in the 'mtdparts' environment
-	  variable.
-
 menu "System tables"
 	depends on (!EFI && !SYS_COREBOOT) || (ARM && EFI_LOADER)
 
-- 
2.42.0.rc1.204.g551eb34607-goog

[PATCH 19/19] boot: Join ARCH_FIXUP_FDT_MEMORY with related options

[Simon Glass]

Move this to be with the other devicetree-fixup options.

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

 boot/Kconfig | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/boot/Kconfig b/boot/Kconfig
index 32d3a7306139..d9cb67945716 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -690,14 +690,6 @@ config SUPPORT_RAW_INITRD
 	  address of the initrd must be augmented by it's size, in the following
 	  format: "<initrd address>:<initrd size>".
 
-config ARCH_FIXUP_FDT_MEMORY
-	bool "Enable arch_fixup_memory_banks() call"
-	default y
-	help
-	  Enable FDT memory map syncup before OS boot. This feature can be
-	  used for booting OS with different memory setup where the part of
-	  the memory location should be used for different purpose.
-
 config CHROMEOS
 	bool "Support booting Chrome OS"
 	help
@@ -1489,6 +1481,14 @@ config FDT_SIMPLEFB
 	  the presence of the simple frame buffer with associated reserved
 	  memory
 
+config ARCH_FIXUP_FDT_MEMORY
+	bool "Enable arch_fixup_memory_banks() call"
+	default y
+	help
+	  Enable FDT memory map syncup before OS boot. This feature can be
+	  used for booting OS with different memory setup where the part of
+	  the memory location should be used for different purpose.
+
 endmenu
 
 endif # OF_LIBFDT
-- 
2.42.0.rc1.204.g551eb34607-goog