diff options
author | Laszlo Ersek <lersek@redhat.com> | 2014-12-22 13:11:36 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2014-12-22 23:39:15 +0000 |
commit | 66708822cd3007ae1ec5104d274a861148725e7a (patch) | |
tree | 0efe1953b1d4890a785a9611200a2caaa06d558f /hw/nvram | |
parent | 5712db6ae5101db645f71edc393368cd59bfd314 (diff) | |
download | qemu-66708822cd3007ae1ec5104d274a861148725e7a.zip qemu-66708822cd3007ae1ec5104d274a861148725e7a.tar.gz qemu-66708822cd3007ae1ec5104d274a861148725e7a.tar.bz2 |
fw_cfg: move boards to fw_cfg_init_io() / fw_cfg_init_mem()
This allows us to drop the fw_cfg_init() shim and to enforce the possible
mappings at compile time.
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1419250305-31062-3-git-send-email-pbonzini@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/nvram')
-rw-r--r-- | hw/nvram/fw_cfg.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index ab7bfff..c48bc6e 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -632,20 +632,6 @@ FWCfgState *fw_cfg_init_mem(hwaddr ctl_addr, hwaddr data_addr) } -FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, - hwaddr crl_addr, hwaddr data_addr) -{ - if (ctl_port + 1 == data_port && crl_addr == 0 && data_addr == 0) { - return fw_cfg_init_io(ctl_port); - } - if (ctl_port == 0 && data_port == 0 && crl_addr != 0 && data_addr != 0) { - return fw_cfg_init_mem(crl_addr, data_addr); - } - assert(false); - return NULL; -} - - FWCfgState *fw_cfg_find(void) { return FW_CFG(object_resolve_path(FW_CFG_PATH, NULL)); |