diff options
| author | Simon Glass <sjg@chromium.org> | 2016-02-22 22:55:43 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-03-14 19:18:07 -0400 |
| commit | 73223f0e1bd0e37925ae1b7f21b51733145571dc (patch) | |
| tree | 3c2da91d78af13cbc1f9778e01bf4bc6a3efffcc /include | |
| parent | 69e173eb57d1f4848f070c83456096ba5d2ba1b4 (diff) | |
| download | talos-obmc-uboot-73223f0e1bd0e37925ae1b7f21b51733145571dc.tar.gz talos-obmc-uboot-73223f0e1bd0e37925ae1b7f21b51733145571dc.zip | |
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 <sjg@chromium.org>
[trini: Add microblaze change, various configs/ re-applies]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include')
160 files changed, 12 insertions, 630 deletions
diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index 765151c731..2076ef0add 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -49,7 +49,6 @@ /* * FDT options */ -#define CONFIG_OF_BOARD_SETUP #define CONFIG_LMB /* diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index 7bb2d61a5e..802ac75219 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -52,7 +52,6 @@ /* * FDT options */ -#define CONFIG_OF_BOARD_SETUP #define CONFIG_LMB /* diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 1c580b93a8..2d9be205d3 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -503,14 +503,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -/* 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 #define CONFIG_SYS_I2C_FSL /* Use FSL common I2C driver */ diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 9ef1208c0c..9c32a01b8d 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -247,16 +247,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #endif -/* - * 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}() */ - #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL #define CONFIG_SYS_FSL_I2C_SPEED 400000 diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 2994797117..9f7ceb838e 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -431,16 +431,6 @@ combinations. this should be removed later #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #endif -/* - * 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}() */ - #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL #define CONFIG_SYS_FSL_I2C_SPEED 400800 /* I2C speed and slave address*/ diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 6310e63640..4cbc9ad71e 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -396,16 +396,6 @@ /* 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}() */ - #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL #define CONFIG_SYS_FSL_I2C_SPEED 400000 diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index e5a50dfed5..1b5b907c75 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -209,8 +209,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ -#define CONFIG_OF_BOARD_SETUP - /*----------------------------------------------------------------------- * FLASH organization */ diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index c1f914a876..9e9765cb6e 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -23,10 +23,6 @@ #define CONFIG_MISC_INIT_R -/* new uImage format support */ -#define CONFIG_FIT 1 -#define CONFIG_FIT_VERBOSE 1 - #define CONFIG_MMC 1 #ifdef CONFIG_MMC @@ -329,8 +325,6 @@ #define CONFIG_SYS_HUSH_PARSER /* Pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 936a914918..d440d883d4 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -359,10 +359,6 @@ #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - #define CONFIG_MPC83XX_GPIO 1 /* diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index d204564c04..3b49f1c64a 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -305,10 +305,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* Pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index fb15d3b968..97f48e23b4 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -227,10 +227,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index eac2bcf30f..d218f59c26 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -307,10 +307,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index cad847889a..5b0900a9ad 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -333,10 +333,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index f058918b40..4346edaa4c 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -366,10 +366,6 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR + 0x4500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR + 0x4600) -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* * PCI */ diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 88867ea386..2475ae4f5f 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -321,10 +321,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* Pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index abd818efae..aa66927f5f 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -347,10 +347,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* Pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 746883a3f6..9298c3080c 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -385,12 +385,6 @@ #define CONFIG_SYS_HUSH_PARSER /* - * Pass open firmware flat tree - */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - -/* * I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index d616c0f3fd..0a6d5bcd69 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -236,10 +236,6 @@ #ifdef CONFIG_SYS_HUSH_PARSER #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* * I2C */ diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 830bd84914..79f81ec6ba 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -259,10 +259,6 @@ extern unsigned long get_clock_freq(void); #ifdef CONFIG_SYS_HUSH_PARSER #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* * I2C */ diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index c1cd986d7f..494c46ff50 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -209,10 +209,6 @@ extern 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 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 1115af9784..8d29762438 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -334,10 +334,6 @@ extern unsigned long get_clock_freq(void); /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* * I2C */ diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index 7b82b9e2b1..b64bbe5df6 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -257,10 +257,6 @@ extern unsigned long get_clock_freq(void); #ifdef CONFIG_SYS_HUSH_PARSER #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* * I2C */ diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 8d6e442ae6..2284646c11 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -231,10 +231,6 @@ #ifdef CONFIG_SYS_HUSH_PARSER #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* * I2C */ diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index c80730315d..a130001dd5 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -242,10 +242,6 @@ extern unsigned long get_clock_freq(void); #ifdef CONFIG_SYS_HUSH_PARSER #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* * I2C */ diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index 00c1e22696..0e003e5c05 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -253,10 +253,6 @@ extern unsigned long get_clock_freq(void); #ifdef CONFIG_SYS_HUSH_PARSER #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* * I2C */ diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 43ac8f3ae0..cfcd5b9bd0 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -380,16 +380,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* - * Pass open firmware flat tree - */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - -/* new uImage format support */ -#define CONFIG_FIT 1 -#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */ - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 13aa2827fd..ac219d1e12 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -236,13 +236,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* - * Pass open firmware flat tree to kernel - */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - - /* maximum size of the flat tree (8K) */ #define OF_FLAT_TREE_MAX_SIZE 8192 diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 78471d77fc..bd0a3f5716 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -273,12 +273,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_HUSH_PARSER /* - * Pass open firmware flat tree to kernel - */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - -/* * I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 60e1fcf528..81af87122c 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -622,16 +622,6 @@ extern unsigned long get_sdram_size(void); /* 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 #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 3aa10d1b43..bc4c733135 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -443,16 +443,6 @@ #define CONFIG_VGA_AS_SINGLE_DEVICE #endif -/* - * 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 - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index 3943707645..a53b1acdf6 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -175,16 +175,6 @@ extern unsigned long get_clock_freq(void); /* 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 #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index ab255055b7..2d27fcf555 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -339,14 +339,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 #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index 71f0699a3c..345affa7a4 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -73,8 +73,6 @@ #define CONFIG_CMD_EEPROM #define CONFIG_CMD_USB -#define CONFIG_OF_BOARD_SETUP - #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h index 927162ffa7..bb0c8bbdcb 100644 --- a/include/configs/PMC405DE.h +++ b/include/configs/PMC405DE.h @@ -64,8 +64,6 @@ #define CONFIG_CMD_PCI #define CONFIG_CMD_PING -#define CONFIG_OF_BOARD_SETUP - #undef CONFIG_WATCHDOG /* watchdog disabled */ #define CONFIG_SDRAM_BANK0 1 /* init onboard SDRAM bank 0 */ #define CONFIG_PRAM 0 diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index ad20117b76..dab4fa7c1d 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -407,9 +407,6 @@ #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 - #define CONFIG_API 1 #endif /* __CONFIG_H */ diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 86bd7d6448..f07b2d1b31 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -536,14 +536,6 @@ unsigned long get_board_ddr_clk(void); #endif #endif -/* 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 #define CONFIG_SYS_I2C_FSL /* Use FSL common I2C driver */ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 92ad71fbeb..1a22beeb8c 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -534,14 +534,6 @@ unsigned long get_board_ddr_clk(void); #undef CONFIG_SYS_FLASH_EMPTY_INFO #endif -/* 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 #define CONFIG_SYS_I2C_FSL /* Use FSL common I2C driver */ diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 599309d9d8..aa0f802233 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -435,14 +435,6 @@ unsigned long get_board_ddr_clk(void); #undef CONFIG_SYS_FLASH_EMPTY_INFO #endif -/* 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 #define CONFIG_SYS_I2C_FSL /* Use FSL common I2C driver */ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 4b87e566cd..84e195dbdf 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -487,14 +487,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg #endif #endif -/* 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 #define CONFIG_SYS_I2C_FSL /* Use FSL common I2C driver */ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 639b9894ba..5957fa8914 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -459,14 +459,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -/* 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 */ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 43ff63e7ad..e0769d04c7 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -419,14 +419,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -/* 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 */ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index bb64be16ea..faf06a0429 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -213,14 +213,6 @@ #define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -/* 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 #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index a3faf0317c..e646c0035d 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -730,8 +730,6 @@ * Open firmware flat tree support *----------------------------------------------------------------------- */ -#define CONFIG_OF_BOARD_SETUP 1 - #define OF_CPU "PowerPC,5200@0" #define OF_SOC "soc5200@f0000000" #define OF_TBCLK (bd->bi_busfreq / 4) diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index 03e195186f..d03f2e6a45 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -457,8 +457,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X) -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 #define CONFIG_HWCONFIG 1 #endif /* __CONFIG_H */ diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index 3982761c54..7d39766375 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -453,8 +453,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X) -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 #define CONFIG_HWCONFIG 1 #endif /* __CONFIG_H */ diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index 148590a5eb..9ed469a560 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -327,10 +327,6 @@ #undef CONFIG_WATCHDOG /* watchdog disabled */ -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* * For booting Linux, the board info and command line data * have to be in the first 256 MB of memory, since this is diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index 57c5fbb3d7..c70c4d799a 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -441,8 +441,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X) -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 #define CONFIG_HWCONFIG 1 #endif /* __CONFIG_H */ diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index ec786a47ee..52cba86c72 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -443,8 +443,6 @@ MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \ MAMR_RLFA_1X | MAMR_WLFA_1X | MAMR_TLFA_4X) -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 #define CONFIG_HWCONFIG 1 #endif /* __CONFIG_H */ diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index 879b4bf7c0..fb2652b237 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -449,8 +449,6 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 #define CONFIG_HWCONFIG 1 #endif /* __CONFIG_H */ diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index d65347f739..301a0a8b93 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -480,8 +480,6 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 #define CONFIG_HWCONFIG 1 #endif /* __CONFIG_H */ diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index e433ff0538..a390e3ff37 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -448,8 +448,6 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 #define CONFIG_HWCONFIG 1 #endif /* __CONFIG_H */ diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index bd6891353d..0d2e1190f8 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -453,8 +453,6 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 #define CONFIG_HWCONFIG 1 #endif /* __CONFIG_H */ diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index 31c9059f5a..6fd08c7cd0 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -453,8 +453,6 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 #define CONFIG_HWCONFIG 1 #endif /* __CONFIG_H */ diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index a68edd1c07..fcdc3e5375 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -454,8 +454,6 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 #define CONFIG_HWCONFIG 1 #endif /* __CONFIG_H */ diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index b8bdde1496..2a0fdf5947 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -472,8 +472,6 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 #define CONFIG_HWCONFIG 1 #endif /* __CONFIG_H */ diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h index 2725e393fb..c9925ab6e7 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -472,8 +472,6 @@ #define CONFIG_ETHPRIME "SCC" -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 #define CONFIG_HWCONFIG 1 #endif /* __CONFIG_H */ diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 3be2893712..b08072401b 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -345,16 +345,6 @@ /* 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 #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index 3421cca935..a734c28ce0 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -66,8 +66,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_EEPROM -#define CONFIG_OF_BOARD_SETUP - #undef CONFIG_WATCHDOG /* watchdog disabled */ #define CONFIG_SDRAM_BANK0 1 /* init onboard SDRAM bank 0 */ diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h index aeb2eff36f..cf931a6522 100644 --- a/include/configs/a3m071.h +++ b/include/configs/a3m071.h @@ -82,7 +82,6 @@ #define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS -#define CONFIG_FIT /* * IPB Bus clocking configuration. @@ -95,9 +94,6 @@ #undef CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2 #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP - /* maximum size of the flat tree (8K) */ #define OF_FLAT_TREE_MAX_SIZE 8192 diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h index cea8a729e7..a883afbfac 100644 --- a/include/configs/a4m072.h +++ b/include/configs/a4m072.h @@ -354,8 +354,6 @@ * Open firmware flat tree support *----------------------------------------------------------------------- */ -#define CONFIG_OF_BOARD_SETUP 1 - #define OF_CPU "PowerPC,5200@0" #define OF_SOC "soc5200@f0000000" #define OF_TBCLK (bd->bi_busfreq / 4) diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index 6f343794bf..750d8ff175 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -557,8 +557,6 @@ #define CONFIG_ARP_TIMEOUT 200UL -#define CONFIG_FIT 1 -#define CONFIG_OF_BOARD_SETUP 1 #define CONFIG_OF_SUPPORT_OLD_DEVICE_TREES 1 #define OF_CPU "PowerPC,5121@0" diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 6ebe0b3866..35f2146706 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -19,9 +19,6 @@ #include <configs/ti_am335x_common.h> #ifndef CONFIG_SPL_BUILD -#ifndef CONFIG_FIT -# define CONFIG_FIT -#endif # define CONFIG_TIMESTAMP # define CONFIG_LZO #endif diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 1bdb96e34f..e9e971e511 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -13,9 +13,6 @@ #undef CONFIG_BOOTDELAY #ifndef CONFIG_SPL_BUILD -#ifndef CONFIG_FIT -# define CONFIG_FIT -#endif # define CONFIG_TIMESTAMP # define CONFIG_LZO #endif diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index e05db6c4b9..0388ffc781 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -121,10 +121,6 @@ #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port*/ #endif -/* - * Pass open firmware flat tree - */ -#define CONFIG_OF_BOARD_SETUP /* Update size in "reg" property of NOR FLASH device tree nodes */ #define CONFIG_FDT_FIXUP_NOR_FLASH_SIZE diff --git a/include/configs/aria.h b/include/configs/aria.h index 94f5717bed..c56a2e339b 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -572,7 +572,6 @@ #define CONFIG_BOOTCOMMAND "run flash_self" -#define CONFIG_OF_BOARD_SETUP 1 #define CONFIG_OF_SUPPORT_OLD_DEVICE_TREES 1 #define OF_CPU "PowerPC,5121@0" diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 0b97cccc58..efbf81658b 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -240,8 +240,6 @@ #define CONFIG_HW_WATCHDOG #define CONFIG_IMX_WATCHDOG -#define CONFIG_FIT - /* Framebuffer */ #define CONFIG_VIDEO #define CONFIG_VIDEO_IPUV3 diff --git a/include/configs/baltos.h b/include/configs/baltos.h index e9b4fe139c..b8c915c720 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -41,7 +41,6 @@ /* FIT support */ #define CONFIG_SYS_BOOTM_LEN SZ_64M -#define CONFIG_OF_BOARD_SETUP /* UBI Support */ #define CONFIG_CMD_MTDPARTS diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index e61a0988a4..a9df0b33c4 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -21,12 +21,9 @@ #define CONFIG_ENV_IS_NOWHERE #ifndef CONFIG_SPL_BUILD -# define CONFIG_FIT # define CONFIG_TIMESTAMP # define CONFIG_LZO # ifdef CONFIG_ENABLE_VBOOT -# define CONFIG_FIT_SIGNATURE -# define CONFIG_RSA # endif #endif diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index dd9a424911..3744af2d58 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -315,7 +315,6 @@ /* * Flat Device Tree support */ -#define CONFIG_OF_BOARD_SETUP 1 #define OF_CPU "PowerPC,5200@0" #define OF_SOC "soc5200@f0000000" #define OF_TBCLK (bd->bi_busfreq / 4) diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 180ea280be..b36ba14be7 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -225,7 +225,6 @@ #define CONFIG_STACKSIZE (128 * 1024) #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 800 /* 400 KB */ -#define CONFIG_OF_BOARD_SETUP #define CONFIG_MISC_INIT_R /* SPL */ diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index 42d54a423a..c8c67c4bab 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -18,9 +18,6 @@ #undef CONFIG_SPL_OS_BOOT -/* Device Tree defines */ -#define CONFIG_OF_BOARD_SETUP - /* EEPROM related defines */ #define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 2e9b9108c2..fa64a1eae3 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -400,16 +400,6 @@ #define CONFIG_MISC_INIT_R #define CONFIG_LAST_STAGE_INIT -/* - * 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 - #else /* CONFIG_TRAILBLAZER */ #define CONFIG_BOARD_EARLY_INIT_F diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 1bc788256e..d30d7ffa80 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -344,14 +344,6 @@ /* 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 #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 3e0f1001e8..b4bf350eb3 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -231,13 +231,6 @@ #define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP - -/* new uImage format support */ -#define CONFIG_FIT -#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */ - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index 09b164610b..0041ab9d35 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -296,8 +296,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 240000 #define CONFIG_SYS_FLASH_WRITE_TOUT 500 -#define CONFIG_OF_BOARD_SETUP 1 - #define OF_CPU "PowerPC,5200@0" #define OF_SOC "soc5200@f0000000" #define OF_TBCLK (bd->bi_busfreq / 4) diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h index b614f190bf..9f9bcb8930 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -36,8 +36,6 @@ #define PLLMR1_DEFAULT PLLMR1_266_133_66 /* new uImage format support */ -#define CONFIG_FIT -#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_DISABLE_SHA256 #define CONFIG_ENV_IS_IN_FLASH /* use FLASH for environment vars */ diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h index 90e839ab1b..1e461f55b6 100644 --- a/include/configs/dlvision.h +++ b/include/configs/dlvision.h @@ -32,8 +32,6 @@ #define PLLMR1_DEFAULT PLLMR1_266_133_66_33 /* new uImage format support */ -#define CONFIG_FIT -#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_DISABLE_SHA256 #define CONFIG_ENV_IS_IN_FLASH /* use FLASH for environment vars */ diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index 5a7915ca22..7d600bf14d 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -178,10 +178,6 @@ #define EXYNOS_USB_SECONDARY_BOOT 0xfeed0002 #define EXYNOS_IRAM_SECONDARY_BASE 0x02020018 -/* Enable FIT support and comparison */ -#define CONFIG_FIT -#define CONFIG_FIT_BEST_MATCH - #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \ diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 99bf7d6550..3e4aaf6cd6 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -252,6 +252,5 @@ /* Enable FIT images support */ #define CONFIG_CMD_FDT -#define CONFIG_FIT #endif /* __CONFIG_H */ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index b7b9c78c2e..38c921a193 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -97,10 +97,6 @@ #endif /* CONFIG_SPI_FLASH */ -/* Flattened Image Tree Suport */ -#define CONFIG_FIT -#define CONFIG_FIT_VERBOSE - /* I2C Configs */ #define CONFIG_CMD_I2C #define CONFIG_SYS_I2C @@ -442,7 +438,6 @@ "done" /* Device Tree Support */ -#define CONFIG_OF_BOARD_SETUP #define CONFIG_FDT_FIXUP_PARTITIONS #endif /* __CONFIG_H */ diff --git a/include/configs/h2200.h b/include/configs/h2200.h index 6fbbe6e0b8..fe0211a7f7 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -115,7 +115,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 38400, 115200 } -#define CONFIG_FIT #define CONFIG_FIT_DISABLE_SHA256 #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_CMDLINE_TAG diff --git a/include/configs/highbank.h b/include/configs/highbank.h index f02575ac04..510741bafb 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -14,8 +14,6 @@ #define CONFIG_SYS_NO_FLASH -#define CONFIG_OF_BOARD_SETUP -#define CONFIG_FIT #define CONFIG_SYS_BOOTMAPSZ (16 << 20) #define CONFIG_SYS_TIMER_RATE (150000000/256) diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index d1e3ff7aee..c9846130a3 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -31,10 +31,6 @@ #define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_LAST_STAGE_INIT -/* new uImage format support */ -#define CONFIG_FIT 1 -#define CONFIG_FIT_VERBOSE 1 - #define CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR @@ -318,8 +314,6 @@ #define CONFIG_SYS_HUSH_PARSER /* Pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 59d1f2fcd6..5855d81858 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -429,9 +429,6 @@ #define CONFIG_BOOTP_HOSTNAME #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP -#define CONFIG_OF_STDOUT_VIA_ALIAS /* * The reserved memory diff --git a/include/configs/intip.h b/include/configs/intip.h index 60c9e2c212..913fdabd73 100644 --- a/include/configs/intip.h +++ b/include/configs/intip.h @@ -46,7 +46,6 @@ #define CONFIG_BOARD_EARLY_INIT_R 1 /* Call board_early_init_r */ #define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */ #define CONFIG_BOARD_TYPES 1 /* support board types */ -#define CONFIG_FIT #define CFG_ALT_MEMTEST #undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ diff --git a/include/configs/io.h b/include/configs/io.h index 2c457d4775..1213fe2ab5 100644 --- a/include/configs/io.h +++ b/include/configs/io.h @@ -36,8 +36,6 @@ #undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ /* new uImage format support */ -#define CONFIG_FIT -#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_DISABLE_SHA256 #define CONFIG_ENV_IS_IN_FLASH /* use FLASH for environment vars */ diff --git a/include/configs/io64.h b/include/configs/io64.h index 25bd01474a..1a6275e609 100644 --- a/include/configs/io64.h +++ b/include/configs/io64.h @@ -46,10 +46,6 @@ #undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ -/* new uImage format support */ -#define CONFIG_FIT -#define CONFIG_FIT_VERBOSE - /*----------------------------------------------------------------------- * Base addresses -- Note these are effective addresses where the * actual resources get mapped (not physical addresses) diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index 3c32d126c5..ea9d8b059a 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -170,8 +170,6 @@ /* * Open firmware flat tree support */ -#define CONFIG_OF_BOARD_SETUP 1 - #define OF_CPU "PowerPC,5200@0" #define OF_SOC "soc5200@f0000000" #define OF_TBCLK (bd->bi_busfreq / 4) diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h index 86470a0b5d..b494683760 100644 --- a/include/configs/jupiter.h +++ b/include/configs/jupiter.h @@ -134,8 +134,6 @@ #if 0 /* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 - #define OF_CPU "PowerPC,5200@0" #define OF_SOC "soc5200@f0000000" #define OF_TBCLK (bd->bi_busfreq / 8) diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index d2cc078d3f..8293607c9c 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 d86b7fc446..6a9d739821 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 ebfb54ece8..d981951bce 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 diff --git a/include/configs/km82xx.h b/include/configs/km82xx.h index 4cfc1dc2d7..1f9c7205ae 100644 --- a/include/configs/km82xx.h +++ b/include/configs/km82xx.h @@ -430,8 +430,6 @@ int get_scl(void); #define CONFIG_SYS_RESET_ADDRESS 0xFDFFFFFC /* "bad" address */ -#define CONFIG_FIT 1 - #define OF_TBCLK (bd->bi_busfreq / 4) #define OF_STDOUT_PATH "/soc/cpm/serial@11a90" diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 2c85e5d638..d7025f6325 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -666,8 +666,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ #endif -#define CONFIG_OF_BOARD_SETUP -#define CONFIG_OF_STDOUT_VIA_ALIAS #define CONFIG_CMD_BOOTZ #define CONFIG_MISC_INIT_R diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 1c57d3b584..cee62812c1 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -509,8 +509,6 @@ #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ #endif -#define CONFIG_OF_BOARD_SETUP -#define CONFIG_OF_STDOUT_VIA_ALIAS #define CONFIG_CMD_BOOTZ #define CONFIG_MISC_INIT_R diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 5ae8caacb2..ea25aadbb3 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -28,13 +28,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_BOARD_EARLY_INIT_F 1 -/* Flat Device Tree Definitions */ -#define CONFIG_OF_BOARD_SETUP - -/* new uImage format support */ -#define CONFIG_FIT -#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */ - #ifndef CONFIG_SYS_FSL_DDR4 #define CONFIG_SYS_FSL_DDR3 /* Use DDR3 memory */ #endif diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index fb04546f24..68e00c8bb1 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -454,7 +454,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_ENV_SIZE 0x20000 #endif -#define CONFIG_OF_BOARD_SETUP #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_MII #define CONFIG_CMDLINE_TAG diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index def84933ff..c9b0a2f428 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -44,14 +44,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_BOARD_EARLY_INIT_F 1 -/* Flat Device Tree Definitions */ -#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}() */ - #ifndef CONFIG_SPL #define CONFIG_FSL_DDR_INTERACTIVE /* Interactive debugging */ #endif diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 925245441c..648e189e40 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -300,15 +300,9 @@ CONFIG_SYS_I2C_DSPIC_KEYB_ADDR,\ CONFIG_SYS_I2C_DSPIC_IO_ADDR } -/* - * Pass open firmware flat tree - */ -#define CONFIG_OF_BOARD_SETUP /* Update size in "reg" property of NOR FLASH device tree nodes */ #define CONFIG_FDT_FIXUP_NOR_FLASH_SIZE -#define CONFIG_FIT /* enable FIT image support */ - #define CONFIG_POST_KEY_MAGIC "3C+3E" /* press F3 + F5 keys to force POST */ #define CONFIG_PREBOOT "setenv bootdelay 15" diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index 8063a1e456..57599f9856 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -12,8 +12,6 @@ #define MACH_TYPE_M28EVK 3613 #define CONFIG_MACH_TYPE MACH_TYPE_M28EVK -#define CONFIG_FIT - #define CONFIG_TIMESTAMP /* Print image info with timestamp */ /* U-Boot Commands */ diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 4bd1f4cb89..1efe48c7f8 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -19,8 +19,6 @@ #define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_FSL_CLK -#define CONFIG_FIT - #define CONFIG_TIMESTAMP /* Print image info with timestamp */ /* diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index f0d5e9d3c5..7f8a59fb59 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -10,8 +10,6 @@ #define CONFIG_SYS_NO_FLASH -#define CONFIG_FIT - #define CONFIG_TIMESTAMP /* Print image info with timestamp */ #include "at91-sama5_common.h" diff --git a/include/configs/manroland/common.h b/include/configs/manroland/common.h index d05d45c542..3c081a2607 100644 --- a/include/configs/manroland/common.h +++ b/include/configs/manroland/common.h @@ -115,7 +115,4 @@ */ #define CONFIG_LOOPW -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 - #endif /* __MANROLAND_COMMON_H */ diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 83202fc369..174cb5c4da 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -33,8 +33,6 @@ #include <asm/arch/cpu.h> /* get chip and board defs */ #include <asm/arch/omap.h> -#define CONFIG_FIT - /* * Leave it at 0x80008000 to allow booting new u-boot.bin with X-loader * and older u-boot.bin with the new U-Boot SPL. diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h index 5f099d2dc9..e561026060 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -427,8 +427,6 @@ #define CONFIG_BOOTCOMMAND "run flash_self" -#define CONFIG_OF_BOARD_SETUP - #define OF_CPU "PowerPC,5121@0" #define OF_SOC_COMPAT "fsl,mpc5121-immr" #define OF_TBCLK (bd->bi_busfreq / 4) diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index cd89fa537b..4c05fc8aba 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -50,9 +50,6 @@ /* LCD support */ #define CONFIG_SYS_WHITE_ON_BLACK -/* support the new (FDT-based) image format */ -#define CONFIG_FIT - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/meesc.h b/include/configs/meesc.h index 6cade14011..88fb3e8735 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -152,7 +152,6 @@ /* Ethernet */ #define CONFIG_MACB #define CONFIG_RMII -#define CONFIG_FIT #define CONFIG_NET_RETRY_COUNT 20 #undef CONFIG_RESET_PHY_R diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 6ac19a0d92..27668f2a89 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -284,7 +284,6 @@ /* Enable flat device tree support */ #define CONFIG_LMB 1 -#define CONFIG_FIT 1 #if defined(CONFIG_XILINX_AXIEMAC) # define CONFIG_MII 1 diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index 1cb135b8ad..10ca05fdda 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -42,9 +42,6 @@ #define VIDEO_IO_OFFSET 0 #define CONFIG_X86EMU_RAW_IO -#define CONFIG_FIT_SIGNATURE -#define CONFIG_RSA - #define CONFIG_ENV_SECT_SIZE 0x1000 #define CONFIG_ENV_OFFSET 0x007fe000 diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index 541420887b..f4d5dbcb75 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -377,9 +377,6 @@ extern void __led_set(led_id_t id, int state); /* Not needed for MPC 5xxx U-Boot, but used by tools/updater */ #define CONFIG_SYS_RESET_ADDRESS 0xfff00100 -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 - #define OF_CPU "PowerPC,5200@0" #define OF_SOC "soc5200@f0000000" #define OF_TBCLK (bd->bi_busfreq / 4) diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index a53b4b2179..4ac291c812 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -586,7 +586,6 @@ #define CONFIG_BOOTCOMMAND "run flash_self" -#define CONFIG_OF_BOARD_SETUP 1 #define CONFIG_OF_SUPPORT_OLD_DEVICE_TREES 1 #define OF_CPU "PowerPC,5121@0" diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index d8db25bedc..1bab9aba56 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -305,10 +305,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* Pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/munices.h b/include/configs/munices.h index a1305b1404..06012563ae 100644 --- a/include/configs/munices.h +++ b/include/configs/munices.h @@ -184,9 +184,6 @@ #define CONFIG_SYS_CS_DEADCYCLE 0x33333333 #define CONFIG_SYS_RESET_ADDRESS 0xff000000 -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 - #define OF_CPU "PowerPC,5200@0" #define OF_TBCLK (bd->bi_busfreq / 4) #define OF_SOC "soc5200@f0000000" diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index 8e18cfac54..5f94e19d51 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -22,15 +22,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_MX31ADS -/* - * Disabled for now due to build problems under Debian and a significant increase - * in the final file size: 144260 vs. 109536 Bytes. - */ -#if 0 -#define CONFIG_FIT 1 -#define CONFIG_FIT_VERBOSE 1 -#endif - #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1 diff --git a/include/configs/neo.h b/include/configs/neo.h index bc014169a4..bd2b190581 100644 --- a/include/configs/neo.h +++ b/include/configs/neo.h @@ -35,8 +35,6 @@ #define PLLMR1_DEFAULT PLLMR1_266_133_66_33 /* new uImage format support */ -#define CONFIG_FIT -#define CONFIG_FIT_VERBOSE /* enable fit_format_{error,warning}() */ #define CONFIG_FIT_DISABLE_SHA256 #define CONFIG_ENV_IS_IN_FLASH /* use FLASH for environment vars */ diff --git a/include/configs/novena.h b/include/configs/novena.h index a5416131ba..d11cdc3983 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -13,7 +13,6 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT #define CONFIG_MISC_INIT_R -#define CONFIG_FIT #define CONFIG_KEYBOARD #include <config_distro_defaults.h> diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index 9548172c17..0b6173be9b 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -65,9 +65,6 @@ /* General networking support */ #define CONFIG_CMD_DHCP -#define CONFIG_FIT -#define CONFIG_FIT_BEST_MATCH - #define CONFIG_KEYBOARD #undef CONFIG_LOADADDR diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h index 79008806c5..73a44a79e5 100644 --- a/include/configs/o2dnt-common.h +++ b/include/configs/o2dnt-common.h @@ -332,8 +332,6 @@ /* * DT support */ -#define CONFIG_OF_BOARD_SETUP 1 - #define OF_CPU "PowerPC,5200@0" #define OF_SOC "soc5200@f0000000" #define OF_TBCLK (bd->bi_busfreq / 4) diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 8e6715975f..9d764d5e57 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -47,8 +47,6 @@ #define CONFIG_SYS_CONSOLE_IS_IN_ENV #define CONFIG_CMD_BOOTZ -#define CONFIG_FIT -#define CONFIG_FIT_VERBOSE #define CONFIG_BOOTARGS "Please use defined boot" #define CONFIG_BOOTCOMMAND "run autoboot" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 2f58bf621a..799521e1e0 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -665,16 +665,6 @@ /* 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 #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index a08b779c34..1e49ee6e22 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -231,16 +231,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #endif -/* - * 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 #define CONFIG_SYS_I2C_FSL /* Use FSL common I2C driver */ diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h index f7722ecc64..b4a7225fb8 100644 --- a/include/configs/pcm030.h +++ b/include/configs/pcm030.h @@ -418,8 +418,6 @@ RTC configuration #define CONFIG_USB_STORAGE /* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 - #define OF_CPU "PowerPC,5200@0" #define OF_TBCLK CONFIG_SYS_MPC5XXX_CLKIN #define OF_SOC "soc5200@f0000000" diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h index ef4206b87f..f2c05f8acc 100644 --- a/include/configs/pdm360ng.h +++ b/include/configs/pdm360ng.h @@ -461,10 +461,7 @@ #define CONFIG_BOOTCOMMAND "run env_cont" -#define CONFIG_OF_BOARD_SETUP 1 #define CONFIG_OF_SUPPORT_OLD_DEVICE_TREES 1 -#define CONFIG_FIT -#define CONFIG_FIT_VERBOSE #define OF_CPU "PowerPC,5121@0" #define OF_SOC_COMPAT "fsl,mpc5121-immr" diff --git a/include/configs/plutux.h b/include/configs/plutux.h index 1d6df323e8..4590063d35 100644 --- a/include/configs/plutux.h +++ b/include/configs/plutux.h @@ -47,9 +47,6 @@ /* General networking support */ #define CONFIG_CMD_DHCP -/* support the new (FDT-based) image format */ -#define CONFIG_FIT - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index d896bca68b..145a93320e 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -149,8 +149,4 @@ #define CONFIG_SYS_CONSOLE_FG_COL 0x00 #endif -#ifndef CONFIG_SPL_BUILD -#define CONFIG_FIT -#endif - #endif /* ! __CONFIG_PXM2_H */ diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index 3de4004d20..293684e4d6 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -117,14 +117,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); #define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -/* 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}() */ - /* * General PCI * Memory space is mapped 1-1, but I/O space must start from 0. diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h index 2c3b02677a..7250e37a35 100644 --- a/include/configs/rpi-common.h +++ b/include/configs/rpi-common.h @@ -126,8 +126,6 @@ #define CONFIG_PARTITION_UUIDS #define CONFIG_CMD_PART -/* Device tree support */ -#define CONFIG_OF_BOARD_SETUP /* ATAGs support for bootm/bootz */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_CMDLINE_TAG diff --git a/include/configs/rut.h b/include/configs/rut.h index 78264bab55..cf018e0590 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -148,8 +148,4 @@ #define CONFIG_SYS_CONSOLE_FG_COL 0x00 #endif -#ifndef CONFIG_SPL_BUILD -#define CONFIG_FIT -#endif - #endif /* ! __CONFIG_RUT_H */ diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index f20f964976..b74a268730 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -282,10 +282,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index f9aefca635..56c197c0c9 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -419,10 +419,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* * I2C */ diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 926824f654..b7238fb942 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -263,12 +263,6 @@ #endif /* - * Pass open firmware flat tree to kernel - */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - -/* * I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 8a6c3d3c73..d06e648640 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -241,11 +241,7 @@ # undef CONFIG_CMD_NFS #endif /* CONFIG_MACB */ -#if !defined(CONFIG_SPL_BUILD) -/* Enable Device-Tree (FDT) support */ #define CONFIG_CMD_FDT -#define CONFIG_FIT -#endif #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_INIT_SP_ADDR 0x301000 diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index e5cf7d2610..a708c68d94 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -29,7 +29,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_DISPLAY_CPUINFO -#define CONFIG_FIT /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index d4253b2646..cd48c9e1ca 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -24,7 +24,6 @@ #define CONFIG_CRC32_VERIFY -#define CONFIG_FIT #define CONFIG_SYS_BOOTMAPSZ (64 * 1024 * 1024) #define CONFIG_TIMESTAMP /* Print image info with timestamp */ diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 5956e111cc..62be0081d1 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -17,10 +17,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* new uImage format support */ -#define CONFIG_FIT 1 -#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */ - /* High Level Configuration Options */ #define CONFIG_BOOKE 1 /* BOOKE */ #define CONFIG_E500 1 /* BOOKE e500 family */ @@ -428,7 +424,6 @@ #define CONFIG_BOOTCOMMAND "run boot_nor" /* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 /* USB support */ #define CONFIG_USB_OHCI_NEW 1 diff --git a/include/configs/strider.h b/include/configs/strider.h index 13926e0684..034240016b 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -30,10 +30,6 @@ #define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_LAST_STAGE_INIT -/* new uImage format support */ -#define CONFIG_FIT 1 -#define CONFIG_FIT_VERBOSE 1 - #define CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR @@ -322,8 +318,6 @@ #define CONFIG_SYS_HUSH_PARSER /* Pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 40850e5d99..ff356e3650 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -296,11 +296,6 @@ extern int soft_i2c_gpio_scl; /* stop x86 thinking in cfbconsole from trying to init a pc keyboard */ #define CONFIG_VGA_AS_SINGLE_DEVICE -/* To be able to hook simplefb into dt */ -#ifdef CONFIG_VIDEO_DT_SIMPLEFB -#define CONFIG_OF_BOARD_SETUP -#endif - #endif /* CONFIG_VIDEO */ /* Ethernet support */ diff --git a/include/configs/t3corp.h b/include/configs/t3corp.h index 7942865f11..1ac54e2069 100644 --- a/include/configs/t3corp.h +++ b/include/configs/t3corp.h @@ -34,7 +34,6 @@ #define CONFIG_BOARD_EARLY_INIT_R 1 /* Call board_early_init_r */ #define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */ #define CONFIG_BOARD_TYPES 1 /* support board types */ -#define CONFIG_FIT #define CFG_ALT_MEMTEST /* diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index f65c4cfdb5..ca6d285d3b 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -157,14 +157,6 @@ #define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -/* 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 #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 38ed626202..a532417e17 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -258,7 +258,6 @@ #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 #define CONFIG_SYS_NAND_U_BOOT_SIZE 0x80000 -#define CONFIG_FIT #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS #define CONFIG_RBTREE diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 0f23034690..33ac955e33 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -61,7 +61,6 @@ /* Filesystems / image support */ #define CONFIG_EFI_PARTITION -#define CONFIG_FIT /* MMC */ #define CONFIG_SYS_FSL_USDHC_NUM 3 diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index a9e3e66a5c..019e32ce86 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -58,8 +58,6 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -/* support the new (FDT-based) image format */ -#define CONFIG_FIT #include "tegra-common-post.h" diff --git a/include/configs/tec.h b/include/configs/tec.h index 50b9e97fe7..a9472146b0 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -50,9 +50,6 @@ /* LCD support */ #define CONFIG_SYS_WHITE_ON_BLACK -/* support the new (FDT-based) image format */ -#define CONFIG_FIT - #include "tegra-common-post.h" #endif /* __CONFIG_H */ diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index ba819c4358..b07ee5645b 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -141,6 +141,4 @@ #define CONFIG_FAT_WRITE #endif -#define CONFIG_OF_SYSTEM_SETUP - #endif /* _TEGRA_COMMON_H_ */ diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index cd9d6b693b..9f186add71 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -77,7 +77,6 @@ #define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */ #define CONFIG_SYS_ALT_MEMTEST #define CONFIG_PREBOOT -#define CONFIG_FIT #define CONFIG_SYS_HUSH_PARSER /* Use the HUSH parser */ #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index a7206f4bea..1f9325351b 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -277,9 +277,6 @@ #define CONFIG_BOOTARGS \ -/* Linux interfacing */ -#define CONFIG_OF_BOARD_SETUP - /* Now for the remaining common defines */ #include <configs/ti_armv7_common.h> diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index e7aa42d73c..1fd3f2ac9d 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -378,10 +378,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_OF_BOARD_SETUP -#define CONFIG_FIT -#define CONFIG_FIT_VERBOSE - /* * All the defines above are for the TQMa6 SoM * diff --git a/include/configs/trats.h b/include/configs/trats.h index 5fb991be5d..7caf0ac871 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -49,8 +49,6 @@ #define MACH_TYPE_TRATS 3928 #define CONFIG_MACH_TYPE MACH_TYPE_TRATS -#define CONFIG_FIT -#define CONFIG_FIT_VERBOSE #define CONFIG_BOOTARGS "Please use defined boot" #define CONFIG_BOOTCOMMAND "run autoboot" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" diff --git a/include/configs/trats2.h b/include/configs/trats2.h index f12a9528d6..a5f6c11a1e 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -41,8 +41,6 @@ #define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_SYS_CONSOLE_IS_IN_ENV -#define CONFIG_FIT -#define CONFIG_FIT_VERBOSE #define CONFIG_BOOTARGS "Please use defined boot" #define CONFIG_BOOTCOMMAND "run autoboot" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" diff --git a/include/configs/tseries.h b/include/configs/tseries.h index 036f1f327c..901dfd726c 100644 --- a/include/configs/tseries.h +++ b/include/configs/tseries.h @@ -43,7 +43,6 @@ /* Support both device trees and ATAGs. */ #define CONFIG_USE_FDT /* use fdt within board code */ -#define CONFIG_OF_BOARD_SETUP #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index 8fbf33f55d..de5c3ce2d2 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -242,10 +242,6 @@ | OR_GPCM_EAD) /* 0xfe0009f7 */ -/* pass open firmware flat tree */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* * Serial Port */ diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index 6343d87ab3..7433d7ec48 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -215,10 +215,6 @@ /* 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 - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 215f24d0b0..ea815c2423 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -26,7 +26,6 @@ #define CONFIG_LMB #define CONFIG_LZO -#define CONFIG_FIT #undef CONFIG_ZLIB #undef CONFIG_GZIP #define CONFIG_SYS_BOOTM_LEN (16 << 20) diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h index 5bc926f067..6f162dc6c2 100644 --- a/include/configs/xpedite1000.h +++ b/include/configs/xpedite1000.h @@ -210,8 +210,6 @@ extern void out32(unsigned int, unsigned long); #define CONFIG_BOOTDELAY 3 /* -1 disables auto-boot */ #define CONFIG_PANIC_HANG /* do not reset board on panic */ #define CONFIG_PREBOOT /* enable preboot variable */ -#define CONFIG_FIT 1 -#define CONFIG_FIT_VERBOSE 1 #define CONFIG_INTEGRITY /* support booting INTEGRITY OS */ #define CONFIG_SYS_EXTBDINFO 1 /* To use extended board_into (bd_t) */ diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 47ef9acdc1..70af1e12ef 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -231,12 +231,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_HUSH_PARSER /* - * Pass open firmware flat tree - */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - -/* * I2C */ #define CONFIG_SYS_I2C @@ -556,8 +550,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_BOOTDELAY 3 /* -1 disables auto-boot */ #define CONFIG_PANIC_HANG /* do not reset board on panic */ #define CONFIG_PREBOOT /* enable preboot variable */ -#define CONFIG_FIT 1 -#define CONFIG_FIT_VERBOSE 1 #define CONFIG_INTEGRITY /* support booting INTEGRITY OS */ /* diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index 712475e87d..19723732f3 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -194,12 +194,6 @@ #define CONFIG_SYS_HUSH_PARSER /* - * Pass open firmware flat tree - */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - -/* * I2C */ #define CONFIG_SYS_I2C @@ -339,8 +333,6 @@ #define CONFIG_BOOTDELAY 3 /* -1 disables auto-boot */ #define CONFIG_PANIC_HANG /* do not reset board on panic */ #define CONFIG_PREBOOT /* enable preboot variable */ -#define CONFIG_FIT 1 -#define CONFIG_FIT_VERBOSE 1 #define CONFIG_INTEGRITY /* support booting INTEGRITY OS */ #define CONFIG_INTERRUPTS /* enable pci, srio, ddr interrupts */ diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 1c3b14c3fe..1be043fa60 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -230,12 +230,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_HUSH_PARSER /* - * Pass open firmware flat tree - */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - -/* * I2C */ #define CONFIG_SYS_I2C @@ -411,8 +405,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_BOOTDELAY 3 /* -1 disables auto-boot */ #define CONFIG_PANIC_HANG /* do not reset board on panic */ #define CONFIG_PREBOOT /* enable preboot variable */ -#define CONFIG_FIT 1 -#define CONFIG_FIT_VERBOSE 1 #define CONFIG_INTEGRITY /* support booting INTEGRITY OS */ /* diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 10c6695a58..0697714a6f 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -220,11 +220,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); */ #define CONFIG_SYS_HUSH_PARSER -/* - * Pass open firmware flat tree - */ -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 #define CONFIG_FDT_FIXUP_PCI_IRQ 1 /* @@ -396,8 +391,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_BOOTDELAY 3 /* -1 disables auto-boot */ #define CONFIG_PANIC_HANG /* do not reset board on panic */ #define CONFIG_PREBOOT /* enable preboot variable */ -#define CONFIG_FIT 1 -#define CONFIG_FIT_VERBOSE 1 #define CONFIG_INTEGRITY /* support booting INTEGRITY OS */ /* diff --git a/include/image.h b/include/image.h index 83653a46a6..02ca43bb89 100644 --- a/include/image.h +++ b/include/image.h @@ -26,7 +26,7 @@ struct lmb; #include <sys/types.h> /* new uImage format support enabled on host */ -#define CONFIG_FIT 1 +#define IMAGE_ENABLE_FIT 1 #define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */ #define IMAGE_ENABLE_IGNORE 0 @@ -42,9 +42,11 @@ struct lmb; #define IMAGE_ENABLE_IGNORE 1 #define IMAGE_INDENT_STRING " " +#define IMAGE_ENABLE_FIT CONFIG_IS_ENABLED(FIT) + #endif /* USE_HOSTCC */ -#if defined(CONFIG_FIT) +#if IMAGE_ENABLE_FIT #include <hash.h> #include <libfdt.h> #include <fdt_support.h> @@ -93,7 +95,7 @@ struct lmb; #define IMAGE_ENABLE_SHA256 0 #endif -#endif /* CONFIG_FIT */ +#endif /* IMAGE_ENABLE_FIT */ #ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH # define IMAGE_ENABLE_RAMDISK_HIGH 1 @@ -308,7 +310,7 @@ typedef struct bootm_headers { image_header_t legacy_hdr_os_copy; /* header copy */ ulong legacy_hdr_valid; -#if defined(CONFIG_FIT) +#if IMAGE_ENABLE_FIT const char *fit_uname_cfg; /* configuration node unit name */ void *fit_hdr_os; /* os FIT image header */ @@ -755,7 +757,7 @@ int bootz_setup(ulong image, ulong *start, ulong *end); /*******************************************************************/ /* New uImage format specific code (prefixed with fit_) */ /*******************************************************************/ -#if defined(CONFIG_FIT) +#if IMAGE_ENABLE_FIT #define FIT_IMAGES_PATH "/images" #define FIT_CONFS_PATH "/configurations" @@ -951,6 +953,7 @@ struct image_sign_info { int required_keynode; /* Node offset of key to use: -1=any */ const char *require_keys; /* Value for 'required' property */ }; +#endif /* Allow struct image_region to always be defined for rsa.h */ /* A part of an image, used for hashing */ struct image_region { @@ -958,6 +961,8 @@ struct image_region { int size; }; +#if IMAGE_ENABLE_FIT + #if IMAGE_ENABLE_VERIFY # include <u-boot/rsa-checksum.h> #endif diff --git a/include/u-boot/rsa.h b/include/u-boot/rsa.h index fd08a617fb..0e96c38711 100644 --- a/include/u-boot/rsa.h +++ b/include/u-boot/rsa.h @@ -30,6 +30,8 @@ struct rsa_public_key { uint64_t exponent; /* public exponent */ }; +struct image_sign_info; + #if IMAGE_ENABLE_SIGN /** * sign() - calculate and return signature for given input data |
