From 7514037bcdc37180fe87f889013d72c49f4bd525 Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Tue, 27 Oct 2015 12:48:15 +0100 Subject: [PATCH 1/2] ppc4xx: Remove remnants from ocotea, taishan, ebony and taihu 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 Cc: Stefan Roese --- arch/powerpc/cpu/ppc4xx/start.S | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S index 77d4040727..3dd0557aa6 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@l - bne strap_1 /* serial eeprom present */ - addis r5,0,CPLD_REG0_ADDR@h - ori r5,r5,CPLD_REG0_ADDR@l - andi. r5, r5, 0x10 - bne _pci_66mhz -#endif /* CONFIG_TAIHU */ - addis r3,0,PLLMR0_DEFAULT@h /* PLLMR0 default value */ ori r3,r3,PLLMR0_DEFAULT@l /* */ addis r4,0,PLLMR1_DEFAULT@h /* PLLMR1 default value */ ori r4,r4,PLLMR1_DEFAULT@l /* */ -#ifdef CONFIG_TAIHU - b 1f -_pci_66mhz: - addis r3,0,PLLMR0_DEFAULT_PCI66@h - ori r3,r3,PLLMR0_DEFAULT_PCI66@l - addis r4,0,PLLMR1_DEFAULT_PCI66@h - ori r4,r4,PLLMR1_DEFAULT_PCI66@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 */ From 6623aee5b6aba2f8efe9b7d2417f090f9c2b3cd3 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Tue, 24 Nov 2015 20:46:45 +0100 Subject: [PATCH 2/2] PPC4xx: Create "liebherr" vendor directory In preparation of some new Liebherr boards to be added soon, a new "liebherr" vendor directory gets created, and the "lwmon5" board directory is moved into this new vendor directory. cc: Stefan Roese Signed-off-by: Wolfgang Denk Signed-off-by: Stefan Roese --- arch/powerpc/cpu/ppc4xx/Kconfig | 2 +- board/{ => liebherr}/lwmon5/Kconfig | 3 +++ board/{ => liebherr}/lwmon5/MAINTAINERS | 2 +- board/{ => liebherr}/lwmon5/Makefile | 0 board/{ => liebherr}/lwmon5/config.mk | 0 board/{ => liebherr}/lwmon5/init.S | 0 board/{ => liebherr}/lwmon5/kbd.c | 0 board/{ => liebherr}/lwmon5/lwmon5.c | 0 board/{ => liebherr}/lwmon5/sdram.c | 0 9 files changed, 5 insertions(+), 2 deletions(-) rename board/{ => liebherr}/lwmon5/Kconfig (78%) rename board/{ => liebherr}/lwmon5/MAINTAINERS (81%) rename board/{ => liebherr}/lwmon5/Makefile (100%) rename board/{ => liebherr}/lwmon5/config.mk (100%) rename board/{ => liebherr}/lwmon5/init.S (100%) rename board/{ => liebherr}/lwmon5/kbd.c (100%) rename board/{ => liebherr}/lwmon5/lwmon5.c (100%) rename board/{ => liebherr}/lwmon5/sdram.c (100%) diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig index 945e77191e..efd316573c 100644 --- a/arch/powerpc/cpu/ppc4xx/Kconfig +++ b/arch/powerpc/cpu/ppc4xx/Kconfig @@ -152,7 +152,7 @@ source "board/gdsys/405ex/Kconfig" source "board/gdsys/dlvision/Kconfig" source "board/gdsys/gdppc440etx/Kconfig" source "board/gdsys/intip/Kconfig" -source "board/lwmon5/Kconfig" +source "board/liebherr/lwmon5/Kconfig" source "board/mosaixtech/icon/Kconfig" source "board/mpl/mip405/Kconfig" source "board/mpl/pip405/Kconfig" diff --git a/board/lwmon5/Kconfig b/board/liebherr/lwmon5/Kconfig similarity index 78% rename from board/lwmon5/Kconfig rename to board/liebherr/lwmon5/Kconfig index 7b8c605a07..7f1bb40098 100644 --- a/board/lwmon5/Kconfig +++ b/board/liebherr/lwmon5/Kconfig @@ -3,6 +3,9 @@ if TARGET_LWMON5 config SYS_BOARD default "lwmon5" +config SYS_VENDOR + default "liebherr" + config SYS_CONFIG_NAME default "lwmon5" diff --git a/board/lwmon5/MAINTAINERS b/board/liebherr/lwmon5/MAINTAINERS similarity index 81% rename from board/lwmon5/MAINTAINERS rename to board/liebherr/lwmon5/MAINTAINERS index 3ea1888cea..df4573012c 100644 --- a/board/lwmon5/MAINTAINERS +++ b/board/liebherr/lwmon5/MAINTAINERS @@ -1,6 +1,6 @@ LWMON5 BOARD M: Stefan Roese S: Maintained -F: board/lwmon5/ +F: board/liebherr/lwmon5/ F: include/configs/lwmon5.h F: configs/lwmon5_defconfig diff --git a/board/lwmon5/Makefile b/board/liebherr/lwmon5/Makefile similarity index 100% rename from board/lwmon5/Makefile rename to board/liebherr/lwmon5/Makefile diff --git a/board/lwmon5/config.mk b/board/liebherr/lwmon5/config.mk similarity index 100% rename from board/lwmon5/config.mk rename to board/liebherr/lwmon5/config.mk diff --git a/board/lwmon5/init.S b/board/liebherr/lwmon5/init.S similarity index 100% rename from board/lwmon5/init.S rename to board/liebherr/lwmon5/init.S diff --git a/board/lwmon5/kbd.c b/board/liebherr/lwmon5/kbd.c similarity index 100% rename from board/lwmon5/kbd.c rename to board/liebherr/lwmon5/kbd.c diff --git a/board/lwmon5/lwmon5.c b/board/liebherr/lwmon5/lwmon5.c similarity index 100% rename from board/lwmon5/lwmon5.c rename to board/liebherr/lwmon5/lwmon5.c diff --git a/board/lwmon5/sdram.c b/board/liebherr/lwmon5/sdram.c similarity index 100% rename from board/lwmon5/sdram.c rename to board/liebherr/lwmon5/sdram.c