openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Multiplatform migration of the Integrator. 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUR55nAAoJEEEQszewGV1zXGkQAKwwhCCI1TMPb+U2e/9fvOMM
 eUiW0CYUJ/G0SKcP1fwegNg3W80kLGJbX23UNXrpV4PzLjg0xlpo0c6Tnh2ttJge
 awDrrqHKxo1FwMqPpRIE2+GPk4ipxJvFyAEiq1gYw7ouEu3nxke1NrpV0DU+S7b+
 KqveK+U1mk21ofOAr6GEWV2XnI7G2UQBCc7sQWc/EZ/Jz1T9gVWckN8Dc5z0l6gy
 9VPeCYn0XzxbBL7jew0n5PMlHbUZf8aC022zXn/JBrDJYaOUH6zKoIztwN8xfKOr
 kZFFlezqjmiISd6WbmK11H3DdAiCBD5QadBixY7RtrepWrIwjDvyZmvkJFNDujRP
 Yl8jOh6G9QRjLeKR61T03OdNn54/c2/aVDbPHasmsjpak0ymZ0wRbnUyqNUbpCFd
 KxyyTpo0GG//I9h1drAAZKqjz3/WBomWoR5YlDEHXTqWAVnoNUta+qs3NEg6/Pcr
 MJ2ApgLLIQ/B5g/b/q1EMIXo1zdf6xF5SAyQlVPiFOtxoSmOr1xgBvlFlVwMqRwz
 a+fZl4cI6H4XOuSt/0VBiByNxW3O7vf1u5k28Ssmuw8ypJ/TABqY8idV39YZLMrv
 mxcX3L0MSYvAsdFllKxSWz4eIzg4AjgWfQ+VUP4We2yDZ7351FT4oT/olJ4ohVqE
 HCz15luWiYI/pUVBWf86
 =XgVc
 -----END PGP SIGNATURE-----

Merge tag 'integrator-multiplatform-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc

Merge "Integrator multiplatform migration for v3.19" from Linus Walleij:

Multiplatform migration of the Integrator.

* tag 'integrator-multiplatform-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: integrator: set V4T and V5 as default multitargets
  ARM: integrator: make the Integrator multiplatform

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2014-11-03 22:31:45 -08:00
parent 656b5def74 9713497b6c
commit 691781785d
4 changed files with 21 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/Kconfig
View File

@ -320,24 +320,6 @@ config ARCH_MULTIPLATFORM
select SPARSE_IRQ select SPARSE_IRQ
select USE_OF select USE_OF
config ARCH_INTEGRATOR
bool "ARM Ltd. Integrator family"
select ARM_AMBA
select ARM_PATCH_PHYS_VIRT if MMU
select AUTO_ZRELADDR
select COMMON_CLK
select COMMON_CLK_VERSATILE
select GENERIC_CLOCKEVENTS
select HAVE_TCM
select ICST
select MULTI_IRQ_HANDLER
select PLAT_VERSATILE
select SPARSE_IRQ
select USE_OF
select VERSATILE_FPGA_IRQ
help
Support for ARM's Integrator platform.
config ARCH_REALVIEW config ARCH_REALVIEW
bool "ARM Ltd. RealView family" bool "ARM Ltd. RealView family"
select ARCH_WANT_OPTIONAL_GPIOLIB select ARCH_WANT_OPTIONAL_GPIOLIB

3
arch/arm/configs/integrator_defconfig
View File

@ -8,6 +8,9 @@ CONFIG_BLK_DEV_INITRD=y
CONFIG_MODULES=y CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD=y
CONFIG_PARTITION_ADVANCED=y CONFIG_PARTITION_ADVANCED=y
CONFIG_ARCH_MULTI_V4T=y
CONFIG_ARCH_MULTI_V5=y
# CONFIG_ARCH_MULTI_V7 is not set
CONFIG_ARCH_INTEGRATOR=y CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_AP=y CONFIG_ARCH_INTEGRATOR_AP=y
CONFIG_ARCH_INTEGRATOR_CP=y CONFIG_ARCH_INTEGRATOR_CP=y

18
arch/arm/mach-integrator/Kconfig
View File

@ -1,3 +1,21 @@
config ARCH_INTEGRATOR
bool "ARM Ltd. Integrator family" if (ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6)
select ARM_AMBA
select ARM_PATCH_PHYS_VIRT if MMU
select AUTO_ZRELADDR
select COMMON_CLK
select COMMON_CLK_VERSATILE
select GENERIC_CLOCKEVENTS
select HAVE_TCM
select ICST
select MULTI_IRQ_HANDLER
select PLAT_VERSATILE
select SPARSE_IRQ
select USE_OF
select VERSATILE_FPGA_IRQ
help
Support for ARM's Integrator platform.
if ARCH_INTEGRATOR if ARCH_INTEGRATOR
menu "Integrator Options" menu "Integrator Options"

48
arch/arm/mach-integrator/include/mach/uncompress.h
View File

@ -1,48 +0,0 @@
/*
* arch/arm/mach-integrator/include/mach/uncompress.h
*
* Copyright (C) 1999 ARM Limited
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#define AMBA_UART_DR (*(volatile unsigned char *)0x16000000)
#define AMBA_UART_LCRH (*(volatile unsigned char *)0x16000008)
#define AMBA_UART_LCRM (*(volatile unsigned char *)0x1600000c)
#define AMBA_UART_LCRL (*(volatile unsigned char *)0x16000010)
#define AMBA_UART_CR (*(volatile unsigned char *)0x16000014)
#define AMBA_UART_FR (*(volatile unsigned char *)0x16000018)
/*
* This does not append a newline
*/
static void putc(int c)
{
while (AMBA_UART_FR & (1 << 5))
barrier();
AMBA_UART_DR = c;
}
static inline void flush(void)
{
while (AMBA_UART_FR & (1 << 3))
barrier();
}
/*
* nothing to do
*/
#define arch_decomp_setup()