diff options
Diffstat (limited to 'include')
246 files changed, 391 insertions, 931 deletions
diff --git a/include/common.h b/include/common.h index 1317f9b9e7..f9f4605dba 100644 --- a/include/common.h +++ b/include/common.h @@ -596,12 +596,8 @@ void upmconfig (unsigned int, unsigned int *, unsigned int); ulong get_tbclk (void); void reset_misc (void); void reset_cpu (ulong addr); -#if defined (CONFIG_OF_LIBFDT) && defined (CONFIG_OF_BOARD_SETUP) void ft_cpu_setup(void *blob, bd_t *bd); -#ifdef CONFIG_PCI void ft_pci_setup(void *blob, bd_t *bd); -#endif -#endif void smp_set_core_boot_addr(unsigned long addr, int corenr); void smp_kick_all_cpus(void); @@ -660,10 +656,8 @@ int get_serial_clock(void); #if defined(CONFIG_MPC85xx) typedef MPC85xx_SYS_INFO sys_info_t; void get_sys_info ( sys_info_t * ); -# if defined(CONFIG_OF_LIBFDT) - void ft_fixup_cpu(void *, u64); - void ft_fixup_num_cores(void *); -# endif +void ft_fixup_cpu(void *, u64); +void ft_fixup_num_cores(void *); #endif #if defined(CONFIG_MPC86xx) typedef MPC86xx_SYS_INFO sys_info_t; diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h index 0f85cd0e14..2ba7cf4616 100644 --- a/include/config_distro_defaults.h +++ b/include/config_distro_defaults.h @@ -41,8 +41,6 @@ #define CONFIG_BOOTP_PXE_CLIENTARCH 0x9 #endif -#define CONFIG_OF_LIBFDT - #ifdef CONFIG_ARM64 #define CONFIG_CMD_BOOTI #else diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index 8dfe2a8e5a..2076ef0add 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -49,8 +49,6 @@ /* * FDT options */ -#define CONFIG_OF_LIBFDT -#define CONFIG_OF_BOARD_SETUP #define CONFIG_LMB /* diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index 2e94b69f87..802ac75219 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -52,8 +52,6 @@ /* * FDT options */ -#define CONFIG_OF_LIBFDT -#define CONFIG_OF_BOARD_SETUP #define CONFIG_LMB /* diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index bcbae5099a..2d9be205d3 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -503,15 +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_LIBFDT -#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 4b5ad0eade..9c32a01b8d 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -247,17 +247,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #endif -/* - * Pass open firmware flat tree - */ -#define CONFIG_OF_LIBFDT -#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 89907dce4b..9f7ceb838e 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -431,17 +431,6 @@ combinations. this should be removed later #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #endif -/* - * Pass open firmware flat tree - */ -#define CONFIG_OF_LIBFDT -#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 16920c6032..4cbc9ad71e 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -396,17 +396,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* - * Pass open firmware flat tree - */ -#define CONFIG_OF_LIBFDT -#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 1e5285cb31..1b5b907c75 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -209,9 +209,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ -#define CONFIG_OF_LIBFDT -#define CONFIG_OF_BOARD_SETUP - /*----------------------------------------------------------------------- * FLASH organization */ diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 955ce629a1..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,9 +325,6 @@ #define CONFIG_SYS_HUSH_PARSER /* Pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 fa6dd6f836..d440d883d4 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -359,11 +359,6 @@ #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 ba952e33a1..3b49f1c64a 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -305,11 +305,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* Pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 a1d45d8396..97f48e23b4 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -227,11 +227,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 b3322ae719..d218f59c26 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -307,11 +307,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 71dcc6cc12..5b0900a9ad 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -333,11 +333,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 ded73b4c9b..4346edaa4c 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -366,11 +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_LIBFDT 1 -#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 df478881ef..2475ae4f5f 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -321,11 +321,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* Pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 e77848e767..aa66927f5f 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -347,11 +347,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* Pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 294be3b53b..9298c3080c 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -385,13 +385,6 @@ #define CONFIG_SYS_HUSH_PARSER /* - * Pass open firmware flat tree - */ -#define CONFIG_OF_LIBFDT 1 -#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 921180f209..0a6d5bcd69 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -236,11 +236,6 @@ #ifdef CONFIG_SYS_HUSH_PARSER #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 d5805c1717..79f81ec6ba 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -259,11 +259,6 @@ extern unsigned long get_clock_freq(void); #ifdef CONFIG_SYS_HUSH_PARSER #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 0fa5fd30b0..494c46ff50 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -209,11 +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_LIBFDT 1 -#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 a84ebfd5d1..8d29762438 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -334,11 +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_LIBFDT 1 -#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 84b8174bda..b64bbe5df6 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -257,11 +257,6 @@ extern unsigned long get_clock_freq(void); #ifdef CONFIG_SYS_HUSH_PARSER #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 69ce13cf45..2284646c11 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -231,11 +231,6 @@ #ifdef CONFIG_SYS_HUSH_PARSER #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 03ba806bc5..a130001dd5 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -242,11 +242,6 @@ extern unsigned long get_clock_freq(void); #ifdef CONFIG_SYS_HUSH_PARSER #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 f86d10fb2b..0e003e5c05 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -253,11 +253,6 @@ extern unsigned long get_clock_freq(void); #ifdef CONFIG_SYS_HUSH_PARSER #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 b34a033f8d..cfcd5b9bd0 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -380,17 +380,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* - * Pass open firmware flat tree - */ -#define CONFIG_OF_LIBFDT 1 -#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 f8aef2e830..ac219d1e12 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -236,14 +236,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* - * Pass open firmware flat tree to kernel - */ -#define CONFIG_OF_LIBFDT 1 -#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 a84db510cb..bd0a3f5716 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -273,13 +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_LIBFDT 1 -#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 3c0faca134..81af87122c 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -622,17 +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_LIBFDT -#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 6235bbbc4e..bc4c733135 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -443,17 +443,6 @@ #define CONFIG_VGA_AS_SINGLE_DEVICE #endif -/* - * Pass open firmware flat tree - */ -#define CONFIG_OF_LIBFDT -#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 bc479f6e08..a53b1acdf6 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -175,17 +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_LIBFDT -#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 f250e7f88e..2d27fcf555 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -339,15 +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_LIBFDT -#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 4eb5fe1c61..345affa7a4 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -73,9 +73,6 @@ #define CONFIG_CMD_EEPROM #define CONFIG_CMD_USB -#define CONFIG_OF_LIBFDT -#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 ce0c49f663..bb0c8bbdcb 100644 --- a/include/configs/PMC405DE.h +++ b/include/configs/PMC405DE.h @@ -64,9 +64,6 @@ #define CONFIG_CMD_PCI #define CONFIG_CMD_PING -#define CONFIG_OF_LIBFDT -#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 05ad315038..dab4fa7c1d 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -407,10 +407,6 @@ #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 e5df784ece..f07b2d1b31 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -536,15 +536,6 @@ unsigned long get_board_ddr_clk(void); #endif #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT -#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 3cda3b1afd..1a22beeb8c 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -534,15 +534,6 @@ unsigned long get_board_ddr_clk(void); #undef CONFIG_SYS_FLASH_EMPTY_INFO #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT -#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 2e7892f94a..aa0f802233 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -435,15 +435,6 @@ unsigned long get_board_ddr_clk(void); #undef CONFIG_SYS_FLASH_EMPTY_INFO #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT -#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 5fc34976d7..84e195dbdf 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -487,15 +487,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg #endif #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT -#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 3caf40bcaf..5957fa8914 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -459,15 +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_LIBFDT -#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 b5290a1a16..e0769d04c7 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -419,15 +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_LIBFDT -#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 c1a0a6ced9..faf06a0429 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -213,15 +213,6 @@ #define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT -#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 535dc6eceb..e646c0035d 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -730,9 +730,6 @@ * Open firmware flat tree support *----------------------------------------------------------------------- */ -#define CONFIG_OF_LIBFDT 1 -#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 013e40e3b9..d03f2e6a45 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -457,9 +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_LIBFDT 1 -#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 fbb2f84959..7d39766375 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -453,9 +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_LIBFDT 1 -#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 58a17f5a03..9ed469a560 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -327,11 +327,6 @@ #undef CONFIG_WATCHDOG /* watchdog disabled */ -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 00771051f0..c70c4d799a 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -441,9 +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_LIBFDT 1 -#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 4a443eda23..52cba86c72 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -443,9 +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_LIBFDT 1 -#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 3fbc1ad128..fb2652b237 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -449,9 +449,6 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 d2729d6d72..301a0a8b93 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -480,9 +480,6 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 764568df66..a390e3ff37 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -448,9 +448,6 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 0894f59832..0d2e1190f8 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -453,9 +453,6 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 9650b8d0b8..6fd08c7cd0 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -453,9 +453,6 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 8b8db89e0e..fcdc3e5375 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -454,9 +454,6 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 a011d2e76c..2a0fdf5947 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -472,9 +472,6 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC" -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 023736ef2b..c9925ab6e7 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -472,9 +472,6 @@ #define CONFIG_ETHPRIME "SCC" -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 c21af1ced6..139e629730 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -345,17 +345,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* - * Pass open firmware flat tree - */ -#define CONFIG_OF_LIBFDT -#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 6cbf1b7b2e..a734c28ce0 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -66,9 +66,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_EEPROM -#define CONFIG_OF_LIBFDT -#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 4839ede8d4..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,10 +94,6 @@ #undef CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2 #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT -#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 0ff5164ce6..a883afbfac 100644 --- a/include/configs/a4m072.h +++ b/include/configs/a4m072.h @@ -354,9 +354,6 @@ * Open firmware flat tree support *----------------------------------------------------------------------- */ -#define CONFIG_OF_LIBFDT 1 -#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 320be8fd1b..750d8ff175 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -557,9 +557,6 @@ #define CONFIG_ARP_TIMEOUT 200UL -#define CONFIG_FIT 1 -#define CONFIG_OF_LIBFDT 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/am3517_evm.h b/include/configs/am3517_evm.h index 5b689a85f9..fae81380cd 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -47,7 +47,6 @@ /* Display CPU and Board information */ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_OF_LIBFDT #define CONFIG_MISC_INIT_R #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 6308cab8e6..1fffdb18fb 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -88,4 +88,8 @@ #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) +/* EEPROM */ +#define CONFIG_EEPROM_CHIP_ADDRESS 0x50 +#define CONFIG_EEPROM_BUS_ADDRESS 0 + #endif /* __CONFIG_AM57XX_EVM_H */ diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index 60d6be7a16..0388ffc781 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -121,11 +121,6 @@ #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port*/ #endif -/* - * Pass open firmware flat tree - */ -#define CONFIG_OF_LIBFDT -#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/apf27.h b/include/configs/apf27.h index 5b286d24fe..018d586ddc 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -161,8 +161,6 @@ #define CONFIG_SETUP_MEMORY_TAGS /* send memory definition to kernel */ #define CONFIG_INITRD_TAG /* send initrd params */ -#define CONFIG_OF_LIBFDT - #define CONFIG_BOOTDELAY 5 #define CONFIG_ZERO_BOOTDELAY_CHECK #define CONFIG_BOOTFILE __stringify(CONFIG_BOARD_NAME) "-linux.bin" diff --git a/include/configs/arcangel4.h b/include/configs/arcangel4.h index 63f61ae467..8a860eef6a 100644 --- a/include/configs/arcangel4.h +++ b/include/configs/arcangel4.h @@ -41,9 +41,6 @@ /* * Command line configuration */ - -#define CONFIG_OF_LIBFDT - #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MAXARGS 16 diff --git a/include/configs/aria.h b/include/configs/aria.h index c38bf3cfb0..c56a2e339b 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -572,8 +572,6 @@ #define CONFIG_BOOTCOMMAND "run flash_self" -#define CONFIG_OF_LIBFDT 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/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/armadillo-800eva.h b/include/configs/armadillo-800eva.h index dfbd60d19c..1ce9b9ad03 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -23,7 +23,6 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_BOOTZ -#define CONFIG_OF_LIBFDT #define BOARD_LATE_INIT #define CONFIG_BAUDRATE 115200 diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index d692106315..6525b5c370 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -31,8 +31,6 @@ #define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_CMD_BOOTZ -#define CONFIG_OF_LIBFDT /* Device Tree support */ - /* general purpose I/O */ #define CONFIG_AT91_GPIO diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h index 9274024fb0..5903f7cc0b 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -59,7 +59,6 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_CMD_BOOTZ -#define CONFIG_OF_LIBFDT /* diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index cc3e69cdf7..7820295ae2 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -46,8 +46,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_CMD_BOOTZ -#define CONFIG_OF_LIBFDT - /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 64fb38bad6..c7ba9eb283 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -31,9 +31,6 @@ #define CONFIG_DISPLAY_CPUINFO -#define CONFIG_OF_LIBFDT - - #define CONFIG_ATMEL_LEGACY #define CONFIG_SYS_TEXT_BASE 0x21f00000 diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 89ee9fe3e2..c8264276a7 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -46,8 +46,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_CMD_BOOTZ -#define CONFIG_OF_LIBFDT - /* * Hardware drivers diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index cc42c909d4..d4baf48b26 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -31,8 +31,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_CMD_BOOTZ -#define CONFIG_OF_LIBFDT - /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index ba91d1f11f..14a843641a 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -30,8 +30,6 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_DISPLAY_CPUINFO -#define CONFIG_OF_LIBFDT - /* general purpose I/O */ #define CONFIG_AT91_GPIO diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index a7a0502dfd..0d453546e3 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -32,8 +32,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_CMD_BOOTZ -#define CONFIG_OF_LIBFDT - #define CONFIG_ATMEL_LEGACY #define CONFIG_AT91_GPIO 1 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 45bb861922..cd91a7b21a 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -27,8 +27,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_CMD_BOOTZ -#define CONFIG_OF_LIBFDT - /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ diff --git a/include/configs/axs101.h b/include/configs/axs101.h index 98fff63cc1..006ddb3a73 100644 --- a/include/configs/axs101.h +++ b/include/configs/axs101.h @@ -39,8 +39,6 @@ #define CONFIG_BOARD_TYPES #define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_OF_LIBFDT - /* * NAND Flash configuration */ 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/bcm_ep_board.h b/include/configs/bcm_ep_board.h index 1d4869bc5f..344f89d8d8 100644 --- a/include/configs/bcm_ep_board.h +++ b/include/configs/bcm_ep_board.h @@ -86,9 +86,6 @@ #define CONFIG_CMD_FAT #define CONFIG_FAT_WRITE -/* Enable devicetree support */ -#define CONFIG_OF_LIBFDT - /* SHA hashing */ #define CONFIG_CMD_HASH #define CONFIG_HASH_VERIFY diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index 69b26746c8..3744af2d58 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -315,8 +315,6 @@ /* * Flat Device Tree support */ -#define CONFIG_OF_LIBFDT 1 -#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_t35.h b/include/configs/cm_t35.h index 24ae14df30..3910b46e5b 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -48,8 +48,6 @@ #define CONFIG_MISC_INIT_R -#define CONFIG_OF_LIBFDT 1 - #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 7a07de439c..d8a29f04dd 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -51,7 +51,6 @@ #define CONFIG_MISC_INIT_R -#define CONFIG_OF_LIBFDT /* * The early kernel mapping on ARM currently only maps from the base of DRAM * to the end of the kernel image. The kernel is loaded at DRAM base + 0x8000. diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index 6d57cd6eb5..c8c67c4bab 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -18,10 +18,6 @@ #undef CONFIG_SPL_OS_BOOT -/* Device Tree defines */ -#define CONFIG_OF_LIBFDT -#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/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 0fc24a04ce..e8851e790e 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -41,7 +41,6 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_LZMA /* LZMA compression support */ -#define CONFIG_OF_LIBFDT /* * Serial Console Configuration diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 60aee8f0bb..9c73cff6ce 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -219,7 +219,6 @@ #define CONFIG_ENV_OFFSET (12 * 64 * 2048) #endif -#define CONFIG_OF_LIBFDT #define CONFIG_CMD_BOOTZ #define CONFIG_SYS_NO_FLASH diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 641aa7ce42..fa64a1eae3 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -400,17 +400,6 @@ #define CONFIG_MISC_INIT_R #define CONFIG_LAST_STAGE_INIT -/* - * Pass open firmware flat tree - */ -#define CONFIG_OF_LIBFDT -#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 a099eee047..d30d7ffa80 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -344,15 +344,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT -#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/corvus.h b/include/configs/corvus.h index 97797e2b96..a1fd93f212 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -40,7 +40,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_CMD_BOOTZ -#define CONFIG_OF_LIBFDT /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 99b3aef228..b4bf350eb3 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -231,14 +231,6 @@ #define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT -#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/da850evm.h b/include/configs/da850evm.h index 63abb80e96..24e55e8b0c 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -270,7 +270,6 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_CRC32_VERIFY #define CONFIG_MX_CYCLIC -#define CONFIG_OF_LIBFDT /* * Linux Information diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 99d9148611..a8ce7e1eec 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -152,7 +152,6 @@ /* * Pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT /* * Environment diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index f802c8dd7e..0041ab9d35 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -296,9 +296,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 240000 #define CONFIG_SYS_FLASH_WRITE_TOUT 500 -#define CONFIG_OF_LIBFDT 1 -#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/dns325.h b/include/configs/dns325.h index c59a3242d6..80f7a1e8ec 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -91,11 +91,6 @@ #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* - * Enable device tree support - */ -#define CONFIG_OF_LIBFDT - -/* * Display cpu info at boot */ #define CONFIG_DISPLAY_CPUINFO diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 0196280739..45bda4f654 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -19,6 +19,11 @@ #define CONFIG_IODELAY_RECALIBRATION #endif +#define CONFIG_VERY_BIG_RAM +#define CONFIG_PHYS_64BIT +#define CONFIG_NR_DRAM_BANKS 2 +#define CONFIG_MAX_MEM_MAPPED 0x80000000 + #ifndef CONFIG_QSPI_BOOT /* MMC ENV related defines */ #define CONFIG_ENV_IS_IN_MMC @@ -341,4 +346,8 @@ #endif #endif /* NOR support */ +/* EEPROM */ +#define CONFIG_EEPROM_CHIP_ADDRESS 0x50 +#define CONFIG_EEPROM_BUS_ADDRESS 0 + #endif /* __CONFIG_DRA7XX_EVM_H */ 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/hikey.h b/include/configs/hikey.h index 796861e485..993b8b1b9f 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -26,9 +26,6 @@ #define CONFIG_IDENT_STRING "hikey" -/* Flat Device Tree Definitions */ -#define CONFIG_OF_LIBFDT - #define CONFIG_BOARD_EARLY_INIT_F /* Physical Memory Map */ diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 801be68e8e..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,9 +314,6 @@ #define CONFIG_SYS_HUSH_PARSER /* Pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 0a5a9f14ad..5855d81858 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -429,10 +429,6 @@ #define CONFIG_BOOTP_HOSTNAME #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT -#define CONFIG_OF_BOARD_SETUP -#define CONFIG_OF_STDOUT_VIA_ALIAS /* * The reserved memory diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index 639a30a310..43d2c3d57e 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -27,7 +27,6 @@ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_OF_LIBFDT /* enable passing a Device Tree */ #define CONFIG_MISC_INIT_R /* call misc_init_r during start up */ /* 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 637bbb321d..ea9d8b059a 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -170,9 +170,6 @@ /* * Open firmware flat tree support */ -#define CONFIG_OF_LIBFDT 1 -#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 ba96d97abf..b494683760 100644 --- a/include/configs/jupiter.h +++ b/include/configs/jupiter.h @@ -134,9 +134,6 @@ #if 0 /* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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/k2e_evm.h b/include/configs/k2e_evm.h index 4f4ebf53ec..e053a54d41 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -38,4 +38,6 @@ #define CONFIG_KSNET_CPSW_NUM_PORTS 9 #define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE +#define CONFIG_DDR_SPD + #endif /* __CONFIG_K2E_EVM_H */ diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index d9ad8cf4b4..ca1e368aa0 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -17,6 +17,7 @@ /* U-Boot general configuration */ #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ DEFAULT_MMC_TI_ARGS \ + DEFAULT_PMMC_BOOT_ENV \ "console=ttyS0,115200n8\0" \ "bootpart=0:2\0" \ "bootdir=/boot\0" \ @@ -28,11 +29,17 @@ "name_ubi=k2g-evm-ubifs.ubi\0" \ "name_uboot=u-boot-spi-k2g-evm.gph\0" \ "init_mmc=run args_all args_mmc\0" \ + "soc_variant=k2g\0" \ "get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}\0"\ "get_kern_mmc=load mmc ${bootpart} ${loadaddr} " \ "${bootdir}/${name_kern}\0" \ "get_mon_mmc=load mmc ${bootpart} ${addr_mon} ${bootdir}/${name_mon}\0"\ +#define CONFIG_BOOTCOMMAND \ + "run set_name_pmmc init_${boot} get_pmmc_${boot} run_pmmc " \ + "get_fdt_${boot} get_mon_${boot} get_kern_${boot} " \ + "run_mon run_kern" + #include <configs/ti_armv7_keystone2.h> /* SPL SPI Loader Configuration */ diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h index 6c6dcb1e5e..3cd2a85a2d 100644 --- a/include/configs/k2hk_evm.h +++ b/include/configs/k2hk_evm.h @@ -37,4 +37,6 @@ #define CONFIG_KSNET_NETCP_V1_0 #define CONFIG_KSNET_CPSW_NUM_PORTS 5 +#define CONFIG_DDR_SPD + #endif /* __CONFIG_K2HK_EVM_H */ diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index eba7479771..8293607c9c 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -17,10 +17,6 @@ #define CONFIG_CMD_DTT #define CONFIG_JFFS2_CMDLINE -/* Pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT -#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/km_arm.h b/include/configs/km/km_arm.h index d1f0b12b0e..dfc1c7e66a 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -93,9 +93,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #define CONFIG_MISC_INIT_R -/* Pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT - /* * NS16550 Configuration */ diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 6860ad2a4b..d981951bce 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -258,15 +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_LIBFDT -#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/kwb.h b/include/configs/kwb.h index 60e6496fad..1f2d2a42c3 100644 --- a/include/configs/kwb.h +++ b/include/configs/kwb.h @@ -112,7 +112,6 @@ BUR_COMMON_ENV \ #undef CONFIG_BOOTM_RTEMS /* Support both device trees and ATAGs. */ -#define CONFIG_OF_LIBFDT #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index d5cbb33661..6c9eed4535 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -23,7 +23,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_OF_LIBFDT #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index f8cae4013c..842169d1b2 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -176,11 +176,6 @@ #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* - * Enable device tree support - */ -#define CONFIG_OF_LIBFDT - -/* * Environment variables configurations */ #define CONFIG_ENV_IS_IN_SPI_FLASH diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h new file mode 100644 index 0000000000..79fa3c476a --- /dev/null +++ b/include/configs/legoev3.h @@ -0,0 +1,255 @@ +/* + * Copyright (C) 2016 David Lechner <david@lechnology.com> + * + * Based on da850evm.h + * + * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/ + * + * Based on davinci_dvevm.h. Original Copyrights follow: + * + * Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +/* + * SoC Configuration + */ +#define CONFIG_MACH_DAVINCI_DA850_EVM +#define CONFIG_SOC_DA8XX /* TI DA8xx SoC */ +#define CONFIG_SOC_DA850 /* TI DA850 SoC */ +#define CONFIG_SYS_EXCEPTION_VECTORS_HIGH +#define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID) +#define CONFIG_SYS_OSCIN_FREQ 24000000 +#define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE +#define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID) +#define CONFIG_SYS_DA850_PLL_INIT +#define CONFIG_SYS_DA850_DDR_INIT + +#define CONFIG_SYS_TEXT_BASE 0xc1080000 + + +/* + * Memory Info + */ +#define CONFIG_SYS_MALLOC_LEN (0x10000 + 1*1024*1024) /* malloc() len */ +#define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */ +#define PHYS_SDRAM_1_SIZE (64 << 20) /* SDRAM size 64MB */ +#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/ + +/* memtest start addr */ +#define CONFIG_SYS_MEMTEST_START (PHYS_SDRAM_1 + 0x2000000) + +/* memtest will be run on 16MB */ +#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + 0x2000000 + 16*1024*1024) + +#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ + +#define CONFIG_SYS_DA850_SYSCFG_SUSPSRC ( \ + DAVINCI_SYSCFG_SUSPSRC_TIMER0 | \ + DAVINCI_SYSCFG_SUSPSRC_SPI0 | \ + DAVINCI_SYSCFG_SUSPSRC_UART1 | \ + DAVINCI_SYSCFG_SUSPSRC_EMAC | \ + DAVINCI_SYSCFG_SUSPSRC_I2C) + +/* + * PLL configuration + */ +#define CONFIG_SYS_DV_CLKMODE 0 +#define CONFIG_SYS_DA850_PLL0_POSTDIV 1 +#define CONFIG_SYS_DA850_PLL0_PLLDIV1 0x8000 +#define CONFIG_SYS_DA850_PLL0_PLLDIV2 0x8001 +#define CONFIG_SYS_DA850_PLL0_PLLDIV3 0x8002 +#define CONFIG_SYS_DA850_PLL0_PLLDIV4 0x8003 +#define CONFIG_SYS_DA850_PLL0_PLLDIV5 0x8002 +#define CONFIG_SYS_DA850_PLL0_PLLDIV6 CONFIG_SYS_DA850_PLL0_PLLDIV1 +#define CONFIG_SYS_DA850_PLL0_PLLDIV7 0x8005 + +#define CONFIG_SYS_DA850_PLL1_POSTDIV 1 +#define CONFIG_SYS_DA850_PLL1_PLLDIV1 0x8000 +#define CONFIG_SYS_DA850_PLL1_PLLDIV2 0x8001 +#define CONFIG_SYS_DA850_PLL1_PLLDIV3 0x8002 + +#define CONFIG_SYS_DA850_PLL0_PLLM 24 +#define CONFIG_SYS_DA850_PLL1_PLLM 21 + +/* + * DDR2 memory configuration + */ +#define CONFIG_SYS_DA850_DDR2_DDRPHYCR (DV_DDR_PHY_PWRDNEN | \ + DV_DDR_PHY_EXT_STRBEN | \ + (0x4 << DV_DDR_PHY_RD_LATENCY_SHIFT)) + +#define CONFIG_SYS_DA850_DDR2_SDBCR ( \ + (1 << DV_DDR_SDCR_MSDRAMEN_SHIFT) | \ + (1 << DV_DDR_SDCR_DDREN_SHIFT) | \ + (1 << DV_DDR_SDCR_SDRAMEN_SHIFT) | \ + (1 << DV_DDR_SDCR_BUS_WIDTH_SHIFT) | \ + (0x3 << DV_DDR_SDCR_CL_SHIFT) | \ + (0x2 << DV_DDR_SDCR_IBANK_SHIFT) | \ + (0x2 << DV_DDR_SDCR_PAGESIZE_SHIFT)) + +/* SDBCR2 is only used if IBANK_POS bit in SDBCR is set */ +#define CONFIG_SYS_DA850_DDR2_SDBCR2 0 + +#define CONFIG_SYS_DA850_DDR2_SDTIMR ( \ + (14 << DV_DDR_SDTMR1_RFC_SHIFT) | \ + (2 << DV_DDR_SDTMR1_RP_SHIFT) | \ + (2 << DV_DDR_SDTMR1_RCD_SHIFT) | \ + (1 << DV_DDR_SDTMR1_WR_SHIFT) | \ + (5 << DV_DDR_SDTMR1_RAS_SHIFT) | \ + (8 << DV_DDR_SDTMR1_RC_SHIFT) | \ + (1 << DV_DDR_SDTMR1_RRD_SHIFT) | \ + (0 << DV_DDR_SDTMR1_WTR_SHIFT)) + +#define CONFIG_SYS_DA850_DDR2_SDTIMR2 ( \ + (7 << DV_DDR_SDTMR2_RASMAX_SHIFT) | \ + (0 << DV_DDR_SDTMR2_XP_SHIFT) | \ + (0 << DV_DDR_SDTMR2_ODT_SHIFT) | \ + (17 << DV_DDR_SDTMR2_XSNR_SHIFT) | \ + (199 << DV_DDR_SDTMR2_XSRD_SHIFT) | \ + (0 << DV_DDR_SDTMR2_RTP_SHIFT) | \ + (0 << DV_DDR_SDTMR2_CKE_SHIFT)) + +#define CONFIG_SYS_DA850_DDR2_SDRCR 0x00000494 +#define CONFIG_SYS_DA850_DDR2_PBBPR 0x30 + +/* + * Serial Driver info + */ +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size */ +#define CONFIG_SYS_NS16550_COM1 DAVINCI_UART1_BASE /* Base address of UART1 */ +#define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID) +#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ +#define CONFIG_BAUDRATE 115200 /* Default baud rate */ + +#define CONFIG_SPI +#define CONFIG_CMD_SF +#define CONFIG_DAVINCI_SPI +#define CONFIG_SYS_SPI_BASE DAVINCI_SPI0_BASE +#define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI0_CLKID) +#define CONFIG_SF_DEFAULT_SPEED 50000000 +#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED + +/* + * I2C Configuration + */ +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_DAVINCI +#define CONFIG_SYS_DAVINCI_I2C_SPEED 400000 +#define CONFIG_SYS_DAVINCI_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */ + +/* + * U-Boot general configuration + */ +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_BOOTFILE "uImage" /* Boot file name */ +#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) +#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */ +#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000) +#define CONFIG_VERSION_VARIABLE +#define CONFIG_AUTO_COMPLETE +#define CONFIG_SYS_HUSH_PARSER +#define CONFIG_CMDLINE_EDITING +#define CONFIG_SYS_LONGHELP +#define CONFIG_CRC32_VERIFY +#define CONFIG_MX_CYCLIC +#define CONFIG_OF_LIBFDT + +/* + * Linux Information + */ +#define LINUX_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100) +#define CONFIG_HWCONFIG /* enable hwconfig */ +#define CONFIG_CMDLINE_TAG +#define CONFIG_REVISION_TAG +#define CONFIG_SERIAL_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_SETUP_INITRD_TAG +#define CONFIG_BOOTDELAY 0 +#define CONFIG_ZERO_BOOTDELAY_CHECK +#define CONFIG_BOOTCOMMAND \ + "if mmc rescan; then " \ + "if run loadbootscr; then " \ + "run bootscript; " \ + "else " \ + "if run loadimage; then " \ + "run mmcargs; " \ + "run mmcboot; " \ + "else " \ + "run flashargs; " \ + "run flashboot; " \ + "fi; " \ + "fi; " \ + "else " \ + "run flashargs; " \ + "run flashboot; " \ + "fi" +#define CONFIG_EXTRA_ENV_SETTINGS \ + "hostname=EV3\0" \ + "memsize=64M\0" \ + "filesyssize=10M\0" \ + "verify=n\0" \ + "console=ttyS1,115200n8\0" \ + "bootscraddr=0xC0600000\0" \ + "loadaddr=0xC0007FC0\0" \ + "filesysaddr=0xC1180000\0" \ + "fwupdateboot=mw 0xFFFF1FFC 0x5555AAAA; reset\0" \ + "mmcargs=setenv bootargs mem=${memsize} console=${console} root=/dev/mmcblk0p2 rw rootwait lpj=747520\0" \ + "mmcboot=bootm ${loadaddr}\0" \ + "flashargs=setenv bootargs mem=${memsize} initrd=${filesysaddr},${filesyssize} root=/dev/ram0 rw rootfstype=squashfs console=${console} lpj=747520\0" \ + "flashboot=sf probe 0; sf read ${loadaddr} 0x50000 0x300000; sf read ${filesysaddr} 0x350000 0x960000; bootm ${loadaddr}\0" \ + "loadimage=fatload mmc 0 ${loadaddr} uImage\0" \ + "loadbootscr=fatload mmc 0 ${bootscraddr} boot.scr\0" \ + "bootscript=source ${bootscraddr}\0" \ + +/* + * U-Boot commands + */ +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_DIAG +#define CONFIG_CMD_MII +#define CONFIG_CMD_PING +#define CONFIG_CMD_SAVES + +#ifdef CONFIG_CMD_BDI +#define CONFIG_CLOCKS +#endif + +#define CONFIG_CMD_SPI + +#define CONFIG_ENV_IS_NOWHERE +#define CONFIG_SYS_NO_FLASH +#define CONFIG_ENV_SIZE (16 << 10) + +/* SD/MMC configuration */ +#define CONFIG_MMC +#define CONFIG_DAVINCI_MMC_SD1 +#define CONFIG_GENERIC_MMC +#define CONFIG_DAVINCI_MMC + +/* + * Enable MMC commands only when + * MMC support is present + */ +#ifdef CONFIG_MMC +#define CONFIG_DOS_PARTITION +#define CONFIG_CMD_EXT3 +#define CONFIG_CMD_EXT4 +#define CONFIG_CMD_FAT +#define CONFIG_CMD_MMC +#endif + +/* additions for new relocation code, must added to all boards */ +#define CONFIG_SYS_SDRAM_BASE 0xc0000000 + +#define CONFIG_SYS_INIT_SP_ADDR 0x80010000 + +#endif /* __CONFIG_H */ diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 39d747f55e..d7025f6325 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -666,9 +666,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ #endif -#define CONFIG_OF_LIBFDT -#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 ae58646d5e..cee62812c1 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -509,9 +509,6 @@ #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ #endif -#define CONFIG_OF_LIBFDT -#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 6150bc1a74..ea25aadbb3 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -28,14 +28,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_BOARD_EARLY_INIT_F 1 -/* Flat Device Tree Definitions */ -#define CONFIG_OF_LIBFDT -#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 158cf02763..68e00c8bb1 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -454,8 +454,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_ENV_SIZE 0x20000 #endif -#define CONFIG_OF_LIBFDT -#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 64b82e8388..c9b0a2f428 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -44,15 +44,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_BOARD_EARLY_INIT_F 1 -/* Flat Device Tree Definitions */ -#define CONFIG_OF_LIBFDT -#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/lsxl.h b/include/configs/lsxl.h index 19ee5bc2f8..8fb0135c97 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -37,7 +37,6 @@ #define CONFIG_SHOW_BOOT_PROGRESS #define CONFIG_KIRKWOOD_GPIO -#define CONFIG_OF_LIBFDT #define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_HUSH_PARSER diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 69172bb995..648e189e40 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -300,16 +300,9 @@ CONFIG_SYS_I2C_DSPIC_KEYB_ADDR,\ CONFIG_SYS_I2C_DSPIC_IO_ADDR } -/* - * Pass open firmware flat tree - */ -#define CONFIG_OF_LIBFDT -#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 fbaa6000bc..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 */ /* @@ -247,7 +245,6 @@ #define CONFIG_LOADADDR 0x70800000 #define CONFIG_BOOTCOMMAND "run mmc_mmc" #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_OF_LIBFDT /* * NAND SPL 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 941290c776..3c081a2607 100644 --- a/include/configs/manroland/common.h +++ b/include/configs/manroland/common.h @@ -115,8 +115,4 @@ */ #define CONFIG_LOOPW -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#define CONFIG_OF_BOARD_SETUP 1 - #endif /* __MANROLAND_COMMON_H */ diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 4eea06dc62..174cb5c4da 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -33,9 +33,6 @@ #include <asm/arch/cpu.h> /* get chip and board defs */ #include <asm/arch/omap.h> -#define CONFIG_OF_LIBFDT -#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 0f39964191..e561026060 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -427,9 +427,6 @@ #define CONFIG_BOOTCOMMAND "run flash_self" -#define CONFIG_OF_LIBFDT -#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 10a6ce995f..88fb3e8735 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -57,7 +57,6 @@ #define CONFIG_PREBOOT /* enable preboot variable */ #define CONFIG_CMD_BOOTZ -#define CONFIG_OF_LIBFDT /* * Hardware drivers @@ -153,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 97a0d86b91..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_OF_LIBFDT 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 a8cf201913..f4d5dbcb75 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -377,10 +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_LIBFDT 1 -#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 5f4e15772d..4ac291c812 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -586,8 +586,6 @@ #define CONFIG_BOOTCOMMAND "run flash_self" -#define CONFIG_OF_LIBFDT 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/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index a90083f305..1bab9aba56 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -305,11 +305,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* Pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 c34cba3d5c..06012563ae 100644 --- a/include/configs/munices.h +++ b/include/configs/munices.h @@ -184,10 +184,6 @@ #define CONFIG_SYS_CS_DEADCYCLE 0x33333333 #define CONFIG_SYS_RESET_ADDRESS 0xff000000 -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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/mv-common.h b/include/configs/mv-common.h index d12d725e5f..674aa0ac7f 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -60,8 +60,6 @@ #define CONFIG_BOOTDELAY 3 /* default enable autoboot */ #define CONFIG_PREBOOT -#define CONFIG_OF_LIBFDT /* Device tree support */ - /* * For booting Linux, the board info and command line data * have to be in the first 8 MB of memory, since this is diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h index d7d8d81cb9..496bc1f4f1 100644 --- a/include/configs/mv-plug-common.h +++ b/include/configs/mv-plug-common.h @@ -28,11 +28,6 @@ #endif /* CONFIG_SYS_MVFS */ /* - * Enable device tree support - */ -#define CONFIG_OF_LIBFDT - -/* * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index f113302695..6dbeeca701 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -82,7 +82,6 @@ #define CONFIG_SYS_LONGHELP /* U-Boot commands */ -#define CONFIG_OF_LIBFDT #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_CACHE #define CONFIG_CMD_MMC diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index ae9f091ef9..5f94e19d51 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -22,16 +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_OF_LIBFDT 1 -#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/mx35pdk.h b/include/configs/mx35pdk.h index 1b2f952975..1177b0a4a2 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -79,7 +79,6 @@ /* * Command definition */ -#define CONFIG_OF_LIBFDT #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 32cd58ef44..31cd5bb69d 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -28,8 +28,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -#define CONFIG_OF_LIBFDT - #define CONFIG_MACH_TYPE MACH_TYPE_MX51_BABBAGE /* * Size of malloc() pool diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 25a4630e1e..22e1b683a3 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -225,7 +225,6 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_OF_LIBFDT #define MX53ARD_CS1GCR1 (CSEN | DSZ(2)) #define MX53ARD_CS1RCR1 (RCSN(2) | OEN (1) | RWSC(22)) diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index 37430f0a2a..fca567da54 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -25,8 +25,6 @@ #define CONFIG_SYS_FSL_CLK -#define CONFIG_OF_LIBFDT - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 54d3e3edd5..cfb3ae365e 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -217,8 +217,6 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_OF_LIBFDT - #define CONFIG_CMD_SATA #ifdef CONFIG_CMD_SATA #define CONFIG_DWC_AHSATA diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index d915b883ce..33d2163d6b 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -159,6 +159,4 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_OF_LIBFDT - #endif /* __CONFIG_H */ diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 179b4f9007..3abc773dd6 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -69,7 +69,6 @@ #define CONFIG_BAUDRATE 115200 /* Filesystems and image support */ -#define CONFIG_OF_LIBFDT #define CONFIG_CMD_BOOTZ #define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_CMD_FS_GENERIC diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index c7e10f91d3..2fff34a725 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -187,7 +187,6 @@ #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ -#define CONFIG_OF_LIBFDT #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_BMODE diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index fac7c3f2e2..a627456d93 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -53,7 +53,6 @@ #define CONFIG_BAUDRATE 115200 /* Filesystems and image support */ -#define CONFIG_OF_LIBFDT #define CONFIG_CMD_BOOTZ #define CONFIG_DOS_PARTITION #define CONFIG_CMD_EXT2 diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 4c490ae54e..a4ffe75823 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -41,9 +41,6 @@ * CPU specifics */ -/* MXS uses FDT */ -#define CONFIG_OF_LIBFDT - /* Startup hooks */ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_ARCH_MISC_INIT diff --git a/include/configs/nas220.h b/include/configs/nas220.h index e5ff7e1f6c..36a00d3d56 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -137,12 +137,6 @@ #define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET #endif - -/* - * Device Tree - */ -#define CONFIG_OF_LIBFDT - /* * EFI partition */ 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 d528fac8c8..0b6173be9b 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -65,10 +65,6 @@ /* General networking support */ #define CONFIG_CMD_DHCP -#define CONFIG_FIT -#define CONFIG_FIT_BEST_MATCH -#define CONFIG_OF_LIBFDT - #define CONFIG_KEYBOARD #undef CONFIG_LOADADDR diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h index 8b0dbdc747..73a44a79e5 100644 --- a/include/configs/o2dnt-common.h +++ b/include/configs/o2dnt-common.h @@ -332,9 +332,6 @@ /* * DT support */ -#define CONFIG_OF_LIBFDT 1 -#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/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index bce4fad826..fc7bfce4e6 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -196,7 +196,6 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_CRC32_VERIFY #define CONFIG_MX_CYCLIC -#define CONFIG_OF_LIBFDT /* * Linux Information diff --git a/include/configs/openrisc-generic.h b/include/configs/openrisc-generic.h index c854189558..28e42757a1 100644 --- a/include/configs/openrisc-generic.h +++ b/include/configs/openrisc-generic.h @@ -120,7 +120,6 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING -#define CONFIG_OF_LIBFDT #define CONFIG_LMB /* diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 60bedaa726..799521e1e0 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -665,17 +665,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* - * Pass open firmware flat tree - */ -#define CONFIG_OF_LIBFDT -#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 77ba2d8bed..1e49ee6e22 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -231,17 +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_LIBFDT -#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 29feb7bba1..b4a7225fb8 100644 --- a/include/configs/pcm030.h +++ b/include/configs/pcm030.h @@ -418,9 +418,6 @@ RTC configuration #define CONFIG_USB_STORAGE /* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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/pcm052.h b/include/configs/pcm052.h index 9d80306ad4..4e29cf34ab 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -267,7 +267,6 @@ #define CONFIG_ENV_OFFSET_REDUND 0xC0000 #endif -#define CONFIG_OF_LIBFDT #define CONFIG_CMD_BOOTZ #endif diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h index a6e7e9c152..f2c05f8acc 100644 --- a/include/configs/pdm360ng.h +++ b/include/configs/pdm360ng.h @@ -461,11 +461,7 @@ #define CONFIG_BOOTCOMMAND "run env_cont" -#define CONFIG_OF_LIBFDT 1 -#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/picosam9g45.h b/include/configs/picosam9g45.h index 47613ded3b..b2ba6fc58a 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -34,8 +34,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_CMD_BOOTZ -#define CONFIG_OF_LIBFDT - /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ 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 2dfea33306..293684e4d6 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -117,15 +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_LIBFDT -#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/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index f750b5305d..6bc33e0c45 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -40,7 +40,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG #define CONFIG_CMDLINE_EDITING -#define CONFIG_OF_LIBFDT #define CONFIG_BAUDRATE 38400 #define CONFIG_BOOTDELAY 3 diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 427ac4bcff..5322685300 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_MALLOC_LEN (32 << 20) #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_THUMB_BUILD -#define CONFIG_OF_LIBFDT #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_SYS_TIMER_RATE (24 * 1000 * 1000) 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/s5p_goni.h b/include/configs/s5p_goni.h index f92c23db51..40fb5ed35d 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -278,7 +278,4 @@ #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE -#define CONFIG_OF_LIBFDT - - #endif /* __CONFIG_H */ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index b7090c8133..cc22467442 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -28,7 +28,6 @@ /* Number of bits in a C 'long' on this architecture */ #define CONFIG_SANDBOX_BITS_PER_LONG 64 -#define CONFIG_OF_LIBFDT #define CONFIG_LMB #define CONFIG_CMD_FDT #define CONFIG_ANDROID_BOOT_IMAGE diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index 25ec7bc7b1..b74a268730 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -282,11 +282,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 9783804194..56c197c0c9 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -419,11 +419,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#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 f88d685db2..b7238fb942 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -263,13 +263,6 @@ #endif /* - * Pass open firmware flat tree to kernel - */ -#define CONFIG_OF_LIBFDT 1 -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - -/* * I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index ebc3d642f1..c529636a66 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -60,12 +60,12 @@ */ #define CONFIG_BOOTCOMMAND "${x_bootcmd_kernel}; " \ "setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \ - "${x_bootcmd_usb}; bootm 0x6400000;" + "bootm 0x6400000;" #define CONFIG_MTDPARTS \ - "mtdparts=orion_nand:512K(uboot)," \ + "orion_nand:512K(uboot)," \ "512K(env),1M(script),6M(kernel)," \ - "12M(ramdisk),4M(spare),-(rootfs)" + "12M(ramdisk),4M(spare),-(rootfs)\0" #define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \ "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index eac72700c0..3a8b90e2de 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -625,7 +625,6 @@ #define CONFIG_BOOTCOUNT_ENV /* Enable Device-Tree (FDT) support */ -#define CONFIG_OF_LIBFDT #define CONFIG_CMD_FDT #endif /* ! __CONFIG_SIEMENS_AM33X_COMMON_H */ diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index de7b6bca1d..d06e648640 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -241,12 +241,7 @@ # undef CONFIG_CMD_NFS #endif /* CONFIG_MACB */ -#if !defined(CONFIG_SPL_BUILD) -/* Enable Device-Tree (FDT) support */ -#define CONFIG_OF_LIBFDT #define CONFIG_CMD_FDT -#define CONFIG_FIT -#endif #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_INIT_SP_ADDR 0x301000 diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index db79e54b5b..d52f5009cb 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -214,7 +214,4 @@ #define CONFIG_ENV_SROM_BANK 3 /* Select SROM Bank-3 for Ethernet*/ #endif /* CONFIG_CMD_NET */ -#define CONFIG_OF_LIBFDT - - #endif /* __CONFIG_H */ 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 0501bd110a..cd48c9e1ca 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -24,8 +24,6 @@ #define CONFIG_CRC32_VERIFY -#define CONFIG_FIT -#define CONFIG_OF_LIBFDT #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 f8bddcacaa..62be0081d1 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -17,11 +17,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* new uImage format support */ -#define CONFIG_FIT 1 -#define CONFIG_OF_LIBFDT 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 */ @@ -429,8 +424,6 @@ #define CONFIG_BOOTCOMMAND "run boot_nor" /* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#define CONFIG_OF_BOARD_SETUP 1 /* USB support */ #define CONFIG_USB_OHCI_NEW 1 diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index 85d492ddc5..41f1b6938d 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -11,8 +11,6 @@ #define CONFIG_SYS_THUMB_BUILD #define CONFIG_STM32F4DISCOVERY -#define CONFIG_OF_LIBFDT - #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R diff --git a/include/configs/strider.h b/include/configs/strider.h index 8771cdc8ca..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,9 +318,6 @@ #define CONFIG_SYS_HUSH_PARSER /* Pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index 6db628a052..375159e1ef 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -71,8 +71,6 @@ #define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTCOMMAND "go 0x40040000" -#define CONFIG_OF_LIBFDT - /* + * QSPI support + */ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 40850e5d99..b26363d69b 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -174,6 +174,7 @@ #define CONFIG_SYS_MONITOR_LEN (768 << 10) /* 768 KiB */ #define CONFIG_IDENT_STRING " Allwinner Technology" +#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_ENV_OFFSET (544 << 10) /* (8 + 24 + 512) KiB */ #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ @@ -296,11 +297,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 5788a7095f..ca6d285d3b 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -157,15 +157,6 @@ #define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT -#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 2d941ca65b..a532417e17 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -258,8 +258,6 @@ #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 #define CONFIG_SYS_NAND_U_BOOT_SIZE 0x80000 -#define CONFIG_OF_LIBFDT -#define CONFIG_FIT #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS #define CONFIG_RBTREE diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index d5aba70aaa..73cd0a028b 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -46,8 +46,6 @@ #define CONFIG_MISC_INIT_R -#define CONFIG_OF_LIBFDT - #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 1d6f9c3429..c1581d87ce 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -52,7 +52,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_CMD_BOOTZ -#define CONFIG_OF_LIBFDT /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ diff --git a/include/configs/tb100.h b/include/configs/tb100.h index e06484f861..62b9de3915 100644 --- a/include/configs/tb100.h +++ b/include/configs/tb100.h @@ -68,8 +68,6 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING -#define CONFIG_OF_LIBFDT - #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MAXARGS 16 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/thunderx_88xx.h b/include/configs/thunderx_88xx.h index cece4ddbcf..4d925ab3a2 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -58,9 +58,6 @@ #define CONFIG_SYS_TEXT_BASE 0x00500000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0) -/* Flat Device Tree Definitions */ -#define CONFIG_OF_LIBFDT - /* SMP Spin Table Definitions */ #define CPU_RELEASE_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0) diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 3d0498df05..f00072e21d 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -33,7 +33,6 @@ #define CONFIG_SYS_NO_FLASH #define CONFIG_MACH_TYPE MACH_TYPE_TI8148EVM -#define CONFIG_OF_LIBFDT #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG /* for ramdisk support */ diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 533fae7d82..e09efc709e 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -28,7 +28,6 @@ #define CONFIG_SYS_HUSH_PARSER #define CONFIG_MACH_TYPE MACH_TYPE_TI8168EVM -#define CONFIG_OF_LIBFDT #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG /* required for ramdisk support */ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 199612be84..3afd6d7e88 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -24,7 +24,6 @@ #define CONFIG_SYS_NO_FLASH /* Support both device trees and ATAGs. */ -#define CONFIG_OF_LIBFDT #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index a7206f4bea..6f30c77d7d 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -223,6 +223,18 @@ /* EDMA3 */ #define CONFIG_TI_EDMA3 +#define DEFAULT_PMMC_BOOT_ENV \ + "set_name_pmmc=setenv name_pmmc ti-sci-firmware-${soc_variant}.bin\0" \ + "dev_pmmc=0\0" \ + "get_pmmc_net=dhcp ${loadaddr} ${tftp_root}/${name_pmmc}\0" \ + "get_pmmc_ramfs=run get_pmmc_net\0" \ + "get_pmmc_mmc=load mmc ${bootpart} ${loadaddr} " \ + "${bootdir}/${name_pmmc}\0" \ + "get_pmmc_ubi=ubifsload ${loadaddr} ${bootdir}/${name_pmmc}\0" \ + "run_pmmc=rproc init; rproc list; " \ + "rproc load ${dev_pmmc} ${loadaddr} 0x${filesize}; " \ + "rproc start ${dev_pmmc}\0" \ + #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ @@ -271,15 +283,14 @@ "mtdparts=mtdparts=davinci_nand.0:" \ "1024k(bootloader)ro,512k(params)ro,-(ubifs)\0" +#ifndef CONFIG_BOOTCOMMAND #define CONFIG_BOOTCOMMAND \ "run init_${boot} get_fdt_${boot} get_mon_${boot} " \ "get_kern_${boot} run_mon run_kern" +#endif #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/ti_omap5_common.h b/include/configs/ti_omap5_common.h index d164e6abd4..d373cbc44a 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -117,6 +117,8 @@ "setenv fdtfile dra72-evm.dtb; fi;" \ "if test $board_name = beagle_x15; then " \ "setenv fdtfile am57xx-beagle-x15.dtb; fi;" \ + "if test $board_name = am57xx_evm; then " \ + "setenv fdtfile am57xx-beagle-x15.dtb; fi;" \ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine device tree to use; fi; \0" \ "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile};\0" \ diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 31d77573c0..1fd3f2ac9d 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -378,11 +378,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_OF_LIBFDT -#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/tricorder.h b/include/configs/tricorder.h index 2ec2f015c1..915cbd851e 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -60,8 +60,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -#define CONFIG_OF_LIBFDT - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (1024*1024) diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index 50e1abb0e5..fcc9d80624 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -24,8 +24,6 @@ #define CONFIG_HW_WATCHDOG -#define CONFIG_OF_LIBFDT - #define CONFIG_MACH_TYPE MACH_TYPE_TS48XX /* text base address used when linking */ diff --git a/include/configs/tseries.h b/include/configs/tseries.h index 43cf9658f3..901dfd726c 100644 --- a/include/configs/tseries.h +++ b/include/configs/tseries.h @@ -42,9 +42,7 @@ #define CONFIG_POWER_TPS65217 /* Support both device trees and ATAGs. */ -#define CONFIG_OF_LIBFDT #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/uniphier.h b/include/configs/uniphier.h index b1c8ccb7b9..1a74489502 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -249,9 +249,6 @@ #define CONFIG_SYS_BOOTMAPSZ 0x20000000 -/* Open Firmware flat tree */ -#define CONFIG_OF_LIBFDT - #define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_NR_DRAM_BANKS 2 diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index 54daede83b..7b2f1ca4a4 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -33,7 +33,6 @@ #define CONFIG_DISPLAY_CPUINFO -#define CONFIG_OF_LIBFDT #define CONFIG_SYS_TEXT_BASE 0x23f00000 /* diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index 6f6666281a..7e24fc61b9 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -16,7 +16,6 @@ #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_SYS_FSL_CLK #define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_OF_LIBFDT #define CONFIG_MXC_GPIO #include <asm/arch/imx-regs.h> diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index bc2d441a5e..de5c3ce2d2 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -242,11 +242,6 @@ | OR_GPCM_EAD) /* 0xfe0009f7 */ -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - /* * Serial Port */ diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 133041bca5..269053e2be 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -39,9 +39,6 @@ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ -/* Flat Device Tree Definitions */ -#define CONFIG_OF_LIBFDT - /* CS register bases for the original memory map. */ #define V2M_PA_CS0 0x00000000 #define V2M_PA_CS1 0x14000000 diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 955aef4652..0809fbb1a7 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -274,7 +274,6 @@ #define CONFIG_ENV_OFFSET 0x180000 #endif -#define CONFIG_OF_LIBFDT #define CONFIG_CMD_BOOTZ #endif diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index 714ebeec51..7433d7ec48 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -215,11 +215,6 @@ /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT -#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/x600.h b/include/configs/x600.h index 0263c50e13..ac477eb0b9 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -152,7 +152,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_BOOT_PARAMS_ADDR 0x00000100 #define CONFIG_CMDLINE_TAG -#define CONFIG_OF_LIBFDT /* enable passing of devicetree */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_MISC_INIT_R #define CONFIG_BOARD_LATE_INIT diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 3ae4366bfa..ea815c2423 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -24,10 +24,8 @@ #define CONFIG_NR_DRAM_BANKS 8 #define CONFIG_LMB -#define CONFIG_OF_LIBFDT #define CONFIG_LZO -#define CONFIG_FIT #undef CONFIG_ZLIB #undef CONFIG_GZIP #define CONFIG_SYS_BOOTM_LEN (16 << 20) diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 1121ea46ec..9d9ffd00c1 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -42,7 +42,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0) /* Flat Device Tree Definitions */ -#define CONFIG_OF_LIBFDT /* Generic Timer Definitions - setup in EL3. Setup by ATF for other cases */ #if !defined(COUNTER_FREQUENCY) 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 96b357b6fd..70af1e12ef 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -231,13 +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_LIBFDT 1 -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - -/* * I2C */ #define CONFIG_SYS_I2C @@ -557,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 b2d6a1e5d9..19723732f3 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -194,13 +194,6 @@ #define CONFIG_SYS_HUSH_PARSER /* - * Pass open firmware flat tree - */ -#define CONFIG_OF_LIBFDT 1 -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - -/* * I2C */ #define CONFIG_SYS_I2C @@ -340,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 8b4d4d96fd..1be043fa60 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -230,13 +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_LIBFDT 1 -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - -/* * I2C */ #define CONFIG_SYS_I2C @@ -412,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 c7e25d9302..0697714a6f 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -220,12 +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_LIBFDT 1 -#define CONFIG_OF_BOARD_SETUP 1 -#define CONFIG_OF_STDOUT_VIA_ALIAS 1 #define CONFIG_FDT_FIXUP_PCI_IRQ 1 /* @@ -397,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/configs/zynq-common.h b/include/configs/zynq-common.h index 982905debd..77edbb8f95 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -274,9 +274,6 @@ #define CONFIG_CMD_FPGA_LOADBP #define CONFIG_CMD_FPGA_LOADFS -/* Open Firmware flat tree */ -#define CONFIG_OF_LIBFDT - /* FIT support */ #define CONFIG_IMAGE_FORMAT_LEGACY /* enable also legacy image format */ diff --git a/include/crc.h b/include/crc.h index 5085d4ed47..111cb4adb7 100644 --- a/include/crc.h +++ b/include/crc.h @@ -36,34 +36,8 @@ # endif #endif -/* Compute a CRC, using the POSIX 1003 definition */ -extern uint32_t -cyg_posix_crc32(unsigned char *s, int len); +/* 16 bit CRC with polynomial x^16+x^12+x^5+1 (CRC-CCITT) */ -/* Gary S. Brown's 32 bit CRC */ - -extern uint32_t -cyg_crc32(unsigned char *s, int len); - -/* Gary S. Brown's 32 bit CRC, but accumulate the result from a */ -/* previous CRC calculation */ - -extern uint32_t -cyg_crc32_accumulate(uint32_t crc, unsigned char *s, int len); - -/* Ethernet FCS Algorithm */ - -extern uint32_t -cyg_ether_crc32(unsigned char *s, int len); - -/* Ethernet FCS algorithm, but accumulate the result from a previous */ -/* CRC calculation. */ - -extern uint32_t -cyg_ether_crc32_accumulate(uint32_t crc, unsigned char *s, int len); - -/* 16 bit CRC with polynomial x^16+x^12+x^5+1 */ - -extern uint16_t cyg_crc16(unsigned char *s, int len); +uint16_t crc16_ccitt(uint16_t crc_start, unsigned char *s, int len); #endif /* _SERVICES_CRC_CRC_H_ */ diff --git a/include/image.h b/include/image.h index 518a4f5291..f9ee5649c5 100644 --- a/include/image.h +++ b/include/image.h @@ -26,8 +26,8 @@ struct lmb; #include <sys/types.h> /* new uImage format support enabled on host */ -#define CONFIG_FIT 1 -#define CONFIG_OF_LIBFDT 1 +#define IMAGE_ENABLE_FIT 1 +#define IMAGE_ENABLE_OF_LIBFDT 1 #define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */ #define IMAGE_ENABLE_IGNORE 0 @@ -43,9 +43,12 @@ struct lmb; #define IMAGE_ENABLE_IGNORE 1 #define IMAGE_INDENT_STRING " " +#define IMAGE_ENABLE_FIT CONFIG_IS_ENABLED(FIT) +#define IMAGE_ENABLE_OF_LIBFDT CONFIG_IS_ENABLED(OF_LIBFDT) + #endif /* USE_HOSTCC */ -#if defined(CONFIG_FIT) +#if IMAGE_ENABLE_FIT #include <hash.h> #include <libfdt.h> #include <fdt_support.h> @@ -94,7 +97,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 @@ -102,12 +105,6 @@ struct lmb; # define IMAGE_ENABLE_RAMDISK_HIGH 0 #endif -#ifdef CONFIG_OF_LIBFDT -# define IMAGE_ENABLE_OF_LIBFDT 1 -#else -# define IMAGE_ENABLE_OF_LIBFDT 0 -#endif - #ifdef CONFIG_SYS_BOOT_GET_CMDLINE # define IMAGE_BOOT_GET_CMDLINE 1 #else @@ -309,7 +306,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 */ @@ -416,7 +413,25 @@ int get_table_entry_id(const table_entry_t *table, char *get_table_entry_name(const table_entry_t *table, char *msg, int id); const char *genimg_get_os_name(uint8_t os); + +/** + * genimg_get_os_short_name() - get the short name for an OS + * + * @param os OS (IH_OS_...) + * @return OS short name, or "unknown" if unknown + */ +const char *genimg_get_os_short_name(uint8_t comp); + const char *genimg_get_arch_name(uint8_t arch); + +/** + * genimg_get_arch_short_name() - get the short name for an architecture + * + * @param arch Architecture type (IH_ARCH_...) + * @return architecture short name, or "unknown" if unknown + */ +const char *genimg_get_arch_short_name(uint8_t arch); + const char *genimg_get_type_name(uint8_t type); /** @@ -428,6 +443,15 @@ const char *genimg_get_type_name(uint8_t type); const char *genimg_get_type_short_name(uint8_t type); const char *genimg_get_comp_name(uint8_t comp); + +/** + * genimg_get_comp_short_name() - get the short name for a compression method + * + * @param comp compression method (IH_COMP_...) + * @return compression method short name, or "unknown" if unknown + */ +const char *genimg_get_comp_short_name(uint8_t comp); + int genimg_get_os_id(const char *name); int genimg_get_arch_id(const char *name); int genimg_get_type_id(const char *name); @@ -756,7 +780,6 @@ int bootz_setup(ulong image, ulong *start, ulong *end); /*******************************************************************/ /* New uImage format specific code (prefixed with fit_) */ /*******************************************************************/ -#if defined(CONFIG_FIT) #define FIT_IMAGES_PATH "/images" #define FIT_CONFS_PATH "/configurations" @@ -789,6 +812,7 @@ int bootz_setup(ulong image, ulong *start, ulong *end); #define FIT_MAX_HASH_LEN HASH_MAX_DIGEST_SIZE +#if IMAGE_ENABLE_FIT /* cmdline argument format parsing */ int fit_parse_conf(const char *spec, ulong addr_curr, ulong *addr, const char **conf_name); @@ -952,6 +976,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 { @@ -959,6 +984,8 @@ struct image_region { int size; }; +#if IMAGE_ENABLE_FIT + #if IMAGE_ENABLE_VERIFY # include <u-boot/rsa-checksum.h> #endif @@ -1127,4 +1154,17 @@ ulong android_image_get_kload(const struct andr_img_hdr *hdr); #endif /* CONFIG_ANDROID_BOOT_IMAGE */ +/** + * board_fit_config_name_match() - Check for a matching board name + * + * This is used when SPL loads a FIT containing multiple device tree files + * and wants to work out which one to use. The description of each one is + * passed to this function. The description comes from the 'description' field + * in each (FDT) image node. + * + * @name: Device tree description + * @return 0 if this device tree should be used, non-zero to try the next + */ +int board_fit_config_name_match(const char *name); + #endif /* __IMAGE_H__ */ diff --git a/include/libfdt.h b/include/libfdt.h index e48c21aced..74b1d149c2 100644 --- a/include/libfdt.h +++ b/include/libfdt.h @@ -1181,6 +1181,22 @@ static inline int fdt_property_cell(void *fdt, const char *name, uint32_t val) { return fdt_property_u32(fdt, name, val); } + +/** + * fdt_property_placeholder - add a new property and return a ptr to its value + * + * @fdt: pointer to the device tree blob + * @name: name of property to add + * @len: length of property value in bytes + * @valp: returns a pointer to where where the value should be placed + * + * returns: + * 0, on success + * -FDT_ERR_BADMAGIC, + * -FDT_ERR_NOSPACE, standard meanings + */ +int fdt_property_placeholder(void *fdt, const char *name, int len, void **valp); + #define fdt_property_string(fdt, name, str) \ fdt_property(fdt, name, str, strlen(str)+1) int fdt_end_node(void *fdt); diff --git a/include/spl.h b/include/spl.h index c62887af0e..de4f70a377 100644 --- a/include/spl.h +++ b/include/spl.h @@ -29,6 +29,24 @@ struct spl_image_info { u32 flags; }; +/* + * Information required to load data from a device + * + * @dev: Pointer to the device, e.g. struct mmc * + * @priv: Private data for the device + * @bl_len: Block length for reading in bytes + * @read: Function to call to read from the device + */ +struct spl_load_info { + void *dev; + void *priv; + int bl_len; + ulong (*read)(struct spl_load_info *load, ulong sector, ulong count, + void *buf); +}; + +int spl_load_simple_fit(struct spl_load_info *info, ulong sector, void *fdt); + #define SPL_COPY_PAYLOAD_ONLY 1 extern struct spl_image_info spl_image; 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 |