leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sandbox: Drop CONFIG_HOST_MAX_DEVICES

Browse Source 
This can go in the related header file. Drop the CONFIG option.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Simon Glass 2021-11-24 09:26:40 -07:00
parent 89050244c4
commit 32c8566f13
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/host.c
View File

@ -78,7 +78,7 @@ static int do_host_info(struct cmd_tbl *cmdtp, int flag, int argc,
if (argc < 1 || argc > 2) if (argc < 1 || argc > 2)
return CMD_RET_USAGE; return CMD_RET_USAGE;
int min_dev = 0; int min_dev = 0;
int max_dev = CONFIG_HOST_MAX_DEVICES - 1; int max_dev = SANDBOX_HOST_MAX_DEVICES - 1;
if (argc >= 2) { if (argc >= 2) {
char *ep; char *ep;
char *dev_str = argv[1]; char *dev_str = argv[1];

6
drivers/block/sandbox.c
View File

@ -19,11 +19,11 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#ifndef CONFIG_BLK #ifndef CONFIG_BLK
static struct host_block_dev host_devices[CONFIG_HOST_MAX_DEVICES]; static struct host_block_dev host_devices[SANDBOX_HOST_MAX_DEVICES];
static struct host_block_dev *find_host_device(int dev) static struct host_block_dev *find_host_device(int dev)
{ {
if (dev >= 0 && dev < CONFIG_HOST_MAX_DEVICES) if (dev >= 0 && dev < SANDBOX_HOST_MAX_DEVICES)
return &host_devices[dev]; return &host_devices[dev];
return NULL; return NULL;
@ -259,7 +259,7 @@ U_BOOT_DRIVER(sandbox_host_blk) = {
U_BOOT_LEGACY_BLK(sandbox_host) = { U_BOOT_LEGACY_BLK(sandbox_host) = {
.if_typename = "host", .if_typename = "host",
.if_type = IF_TYPE_HOST, .if_type = IF_TYPE_HOST,
.max_devs = CONFIG_HOST_MAX_DEVICES, .max_devs = SANDBOX_HOST_MAX_DEVICES,
.get_dev = host_get_dev_err, .get_dev = host_get_dev_err,
}; };
#endif #endif

2
include/configs/sandbox.h
View File

@ -14,8 +14,6 @@
#define CONFIG_SYS_TIMER_RATE 1000000 #define CONFIG_SYS_TIMER_RATE 1000000
#endif #endif
#define CONFIG_HOST_MAX_DEVICES 4
#define CONFIG_MALLOC_F_ADDR 0x0010000 #define CONFIG_MALLOC_F_ADDR 0x0010000
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */

3
include/sandboxblockdev.h
View File

@ -6,6 +6,9 @@
#ifndef __SANDBOX_BLOCK_DEV__ #ifndef __SANDBOX_BLOCK_DEV__
#define __SANDBOX_BLOCK_DEV__ #define __SANDBOX_BLOCK_DEV__
/* Maximum number of host devices - see drivers/block/sandbox.c */
#define SANDBOX_HOST_MAX_DEVICES 4
struct host_block_dev { struct host_block_dev {
#ifndef CONFIG_BLK #ifndef CONFIG_BLK
struct blk_desc blk_dev; struct blk_desc blk_dev;

1
scripts/config_whitelist.txt
View File

@ -440,7 +440,6 @@ CONFIG_HIDE_LOGO_VERSION
CONFIG_HIKEY_GPIO CONFIG_HIKEY_GPIO
CONFIG_HITACHI_SX14 CONFIG_HITACHI_SX14
CONFIG_HOSTNAME CONFIG_HOSTNAME
CONFIG_HOST_MAX_DEVICES
CONFIG_HPS_ALTERAGRP_DBGATCLK CONFIG_HPS_ALTERAGRP_DBGATCLK
CONFIG_HPS_ALTERAGRP_MAINCLK CONFIG_HPS_ALTERAGRP_MAINCLK
CONFIG_HPS_ALTERAGRP_MPUCLK CONFIG_HPS_ALTERAGRP_MPUCLK