diff options
| author | Marek Vasut <marex@denx.de> | 2015-08-10 21:21:07 +0200 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2015-08-23 11:56:20 +0200 |
| commit | f6badb0d89ae1221c8aa83138632613f91a48715 (patch) | |
| tree | f8a1801c3c96692ec5acb9a414061b026aa06286 /arch/arm/mach-socfpga | |
| parent | e996b9362b26c62e7f1264c51714aade48727a0b (diff) | |
| download | talos-obmc-uboot-f6badb0d89ae1221c8aa83138632613f91a48715.tar.gz talos-obmc-uboot-f6badb0d89ae1221c8aa83138632613f91a48715.zip | |
arm: socfpga: Switch to filtered QTS files
Signed-off-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'arch/arm/mach-socfpga')
| -rw-r--r-- | arch/arm/mach-socfpga/wrap_iocsr_config.c | 7 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/wrap_pinmux_config.c | 23 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/wrap_sdram_config.c | 8 |
3 files changed, 8 insertions, 30 deletions
diff --git a/arch/arm/mach-socfpga/wrap_iocsr_config.c b/arch/arm/mach-socfpga/wrap_iocsr_config.c index 31b54260df..5e3f057355 100644 --- a/arch/arm/mach-socfpga/wrap_iocsr_config.c +++ b/arch/arm/mach-socfpga/wrap_iocsr_config.c @@ -7,10 +7,9 @@ #include <common.h> #include <errno.h> #include <asm/arch/clock_manager.h> -/* - * Yes, dear reader, we're including a C file here, this is no mistake :-) - */ -#include <qts/iocsr_config.c> + +/* Board-specific header. */ +#include <qts/iocsr_config.h> int iocsr_get_config_table(const unsigned int chain_id, const unsigned long **table, diff --git a/arch/arm/mach-socfpga/wrap_pinmux_config.c b/arch/arm/mach-socfpga/wrap_pinmux_config.c index 688f1e4aca..bcb7781443 100644 --- a/arch/arm/mach-socfpga/wrap_pinmux_config.c +++ b/arch/arm/mach-socfpga/wrap_pinmux_config.c @@ -6,26 +6,9 @@ #include <common.h> #include <errno.h> -/* - * Yes, dear reader, we're including a C file here, this is no mistake. - * But this time around, we do even more perverse hacking here to be - * compatible with QTS headers and obtain reasonably nice results too. - * - * First, we define _PRELOADER_PINMUX_CONFIG_H_, which will neutralise - * the pinmux_config.h inclusion in pinmux_config.c . Since we are - * probing everything from DT, we do NOT want those macros from the - * pinmux_config.h to ooze into our build system, anywhere, ever. So - * we nip it at the bud. - * - * Next, pinmux_config.c needs CONFIG_HPS_PINMUX_NUM and uses it to - * specify sized array explicitly. Instead, we want to use ARRAY_SIZE - * to figure out the size of the array, so define this macro as an - * empty one, so that the preprocessor optimizes things such that the - * arrays are not sized by default. - */ -#define _PRELOADER_PINMUX_CONFIG_H_ -#define CONFIG_HPS_PINMUX_NUM -#include <qts/pinmux_config.c> + +/* Board-specific header. */ +#include <qts/pinmux_config.h> void sysmgr_get_pinmux_table(const unsigned long **table, unsigned int *table_len) diff --git a/arch/arm/mach-socfpga/wrap_sdram_config.c b/arch/arm/mach-socfpga/wrap_sdram_config.c index 72ce565751..31cc7dee4e 100644 --- a/arch/arm/mach-socfpga/wrap_sdram_config.c +++ b/arch/arm/mach-socfpga/wrap_sdram_config.c @@ -7,13 +7,9 @@ #include <common.h> #include <errno.h> #include <asm/arch/sdram.h> -/* QTS output file. */ -#include <qts/sdram_config.h> -#include <qts/sequencer_auto_ac_init.h> -#include <qts/sequencer_auto_inst_init.h> -#include <qts/sequencer_auto.h> -#include <qts/sequencer_defines.h> +/* Board-specific header. */ +#include <qts/sdram_config.h> static const struct socfpga_sdram_config sdram_config = { .ctrl_cfg = |
