kconfig: Move CONFIG_OF_LIBFDT to Kconfig
Subsystems (2)
PATCH v2 1/2 kconfig: Move CONFIG_OF_LIBFDT to Kconfig
This patch follows work done by:
"Move CONFIG_OF_LIBFDT to Kconfig"
(sha1: 69e173eb57d1f4848f070c83456096ba5d2ba1b4)
---
Changes in v2:
- new patch in series. Masahiro asked for it.
configs/legoev3_defconfig | 2 ++ configs/ma5d4evk_defconfig | 2 ++ configs/stm32f746-disco_defconfig | 2 ++ configs/zipitz2_defconfig | 4 +++- include/configs/legoev3.h | 1 - include/configs/ma5d4evk.h | 1 - include/configs/pic32mzdask.h | 5 ----- include/configs/stm32f746-disco.h | 1 - include/configs/xilinx-ppc.h | 1 - include/configs/zipitz2.h | 1 - 10 files changed, 9 insertions(+), 11 deletions(-)
configs/legoev3_defconfig +2 -0
@@ -10,3 +10,5 @@ CONFIG_AUTOBOOT_STOP_STR="l" CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SYS_NS16550=y +CONFIG_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not set
configs/ma5d4evk_defconfig +2 -0
@@ -12,3 +12,5 @@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4" CONFIG_SPI_FLASH=y CONFIG_USB=y CONFIG_USB_GADGET=y +CONFIG_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not set
configs/stm32f746-disco_defconfig +2 -0
@@ -7,3 +7,5 @@ CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n" CONFIG_AUTOBOOT_STOP_STR=" " # CONFIG_CMD_SETEXPR is not set +CONFIG_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not set
configs/zipitz2_defconfig +3 -1
@@ -1,7 +1,9 @@ CONFIG_ARM=y CONFIG_TARGET_ZIPITZ2=y +CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set -CONFIG_SYS_PROMPT="$ " +CONFIG_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not set
include/configs/legoev3.h +0 -1
@@ -160,7 +160,6 @@#define CONFIG_SYS_LONGHELP #define CONFIG_CRC32_VERIFY #define CONFIG_MX_CYCLIC -#define CONFIG_OF_LIBFDT /* * Linux Information
include/configs/ma5d4evk.h +0 -1
@@ -150,7 +150,6 @@#define CONFIG_LOADADDR 0x20800000#define CONFIG_BOOTCOMMAND "run mmc_mmc"#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_OF_LIBFDT /* * Extra Environments
include/configs/pic32mzdask.h +0 -5
@@ -92,11 +92,6 @@#define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME -/* -* Handover flattened device tree (dtb file) to Linux kernel -*/ -#define CONFIG_OF_LIBFDT 1 -/*----------------------------------------------------------------------- * SDHC Configuration */
include/configs/stm32f746-disco.h +0 -1
@@ -11,7 +11,6 @@#define CONFIG_SYS_THUMB_BUILD /*#define CONFIG_SYS_NO_FLASH*/ -#define CONFIG_OF_LIBFDT #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_SYS_FLASH_BASE 0x08000000
include/configs/xilinx-ppc.h +0 -1
@@ -101,7 +101,6 @@#define CONFIG_SYS_NO_FLASH #endif -#define CONFIG_OF_LIBFDT 1#define CONFIG_BAUDRATE 115200/* The following table includes the supported baudrates */ # define CONFIG_SYS_BAUDRATE_TABLE \
include/configs/zipitz2.h +0 -1
@@ -45,7 +45,6 @@#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_SYS_TEXT_BASE 0x0#define CONFIG_LZMA /* LZMA compression support */ -#define CONFIG_OF_LIBFDT /* * Serial Console Configuration
Signature · 1 line
1.9.1
PATCH v2 2/2 cmd: fdt: Use separate CMD_FDT Kconfig entry instead of OF_LIBFDT
Create CMD_FDT Kconfig entry to have an option to disable fdt command which is not required for small configuration which requires libfdt only.
Enable it by default for all targets which enables OF_LIBFDT.
---
Changes in v2: None
cmd/Kconfig | 7 +++++++ cmd/Makefile | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
cmd/Kconfig +7 -0
@@ -173,6 +173,13 @@ config CMD_ELF help Boot an ELF/vxWorks image from the memory. +config CMD_FDT + bool "Flattened Device Tree utility commands" + default y + depends on OF_LIBFDT + help + Do FDT related setup before booting into the Operating System. + config CMD_GO bool "go" default y
cmd/Makefile +1 -1
@@ -54,7 +54,7 @@ obj-$(CONFIG_CMD_EXT4) += ext4.o obj-$(CONFIG_CMD_EXT2) += ext2.o obj-$(CONFIG_CMD_FAT) += fat.o obj-$(CONFIG_CMD_FDC) += fdc.o -obj-$(CONFIG_OF_LIBFDT) += fdt.o +obj-$(CONFIG_CMD_FDT) += fdt.o obj-$(CONFIG_CMD_FITUPD) += fitupd.o obj-$(CONFIG_CMD_FLASH) += flash.o ifdef CONFIG_FPGA
Signature · 1 line
1.9.1
PATCH v2 2/2 cmd: fdt: Use separate CMD_FDT Kconfig entry instead of OF_LIBFDT
Hi Michal,
Quoted 37 lines · Michal Simek
Create
CMD_FDTKconfigentry to have an option to disable fdt command which is not required for small configuration which requires libfdt only.
Enable it by default for all targets which enablesOF_LIBFDT.Signed-off-by Michal Simek <[email protected]>---
Changes in v2: None
cmd/Kconfig | 7 +++++++ cmd/Makefile | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)cmd/Kconfig +7
-0@@ -173,6 +173,13 @@ config CMD_ELF help Boot an ELF/vxWorks image from the memory. +config CMD_FDT + bool "Flattened Device Tree utility commands" + default y + depends on OF_LIBFDT + help + Do FDT related setup before booting into the Operating System. + config CMD_GO bool "go" default ycmd/Makefile +0
-0
cmd/Makefile obj-$(CONFIG_CMD_EXT4) += ext4.o · line 57
Quoted 5 lines
cmd/Makefile +1
-1@@ -54,7 +54,7 @@ obj-$(CONFIG_CMD_EXT4) += ext4.o obj-$(CONFIG_CMD_EXT2) += ext2.o obj-$(CONFIG_CMD_FAT) += fat.o obj-$(CONFIG_CMD_FDC) += fdc.o -obj-$(CONFIG_OF_LIBFDT) += fdt.o +obj-$(CONFIG_CMD_FDT) += fdt.o
Won't this disable the command for lots of boards?
Quoted 6 lines
cmd/Makefile +0
-1obj-$(CONFIG_CMD_FITUPD) += fitupd.o obj-$(CONFIG_CMD_FLASH) += flash.o ifdef CONFIG_FPGA --1.9.1
Regards,
Simon
PATCH v2 2/2 cmd: fdt: Use separate CMD_FDT Kconfig entry instead of OF_LIBFDT
Quoted 39 lines · Simon Glass
Hi Michal,
Quoted 36 lines · Michal Simek
Create
CMD_FDTKconfigentry to have an option to disable fdt command which is not required for small configuration which requires libfdt only.
Enable it by default for all targets which enablesOF_LIBFDT.Signed-off-by Michal Simek <[email protected]>---
Changes in v2: None
cmd/Kconfig | 7 +++++++ cmd/Makefile | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)cmd/Kconfig +7
-0@@ -173,6 +173,13 @@ config CMD_ELF help Boot an ELF/vxWorks image from the memory. +config CMD_FDT + bool "Flattened Device Tree utility commands" + default y + depends on OF_LIBFDT + help + Do FDT related setup before booting into the Operating System. + config CMD_GO bool "go" default ycmd/Makefile +0
-0
Quoted 8 lines
cmd/Makefile obj-$(CONFIG_CMD_EXT4) += ext4.o · line 57
Quoted 6 lines
cmd/Makefile +1
-1@@ -54,7 +54,7 @@ obj-$(CONFIG_CMD_EXT4) += ext4.o obj-$(CONFIG_CMD_EXT2) += ext2.o obj-$(CONFIG_CMD_FAT) += fat.o obj-$(CONFIG_CMD_FDC) += fdc.o -obj-$(CONFIG_OF_LIBFDT) += fdt.o +obj-$(CONFIG_CMD_FDT) += fdt.oWon't this disable the command for lots of boards?
Also based on Masahiro response boards shouldn't be affected. Only that 6 boards needs to be fixed which is what I have done in 1/2.
http://lists.denx.de/pipermail/u-boot/2016-April/250628.html
Thanks,
Michal
PATCH v2 2/2 cmd: fdt: Use separate CMD_FDT Kconfig entry instead of OF_LIBFDT
Hi Tom,
Quoted 49 lines · Michal Simek
Quoted 39 lines · Simon Glass
Hi Michal,
Quoted 36 lines · Michal Simek
Create
CMD_FDTKconfigentry to have an option to disable fdt command which is not required for small configuration which requires libfdt only.
Enable it by default for all targets which enablesOF_LIBFDT.Signed-off-by Michal Simek <[email protected]>---
Changes in v2: None
cmd/Kconfig | 7 +++++++ cmd/Makefile | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)cmd/Kconfig +7
-0@@ -173,6 +173,13 @@ config CMD_ELF help Boot an ELF/vxWorks image from the memory. +config CMD_FDT + bool "Flattened Device Tree utility commands" + default y + depends on OF_LIBFDT + help + Do FDT related setup before booting into the Operating System. + config CMD_GO bool "go" default ycmd/Makefile +0
-0Quoted 8 lines
cmd/Makefile obj-$(CONFIG_CMD_EXT4) += ext4.o · line 57
Quoted 6 lines
cmd/Makefile +1
-1@@ -54,7 +54,7 @@ obj-$(CONFIG_CMD_EXT4) += ext4.o obj-$(CONFIG_CMD_EXT2) += ext2.o obj-$(CONFIG_CMD_FAT) += fat.o obj-$(CONFIG_CMD_FDC) += fdc.o -obj-$(CONFIG_OF_LIBFDT) += fdt.o +obj-$(CONFIG_CMD_FDT) += fdt.oWon't this disable the command for lots of boards?
Quoted 3 lines
Also based on Masahiro response boards shouldn't be affected. Only that 6 boards needs to be fixed which is what I have done in 1/2.
http://lists.denx.de/pipermail/u-boot/2016-April/250628.html
Do you see any problem with these 2 patches?
When this is resolved I can push mini configuration for zynqmp.
Thanks,
Michal
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform -------------- 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/20160414/9052b90e/attachment.sig>
PATCH v2 2/2 cmd: fdt: Use separate CMD_FDT Kconfig entry instead of OF_LIBFDT
In reply to Michal SimekQuoted 6 lines · Michal Simek
Create
CMD_FDTKconfigentry to have an option to disable fdt command which is not required for small configuration which requires libfdt only.
Enable it by default for all targets which enablesOF_LIBFDT.Signed-off-by Michal Simek <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160421/d0e3b78d/attachment.sig>
PATCH v2 1/2 kconfig: Move CONFIG_OF_LIBFDT to Kconfig
In reply to Michal SimekHi Michal
xilinx-ppc405-generic and xilinx-ppc440-generic also depend on xilinx-ppc.h So I think this is missing.
Shall I send this as a separated patch? or you want to include it in yours?
Regards
ricardo at pilix:~/curro/u-boot$ git diff
(quoted diff) +0 -0
b/configs/xilinx-ppc405-generic_defconfig
index 2008a8d79394..381b668bb9e4 100644
configs/xilinx-ppc405-generic_defconfig +2 -0
@@ -13,3 +13,5 @@ CONFIG_SYS_PROMPT="xlx-ppc405:/# " CONFIG_OF_EMBED=y CONFIG_SYS_NS16550=y CONFIG_XILINX_UARTLITE=y +CONFIG_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not set
(quoted diff) +0 -0
b/configs/xilinx-ppc440-generic_defconfig
index 8df33d3270d1..9fe518a83dc3 100644
configs/xilinx-ppc440-generic_defconfig +2 -0
@@ -13,3 +13,5 @@ CONFIG_OF_EMBED=y CONFIG_NETCONSOLE=y CONFIG_SYS_NS16550=y CONFIG_XILINX_UARTLITE=y +CONFIG_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not set
Quoted 146 lines · Michal Simek
This patch follows work done by:
"MoveCONFIG_OF_LIBFDTtoKconfig"
(sha1:69e173eb57d1f4848f070c83456096ba5d2ba1b4)Signed-off-by Michal Simek <[email protected]>---
Changes in v2:
- new patch in series. Masahiro asked for it.configs/legoev3_defconfig | 2 ++ configs/ma5d4evk_defconfig | 2 ++ configs/stm32f746-disco_defconfig | 2 ++ configs/zipitz2_defconfig | 4 +++- include/configs/legoev3.h | 1 - include/configs/ma5d4evk.h | 1 - include/configs/pic32mzdask.h | 5 ----- include/configs/stm32f746-disco.h | 1 - include/configs/xilinx-ppc.h | 1 - include/configs/zipitz2.h | 1 - 10 files changed, 9 insertions(+), 11 deletions(-)configs/legoev3_defconfig +2
-0@@ -10,3 +10,5 @@ CONFIG_AUTOBOOT_STOP_STR="l" CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SYS_NS16550=y +CONFIG_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not setconfigs/ma5d4evk_defconfig +2
-0@@ -12,3 +12,5 @@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4" CONFIG_SPI_FLASH=y CONFIG_USB=y CONFIG_USB_GADGET=y +CONFIG_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not setconfigs/stm32f746-disco_defconfig +2
-0@@ -7,3 +7,5 @@ CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n" CONFIG_AUTOBOOT_STOP_STR=" " # CONFIG_CMD_SETEXPR is not set +CONFIG_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not setconfigs/zipitz2_defconfig +3
-1@@ -1,7 +1,9 @@ CONFIG_ARM=y CONFIG_TARGET_ZIPITZ2=y +CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set -CONFIG_SYS_PROMPT="$ " +CONFIG_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not setinclude/configs/legoev3.h +0
-1@@ -160,7 +160,6 @@#define CONFIG_SYS_LONGHELP #define CONFIG_CRC32_VERIFY #define CONFIG_MX_CYCLIC -#define CONFIG_OF_LIBFDT /* * Linux Information include/configs/ma5d4evk.h +0
-1@@ -150,7 +150,6 @@#define CONFIG_LOADADDR 0x20800000#define CONFIG_BOOTCOMMAND "run mmc_mmc"#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_OF_LIBFDT /* * Extra Environments include/configs/pic32mzdask.h +0
-5@@ -92,11 +92,6 @@#define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME -/* -* Handover flattened device tree (dtb file) to Linux kernel -*/ -#define CONFIG_OF_LIBFDT 1 -/*----------------------------------------------------------------------- * SDHC Configuration */ include/configs/stm32f746-disco.h +0
-1@@ -11,7 +11,6 @@#define CONFIG_SYS_THUMB_BUILD /*#define CONFIG_SYS_NO_FLASH*/ -#define CONFIG_OF_LIBFDT #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_SYS_FLASH_BASE 0x08000000include/configs/xilinx-ppc.h +0
-1@@ -101,7 +101,6 @@#define CONFIG_SYS_NO_FLASH #endif -#define CONFIG_OF_LIBFDT 1#define CONFIG_BAUDRATE 115200/* The following table includes the supported baudrates */ # define CONFIG_SYS_BAUDRATE_TABLE \include/configs/zipitz2.h +0
-2@@ -45,7 +45,6 @@#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_SYS_TEXT_BASE 0x0#define CONFIG_LZMA /* LZMA compression support */ -#define CONFIG_OF_LIBFDT /* * Serial Console Configuration -- 1.9.1
Signature · 1 line
Ricardo Ribalda
PATCH v2 1/2 kconfig: Move CONFIG_OF_LIBFDT to Kconfig
Hi,
Quoted 6 lines · Ricardo Ribalda Delgado
Hi Michal
xilinx-ppc405-generic and xilinx-ppc440-generic also depend on
xilinx-ppc.hSo I think this is missing.Shall I send this as a separated patch? or you want to include it in yours?
I was checking that and LIBFDT is enabled by default that's why there was not defconfig update. Definitely feel free to check it and test if this patch breaks something.
Thanks,
Michal
PATCH v2 1/2 kconfig: Move CONFIG_OF_LIBFDT to Kconfig
Hi Michal
You are right,
OF_CONTROL (on arch/powerpc/cpu/ppc4xx/Kconfig ) selects OF_LIBFDT by default (on lib/Kconfig)
So no need for my changes
Thanks!
Quoted 16 lines · Michal Simek
Hi,
Quoted 6 lines · Ricardo Ribalda Delgado
Hi Michal
xilinx-ppc405-generic and xilinx-ppc440-generic also depend on
xilinx-ppc.hSo I think this is missing.Shall I send this as a separated patch? or you want to include it in yours?
I was checking that and LIBFDT is enabled by default that's why there was not defconfig update. Definitely feel free to check it and test if this patch breaks something.
Thanks,
Michal
Signature · 1 line
Ricardo Ribalda
PATCH v2 1/2 kconfig: Move CONFIG_OF_LIBFDT to Kconfig
Quoted 8 lines · Ricardo Ribalda Delgado
Hi Michal
You are right,
OF_CONTROL(onarch/powerpc/cpu/ppc4xx/Kconfig) selectsOF_LIBFDTby default (on lib/Kconfig)So no need for my changes
ok. Your Tested-by or Reviewed-by flag would help.
Thanks,
Michal
PATCH v2 1/2 kconfig: Move CONFIG_OF_LIBFDT to Kconfig
For xilinx-ppc405-generic and xilinx-ppc440-generic:
I have access to my hardware again from the 20th of April. I can give you a tested-by by them if you want ;)
regards!
Quoted 15 lines · Michal Simek
Quoted 8 lines · Ricardo Ribalda Delgado
Hi Michal
You are right,
OF_CONTROL(onarch/powerpc/cpu/ppc4xx/Kconfig) selectsOF_LIBFDTby default (on lib/Kconfig)So no need for my changes
ok. Your Tested-by or Reviewed-by flag would help.
Thanks,
Michal
Signature · 1 line
Ricardo Ribalda
PATCH v2 1/2 kconfig: Move CONFIG_OF_LIBFDT to Kconfig
In reply to Michal SimekQuoted 5 lines · Michal Simek
This patch follows work done by:
"MoveCONFIG_OF_LIBFDTtoKconfig"
(sha1:69e173eb57d1f4848f070c83456096ba5d2ba1b4)Signed-off-by Michal Simek <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160421/6ff80e5e/attachment.sig>