Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-14 00:47:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

blkcache: Remove unused NEEDS_MANUAL_RELOC code bits

Browse source 
The last user of the NEEDS_MANUAL_RELOC has been removed in commit
26af162ac8 ("arch: m68k: Implement relocation")
Remove now unused NEEDS_MANUAL_RELOC code.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
This commit is contained in:
Marek Vasut 2023-09-06 23:29:42 +02:00 committed by Tom Rini
parent 446d664303
commit 4fa6511e8c
4 changed files with 0 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cmd/blkcache.c
View file

@ -46,24 +46,11 @@ static struct cmd_tbl cmd_blkc_sub[] = {
U_BOOT_CMD_MKENT(configure, 3, 0, blkc_configure, "", ""), U_BOOT_CMD_MKENT(configure, 3, 0, blkc_configure, "", ""),
}; };
static __maybe_unused void blkc_reloc(void)
{
static int relocated;
if (!relocated) {
fixup_cmdtable(cmd_blkc_sub, ARRAY_SIZE(cmd_blkc_sub));
relocated = 1;
};
}
static int do_blkcache(struct cmd_tbl *cmdtp, int flag, static int do_blkcache(struct cmd_tbl *cmdtp, int flag,
int argc, char *const argv[]) int argc, char *const argv[])
{ {
struct cmd_tbl *c; struct cmd_tbl *c;
#ifdef CONFIG_NEEDS_MANUAL_RELOC
blkc_reloc();
#endif
if (argc < 2) if (argc < 2)
return CMD_RET_USAGE; return CMD_RET_USAGE;

3
common/board_r.c
View file

@ -657,9 +657,6 @@ static init_fnc_t init_sequence_r[] = {
initr_watchdog, initr_watchdog,
#endif #endif
INIT_FUNC_WATCHDOG_RESET INIT_FUNC_WATCHDOG_RESET
#if defined(CONFIG_NEEDS_MANUAL_RELOC) && defined(CONFIG_BLOCK_CACHE)
blkcache_init,
#endif
#ifdef CONFIG_NEEDS_MANUAL_RELOC #ifdef CONFIG_NEEDS_MANUAL_RELOC
initr_manual_reloc_cmdtable, initr_manual_reloc_cmdtable,
#endif #endif

16
drivers/block/blkcache.c
View file

@ -13,10 +13,6 @@
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/list.h> #include <linux/list.h>
#ifdef CONFIG_NEEDS_MANUAL_RELOC
DECLARE_GLOBAL_DATA_PTR;
#endif
struct block_cache_node { struct block_cache_node {
struct list_head lh; struct list_head lh;
int iftype; int iftype;
@ -34,18 +30,6 @@ static struct block_cache_stats _stats = {
.max_entries = 32 .max_entries = 32
}; };
#ifdef CONFIG_NEEDS_MANUAL_RELOC
int blkcache_init(void)
{
struct list_head *head = &block_cache;
head->next = (uintptr_t)head->next + gd->reloc_off;
head->prev = (uintptr_t)head->prev + gd->reloc_off;
return 0;
}
#endif
static struct block_cache_node *cache_find(int iftype, int devnum, static struct block_cache_node *cache_find(int iftype, int devnum,
lbaint_t start, lbaint_t blkcnt, lbaint_t start, lbaint_t blkcnt,
unsigned long blksz) unsigned long blksz)

6
include/blk.h
View file

@ -105,12 +105,6 @@ struct blk_desc {
(PAD_SIZE(size, blk_desc->blksz)) (PAD_SIZE(size, blk_desc->blksz))
#if CONFIG_IS_ENABLED(BLOCK_CACHE) #if CONFIG_IS_ENABLED(BLOCK_CACHE)
/**
* blkcache_init() - initialize the block cache list pointers
*/
int blkcache_init(void);
/** /**
* blkcache_read() - attempt to read a set of blocks from cache * blkcache_read() - attempt to read a set of blocks from cache
* *