diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-30 07:10:49 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-30 07:10:49 -0500 |
| commit | 30f56399e7c740be043ecbc57cd96ce95998208a (patch) | |
| tree | 062c5922499ae64a0c56967a37a4f1aa3f6d4904 | |
| parent | a71d99ac03c8d5d9622962344485b04aade27b67 (diff) | |
| parent | 6623aee5b6aba2f8efe9b7d2417f090f9c2b3cd3 (diff) | |
| download | blackbird-obmc-uboot-30f56399e7c740be043ecbc57cd96ce95998208a.tar.gz blackbird-obmc-uboot-30f56399e7c740be043ecbc57cd96ce95998208a.zip | |
Merge git://www.denx.de/git/u-boot-ppc4xx
| -rw-r--r-- | arch/powerpc/cpu/ppc4xx/Kconfig | 2 | ||||
| -rw-r--r-- | arch/powerpc/cpu/ppc4xx/start.S | 23 | ||||
| -rw-r--r-- | board/liebherr/lwmon5/Kconfig (renamed from board/lwmon5/Kconfig) | 3 | ||||
| -rw-r--r-- | board/liebherr/lwmon5/MAINTAINERS (renamed from board/lwmon5/MAINTAINERS) | 2 | ||||
| -rw-r--r-- | board/liebherr/lwmon5/Makefile (renamed from board/lwmon5/Makefile) | 0 | ||||
| -rw-r--r-- | board/liebherr/lwmon5/config.mk (renamed from board/lwmon5/config.mk) | 0 | ||||
| -rw-r--r-- | board/liebherr/lwmon5/init.S (renamed from board/lwmon5/init.S) | 0 | ||||
| -rw-r--r-- | board/liebherr/lwmon5/kbd.c (renamed from board/lwmon5/kbd.c) | 0 | ||||
| -rw-r--r-- | board/liebherr/lwmon5/lwmon5.c (renamed from board/lwmon5/lwmon5.c) | 0 | ||||
| -rw-r--r-- | board/liebherr/lwmon5/sdram.c (renamed from board/lwmon5/sdram.c) | 0 |
10 files changed, 5 insertions, 25 deletions
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/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 */ diff --git a/board/lwmon5/Kconfig b/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 index 3ea1888cea..df4573012c 100644 --- a/board/lwmon5/MAINTAINERS +++ b/board/liebherr/lwmon5/MAINTAINERS @@ -1,6 +1,6 @@ LWMON5 BOARD M: Stefan Roese <sr@denx.de> 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 index 02478ca0c8..02478ca0c8 100644 --- a/board/lwmon5/Makefile +++ b/board/liebherr/lwmon5/Makefile diff --git a/board/lwmon5/config.mk b/board/liebherr/lwmon5/config.mk index d0348e8024..d0348e8024 100644 --- a/board/lwmon5/config.mk +++ b/board/liebherr/lwmon5/config.mk diff --git a/board/lwmon5/init.S b/board/liebherr/lwmon5/init.S index e5207c2b40..e5207c2b40 100644 --- a/board/lwmon5/init.S +++ b/board/liebherr/lwmon5/init.S diff --git a/board/lwmon5/kbd.c b/board/liebherr/lwmon5/kbd.c index d6c0a205a3..d6c0a205a3 100644 --- a/board/lwmon5/kbd.c +++ b/board/liebherr/lwmon5/kbd.c diff --git a/board/lwmon5/lwmon5.c b/board/liebherr/lwmon5/lwmon5.c index 8ad6712841..8ad6712841 100644 --- a/board/lwmon5/lwmon5.c +++ b/board/liebherr/lwmon5/lwmon5.c diff --git a/board/lwmon5/sdram.c b/board/liebherr/lwmon5/sdram.c index bcb344940b..bcb344940b 100644 --- a/board/lwmon5/sdram.c +++ b/board/liebherr/lwmon5/sdram.c |
