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

Commit 76fdf67b authored by Jesper Nilsson's avatar Jesper Nilsson
Browse files

CRIS: Avoid compilation warning for puts 



Rename to aputs.
Also, simplify code by moving some common code out to macros.

Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
parent ac93f621

arch/cris/boot/compressed/misc.c

+25 −40
Original line number Original line Diff line number Diff line
@@ -106,7 +106,7 @@ static unsigned outcnt = 0; /* bytes in output buffer */ 




static void flush_window(void);

static void flush_window(void);

static void error(char *m);

static void error(char *m);

static void puts(const char *);

static void aputs(const char *s);





extern char *input_data;  /* lives in head.S */

extern char *input_data;  /* lives in head.S */
@@ -137,52 +137,37 @@ static inline void serout(const char *s, reg_scope_instances regi_ser) 




	REG_WR(ser, regi_ser, rw_dout, dout);

	REG_WR(ser, regi_ser, rw_dout, dout);

}

}

#define SEROUT(S, N) \

	do { \

		serout(S, regi_ser ## N); \

		s++; \

	} while (0)

#else

#define SEROUT(S, N) do { \

		while (!(*R_SERIAL ## N ## _STATUS & (1 << 5))) \

			; \

		*R_SERIAL ## N ## _TR_DATA = *s++; \

	} while (0)

#endif

#endif





static void puts(const char *s)

static void aputs(const char *s)

{

{

#ifndef CONFIG_ETRAX_DEBUG_PORT_NULL

#ifndef CONFIG_ETRAX_DEBUG_PORT_NULL

	while (*s) {

	while (*s) {

#ifdef CONFIG_ETRAX_DEBUG_PORT0

#ifdef CONFIG_ETRAX_DEBUG_PORT0

#ifdef CONFIG_ETRAX_ARCH_V32

		SEROUT(s, 0);

		serout(s, regi_ser0);

#else

		while (!(*R_SERIAL0_STATUS & (1 << 5)))

			;

		*R_SERIAL0_TR_DATA = *s++;

#endif

#endif

#endif

#ifdef CONFIG_ETRAX_DEBUG_PORT1

#ifdef CONFIG_ETRAX_DEBUG_PORT1

#ifdef CONFIG_ETRAX_ARCH_V32

		SEROUT(s, 1);

		serout(s, regi_ser1);

#else

		while (!(*R_SERIAL1_STATUS & (1 << 5)))

			;

		*R_SERIAL1_TR_DATA = *s++;

#endif

#endif

#endif

#ifdef CONFIG_ETRAX_DEBUG_PORT2

#ifdef CONFIG_ETRAX_DEBUG_PORT2

#ifdef CONFIG_ETRAX_ARCH_V32

		SEROUT(s, 2);

		serout(s, regi_ser2);

#else

		while (!(*R_SERIAL2_STATUS & (1 << 5)))

			;

		*R_SERIAL2_TR_DATA = *s++;

#endif

#endif

#endif

#ifdef CONFIG_ETRAX_DEBUG_PORT3

#ifdef CONFIG_ETRAX_DEBUG_PORT3

#ifdef CONFIG_ETRAX_ARCH_V32

		SEROUT(s, 3);

		serout(s, regi_ser3);

#else

		while (!(*R_SERIAL3_STATUS & (1 << 5)))

			;

		*R_SERIAL3_TR_DATA = *s++;

#endif

#endif

#endif

		*s++;

	}

	}

/* CONFIG_ETRAX_DEBUG_PORT_NULL */

#endif /* CONFIG_ETRAX_DEBUG_PORT_NULL */

#endif

}

}





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

void *memset(void *s, int c, size_t n)
@@ -233,9 +218,9 @@ static void flush_window(void) 




static void error(char *x)

static void error(char *x)

{

{

	puts("\n\n");

	aputs("\n\n");

	puts(x);

	aputs(x);

	puts("\n\n -- System halted\n");

	aputs("\n\n -- System halted\n");





	while(1);	/* Halt */

	while(1);	/* Halt */

}

}
@@ -378,14 +363,14 @@ void decompress_kernel(void) 
	__asm__ volatile ("move $vr,%0" : "=rm" (revision));

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

	if (revision < compile_rev) {

	if (revision < compile_rev) {

#ifdef CONFIG_ETRAX_ARCH_V32

#ifdef CONFIG_ETRAX_ARCH_V32

		puts("You need an ETRAX FS to run Linux 2.6/crisv32\n");

		aputs("You need at least ETRAX FS to run Linux 2.6/crisv32\n");

#else

#else

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

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

#endif

#endif

		while(1);

		while(1);

	}

	}





	puts("Uncompressing Linux...\n");

	aputs("Uncompressing Linux...\n");

	gunzip();

	gunzip();

	puts("Done. Now booting the kernel\n");

	aputs("Done. Now booting the kernel\n");

}
 
}