Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc4d7b37 authored by Antony Pavlov's avatar Antony Pavlov Committed by Ralf Baechle
Browse files

MIPS: ZBOOT: gather string functions into string.c 



In the worst case this adds less then 128 bytes of code
but on the other hand this makes code organization more clear.

Signed-off-by: default avatarAntony Pavlov <antonynpavlov@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: John Crispin <blogic@openwrt.org>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6344/
parent dfe0924e

arch/mips/boot/compressed/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ KBUILD_AFLAGS := $(LINUXINCLUDE) $(KBUILD_AFLAGS) -D__ASSEMBLY__ \ 
	-DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) \

	-DKERNEL_ENTRY=$(VMLINUX_ENTRY_ADDRESS)



targets := head.o decompress.o dbg.o uart-16550.o uart-alchemy.o

targets := head.o decompress.o string.o dbg.o uart-16550.o uart-alchemy.o



# decompressor objects (linked with vmlinuz)

vmlinuzobjs-y := $(obj)/head.o $(obj)/decompress.o $(obj)/dbg.o

vmlinuzobjs-y := $(obj)/head.o $(obj)/decompress.o $(obj)/string.o $(obj)/dbg.o



ifdef CONFIG_DEBUG_ZBOOT

vmlinuzobjs-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o

arch/mips/boot/compressed/decompress.c

+0 −22
Original line number Diff line number Diff line
@@ -43,33 +43,11 @@ void error(char *x) 
/* activate the code for pre-boot environment */

#define STATIC static



#if defined(CONFIG_KERNEL_GZIP) || defined(CONFIG_KERNEL_XZ) || \

	defined(CONFIG_KERNEL_LZ4)

void *memcpy(void *dest, const void *src, size_t n)

{

	int i;

	const char *s = src;

	char *d = dest;



	for (i = 0; i < n; i++)

		d[i] = s[i];

	return dest;

}

#endif

#ifdef CONFIG_KERNEL_GZIP

#include "../../../../lib/decompress_inflate.c"

#endif



#ifdef CONFIG_KERNEL_BZIP2

void *memset(void *s, int c, size_t n)

{

	int i;

	char *ss = s;



	for (i = 0; i < n; i++)

		ss[i] = c;

	return s;

}

#include "../../../../lib/decompress_bunzip2.c"

#endif

arch/mips/boot/compressed/string.c

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/*

 * arch/mips/boot/compressed/string.c

 *

 * Very small subset of simple string routines

 */



#include <linux/types.h>



void *memcpy(void *dest, const void *src, size_t n)

{

	int i;

	const char *s = src;

	char *d = dest;



	for (i = 0; i < n; i++)

		d[i] = s[i];

	return dest;

}



void *memset(void *s, int c, size_t n)

{

	int i;

	char *ss = s;



	for (i = 0; i < n; i++)

		ss[i] = c;

	return s;

}