diff options
| author | David Woodhouse | 2012-11-21 11:38:13 +0100 |
|---|---|---|
| committer | David Woodhouse | 2012-11-21 11:38:13 +0100 |
| commit | 851462444d421c223965b12b836bef63da61b57f (patch) | |
| tree | 495baa14e638817941496c36e1443aed7dae0ea0 /arch/c6x/include/uapi/asm/setup.h | |
| parent | mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions() (diff) | |
| parent | mtd: nand: fix Samsung SLC detection regression (diff) | |
| download | kernel-qcow2-linux-851462444d421c223965b12b836bef63da61b57f.tar.gz kernel-qcow2-linux-851462444d421c223965b12b836bef63da61b57f.tar.xz kernel-qcow2-linux-851462444d421c223965b12b836bef63da61b57f.zip | |
Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd
Conflicts:
drivers/mtd/nand/nand_base.c
Diffstat (limited to 'arch/c6x/include/uapi/asm/setup.h')
| -rw-r--r-- | arch/c6x/include/uapi/asm/setup.h | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/arch/c6x/include/uapi/asm/setup.h b/arch/c6x/include/uapi/asm/setup.h new file mode 100644 index 000000000000..a01e31896fa9 --- /dev/null +++ b/arch/c6x/include/uapi/asm/setup.h @@ -0,0 +1,33 @@ +/* + * Port on Texas Instruments TMS320C6x architecture + * + * Copyright (C) 2004, 2009, 2010 2011 Texas Instruments Incorporated + * Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#ifndef _ASM_C6X_SETUP_H +#define _ASM_C6X_SETUP_H + +#define COMMAND_LINE_SIZE 1024 + +#ifndef __ASSEMBLY__ +extern char c6x_command_line[COMMAND_LINE_SIZE]; + +extern int c6x_add_memory(phys_addr_t start, unsigned long size); + +extern unsigned long ram_start; +extern unsigned long ram_end; + +extern int c6x_num_cores; +extern unsigned int c6x_silicon_rev; +extern unsigned int c6x_devstat; +extern unsigned char c6x_fuse_mac[6]; + +extern void machine_init(unsigned long dt_ptr); +extern void time_init(void); + +#endif /* !__ASSEMBLY__ */ +#endif /* _ASM_C6X_SETUP_H */ |