diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/barebox.lds.h | 11 | ||||
| -rw-r--r-- | include/envfs.h | 5 | ||||
| -rw-r--r-- | include/linux/amba/bus.h | 6 | ||||
| -rw-r--r-- | include/soc/fsl/fsl_qbman.h | 18 | ||||
| -rw-r--r-- | include/soc/fsl/immap_lsch2.h | 1 |
5 files changed, 18 insertions, 23 deletions
diff --git a/include/asm-generic/barebox.lds.h b/include/asm-generic/barebox.lds.h index 68b78a13a9..138e9405a1 100644 --- a/include/asm-generic/barebox.lds.h +++ b/include/asm-generic/barebox.lds.h @@ -16,6 +16,7 @@ #endif #define BAREBOX_INITCALLS \ + STRUCT_ALIGN(); \ __barebox_initcalls_start = .; \ KEEP(*(.initcall.0)) \ KEEP(*(.initcall.1)) \ @@ -35,6 +36,7 @@ __barebox_initcalls_end = .; #define BAREBOX_EXITCALLS \ + STRUCT_ALIGN(); \ __barebox_exitcalls_start = .; \ KEEP(*(.exitcall.0)) \ KEEP(*(.exitcall.1)) \ @@ -46,37 +48,44 @@ __barebox_exitcalls_end = .; #define BAREBOX_CMDS \ + STRUCT_ALIGN(); \ __barebox_cmd_start = .; \ KEEP(*(SORT_BY_NAME(.barebox_cmd*))) \ __barebox_cmd_end = .; #define BAREBOX_RATP_CMDS \ + STRUCT_ALIGN(); \ __barebox_ratp_cmd_start = .; \ KEEP(*(SORT_BY_NAME(.barebox_ratp_cmd*))) \ __barebox_ratp_cmd_end = .; #define BAREBOX_SYMS \ + STRUCT_ALIGN(); \ __usymtab_start = .; \ KEEP(*(__usymtab)) \ __usymtab_end = .; #define BAREBOX_MAGICVARS \ + STRUCT_ALIGN(); \ __barebox_magicvar_start = .; \ KEEP(*(SORT_BY_NAME(.barebox_magicvar*))) \ __barebox_magicvar_end = .; #define BAREBOX_CLK_TABLE \ + STRUCT_ALIGN(); \ __clk_of_table_start = .; \ KEEP(*(.__clk_of_table)); \ KEEP(*(.__clk_of_table_end)); \ __clk_of_table_end = .; #define BAREBOX_DTB \ + STRUCT_ALIGN(); \ __dtb_start = .; \ KEEP(*(.dtb.rodata.*)); \ __dtb_end = .; #define BAREBOX_IMD \ + STRUCT_ALIGN(); \ KEEP(*(.barebox_imd_start)) \ KEEP(*(.barebox_imd_1*)) \ *(.barebox_imd_0*) \ @@ -84,6 +93,7 @@ #ifdef CONFIG_PCI #define BAREBOX_PCI_FIXUP \ + STRUCT_ALIGN(); \ __start_pci_fixups_early = .; \ KEEP(*(.pci_fixup_early)) \ __end_pci_fixups_early = .; \ @@ -98,6 +108,7 @@ #endif #define BAREBOX_RSA_KEYS \ + STRUCT_ALIGN(); \ __rsa_keys_start = .; \ KEEP(*(.rsa_keys.rodata.*)); \ __rsa_keys_end = .; \ diff --git a/include/envfs.h b/include/envfs.h index 27c4b42c6b..c8fc3759c6 100644 --- a/include/envfs.h +++ b/include/envfs.h @@ -93,8 +93,13 @@ struct envfs_super { #endif #define ENV_FLAG_NO_OVERWRITE (1 << 0) +#define PAD4(x) ((x + 3) & ~3) int envfs_load(const char *filename, const char *dirname, unsigned flags); int envfs_save(const char *filename, const char *dirname, unsigned flags); +int envfs_check_super(struct envfs_super *super, size_t *size); +int envfs_check_data(struct envfs_super *super, const void *buf, size_t size); +int envfs_load_data(struct envfs_super *super, void *buf, size_t size, + const char *dir, unsigned flags); int envfs_load_from_buf(void *buf, int len, const char *dir, unsigned flags); /* defaults to /dev/env0 */ diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h index 2ecef35a40..7b3e603322 100644 --- a/include/linux/amba/bus.h +++ b/include/linux/amba/bus.h @@ -90,12 +90,6 @@ amba_ahb_device_add(struct device_d *parent, const char *name, int id, periphid); } - -void amba_device_unregister(struct amba_device *); -struct amba_device *amba_find_device(const char *, struct device_d *, unsigned int, unsigned int); -int amba_request_regions(struct amba_device *, const char *); -void amba_release_regions(struct amba_device *); - static inline void __iomem *amba_get_mem_region(struct amba_device *dev) { return dev->base; diff --git a/include/soc/fsl/fsl_qbman.h b/include/soc/fsl/fsl_qbman.h index 4687eb9bb1..1caaf4808d 100644 --- a/include/soc/fsl/fsl_qbman.h +++ b/include/soc/fsl/fsl_qbman.h @@ -5,23 +5,9 @@ #ifndef __FSL_QBMAN_H__ #define __FSL_QBMAN_H__ -void fdt_fixup_qportals(void *blob); -void fdt_fixup_bportals(void *blob); -void inhibit_portals(void __iomem *addr, int max_portals, - int arch_max_portals, int portal_cinh_size); -void setup_qbman_portals(void); -struct ccsr_qman { -#ifdef CONFIG_SYS_FSL_QMAN_V3 +struct ccsr_qman_v3 { u8 res0[0x200]; -#else - struct { - u32 qcsp_lio_cfg; /* 0x0 - SW Portal n LIO cfg */ - u32 qcsp_io_cfg; /* 0x4 - SW Portal n IO cfg */ - u32 res; - u32 qcsp_dd_cfg; /* 0xc - SW Portal Dynamic Debug cfg */ - } qcsp[32]; -#endif /* Not actually reserved, but irrelevant to u-boot */ u8 res[0xbf8 - 0x200]; u32 ip_rev_1; @@ -46,14 +32,12 @@ struct ccsr_qman { u32 ci_rlm_cfg; /* Initiator Read Latency Monitor Cfg */ u32 ci_rlm_avg; /* Initiator Read Latency Monitor Avg */ u8 res7[0x2e8]; -#ifdef CONFIG_SYS_FSL_QMAN_V3 struct { u32 qcsp_lio_cfg; /* 0x0 - SW Portal n LIO cfg */ u32 qcsp_io_cfg; /* 0x4 - SW Portal n IO cfg */ u32 res; u32 qcsp_dd_cfg; /* 0xc - SW Portal n Dynamic Debug cfg*/ } qcsp[50]; -#endif }; struct ccsr_bman { diff --git a/include/soc/fsl/immap_lsch2.h b/include/soc/fsl/immap_lsch2.h index 4eb6658788..1b74c77908 100644 --- a/include/soc/fsl/immap_lsch2.h +++ b/include/soc/fsl/immap_lsch2.h @@ -56,6 +56,7 @@ #define LSCH2_PCIE1_ADDR (LSCH2_IMMR + 0x02400000) #define LSCH2_PCIE2_ADDR (LSCH2_IMMR + 0x02500000) #define LSCH2_PCIE3_ADDR (LSCH2_IMMR + 0x02600000) +#define LSCH2_SEC_ADDR (LSCH2_IMMR + 0x00700000) #define LSCH2_QDMA_BASE_ADDR (LSCH2_IMMR + 0x07380000) #define LSCH2_EHCI_USB1_ADDR (LSCH2_IMMR + 0x07600000) |