Commit 25c7d77d authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by John Paul Adrian Glaubitz
Browse files

sh: boot: Remove sh5 cache handling 



Commit 37744fee ("sh: remove sh5 support") in v5.8 forgot to
remove the sh5 cache handling.

Suggested-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarJohn Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Link: https://lore.kernel.org/r/23e9b3fd0d78e46c9fc1835852ba226aba92c3ca.1713959531.git.geert+renesas@glider.be


Signed-off-by: default avatarJohn Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
parent b5319c96

arch/sh/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
# create a compressed vmlinux image from the original vmlinux

#



OBJECTS := head_32.o misc.o cache.o piggy.o \

OBJECTS := head_32.o misc.o piggy.o \

           ashiftrt.o ashldi3.o ashrsi3.o ashlsi3.o lshrsi3.o



targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 \

arch/sh/boot/compressed/cache.c

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

int cache_control(unsigned int command)

{

	volatile unsigned int *p = (volatile unsigned int *) 0x80000000;

	int i;



	for (i = 0; i < (32 * 1024); i += 32) {

		(void)*p;

		p += (32 / sizeof(int));

	}



	return 0;

}

arch/sh/boot/compressed/misc.c

+0 −7
Original line number Diff line number Diff line
@@ -26,11 +26,6 @@ 
#undef memcpy

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



/* cache.c */

#define CACHE_ENABLE      0

#define CACHE_DISABLE     1

int cache_control(unsigned int command);



extern char input_data[];

extern int input_len;

static unsigned char *output;
@@ -139,8 +134,6 @@ void decompress_kernel(void) 
	free_mem_end_ptr = free_mem_ptr + HEAP_SIZE;



	puts("Uncompressing Linux... ");

	cache_control(CACHE_ENABLE);

	__decompress(input_data, input_len, NULL, NULL, output, 0, NULL, error);

	cache_control(CACHE_DISABLE);

	puts("Ok, booting the kernel.\n");

}