Commit 89f1fa08 authored by Ben Dooks's avatar Ben Dooks

ARM: SAMSUNG: Move plat-s3c Kconfig entries to plat-samsung and plat-s3c24xx

Move the Kconfig entries from plat-s3c to plat-samsung and plat-s3c24xx
as necessary. The S3C_BOOT entries and the DMA configuration can go to
plat-samsung. The low-level UART configurations are currently S3C2XX
specific and can go to plat-s3c24xx.

Eliminating plat-s3c from the build process will be submitted seperately.
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 6c6971dc
...@@ -627,7 +627,7 @@ config ARCH_S3C2410 ...@@ -627,7 +627,7 @@ config ARCH_S3C2410
config ARCH_S3C64XX config ARCH_S3C64XX
bool "Samsung S3C64XX" bool "Samsung S3C64XX"
select PLAT_S3C select PLAT_SAMSUNG
select CPU_V6 select CPU_V6
select GENERIC_GPIO select GENERIC_GPIO
select ARM_VIC select ARM_VIC
......
...@@ -117,7 +117,7 @@ config DEBUG_CLPS711X_UART2 ...@@ -117,7 +117,7 @@ config DEBUG_CLPS711X_UART2
cause the debug messages to appear on the first serial port. cause the debug messages to appear on the first serial port.
config DEBUG_S3C_UART config DEBUG_S3C_UART
depends on PLAT_S3C depends on PLAT_SAMSUNG
int "S3C UART to use for low-level debug" int "S3C UART to use for low-level debug"
default "0" default "0"
help help
......
/* arch/arm/mach-s5pc100/include/mach/io.h
*
* Copyright 2008 Simtec Electronics
* Ben Dooks <ben-linux@fluff.org>
*
* Default IO routines for S5PC100 systems
*/
#ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H
/* No current ISA/PCI bus support. */
#define __io(a) __typesafe_io(a)
#define __mem_pci(a) (a)
#define IO_SPACE_LIMIT (0xFFFFFFFF)
#endif
/* arch/arm/mach-s5pc100/include/mach/timex.h
*
* Copyright (c) 2003-2005 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
*
* S3C6400 - time parameters
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#ifndef __ASM_ARCH_TIMEX_H
#define __ASM_ARCH_TIMEX_H
/* CLOCK_TICK_RATE needs to be evaluatable by the cpp, so making it
* a variable is useless. It seems as long as we make our timers an
* exact multiple of HZ, any value that makes a 1->1 correspondence
* for the time conversion functions to/from jiffies is acceptable.
*/
#define CLOCK_TICK_RATE 12000000
#endif /* __ASM_ARCH_TIMEX_H */
/* arch/arm/mach-s5pc100/include/mach/vmalloc.h
*
* Copyright 2010 Ben Dooks <ben-linux@fluff.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* S3C6400 vmalloc definition
*/
#ifndef __ASM_ARCH_VMALLOC_H
#define __ASM_ARCH_VMALLOC_H
#define VMALLOC_END (0xE0000000)
#endif /* __ASM_ARCH_VMALLOC_H */
...@@ -9,88 +9,3 @@ config PLAT_S3C ...@@ -9,88 +9,3 @@ config PLAT_S3C
select NO_IOPORT select NO_IOPORT
help help
Base platform code for any Samsung S3C device Base platform code for any Samsung S3C device
# low-level serial option nodes
if PLAT_S3C
config CPU_LLSERIAL_S3C2410_ONLY
bool
default y if CPU_LLSERIAL_S3C2410 && !CPU_LLSERIAL_S3C2440
config CPU_LLSERIAL_S3C2440_ONLY
bool
default y if CPU_LLSERIAL_S3C2440 && !CPU_LLSERIAL_S3C2410
config CPU_LLSERIAL_S3C2410
bool
help
Selected if there is an S3C2410 (or register compatible) serial
low-level implementation needed
config CPU_LLSERIAL_S3C2440
bool
help
Selected if there is an S3C2440 (or register compatible) serial
low-level implementation needed
# boot configurations
comment "Boot options"
config S3C_BOOT_WATCHDOG
bool "S3C Initialisation watchdog"
depends on S3C2410_WATCHDOG
help
Say y to enable the watchdog during the kernel decompression
stage. If the kernel fails to uncompress, then the watchdog
will trigger a reset and the system should restart.
config S3C_BOOT_ERROR_RESET
bool "S3C Reboot on decompression error"
help
Say y here to use the watchdog to reset the system if the
kernel decompressor detects an error during decompression.
config S3C_BOOT_UART_FORCE_FIFO
bool "Force UART FIFO on during boot process"
default y
help
Say Y here to force the UART FIFOs on during the kernel
uncompressor
config S3C_LOWLEVEL_UART_PORT
int "S3C UART to use for low-level messages"
default 0
help
Choice of which UART port to use for the low-level messages,
such as the `Uncompressing...` at start time. The value of
this configuration should be between zero and two. The port
must have been initialised by the boot-loader before use.
# options for gpiolib support
config S3C_GPIO_SPACE
int "Space between gpio banks"
default 0
help
Add a number of spare GPIO entries between each bank for debugging
purposes. This allows any problems where an counter overflows from
one bank to another to be caught, at the expense of using a little
more memory.
config S3C_GPIO_TRACK
bool
help
Internal configuration option to enable the s3c specific gpio
chip tracking if the platform requires it.
# DMA
config S3C_DMA
bool
help
Internal configuration for S3C DMA core
endif
...@@ -14,6 +14,28 @@ config PLAT_S3C24XX ...@@ -14,6 +14,28 @@ config PLAT_S3C24XX
if PLAT_S3C24XX if PLAT_S3C24XX
# low-level serial option nodes
config CPU_LLSERIAL_S3C2410_ONLY
bool
default y if CPU_LLSERIAL_S3C2410 && !CPU_LLSERIAL_S3C2440
config CPU_LLSERIAL_S3C2440_ONLY
bool
default y if CPU_LLSERIAL_S3C2440 && !CPU_LLSERIAL_S3C2410
config CPU_LLSERIAL_S3C2410
bool
help
Selected if there is an S3C2410 (or register compatible) serial
low-level implementation needed
config CPU_LLSERIAL_S3C2440
bool
help
Selected if there is an S3C2440 (or register compatible) serial
low-level implementation needed
# code that is shared between a number of the s3c24xx implementations # code that is shared between a number of the s3c24xx implementations
config S3C2410_CLOCK config S3C2410_CLOCK
......
...@@ -9,7 +9,6 @@ config PLAT_S5P ...@@ -9,7 +9,6 @@ config PLAT_S5P
bool bool
depends on ARCH_S5P6440 depends on ARCH_S5P6440
default y default y
select PLAT_S3C
select ARM_VIC select ARM_VIC
select NO_IOPORT select NO_IOPORT
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
......
...@@ -13,6 +13,43 @@ config PLAT_SAMSUNG ...@@ -13,6 +13,43 @@ config PLAT_SAMSUNG
if PLAT_SAMSUNG if PLAT_SAMSUNG
# boot configurations
comment "Boot options"
config S3C_BOOT_WATCHDOG
bool "S3C Initialisation watchdog"
depends on S3C2410_WATCHDOG
help
Say y to enable the watchdog during the kernel decompression
stage. If the kernel fails to uncompress, then the watchdog
will trigger a reset and the system should restart.
config S3C_BOOT_ERROR_RESET
bool "S3C Reboot on decompression error"
help
Say y here to use the watchdog to reset the system if the
kernel decompressor detects an error during decompression.
config S3C_BOOT_UART_FORCE_FIFO
bool "Force UART FIFO on during boot process"
default y
help
Say Y here to force the UART FIFOs on during the kernel
uncompressor
config S3C_LOWLEVEL_UART_PORT
int "S3C UART to use for low-level messages"
default 0
help
Choice of which UART port to use for the low-level messages,
such as the `Uncompressing...` at start time. The value of
this configuration should be between zero and two. The port
must have been initialised by the boot-loader before use.
# clock options
config SAMSUNG_CLKSRC config SAMSUNG_CLKSRC
bool bool
help help
...@@ -81,6 +118,21 @@ config SAMSUNG_GPIO_EXTRA ...@@ -81,6 +118,21 @@ config SAMSUNG_GPIO_EXTRA
provides. This allows expanding the GPIO space for use with provides. This allows expanding the GPIO space for use with
GPIO expanders. GPIO expanders.
config S3C_GPIO_SPACE
int "Space between gpio banks"
default 0
help
Add a number of spare GPIO entries between each bank for debugging
purposes. This allows any problems where an counter overflows from
one bank to another to be caught, at the expense of using a little
more memory.
config S3C_GPIO_TRACK
bool
help
Internal configuration option to enable the s3c specific gpio
chip tracking if the platform requires it.
# ADC driver # ADC driver
config S3C_ADC config S3C_ADC
...@@ -138,6 +190,13 @@ config S3C64XX_DEV_SPI ...@@ -138,6 +190,13 @@ config S3C64XX_DEV_SPI
Compile in platform device definitions for S3C64XX's type Compile in platform device definitions for S3C64XX's type
SPI controllers. SPI controllers.
# DMA
config S3C_DMA
bool
help
Internal configuration for S3C DMA core
comment "Power management" comment "Power management"
config SAMSUNG_PM_DEBUG config SAMSUNG_PM_DEBUG
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment