diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/configs/mx21ads_defconfig | 1 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/page.h | 92 | ||||
| -rw-r--r-- | arch/mips/lib/barebox.lds.S | 2 | ||||
| -rw-r--r-- | arch/ppc/mach-mpc5xxx/cpu_init.c | 2 | ||||
| -rw-r--r-- | commands/crc.c | 2 | ||||
| -rw-r--r-- | common/console.c | 3 | ||||
| -rw-r--r-- | common/console_simple.c | 11 | ||||
| -rw-r--r-- | lib/Makefile | 3 |
9 files changed, 15 insertions, 103 deletions
@@ -1,5 +1,5 @@ VERSION = 2011 -PATCHLEVEL = 11 +PATCHLEVEL = 12 SUBLEVEL = 0 EXTRAVERSION = NAME = Amissive Actinocutious Kiwi diff --git a/arch/arm/configs/mx21ads_defconfig b/arch/arm/configs/mx21ads_defconfig index 52f84e1e9a..175c229381 100644 --- a/arch/arm/configs/mx21ads_defconfig +++ b/arch/arm/configs/mx21ads_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_IMX21=y CONFIG_IMX_CLKO=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_TEXT_BASE=0xc1000000 +CONFIG_MALLOC_SIZE=0x500000 CONFIG_LONGHELP=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y diff --git a/arch/blackfin/include/asm/page.h b/arch/blackfin/include/asm/page.h index ce65ee0bd4..1d8978db33 100644 --- a/arch/blackfin/include/asm/page.h +++ b/arch/blackfin/include/asm/page.h @@ -25,96 +25,4 @@ #ifndef _BLACKFIN_PAGE_H #define _BLACKFIN_PAGE_H -/* PAGE_SHIFT determines the page size */ - -#define PAGE_SHIFT (12) -#define PAGE_MASK (~(PAGE_SIZE-1)) - -#ifdef __KERNEL__ - -#include <asm/setup.h> - -#if PAGE_SHIFT < 13 -#define KTHREAD_SIZE (8192) -#else -#define KTHREAD_SIZE PAGE_SIZE -#endif - -#ifndef __ASSEMBLY__ - -#define get_user_page(vaddr) __get_free_page(GFP_KERNEL) -#define free_user_page(page, addr) free_page(addr) - -#define clear_page(page) memset((page), 0, PAGE_SIZE) -#define copy_page(to,from) memcpy((to), (from), PAGE_SIZE) - -#define clear_user_page(page, vaddr) clear_page(page) -#define copy_user_page(to, from, vaddr) copy_page(to, from) - -/* - * These are used to make use of C type-checking.. - */ -typedef struct { - unsigned long pte; -} pte_t; -typedef struct { - unsigned long pmd[16]; -} pmd_t; -typedef struct { - unsigned long pgd; -} pgd_t; -typedef struct { - unsigned long pgprot; -} pgprot_t; - -#define pte_val(x) ((x).pte) -#define pmd_val(x) ((&x)->pmd[0]) -#define pgd_val(x) ((x).pgd) -#define pgprot_val(x) ((x).pgprot) - -#define __pte(x) ((pte_t) { (x) } ) -#define __pmd(x) ((pmd_t) { (x) } ) -#define __pgd(x) ((pgd_t) { (x) } ) -#define __pgprot(x) ((pgprot_t) { (x) } ) - -/* to align the pointer to the (next) page boundary */ -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) - -/* Pure 2^n version of get_order */ -extern __inline__ int get_order(unsigned long size) -{ - int order; - - size = (size - 1) >> (PAGE_SHIFT - 1); - order = -1; - do { - size >>= 1; - order++; - } while (size); - return order; -} - -#endif /* !__ASSEMBLY__ */ - -#include <asm/page_offset.h> - -#define PAGE_OFFSET (PAGE_OFFSET_RAW) - -#ifndef __ASSEMBLY__ - -#define __pa(vaddr) virt_to_phys((void *)vaddr) -#define __va(paddr) phys_to_virt((unsigned long)paddr) - -#define MAP_NR(addr) (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT) -#define virt_to_page(addr) (mem_map + (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT)) -#define VALID_PAGE(page) ((page - mem_map) < max_mapnr) - -#define PAGE_BUG(page) do { \ - BUG(); \ -} while (0) - -#endif - -#endif - #endif diff --git a/arch/mips/lib/barebox.lds.S b/arch/mips/lib/barebox.lds.S index 7746ea0c71..a60728485c 100644 --- a/arch/mips/lib/barebox.lds.S +++ b/arch/mips/lib/barebox.lds.S @@ -71,6 +71,6 @@ SECTIONS . = ALIGN(4); __bss_start = .; .bss : { *(.bss*) } - __bss_end = .; + __bss_stop = .; _end = .; } diff --git a/arch/ppc/mach-mpc5xxx/cpu_init.c b/arch/ppc/mach-mpc5xxx/cpu_init.c index a6c270b3ef..05aa5d5db3 100644 --- a/arch/ppc/mach-mpc5xxx/cpu_init.c +++ b/arch/ppc/mach-mpc5xxx/cpu_init.c @@ -32,8 +32,6 @@ */ int cpu_init(void) { - unsigned long addecr = (1 << 25); /* Boot_CS */ - /* enable timebase */ *(vu_long *)(MPC5XXX_XLBARB + 0x40) |= (1 << 13); diff --git a/commands/crc.c b/commands/crc.c index 01fedd7c65..8ce97da530 100644 --- a/commands/crc.c +++ b/commands/crc.c @@ -108,6 +108,8 @@ static int do_crc(struct command *cmdtp, int argc, char *argv[]) verify = 1; vcrc = simple_strtoul(optarg, NULL, 0); break; + default: + return COMMAND_ERROR_USAGE; } } diff --git a/common/console.c b/common/console.c index 219148d097..cab8689252 100644 --- a/common/console.c +++ b/common/console.c @@ -347,7 +347,6 @@ EXPORT_SYMBOL(console_flush); int fprintf(int file, const char *fmt, ...) { va_list args; - uint i; char printbuffer[CFG_PBSIZE]; va_start (args, fmt); @@ -355,7 +354,7 @@ int fprintf(int file, const char *fmt, ...) /* For this to work, printbuffer must be larger than * anything we ever want to print. */ - i = vsprintf (printbuffer, fmt, args); + vsprintf (printbuffer, fmt, args); va_end (args); /* Print the string */ diff --git a/common/console_simple.c b/common/console_simple.c index 7e0619db02..73e4752cd8 100644 --- a/common/console_simple.c +++ b/common/console_simple.c @@ -45,7 +45,7 @@ int vprintf (const char *fmt, va_list args) } EXPORT_SYMBOL(vprintf); -void fprintf (int file, const char *fmt, ...) +int fprintf(int file, const char *fmt, ...) { va_list args; uint i; @@ -61,18 +61,25 @@ void fprintf (int file, const char *fmt, ...) /* Print the string */ fputs(file, printbuffer); + + return i; } EXPORT_SYMBOL(fprintf); -void console_puts(unsigned int ch, const char *str) +int console_puts(unsigned int ch, const char *str) { const char *s = str; + int i = 0; + while (*s) { console_putc(ch, *s); if (*s == '\n') console_putc(ch, '\r'); s++; + i++; } + + return i; } EXPORT_SYMBOL(console_puts); diff --git a/lib/Makefile b/lib/Makefile index e35d4b190b..ae76b4c9a7 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -29,8 +29,5 @@ obj-y += lzo/ obj-y += show_progress.o obj-$(CONFIG_LZO_DECOMPRESS) += decompress_unlzo.o obj-$(CONFIG_PROCESS_ESCAPE_SEQUENCE) += process_escape_sequence.o -obj-$(CONFIG_MD5) += md5.o -obj-$(CONFIG_SHA1) += sha1.o -obj-$(CONFIG_SHA256) += sha256.o obj-$(CONFIG_FDT) += fdt/ obj-y += uncompress.o |