Skip to content

Commit 25c7d77

Browse files
geertuglaubitz
authored andcommitted
sh: boot: Remove sh5 cache handling
Commit 37744fe ("sh: remove sh5 support") in v5.8 forgot to remove the sh5 cache handling. Suggested-by: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Link: https://lore.kernel.org/r/23e9b3fd0d78e46c9fc1835852ba226aba92c3ca.1713959531.git.geert+renesas@glider.be Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
1 parent b5319c9 commit 25c7d77

File tree

3 files changed

+1
-21
lines changed

3 files changed

+1
-21
lines changed

arch/sh/boot/compressed/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# create a compressed vmlinux image from the original vmlinux
66
#
77

8-
OBJECTS := head_32.o misc.o cache.o piggy.o \
8+
OBJECTS := head_32.o misc.o piggy.o \
99
ashiftrt.o ashldi3.o ashrsi3.o ashlsi3.o lshrsi3.o
1010

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

arch/sh/boot/compressed/cache.c

Lines changed: 0 additions & 13 deletions
This file was deleted.

arch/sh/boot/compressed/misc.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@
2626
#undef memcpy
2727
#define memzero(s, n) memset ((s), 0, (n))
2828

29-
/* cache.c */
30-
#define CACHE_ENABLE 0
31-
#define CACHE_DISABLE 1
32-
int cache_control(unsigned int command);
33-
3429
extern char input_data[];
3530
extern int input_len;
3631
static unsigned char *output;
@@ -139,8 +134,6 @@ void decompress_kernel(void)
139134
free_mem_end_ptr = free_mem_ptr + HEAP_SIZE;
140135

141136
puts("Uncompressing Linux... ");
142-
cache_control(CACHE_ENABLE);
143137
__decompress(input_data, input_len, NULL, NULL, output, 0, NULL, error);
144-
cache_control(CACHE_DISABLE);
145138
puts("Ok, booting the kernel.\n");
146139
}

0 commit comments

Comments
 (0)