Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sh: boot: Remove sh5 cache handling

Commit 37744feebc086908 ("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>

authored by

Geert Uytterhoeven and committed by
John Paul Adrian Glaubitz
25c7d77d b5319c96

+1 -21
+1 -1
arch/sh/boot/compressed/Makefile
··· 5 5 # create a compressed vmlinux image from the original vmlinux 6 6 # 7 7 8 - OBJECTS := head_32.o misc.o cache.o piggy.o \ 8 + OBJECTS := head_32.o misc.o piggy.o \ 9 9 ashiftrt.o ashldi3.o ashrsi3.o ashlsi3.o lshrsi3.o 10 10 11 11 targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 \
-13
arch/sh/boot/compressed/cache.c
··· 1 - // SPDX-License-Identifier: GPL-2.0 2 - int cache_control(unsigned int command) 3 - { 4 - volatile unsigned int *p = (volatile unsigned int *) 0x80000000; 5 - int i; 6 - 7 - for (i = 0; i < (32 * 1024); i += 32) { 8 - (void)*p; 9 - p += (32 / sizeof(int)); 10 - } 11 - 12 - return 0; 13 - }
-7
arch/sh/boot/compressed/misc.c
··· 26 26 #undef memcpy 27 27 #define memzero(s, n) memset ((s), 0, (n)) 28 28 29 - /* cache.c */ 30 - #define CACHE_ENABLE 0 31 - #define CACHE_DISABLE 1 32 - int cache_control(unsigned int command); 33 - 34 29 extern char input_data[]; 35 30 extern int input_len; 36 31 static unsigned char *output; ··· 134 139 free_mem_end_ptr = free_mem_ptr + HEAP_SIZE; 135 140 136 141 puts("Uncompressing Linux... "); 137 - cache_control(CACHE_ENABLE); 138 142 __decompress(input_data, input_len, NULL, NULL, output, 0, NULL, error); 139 - cache_control(CACHE_DISABLE); 140 143 puts("Ok, booting the kernel.\n"); 141 144 }