From: Bin Meng <bmeng.cn@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 7/8] x86: Remove legacy pci codes
Date: Fri, 6 Nov 2015 02:04:54 -0800 [thread overview]
Message-ID: <1446804295-6465-7-git-send-email-bmeng.cn@gmail.com> (raw)
In-Reply-To: <1446804295-6465-1-git-send-email-bmeng.cn@gmail.com>
Now that we have converted all x86 boards to use driver model pci,
remove these legacy pci codes.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---
Changes in v2: None
arch/x86/cpu/pci.c | 45 -------------------------------------------
arch/x86/include/asm/pci.h | 21 --------------------
arch/x86/lib/fsp/fsp_common.c | 5 -----
3 files changed, 71 deletions(-)
diff --git a/arch/x86/cpu/pci.c b/arch/x86/cpu/pci.c
index d2ec45a..7a31260 100644
--- a/arch/x86/cpu/pci.c
+++ b/arch/x86/cpu/pci.c
@@ -19,51 +19,6 @@
DECLARE_GLOBAL_DATA_PTR;
-static struct pci_controller x86_hose;
-
-int pci_early_init_hose(struct pci_controller **hosep)
-{
- struct pci_controller *hose;
-
- hose = calloc(1, sizeof(struct pci_controller));
- if (!hose)
- return -ENOMEM;
-
- board_pci_setup_hose(hose);
- pci_setup_type1(hose);
- hose->last_busno = pci_hose_scan(hose);
- gd->hose = hose;
- *hosep = hose;
-
- return 0;
-}
-
-__weak int board_pci_pre_scan(struct pci_controller *hose)
-{
- return 0;
-}
-
-__weak int board_pci_post_scan(struct pci_controller *hose)
-{
- return 0;
-}
-
-void pci_init_board(void)
-{
- struct pci_controller *hose = &x86_hose;
-
- /* Stop using the early hose */
- gd->hose = NULL;
-
- board_pci_setup_hose(hose);
- pci_setup_type1(hose);
- pci_register_hose(hose);
-
- board_pci_pre_scan(hose);
- hose->last_busno = pci_hose_scan(hose);
- board_pci_post_scan(hose);
-}
-
static struct pci_controller *get_hose(void)
{
if (gd->hose)
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index f7e968e..a2945f1 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -25,27 +25,6 @@ struct pci_controller;
void pci_setup_type1(struct pci_controller *hose);
-/**
- * board_pci_setup_hose() - Set up the PCI hose
- *
- * This is called by the common x86 PCI code to set up the PCI controller
- * hose. It may be called when no memory/BSS is available so should just
- * store things in 'hose' and not in BSS variables.
- */
-void board_pci_setup_hose(struct pci_controller *hose);
-
-/**
- * pci_early_init_hose() - Set up PCI host before relocation
- *
- * This allocates memory for, sets up and returns the PCI hose. It can be
- * called before relocation. The hose will be stored in gd->hose for
- * later use, but will become invalid one DRAM is available.
- */
-int pci_early_init_hose(struct pci_controller **hosep);
-
-int board_pci_pre_scan(struct pci_controller *hose);
-int board_pci_post_scan(struct pci_controller *hose);
-
/*
* Simple PCI access routines - these work from either the early PCI hose
* or the 'real' one, created after U-Boot has memory available
diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c
index c78df94..5276ce6 100644
--- a/arch/x86/lib/fsp/fsp_common.c
+++ b/arch/x86/lib/fsp/fsp_common.c
@@ -35,11 +35,6 @@ int fsp_init_phase_pci(void)
return status ? -EPERM : 0;
}
-int board_pci_post_scan(struct pci_controller *hose)
-{
- return fsp_init_phase_pci();
-}
-
void board_final_cleanup(void)
{
u32 status;
--
1.8.2.1
next prev parent reply other threads:[~2015-11-06 10:04 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-06 10:04 [U-Boot] [PATCH v2 1/8] x86: qemu: Remove call to vgabios execution Bin Meng
2015-11-06 10:04 ` [U-Boot] [PATCH v2 2/8] x86: qemu: Move chipset-specific codes from pci.c to qemu.c Bin Meng
2015-11-06 23:57 ` Simon Glass
2015-11-11 4:42 ` Bin Meng
2015-11-06 10:04 ` [U-Boot] [PATCH v2 3/8] x86: qemu: Convert to use driver model pci Bin Meng
2015-11-06 23:57 ` Simon Glass
2015-11-11 4:42 ` Bin Meng
2015-11-06 10:04 ` [U-Boot] [PATCH v2 4/8] x86: qemu: Convert to use driver model usb Bin Meng
2015-11-06 23:58 ` Simon Glass
2015-11-11 4:42 ` Bin Meng
2015-11-06 10:04 ` [U-Boot] [PATCH v2 5/8] x86: qemu: Convert to use driver model eth Bin Meng
2015-11-06 23:58 ` Simon Glass
2015-11-11 4:42 ` Bin Meng
2015-11-06 10:04 ` [U-Boot] [PATCH v2 6/8] x86: crownbay: Remove unused PCI region address macros Bin Meng
2015-11-06 23:58 ` Simon Glass
2015-11-11 4:42 ` Bin Meng
2015-11-06 10:04 ` Bin Meng [this message]
2015-11-06 23:58 ` [U-Boot] [PATCH v2 7/8] x86: Remove legacy pci codes Simon Glass
2015-11-11 4:42 ` Bin Meng
2015-11-06 10:04 ` [U-Boot] [PATCH v2 8/8] x86: Remove CONFIG_SYS_EARLY_PCI_INIT Bin Meng
2015-11-06 23:58 ` Simon Glass
2015-11-11 4:42 ` Bin Meng
2015-11-06 12:08 ` [U-Boot] [PATCH v2 1/8] x86: qemu: Remove call to vgabios execution Simon Glass
2015-11-11 4:42 ` Bin Meng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1446804295-6465-7-git-send-email-bmeng.cn@gmail.com \
--to=bmeng.cn@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox