| Message ID | 20240122223920.3630168-2-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | e82f7c627cd0bee334273541fa41b26eb9a9ab8a |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [01/16] kbuild: Allow for CONFIG_SYS_CONFIG_NAME to be unset | expand |
On 1/22/24 23:39, Tom Rini wrote: > Now that we support having CONFIG_SYS_CONFIG_NAME be unset to indicate a > lack of board.h file, unset this on the xilinx_mbv platforms and remove > the otherwise empty file. > > Signed-off-by: Tom Rini <trini@konsulko.com> > --- > Cc: Michal Simek <michal.simek@amd.com> > --- > board/xilinx/mbv/Kconfig | 3 --- > board/xilinx/mbv/MAINTAINERS | 1 - > include/configs/xilinx_mbv.h | 6 ------ > 3 files changed, 10 deletions(-) > delete mode 100644 include/configs/xilinx_mbv.h > > diff --git a/board/xilinx/mbv/Kconfig b/board/xilinx/mbv/Kconfig > index 4bc9f72c541b..d2dec397ed6f 100644 > --- a/board/xilinx/mbv/Kconfig > +++ b/board/xilinx/mbv/Kconfig > @@ -9,9 +9,6 @@ config SYS_VENDOR > config SYS_CPU > default "generic" > > -config SYS_CONFIG_NAME > - default "xilinx_mbv" > - > config TEXT_BASE > default 0x80000000 if !RISCV_SMODE > default 0x80400000 if RISCV_SMODE && ARCH_RV32I > diff --git a/board/xilinx/mbv/MAINTAINERS b/board/xilinx/mbv/MAINTAINERS > index 445654fe740e..db9f03388df9 100644 > --- a/board/xilinx/mbv/MAINTAINERS > +++ b/board/xilinx/mbv/MAINTAINERS > @@ -4,4 +4,3 @@ S: Maintained > F: arch/riscv/dts/xilinx-mbv* > F: board/xilinx/mbv/ > F: configs/xilinx_mbv* > -F: include/configs/xilinx_mbv.h > diff --git a/include/configs/xilinx_mbv.h b/include/configs/xilinx_mbv.h > deleted file mode 100644 > index dba398aeec49..000000000000 > --- a/include/configs/xilinx_mbv.h > +++ /dev/null > @@ -1,6 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > -/* > - * (C) Copyright 2023, Advanced Micro Devices, Inc. > - * > - * Michal Simek <michal.simek@amd.com> > - */ Acked-by: Michal Simek <michal.simek@amd.com> But maybe in future we need to revert this patch to add more options there. Or do you plan to remove all of these configs? I can imagine distro boot wiring but that can be done via vars file only but it is not practical. Thanks, Michal
On Tue, Jan 23, 2024 at 08:53:21AM +0100, Michal Simek wrote: > > > On 1/22/24 23:39, Tom Rini wrote: > > Now that we support having CONFIG_SYS_CONFIG_NAME be unset to indicate a > > lack of board.h file, unset this on the xilinx_mbv platforms and remove > > the otherwise empty file. > > > > Signed-off-by: Tom Rini <trini@konsulko.com> > > --- > > Cc: Michal Simek <michal.simek@amd.com> > > --- > > board/xilinx/mbv/Kconfig | 3 --- > > board/xilinx/mbv/MAINTAINERS | 1 - > > include/configs/xilinx_mbv.h | 6 ------ > > 3 files changed, 10 deletions(-) > > delete mode 100644 include/configs/xilinx_mbv.h > > > > diff --git a/board/xilinx/mbv/Kconfig b/board/xilinx/mbv/Kconfig > > index 4bc9f72c541b..d2dec397ed6f 100644 > > --- a/board/xilinx/mbv/Kconfig > > +++ b/board/xilinx/mbv/Kconfig > > @@ -9,9 +9,6 @@ config SYS_VENDOR > > config SYS_CPU > > default "generic" > > -config SYS_CONFIG_NAME > > - default "xilinx_mbv" > > - > > config TEXT_BASE > > default 0x80000000 if !RISCV_SMODE > > default 0x80400000 if RISCV_SMODE && ARCH_RV32I > > diff --git a/board/xilinx/mbv/MAINTAINERS b/board/xilinx/mbv/MAINTAINERS > > index 445654fe740e..db9f03388df9 100644 > > --- a/board/xilinx/mbv/MAINTAINERS > > +++ b/board/xilinx/mbv/MAINTAINERS > > @@ -4,4 +4,3 @@ S: Maintained > > F: arch/riscv/dts/xilinx-mbv* > > F: board/xilinx/mbv/ > > F: configs/xilinx_mbv* > > -F: include/configs/xilinx_mbv.h > > diff --git a/include/configs/xilinx_mbv.h b/include/configs/xilinx_mbv.h > > deleted file mode 100644 > > index dba398aeec49..000000000000 > > --- a/include/configs/xilinx_mbv.h > > +++ /dev/null > > @@ -1,6 +0,0 @@ > > -/* SPDX-License-Identifier: GPL-2.0 */ > > -/* > > - * (C) Copyright 2023, Advanced Micro Devices, Inc. > > - * > > - * Michal Simek <michal.simek@amd.com> > > - */ > > Acked-by: Michal Simek <michal.simek@amd.com> > > But maybe in future we need to revert this patch to add more options there. > Or do you plan to remove all of these configs? > I can imagine distro boot wiring but that can be done via vars file only but > it is not practical. Do you mean that plain text environment feels impractical for standard boot (which should be used instead of the pure scripts of distro_boot) ?
On 1/23/24 18:58, Tom Rini wrote: > On Tue, Jan 23, 2024 at 08:53:21AM +0100, Michal Simek wrote: >> >> >> On 1/22/24 23:39, Tom Rini wrote: >>> Now that we support having CONFIG_SYS_CONFIG_NAME be unset to indicate a >>> lack of board.h file, unset this on the xilinx_mbv platforms and remove >>> the otherwise empty file. >>> >>> Signed-off-by: Tom Rini <trini@konsulko.com> >>> --- >>> Cc: Michal Simek <michal.simek@amd.com> >>> --- >>> board/xilinx/mbv/Kconfig | 3 --- >>> board/xilinx/mbv/MAINTAINERS | 1 - >>> include/configs/xilinx_mbv.h | 6 ------ >>> 3 files changed, 10 deletions(-) >>> delete mode 100644 include/configs/xilinx_mbv.h >>> >>> diff --git a/board/xilinx/mbv/Kconfig b/board/xilinx/mbv/Kconfig >>> index 4bc9f72c541b..d2dec397ed6f 100644 >>> --- a/board/xilinx/mbv/Kconfig >>> +++ b/board/xilinx/mbv/Kconfig >>> @@ -9,9 +9,6 @@ config SYS_VENDOR >>> config SYS_CPU >>> default "generic" >>> -config SYS_CONFIG_NAME >>> - default "xilinx_mbv" >>> - >>> config TEXT_BASE >>> default 0x80000000 if !RISCV_SMODE >>> default 0x80400000 if RISCV_SMODE && ARCH_RV32I >>> diff --git a/board/xilinx/mbv/MAINTAINERS b/board/xilinx/mbv/MAINTAINERS >>> index 445654fe740e..db9f03388df9 100644 >>> --- a/board/xilinx/mbv/MAINTAINERS >>> +++ b/board/xilinx/mbv/MAINTAINERS >>> @@ -4,4 +4,3 @@ S: Maintained >>> F: arch/riscv/dts/xilinx-mbv* >>> F: board/xilinx/mbv/ >>> F: configs/xilinx_mbv* >>> -F: include/configs/xilinx_mbv.h >>> diff --git a/include/configs/xilinx_mbv.h b/include/configs/xilinx_mbv.h >>> deleted file mode 100644 >>> index dba398aeec49..000000000000 >>> --- a/include/configs/xilinx_mbv.h >>> +++ /dev/null >>> @@ -1,6 +0,0 @@ >>> -/* SPDX-License-Identifier: GPL-2.0 */ >>> -/* >>> - * (C) Copyright 2023, Advanced Micro Devices, Inc. >>> - * >>> - * Michal Simek <michal.simek@amd.com> >>> - */ >> >> Acked-by: Michal Simek <michal.simek@amd.com> >> >> But maybe in future we need to revert this patch to add more options there. >> Or do you plan to remove all of these configs? >> I can imagine distro boot wiring but that can be done via vars file only but >> it is not practical. > > Do you mean that plain text environment feels impractical for standard > boot (which should be used instead of the pure scripts of distro_boot) ? I didn't play with standard boot yet to find out how to prioritize certain devices at run time. But normally we are trying to keep all amd platforms in sync to make sure that from user perspective doesn't really matter if you are on microblaze, arm32, arm64 or risc-v based platform. There are still a lot of configs like GUIDs, dfu and others that I don't think we will end up without these config files anytime soon. But it doesn't mean we shouldn't aim for it. Thanks, Michal
On Wed, Jan 24, 2024 at 08:19:00AM +0100, Michal Simek wrote: > > > On 1/23/24 18:58, Tom Rini wrote: > > On Tue, Jan 23, 2024 at 08:53:21AM +0100, Michal Simek wrote: > > > > > > > > > On 1/22/24 23:39, Tom Rini wrote: > > > > Now that we support having CONFIG_SYS_CONFIG_NAME be unset to indicate a > > > > lack of board.h file, unset this on the xilinx_mbv platforms and remove > > > > the otherwise empty file. > > > > > > > > Signed-off-by: Tom Rini <trini@konsulko.com> > > > > --- > > > > Cc: Michal Simek <michal.simek@amd.com> > > > > --- > > > > board/xilinx/mbv/Kconfig | 3 --- > > > > board/xilinx/mbv/MAINTAINERS | 1 - > > > > include/configs/xilinx_mbv.h | 6 ------ > > > > 3 files changed, 10 deletions(-) > > > > delete mode 100644 include/configs/xilinx_mbv.h > > > > > > > > diff --git a/board/xilinx/mbv/Kconfig b/board/xilinx/mbv/Kconfig > > > > index 4bc9f72c541b..d2dec397ed6f 100644 > > > > --- a/board/xilinx/mbv/Kconfig > > > > +++ b/board/xilinx/mbv/Kconfig > > > > @@ -9,9 +9,6 @@ config SYS_VENDOR > > > > config SYS_CPU > > > > default "generic" > > > > -config SYS_CONFIG_NAME > > > > - default "xilinx_mbv" > > > > - > > > > config TEXT_BASE > > > > default 0x80000000 if !RISCV_SMODE > > > > default 0x80400000 if RISCV_SMODE && ARCH_RV32I > > > > diff --git a/board/xilinx/mbv/MAINTAINERS b/board/xilinx/mbv/MAINTAINERS > > > > index 445654fe740e..db9f03388df9 100644 > > > > --- a/board/xilinx/mbv/MAINTAINERS > > > > +++ b/board/xilinx/mbv/MAINTAINERS > > > > @@ -4,4 +4,3 @@ S: Maintained > > > > F: arch/riscv/dts/xilinx-mbv* > > > > F: board/xilinx/mbv/ > > > > F: configs/xilinx_mbv* > > > > -F: include/configs/xilinx_mbv.h > > > > diff --git a/include/configs/xilinx_mbv.h b/include/configs/xilinx_mbv.h > > > > deleted file mode 100644 > > > > index dba398aeec49..000000000000 > > > > --- a/include/configs/xilinx_mbv.h > > > > +++ /dev/null > > > > @@ -1,6 +0,0 @@ > > > > -/* SPDX-License-Identifier: GPL-2.0 */ > > > > -/* > > > > - * (C) Copyright 2023, Advanced Micro Devices, Inc. > > > > - * > > > > - * Michal Simek <michal.simek@amd.com> > > > > - */ > > > > > > Acked-by: Michal Simek <michal.simek@amd.com> > > > > > > But maybe in future we need to revert this patch to add more options there. > > > Or do you plan to remove all of these configs? > > > I can imagine distro boot wiring but that can be done via vars file only but > > > it is not practical. > > > > Do you mean that plain text environment feels impractical for standard > > boot (which should be used instead of the pure scripts of distro_boot) ? > > I didn't play with standard boot yet to find out how to prioritize certain > devices at run time. But normally we are trying to keep all amd platforms in > sync to make sure that from user perspective doesn't really matter if you > are on microblaze, arm32, arm64 or risc-v based platform. > > There are still a lot of configs like GUIDs, dfu and others that I don't > think we will end up without these config files anytime soon. But it doesn't > mean we shouldn't aim for it. OK. Yeah, after a quick look at include/configs/xilinx* today, a lot of that could just be in standard boot and plain text environment and just like there's include/env/ti/ today to share common logic, we should get include/env/amd/ to share some common logic too. Or you and your team can suggest a better sharing alternative too.
diff --git a/board/xilinx/mbv/Kconfig b/board/xilinx/mbv/Kconfig index 4bc9f72c541b..d2dec397ed6f 100644 --- a/board/xilinx/mbv/Kconfig +++ b/board/xilinx/mbv/Kconfig @@ -9,9 +9,6 @@ config SYS_VENDOR config SYS_CPU default "generic" -config SYS_CONFIG_NAME - default "xilinx_mbv" - config TEXT_BASE default 0x80000000 if !RISCV_SMODE default 0x80400000 if RISCV_SMODE && ARCH_RV32I diff --git a/board/xilinx/mbv/MAINTAINERS b/board/xilinx/mbv/MAINTAINERS index 445654fe740e..db9f03388df9 100644 --- a/board/xilinx/mbv/MAINTAINERS +++ b/board/xilinx/mbv/MAINTAINERS @@ -4,4 +4,3 @@ S: Maintained F: arch/riscv/dts/xilinx-mbv* F: board/xilinx/mbv/ F: configs/xilinx_mbv* -F: include/configs/xilinx_mbv.h diff --git a/include/configs/xilinx_mbv.h b/include/configs/xilinx_mbv.h deleted file mode 100644 index dba398aeec49..000000000000 --- a/include/configs/xilinx_mbv.h +++ /dev/null @@ -1,6 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * (C) Copyright 2023, Advanced Micro Devices, Inc. - * - * Michal Simek <michal.simek@amd.com> - */
Now that we support having CONFIG_SYS_CONFIG_NAME be unset to indicate a lack of board.h file, unset this on the xilinx_mbv platforms and remove the otherwise empty file. Signed-off-by: Tom Rini <trini@konsulko.com> --- Cc: Michal Simek <michal.simek@amd.com> --- board/xilinx/mbv/Kconfig | 3 --- board/xilinx/mbv/MAINTAINERS | 1 - include/configs/xilinx_mbv.h | 6 ------ 3 files changed, 10 deletions(-) delete mode 100644 include/configs/xilinx_mbv.h