[U-Boot] [PATCH] ppc4xx: Remove remnants from ocotea, taishan, ebony and taihu
Stefan Roese
sr at denx.de
Tue Oct 27 12:48:15 CET 2015
The removal of some PPC4xx boards did not catch all references to
these boards. This patch now removes all remnants still left.
Signed-off-by: Stefan Roese <sr at denx.de>
Cc: Stefan Roese <sr at denx.de>
---
arch/powerpc/cpu/ppc4xx/Kconfig | 16 ----------------
arch/powerpc/cpu/ppc4xx/start.S | 23 -----------------------
2 files changed, 39 deletions(-)
diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig
index ce58d86..945e771 100644
--- a/arch/powerpc/cpu/ppc4xx/Kconfig
+++ b/arch/powerpc/cpu/ppc4xx/Kconfig
@@ -28,9 +28,6 @@ config TARGET_CANYONLANDS
select DM
select DM_SERIAL
-config TARGET_EBONY
- bool "Support ebony"
-
config TARGET_KATMAI
bool "Support katmai"
@@ -43,21 +40,12 @@ config TARGET_LUAN
config TARGET_MAKALU
bool "Support makalu"
-config TARGET_OCOTEA
- bool "Support ocotea"
-
config TARGET_REDWOOD
bool "Support redwood"
config TARGET_SEQUOIA
bool "Support sequoia"
-config TARGET_TAIHU
- bool "Support taihu"
-
-config TARGET_TAISHAN
- bool "Support taishan"
-
config TARGET_WALNUT
bool "Support walnut"
@@ -142,16 +130,12 @@ source "board/amcc/acadia/Kconfig"
source "board/amcc/bamboo/Kconfig"
source "board/amcc/bubinga/Kconfig"
source "board/amcc/canyonlands/Kconfig"
-source "board/amcc/ebony/Kconfig"
source "board/amcc/katmai/Kconfig"
source "board/amcc/kilauea/Kconfig"
source "board/amcc/luan/Kconfig"
source "board/amcc/makalu/Kconfig"
-source "board/amcc/ocotea/Kconfig"
source "board/amcc/redwood/Kconfig"
source "board/amcc/sequoia/Kconfig"
-source "board/amcc/taihu/Kconfig"
-source "board/amcc/taishan/Kconfig"
source "board/amcc/walnut/Kconfig"
source "board/amcc/yosemite/Kconfig"
source "board/amcc/yucca/Kconfig"
diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S
index 77d4040..3dd0557 100644
--- a/arch/powerpc/cpu/ppc4xx/start.S
+++ b/arch/powerpc/cpu/ppc4xx/start.S
@@ -1795,34 +1795,11 @@ ppc405ep_init:
..no_pllset:
#endif /* CONFIG_BUBINGA */
-#ifdef CONFIG_TAIHU
- mfdcr r4, CPC0_BOOT
- andi. r5, r4, CPC0_BOOT_SEP at l
- bne strap_1 /* serial eeprom present */
- addis r5,0,CPLD_REG0_ADDR at h
- ori r5,r5,CPLD_REG0_ADDR at l
- andi. r5, r5, 0x10
- bne _pci_66mhz
-#endif /* CONFIG_TAIHU */
-
addis r3,0,PLLMR0_DEFAULT at h /* PLLMR0 default value */
ori r3,r3,PLLMR0_DEFAULT at l /* */
addis r4,0,PLLMR1_DEFAULT at h /* PLLMR1 default value */
ori r4,r4,PLLMR1_DEFAULT at l /* */
-#ifdef CONFIG_TAIHU
- b 1f
-_pci_66mhz:
- addis r3,0,PLLMR0_DEFAULT_PCI66 at h
- ori r3,r3,PLLMR0_DEFAULT_PCI66 at l
- addis r4,0,PLLMR1_DEFAULT_PCI66 at h
- ori r4,r4,PLLMR1_DEFAULT_PCI66 at l
- b 1f
-strap_1:
- mfdcr r3, CPC0_PLLMR0
- mfdcr r4, CPC0_PLLMR1
-#endif /* CONFIG_TAIHU */
-
1:
b pll_write /* Write the CPC0_PLLMR with new value */
--
2.6.2
More information about the U-Boot
mailing list