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

Commit fea72637 authored by Jesper Nilsson's avatar Jesper Nilsson
Browse files

Merge branch 'build_fix' into cris

parents 53e43d01 f3c4b53d

arch/cris/arch-v10/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


asflags-y += $(LINUXINCLUDE)

ccflags-y += -O2 $(LINUXINCLUDE)

ldflags-y += -T $(obj)/decompress.ld

ldflags-y += -T $(srctree)/$(obj)/decompress.ld

OBJECTS = $(obj)/head.o $(obj)/misc.o

OBJCOPYFLAGS = -O binary --remove-section=.bss

arch/cris/arch-v10/boot/compressed/misc.c

+70 −57
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ void* memcpy(void* __dest, __const void* __src, size_t __n); 


#define memzero(s, n)     memset((s), 0, (n))





typedef unsigned char  uch;

typedef unsigned short ush;

typedef unsigned long  ulg;
@@ -61,16 +60,31 @@ static unsigned outcnt = 0; /* bytes in output buffer */ 
#define ENCRYPTED    0x20 /* bit 5 set: file is encrypted */

#define RESERVED     0xC0 /* bit 6,7:   reserved */



#define get_byte() inbuf[inptr++]	

#define get_byte() (inbuf[inptr++])



/* Diagnostic functions */

#ifdef DEBUG

#  define Assert(cond,msg) {if(!(cond)) error(msg);}

#  define Assert(cond, msg) do { \

		if (!(cond)) \

			error(msg); \

	} while (0)

#  define Trace(x) fprintf x

#  define Tracev(x) {if (verbose) fprintf x ;}

#  define Tracevv(x) {if (verbose>1) fprintf x ;}

#  define Tracec(c,x) {if (verbose && (c)) fprintf x ;}

#  define Tracecv(c,x) {if (verbose>1 && (c)) fprintf x ;}

#  define Tracev(x) do { \

		if (verbose) \

			fprintf x; \

	} while (0)

#  define Tracevv(x) do { \

		if (verbose > 1) \

			fprintf x; \

	} while (0)

#  define Tracec(c, x) do { \

		if (verbose && (c)) \

			fprintf x; \

	} while (0)

#  define Tracecv(c, x) do { \

		if (verbose > 1 && (c)) \

			fprintf x; \

	} while (0)

#else

#  define Assert(cond, msg)

#  define Trace(x)
@@ -107,7 +121,8 @@ static void *malloc(int size) 
{

	void *p;



	if (size <0) error("Malloc error");

	if (size < 0)

		error("Malloc error");



	free_mem_ptr = (free_mem_ptr + 3) & ~3;	/* Align */
@@ -158,25 +173,24 @@ puts(const char *s) 
#endif

}



void*

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

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

{

	int i;

	char *ss = (char *)s;



	for (i=0;i<n;i++) ss[i] = c;

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

		ss[i] = c;



	return s;

}



void*

memcpy(void* __dest, __const void* __src,

			    size_t __n)

void *memcpy(void *__dest, __const void *__src, size_t __n)

{

	int i;

	char *d = (char *)__dest, *s = (char *)__src;



	for (i=0;i<__n;i++) d[i] = s[i];

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

		d[i] = s[i];



	return __dest;

}
@@ -186,8 +200,7 @@ memcpy(void* __dest, __const void* __src, 
 * (Used for the decompressed data only.)

 */



static void

flush_window()

static void flush_window(void)

{

	ulg c = crc;         /* temporary variable */

	unsigned n;
@@ -196,7 +209,9 @@ flush_window() 
	in = window;

	out = &output_data[output_ptr];

	for (n = 0; n < outcnt; n++) {

	    ch = *out++ = *in++;

		ch = *out = *in;

		out++;

		in++;

		c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8);

	}

	crc = c;
@@ -205,8 +220,7 @@ flush_window() 
	outcnt = 0;

}



static void

error(char *x)

static void error(char *x)

{

	puts("\n\n");

	puts(x);
@@ -255,8 +269,7 @@ void decompress_kernel(void) 
	makecrc();



	__asm__ volatile ("move $vr,%0" : "=rm" (revision));

	if (revision < 10)

	{

	if (revision < 10) {

		puts("You need an ETRAX 100LX to run linux 2.6\n");

		while (1);

	}

arch/cris/arch-v10/boot/rescue/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


ccflags-y += -O2 $(LINUXINCLUDE)

asflags-y += $(LINUXINCLUDE)

ldflags-y += -T $(obj)/rescue.ld

ldflags-y += -T $(srctree)/$(obj)/rescue.ld

OBJCOPYFLAGS = -O binary --remove-section=.bss

obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o

OBJECT := $(obj)/head.o

arch/cris/arch-v32/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


asflags-y += -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch

ccflags-y += -O2 -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch

ldflags-y += -T $(obj)/decompress.ld

ldflags-y += -T $(srctree)/$(obj)/decompress.ld

OBJECTS = $(obj)/head.o $(obj)/misc.o

OBJCOPYFLAGS = -O binary --remove-section=.bss

arch/cris/arch-v32/boot/rescue/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ ccflags-y += -O2 -I $(srctree)/include/asm/arch/mach/ \ 
		-I $(srctree)/include/asm/arch

asflags-y += -I $(srctree)/include/asm/arch/mach/ -I $(srctree)/include/asm/arch

LD = gcc-cris -mlinux -march=v32 -nostdlib

ldflags-y += -T $(obj)/rescue.ld

ldflags-y += -T $(srctree)/$(obj)/rescue.ld

LDPOSTFLAGS = -lgcc

OBJCOPYFLAGS = -O binary --remove-section=.bss

obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o