diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-02-22 19:18:36 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-02-23 20:52:13 -0500 |
commit | 7965b214bfbe0e6b3dc843cd1d639dc2711ff86e (patch) | |
tree | 819b8b9a58baeaa973cb8b51afc3cb31b4a511d1 /arch | |
parent | f94327f2cebf3711defd25375df0c380562127ba (diff) |
ARM: SAMSUNG: Eliminate plat-s3c
The plat-s3c directory is now clear, so remove the files in it and
expunge it from the build process.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/Makefile | 8 | ||||
-rw-r--r-- | arch/arm/plat-s3c/Kconfig | 11 | ||||
-rw-r--r-- | arch/arm/plat-s3c/Makefile | 13 | ||||
-rw-r--r-- | arch/arm/plat-s3c/include/mach/io.h | 18 | ||||
-rw-r--r-- | arch/arm/plat-s3c/include/mach/timex.h | 26 | ||||
-rw-r--r-- | arch/arm/plat-s3c/include/mach/vmalloc.h | 20 |
7 files changed, 4 insertions, 93 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5c691c658074..fd4882e61dd5 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -799,7 +799,6 @@ source "arch/arm/mach-dove/Kconfig" | |||
799 | 799 | ||
800 | source "arch/arm/plat-samsung/Kconfig" | 800 | source "arch/arm/plat-samsung/Kconfig" |
801 | source "arch/arm/plat-s3c24xx/Kconfig" | 801 | source "arch/arm/plat-s3c24xx/Kconfig" |
802 | source "arch/arm/plat-s3c/Kconfig" | ||
803 | source "arch/arm/plat-s5p/Kconfig" | 802 | source "arch/arm/plat-s5p/Kconfig" |
804 | source "arch/arm/plat-s5pc1xx/Kconfig" | 803 | source "arch/arm/plat-s5pc1xx/Kconfig" |
805 | 804 | ||
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index a2a941d98c25..13c5c2be31ad 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -182,10 +182,10 @@ plat-$(CONFIG_PLAT_IOP) := iop | |||
182 | plat-$(CONFIG_PLAT_NOMADIK) := nomadik | 182 | plat-$(CONFIG_PLAT_NOMADIK) := nomadik |
183 | plat-$(CONFIG_PLAT_ORION) := orion | 183 | plat-$(CONFIG_PLAT_ORION) := orion |
184 | plat-$(CONFIG_PLAT_PXA) := pxa | 184 | plat-$(CONFIG_PLAT_PXA) := pxa |
185 | plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c samsung | 185 | plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx samsung |
186 | plat-$(CONFIG_ARCH_S3C64XX) := s3c samsung | 186 | plat-$(CONFIG_ARCH_S3C64XX) := samsung |
187 | plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx s3c samsung | 187 | plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx samsung |
188 | plat-$(CONFIG_PLAT_S5P) := s5p samsung s3c | 188 | plat-$(CONFIG_PLAT_S5P) := s5p samsung |
189 | plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx | 189 | plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx |
190 | 190 | ||
191 | ifeq ($(CONFIG_ARCH_EBSA110),y) | 191 | ifeq ($(CONFIG_ARCH_EBSA110),y) |
diff --git a/arch/arm/plat-s3c/Kconfig b/arch/arm/plat-s3c/Kconfig deleted file mode 100644 index 6108ba9c2bee..000000000000 --- a/arch/arm/plat-s3c/Kconfig +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | # Copyright 2007 Simtec Electronics | ||
2 | # | ||
3 | # Licensed under GPLv2 | ||
4 | |||
5 | config PLAT_S3C | ||
6 | bool | ||
7 | depends on ARCH_S3C2410 || ARCH_S3C24A0 || ARCH_S3C64XX | ||
8 | default y | ||
9 | select NO_IOPORT | ||
10 | help | ||
11 | Base platform code for any Samsung S3C device | ||
diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile deleted file mode 100644 index 867c9cf755a7..000000000000 --- a/arch/arm/plat-s3c/Makefile +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | # arch/arm/plat-s3c/Makefile | ||
2 | # | ||
3 | # Copyright 2008 Simtec Electronics | ||
4 | # | ||
5 | # Licensed under GPLv2 | ||
6 | |||
7 | obj-y := | ||
8 | obj-m := | ||
9 | obj-n := dummy.o | ||
10 | obj- := | ||
11 | |||
12 | # Core support for all Samsung SoCs | ||
13 | |||
diff --git a/arch/arm/plat-s3c/include/mach/io.h b/arch/arm/plat-s3c/include/mach/io.h deleted file mode 100644 index f6a53631b665..000000000000 --- a/arch/arm/plat-s3c/include/mach/io.h +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | /* arch/arm/plat-s3c/include/mach/io.h | ||
2 | * | ||
3 | * Copyright 2008 Simtec Electronics | ||
4 | * Ben Dooks <ben-linux@fluff.org> | ||
5 | * | ||
6 | * Default IO routines for plat-s3c based systems, such as S3C24A0 | ||
7 | */ | ||
8 | |||
9 | #ifndef __ASM_ARM_ARCH_IO_H | ||
10 | #define __ASM_ARM_ARCH_IO_H | ||
11 | |||
12 | /* No current ISA/PCI bus support. */ | ||
13 | #define __io(a) __typesafe_io(a) | ||
14 | #define __mem_pci(a) (a) | ||
15 | |||
16 | #define IO_SPACE_LIMIT (0xFFFFFFFF) | ||
17 | |||
18 | #endif | ||
diff --git a/arch/arm/plat-s3c/include/mach/timex.h b/arch/arm/plat-s3c/include/mach/timex.h deleted file mode 100644 index 2a425ed0a7e0..000000000000 --- a/arch/arm/plat-s3c/include/mach/timex.h +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | /* arch/arm/mach-s3c2410/include/mach/timex.h | ||
2 | * | ||
3 | * Copyright (c) 2003-2005 Simtec Electronics | ||
4 | * Ben Dooks <ben@simtec.co.uk> | ||
5 | * | ||
6 | * S3C2410 - time parameters | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | #ifndef __ASM_ARCH_TIMEX_H | ||
14 | #define __ASM_ARCH_TIMEX_H | ||
15 | |||
16 | /* CLOCK_TICK_RATE needs to be evaluatable by the cpp, so making it | ||
17 | * a variable is useless. It seems as long as we make our timers an | ||
18 | * exact multiple of HZ, any value that makes a 1->1 correspondence | ||
19 | * for the time conversion functions to/from jiffies is acceptable. | ||
20 | */ | ||
21 | |||
22 | |||
23 | #define CLOCK_TICK_RATE 12000000 | ||
24 | |||
25 | |||
26 | #endif /* __ASM_ARCH_TIMEX_H */ | ||
diff --git a/arch/arm/plat-s3c/include/mach/vmalloc.h b/arch/arm/plat-s3c/include/mach/vmalloc.h deleted file mode 100644 index bfd2ca6e3074..000000000000 --- a/arch/arm/plat-s3c/include/mach/vmalloc.h +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | /* arch/arm/plat-s3c/include/mach/vmalloc.h | ||
2 | * | ||
3 | * from arch/arm/mach-iop3xx/include/mach/vmalloc.h | ||
4 | * | ||
5 | * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> | ||
6 | * http://www.simtec.co.uk/products/SWLINUX/ | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | * | ||
12 | * S3C2410 vmalloc definition | ||
13 | */ | ||
14 | |||
15 | #ifndef __ASM_ARCH_VMALLOC_H | ||
16 | #define __ASM_ARCH_VMALLOC_H | ||
17 | |||
18 | #define VMALLOC_END (0xE0000000) | ||
19 | |||
20 | #endif /* __ASM_ARCH_VMALLOC_H */ | ||