Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 123832
b: refs/heads/master
c: a08ab63
h: refs/heads/master
v: v3
  • Loading branch information
Ben Dooks committed Dec 15, 2008
1 parent 221ca99 commit cc624f2
Show file tree
Hide file tree
Showing 11 changed files with 107 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9bc1aaeac0118611c30edf84995ebad5adfd6822
refs/heads/master: a08ab63761730634bbbf8f361d1a058c1f4af9c5
13 changes: 13 additions & 0 deletions trunk/arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,13 @@ config ARCH_S3C2410
BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
the Samsung SMDK2410 development board (and derivatives).

config ARCH_S3C64XX
bool "Samsung S3C64XX"
select GENERIC_GPIO
select HAVE_CLK
help
Samsung S3C64XX series based systems

config ARCH_SHARK
bool "Shark"
select CPU_SA110
Expand Down Expand Up @@ -620,6 +627,7 @@ source "arch/arm/mach-orion5x/Kconfig"
source "arch/arm/mach-kirkwood/Kconfig"

source "arch/arm/plat-s3c24xx/Kconfig"
source "arch/arm/plat-s3c64xx/Kconfig"
source "arch/arm/plat-s3c/Kconfig"

if ARCH_S3C2410
Expand All @@ -631,6 +639,11 @@ source "arch/arm/mach-s3c2442/Kconfig"
source "arch/arm/mach-s3c2443/Kconfig"
endif

if ARCH_S3C64XX
source "arch/arm/mach-s3c6400/Kconfig"
source "arch/arm/mach-s3c6410/Kconfig"
endif

source "arch/arm/mach-lh7a40x/Kconfig"

source "arch/arm/mach-imx/Kconfig"
Expand Down
2 changes: 2 additions & 0 deletions trunk/arch/arm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ endif
machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0
plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c
machine-$(CONFIG_ARCH_S3C64XX) := s3c6400
plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c
machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x
machine-$(CONFIG_ARCH_VERSATILE) := versatile
machine-$(CONFIG_ARCH_IMX) := imx
Expand Down
8 changes: 8 additions & 0 deletions trunk/arch/arm/mach-s3c6400/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# arch/arm/mach-s3c6400/Kconfig
#
# Copyright 2008 Openmoko, Inc.
# Simtec Electronics, Ben Dooks <ben@simtec.co.uk>
#
# Licensed under GPLv2

# Currently nothing here, this will be added later
15 changes: 15 additions & 0 deletions trunk/arch/arm/mach-s3c6400/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# arch/arm/mach-s3c6400/Makefile
#
# Copyright 2008 Openmoko, Inc.
# Copyright 2008 Simtec Electronics
#
# Licensed under GPLv2

obj-y :=
obj-m :=
obj-n :=
obj- :=

# Core support for S3C6400 system

obj-n += blank.o
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-s3c6400/Makefile.boot
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
zreladdr-y := 0x50008000
params_phys-y := 0x50000100
21 changes: 21 additions & 0 deletions trunk/arch/arm/mach-s3c6400/include/mach/memory.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/* arch/arm/mach-s3c6400/include/mach/memory.h
*
* Copyright 2008 Openmoko, Inc.
* Copyright 2008 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
* http://armlinux.simtec.co.uk/
*
* 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_MEMORY_H
#define __ASM_ARCH_MEMORY_H

#define PHYS_OFFSET UL(0x50000000)

#define __virt_to_bus(x) __virt_to_phys(x)
#define __bus_to_virt(x) __phys_to_virt(x)

#endif
8 changes: 8 additions & 0 deletions trunk/arch/arm/mach-s3c6410/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# arch/arm/mach-s3c6410/Kconfig
#
# Copyright 2008 Openmoko, Inc.
# Copyright 2008 Simtec Electronics
#
# Licensed under GPLv2

# Configuration options for the S3C6410 CPU
2 changes: 1 addition & 1 deletion trunk/arch/arm/plat-s3c/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

config PLAT_S3C
bool
depends on ARCH_S3C2410 || ARCH_S3C24A0
depends on ARCH_S3C2410 || ARCH_S3C24A0 || ARCH_S3C64XX
default y
select NO_IOPORT
help
Expand Down
23 changes: 23 additions & 0 deletions trunk/arch/arm/plat-s3c64xx/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# arch/arm/plat-s3c64xx/Kconfig
#
# Copyright 2008 Openmoko, Inc.
# Copyright 2008 Simtec Electronics
# Ben Dooks <ben@simtec.co.uk>
#
# Licensed under GPLv2

config PLAT_S3C64XX
bool
depends on ARCH_S3C64XX
select PLAT_S3C
default y
select NO_IOPORT
select ARCH_REQUIRE_GPIOLIB
help
Base platform code for any Samsung S3C64XX device

if PLAT_S3C64XX

# Configuration options shared by all S3C64XX implementations

endif
13 changes: 13 additions & 0 deletions trunk/arch/arm/plat-s3c64xx/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# arch/arm/plat-s3c64xx/Makefile
#
# Copyright 2008 Openmoko, Inc.
# Copyright 2008 Simtec Electronics
#
# Licensed under GPLv2

obj-y :=
obj-m :=
obj-n := dummy.o
obj- :=

# Core files

0 comments on commit cc624f2

Please sign in to comment.