From 73223f0e1bd0e37925ae1b7f21b51733145571dc Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 22 Feb 2016 22:55:43 -0700 Subject: Kconfig: Move CONFIG_FIT and related options to Kconfig There are already two FIT options in Kconfig but the CONFIG options are still in the header files. We need to do a proper move to fix this. Move these options to Kconfig and tidy up board configuration: CONFIG_FIT CONFIG_OF_BOARD_SETUP CONFIG_OF_SYSTEM_SETUP CONFIG_FIT_SIGNATURE CONFIG_FIT_BEST_MATCH CONFIG_FIT_VERBOSE CONFIG_OF_STDOUT_VIA_ALIAS CONFIG_RSA Unfortunately the first one is a little complicated. We need to make sure this option is not enabled in SPL by this change. Also this option is enabled automatically in the host builds by defining CONFIG_FIT in the image.h file. To solve this, add a new IMAGE_USE_FIT #define which can be used in files that are built on the host but must also build for U-Boot and SPL. Note: Masahiro's moveconfig.py script is amazing. Signed-off-by: Simon Glass [trini: Add microblaze change, various configs/ re-applies] Signed-off-by: Tom Rini --- include/configs/km/km-powerpc.h | 3 --- include/configs/km/km83xx-common.h | 2 -- include/configs/km/kmp204x-common.h | 8 -------- 3 files changed, 13 deletions(-) (limited to 'include/configs/km') diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index d2cc078..8293607 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -17,9 +17,6 @@ #define CONFIG_CMD_DTT #define CONFIG_JFFS2_CMDLINE -/* Pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP - /* standard km ethernet_present for piggy */ #define CONFIG_KM_COMMON_ETH_INIT diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h index d86b7fc..6a9d739 100644 --- a/include/configs/km/km83xx-common.h +++ b/include/configs/km/km83xx-common.h @@ -151,8 +151,6 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR+0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR+0x4600) -#define CONFIG_OF_STDOUT_VIA_ALIAS - /* * QE UEC ethernet configuration */ diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index ebfb54e..d981951 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -258,14 +258,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP -#define CONFIG_OF_STDOUT_VIA_ALIAS - -/* new uImage format support */ -#define CONFIG_FIT -#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */ - /* I2C */ #define CONFIG_SYS_I2C -- cgit v1.1