This patch follows work done by: "Move CONFIG_OF_LIBFDT to Kconfig" (sha1: 69e173eb57d1f4848f070c83456096ba5d2ba1b4)
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
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(-)
diff --git a/configs/legoev3_defconfig b/configs/legoev3_defconfig index d838baa32cbb..22fd0578ef72 100644 --- a/configs/legoev3_defconfig +++ b/configs/legoev3_defconfig @@ -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 diff --git a/configs/ma5d4evk_defconfig b/configs/ma5d4evk_defconfig index 39ce550ff44f..144851426937 100644 --- a/configs/ma5d4evk_defconfig +++ b/configs/ma5d4evk_defconfig @@ -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 diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig index 7cfed4a514bf..07aa874760c2 100644 --- a/configs/stm32f746-disco_defconfig +++ b/configs/stm32f746-disco_defconfig @@ -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 diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig index 2977ccc8ddee..d2fa63d15f08 100644 --- a/configs/zipitz2_defconfig +++ b/configs/zipitz2_defconfig @@ -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 diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index 79fa3c476ad1..0bc9d2dc18b4 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -160,7 +160,6 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_CRC32_VERIFY #define CONFIG_MX_CYCLIC -#define CONFIG_OF_LIBFDT
/* * Linux Information diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index e061a101aee6..8a80b954a68d 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -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 diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index 3ea11946b8ab..fd874c42a2bc 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -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 */ diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 807ab6574eb5..e94812bf5a78 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -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 diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index d01d88b33f4d..831b9401d1df 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -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 \ diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index 5200e0219168..46836d578c0a 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -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