From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Cc: Priyanka Jain <priyanka.jain@nxp.com>
Subject: [PATCH 11/22] mpc8548cds: Rework CONFIG_LEGACY usage
Date: Wed, 23 Mar 2022 17:19:58 -0400 [thread overview]
Message-ID: <20220323212009.1066483-11-trini@konsulko.com> (raw)
In-Reply-To: <20220323212009.1066483-1-trini@konsulko.com>
This CONFIG option is used in one place, so pick a more direct name and
migrate to Kconfig. Rework the code slightly.
Cc: Priyanka Jain <priyanka.jain@nxp.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
board/freescale/common/cds_via.c | 6 +++++-
board/freescale/mpc8548cds/Kconfig | 3 +++
configs/MPC8548CDS_legacy_defconfig | 2 +-
include/configs/MPC8548CDS.h | 8 --------
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/board/freescale/common/cds_via.c b/board/freescale/common/cds_via.c
index 8f8f0d1f588b..6184472b1658 100644
--- a/board/freescale/common/cds_via.c
+++ b/board/freescale/common/cds_via.c
@@ -28,7 +28,11 @@ void mpc85xx_config_via(struct pci_controller *hose,
* This allows legacy I/O (i8259, etc) on the VIA
* southbridge to be accessed.
*/
- bridge = PCI_BDF(0,BRIDGE_ID,0);
+#ifdef CONFIG_TARGET_MPC8548CDS_LEGACY
+ bridge = PCI_BDF(0, 17, 0);
+#else
+ bridge = PCI_BDF(0, 28, 0);
+#endif
pci_hose_write_config_byte(hose, bridge, PCI_IO_BASE, 0);
pci_hose_write_config_word(hose, bridge, PCI_IO_BASE_UPPER16, 0);
pci_hose_write_config_byte(hose, bridge, PCI_IO_LIMIT, 0x10);
diff --git a/board/freescale/mpc8548cds/Kconfig b/board/freescale/mpc8548cds/Kconfig
index 09f3b0b7663d..87f3374bf453 100644
--- a/board/freescale/mpc8548cds/Kconfig
+++ b/board/freescale/mpc8548cds/Kconfig
@@ -9,4 +9,7 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "MPC8548CDS"
+config TARGET_MPC8548CDS_LEGACY
+ bool "Legacy platform support"
+
endif
diff --git a/configs/MPC8548CDS_legacy_defconfig b/configs/MPC8548CDS_legacy_defconfig
index 123dd20c82f5..8e07df1386d0 100644
--- a/configs/MPC8548CDS_legacy_defconfig
+++ b/configs/MPC8548CDS_legacy_defconfig
@@ -8,9 +8,9 @@ CONFIG_MPC85xx=y
# CONFIG_CMD_ERRATA is not set
CONFIG_TARGET_MPC8548CDS=y
CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+CONFIG_TARGET_MPC8548CDS_LEGACY=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SYS_EXTRA_OPTIONS="LEGACY"
CONFIG_DYNAMIC_SYS_CLK_FREQ=y
CONFIG_BOOTDELAY=10
CONFIG_USE_BOOTCOMMAND=y
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index fc3cc0c533d8..cc675ef42f57 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -324,14 +324,6 @@
#endif
#define CONFIG_SYS_SRIO1_MEM_SIZE 0x20000000 /* 512M */
-#ifdef CONFIG_LEGACY
-#define BRIDGE_ID 17
-#define VIA_ID 2
-#else
-#define BRIDGE_ID 28
-#define VIA_ID 4
-#endif
-
#if defined(CONFIG_PCI)
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#endif /* CONFIG_PCI */
--
2.25.1
next prev parent reply other threads:[~2022-03-23 21:22 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-23 21:19 [PATCH 01/22] Convert CONFIG_CF_DSPI to Kconfig Tom Rini
2022-03-23 21:19 ` [PATCH 02/22] Convert CONFIG_MCFTMR " Tom Rini
2022-03-23 21:19 ` [PATCH 03/22] stmark2: Remove CONFIG_SERIAL_FLASH Tom Rini
2022-03-23 21:19 ` [PATCH 04/22] Convert CONFIG_MCFRTC et al to Kconfig Tom Rini
2022-03-23 21:19 ` [PATCH 05/22] stmark2: Migrate CONFIG_SYS_EXTRA_OPTIONS " Tom Rini
2022-03-23 21:19 ` [PATCH 06/22] mx28evk_auart_console: Remove CONFIG_SYS_EXTRA_OPTIONS Tom Rini
2022-03-23 21:19 ` [PATCH 07/22] Convert CONFIG_EMMC_BOOT et al to Kconfig Tom Rini
2022-03-23 21:19 ` [PATCH 08/22] keymile: Move sourcing of common Kconfig Tom Rini
2022-03-24 7:45 ` Holger Brunck
2022-03-23 21:19 ` [PATCH 09/22] kmtegr1: Drop CONFIG_KMTEGR1 Tom Rini
2022-03-24 4:59 ` Heiko Schocher
2022-03-24 7:46 ` Holger Brunck
2022-03-23 21:19 ` [PATCH 10/22] Convert CONFIG_KM_COGE5UN et al to Kconfig Tom Rini
2022-03-24 7:46 ` Holger Brunck
2022-03-23 21:19 ` Tom Rini [this message]
2022-03-23 21:19 ` [PATCH 12/22] Convert CONFIG_LSCHLV2 to Kconfig et al Tom Rini
2022-03-24 17:48 ` Michael Walle
2022-03-23 21:20 ` [PATCH 13/22] Convert CONFIG_LPUART et al to Kconfig Tom Rini
2022-03-23 21:20 ` [PATCH 14/22] MPC837XERDB: Move CONFIG_PCIE " Tom Rini
2022-03-23 21:20 ` [PATCH 15/22] am43xx_evm_qspiboot: Remove CONFIG_SYS_EXTRA_OPTIONS Tom Rini
2022-03-23 21:20 ` [PATCH 16/22] Convert CONFIG_SDCARD et al to Kconfig Tom Rini
2022-03-23 21:20 ` [PATCH 17/22] global: Remove CONFIG_SYS_USE_DATAFLASH* Tom Rini
2022-03-23 21:20 ` [PATCH 18/22] Convert CONFIG_SYS_USE_NORFLASH et al to Kconfig Tom Rini
2022-03-23 21:20 ` [PATCH 19/22] exynos: Drop CONFIG_CLK_* Tom Rini
2022-03-25 4:41 ` Minkyu Kang
2022-03-28 23:14 ` Jaehoon Chung
2022-03-23 21:20 ` [PATCH 20/22] Convert CONFIG_CLOCK_SYNTHESIZER to Kconfig Tom Rini
2022-03-23 21:20 ` [PATCH 21/22] Convert CONFIG_CLOCKS " Tom Rini
2022-03-23 21:20 ` [PATCH 22/22] p1_p2_rdb: Remove CONFIG_CPLD_[BO]R_PRELIM Tom Rini
2022-04-01 18:45 ` [PATCH 01/22] Convert CONFIG_CF_DSPI to Kconfig Tom Rini
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=20220323212009.1066483-11-trini@konsulko.com \
--to=trini@konsulko.com \
--cc=priyanka.jain@nxp.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