Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Sep 2014 11:38:27 +0000 (UTC)
From:      Gavin Atkinson <gavin@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r272103 - in head/sys: arm/conf arm/s3c2xx0 arm/samsung/s3c2xx0 dev/usb/controller
Message-ID:  <201409251138.s8PBcRR9020580@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gavin
Date: Thu Sep 25 11:38:26 2014
New Revision: 272103
URL: http://svnweb.freebsd.org/changeset/base/272103

Log:
  Move the ARM Samsung s3c2xx0 support files into the samsung directory, to
  match other platforms.
  
  Discussed with:	andrew

Added:
  head/sys/arm/samsung/s3c2xx0/
     - copied from r272070, head/sys/arm/s3c2xx0/
Deleted:
  head/sys/arm/s3c2xx0/
Modified:
  head/sys/arm/conf/LN2410SBC
  head/sys/arm/conf/NOTES
  head/sys/arm/samsung/s3c2xx0/board_ln2410sbc.c
  head/sys/arm/samsung/s3c2xx0/files.s3c2xx0
  head/sys/arm/samsung/s3c2xx0/s3c2410reg.h
  head/sys/arm/samsung/s3c2xx0/s3c2410var.h
  head/sys/arm/samsung/s3c2xx0/s3c2440reg.h
  head/sys/arm/samsung/s3c2xx0/s3c24x0.c
  head/sys/arm/samsung/s3c2xx0/s3c24x0_clk.c
  head/sys/arm/samsung/s3c2xx0/s3c24x0_machdep.c
  head/sys/arm/samsung/s3c2xx0/s3c24x0_rtc.c
  head/sys/arm/samsung/s3c2xx0/s3c24x0reg.h
  head/sys/arm/samsung/s3c2xx0/s3c24x0var.h
  head/sys/arm/samsung/s3c2xx0/std.ln2410sbc
  head/sys/arm/samsung/s3c2xx0/std.s3c2410
  head/sys/arm/samsung/s3c2xx0/uart_bus_s3c2410.c
  head/sys/arm/samsung/s3c2xx0/uart_cpu_s3c2410.c
  head/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c
  head/sys/dev/usb/controller/ohci_s3c24x0.c

Modified: head/sys/arm/conf/LN2410SBC
==============================================================================
--- head/sys/arm/conf/LN2410SBC	Thu Sep 25 10:59:01 2014	(r272102)
+++ head/sys/arm/conf/LN2410SBC	Thu Sep 25 11:38:26 2014	(r272103)
@@ -19,7 +19,7 @@
 
 ident		LN2410SBC
 
-include 	"../s3c2xx0/std.ln2410sbc"
+include 	"../samsung/s3c2xx0/std.ln2410sbc"
 #To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		# Default places to look for devices.
 makeoptions	MODULES_OVERRIDE=""

Modified: head/sys/arm/conf/NOTES
==============================================================================
--- head/sys/arm/conf/NOTES	Thu Sep 25 10:59:01 2014	(r272102)
+++ head/sys/arm/conf/NOTES	Thu Sep 25 11:38:26 2014	(r272103)
@@ -19,7 +19,7 @@ files	"../mv/discovery/files.db78xxx"
 files	"../mv/kirkwood/files.kirkwood"
 files	"../mv/orion/files.db88f5xxx"
 files	"../mv/orion/files.ts7800"
-files	"../s3c2xx0/files.s3c2xx0"
+files	"../samsung/s3c2xx0/files.s3c2xx0"
 files	"../xscale/i80321/files.ep80219"
 files	"../xscale/i80321/files.i80219"
 files	"../xscale/i80321/files.i80321"

Modified: head/sys/arm/samsung/s3c2xx0/board_ln2410sbc.c
==============================================================================
--- head/sys/arm/s3c2xx0/board_ln2410sbc.c	Wed Sep 24 12:41:39 2014	(r272070)
+++ head/sys/arm/samsung/s3c2xx0/board_ln2410sbc.c	Thu Sep 25 11:38:26 2014	(r272103)
@@ -30,8 +30,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#include <arm/s3c2xx0/s3c2410reg.h>
-#include <arm/s3c2xx0/s3c2xx0board.h>
+#include <arm/samsung/s3c2xx0/s3c2410reg.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0board.h>
 
 extern vm_offset_t s3c2410_uart_vaddr;
 

Modified: head/sys/arm/samsung/s3c2xx0/files.s3c2xx0
==============================================================================
--- head/sys/arm/s3c2xx0/files.s3c2xx0	Wed Sep 24 12:41:39 2014	(r272070)
+++ head/sys/arm/samsung/s3c2xx0/files.s3c2xx0	Thu Sep 25 11:38:26 2014	(r272103)
@@ -2,14 +2,14 @@
 arm/arm/bus_space_asm_generic.S	standard
 arm/arm/bus_space_generic.c	standard
 arm/arm/cpufunc_asm_arm9.S	standard
-arm/s3c2xx0/board_ln2410sbc.c	optional	board_ln2410sbc
-arm/s3c2xx0/s3c24x0_rtc.c	standard
-arm/s3c2xx0/s3c24x0_machdep.c	standard
-arm/s3c2xx0/s3c24x0.c   	standard
-arm/s3c2xx0/s3c2xx0_space.c	standard
-arm/s3c2xx0/s3c24x0_clk.c	standard
-arm/s3c2xx0/uart_bus_s3c2410.c	optional	uart
-arm/s3c2xx0/uart_cpu_s3c2410.c	optional	uart
-arm/s3c2xx0/uart_dev_s3c2410.c	optional	uart
+arm/samsung/s3c2xx0/board_ln2410sbc.c	optional	board_ln2410sbc
+arm/samsung/s3c2xx0/s3c24x0_rtc.c	standard
+arm/samsung/s3c2xx0/s3c24x0_machdep.c	standard
+arm/samsung/s3c2xx0/s3c24x0.c   	standard
+arm/samsung/s3c2xx0/s3c2xx0_space.c	standard
+arm/samsung/s3c2xx0/s3c24x0_clk.c	standard
+arm/samsung/s3c2xx0/uart_bus_s3c2410.c	optional	uart
+arm/samsung/s3c2xx0/uart_cpu_s3c2410.c	optional	uart
+arm/samsung/s3c2xx0/uart_dev_s3c2410.c	optional	uart
 
 dev/usb/controller/ohci_s3c24x0.c	optional	ohci

Modified: head/sys/arm/samsung/s3c2xx0/s3c2410reg.h
==============================================================================
--- head/sys/arm/s3c2xx0/s3c2410reg.h	Wed Sep 24 12:41:39 2014	(r272070)
+++ head/sys/arm/samsung/s3c2xx0/s3c2410reg.h	Thu Sep 25 11:38:26 2014	(r272103)
@@ -42,7 +42,7 @@
 #define	_ARM_S3C2XX0_S3C2410REG_H_
 
 /* common definitions for S3C2410 and S3C2440 */
-#include <arm/s3c2xx0/s3c24x0reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0reg.h>
 
 /*
  * Memory Map

Modified: head/sys/arm/samsung/s3c2xx0/s3c2410var.h
==============================================================================
--- head/sys/arm/s3c2xx0/s3c2410var.h	Wed Sep 24 12:41:39 2014	(r272070)
+++ head/sys/arm/samsung/s3c2xx0/s3c2410var.h	Thu Sep 25 11:38:26 2014	(r272103)
@@ -34,7 +34,7 @@
 #ifndef _ARM_S3C2410VAR_H_
 #define _ARM_S3C2410VAR_H_
 
-#include <arm/s3c2xx0/s3c24x0var.h>
+#include <arm/samsung/s3c2xx0/s3c24x0var.h>
 
 int	s3c2410_sscom_cnattach(bus_space_tag_t, int, int, int, tcflag_t);
 int	s3c2410_sscom_kgdb_attach(bus_space_tag_t, int, int, int, tcflag_t);

Modified: head/sys/arm/samsung/s3c2xx0/s3c2440reg.h
==============================================================================
--- head/sys/arm/s3c2xx0/s3c2440reg.h	Wed Sep 24 12:41:39 2014	(r272070)
+++ head/sys/arm/samsung/s3c2xx0/s3c2440reg.h	Thu Sep 25 11:38:26 2014	(r272103)
@@ -36,7 +36,7 @@
 #define	_ARM_S3C2XX0_S3C2440REG_H_
 
 /* common definitions for S3C2410 and S3C2440 */
-#include <arm/s3c2xx0/s3c24x0reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0reg.h>
 
 /*
  * Memory Map

Modified: head/sys/arm/samsung/s3c2xx0/s3c24x0.c
==============================================================================
--- head/sys/arm/s3c2xx0/s3c24x0.c	Wed Sep 24 12:41:39 2014	(r272070)
+++ head/sys/arm/samsung/s3c2xx0/s3c24x0.c	Thu Sep 25 11:38:26 2014	(r272103)
@@ -49,9 +49,9 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/cpufunc.h>
 #include <machine/intr.h>
-#include <arm/s3c2xx0/s3c2410reg.h>
-#include <arm/s3c2xx0/s3c2440reg.h>
-#include <arm/s3c2xx0/s3c24x0var.h>
+#include <arm/samsung/s3c2xx0/s3c2410reg.h>
+#include <arm/samsung/s3c2xx0/s3c2440reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0var.h>
 #include <sys/rman.h>
 
 #define S3C2XX0_XTAL_CLK 12000000

Modified: head/sys/arm/samsung/s3c2xx0/s3c24x0_clk.c
==============================================================================
--- head/sys/arm/s3c2xx0/s3c24x0_clk.c	Wed Sep 24 12:41:39 2014	(r272070)
+++ head/sys/arm/samsung/s3c2xx0/s3c24x0_clk.c	Thu Sep 25 11:38:26 2014	(r272103)
@@ -48,8 +48,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/frame.h>
 #include <machine/resource.h>
 #include <machine/intr.h>
-#include <arm/s3c2xx0/s3c24x0reg.h>
-#include <arm/s3c2xx0/s3c24x0var.h>
+#include <arm/samsung/s3c2xx0/s3c24x0reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0var.h>
 
 struct s3c24x0_timer_softc {
 	device_t	dev;

Modified: head/sys/arm/samsung/s3c2xx0/s3c24x0_machdep.c
==============================================================================
--- head/sys/arm/s3c2xx0/s3c24x0_machdep.c	Wed Sep 24 12:41:39 2014	(r272070)
+++ head/sys/arm/samsung/s3c2xx0/s3c24x0_machdep.c	Thu Sep 25 11:38:26 2014	(r272103)
@@ -89,9 +89,9 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <sys/reboot.h>
 
-#include <arm/s3c2xx0/s3c24x0var.h>
-#include <arm/s3c2xx0/s3c2410reg.h>
-#include <arm/s3c2xx0/s3c2xx0board.h>
+#include <arm/samsung/s3c2xx0/s3c24x0var.h>
+#include <arm/samsung/s3c2xx0/s3c2410reg.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0board.h>
 
 /* Page table for mapping proc0 zero page */
 #define KERNEL_PT_SYS		0

Modified: head/sys/arm/samsung/s3c2xx0/s3c24x0_rtc.c
==============================================================================
--- head/sys/arm/s3c2xx0/s3c24x0_rtc.c	Wed Sep 24 12:41:39 2014	(r272070)
+++ head/sys/arm/samsung/s3c2xx0/s3c24x0_rtc.c	Thu Sep 25 11:38:26 2014	(r272103)
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 
-#include <arm/s3c2xx0/s3c24x0reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0reg.h>
 
 #include "clock_if.h"
 

Modified: head/sys/arm/samsung/s3c2xx0/s3c24x0reg.h
==============================================================================
--- head/sys/arm/s3c2xx0/s3c24x0reg.h	Wed Sep 24 12:41:39 2014	(r272070)
+++ head/sys/arm/samsung/s3c2xx0/s3c24x0reg.h	Thu Sep 25 11:38:26 2014	(r272103)
@@ -43,7 +43,7 @@
 #define	_ARM_S3C2XX0_S3C24X0REG_H_
 
 /* common definitions for S3C2800, S3C2410 and S3C2440 */
-#include <arm/s3c2xx0/s3c2xx0reg.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0reg.h>
 
 /*
  * Map the device registers into kernel space.

Modified: head/sys/arm/samsung/s3c2xx0/s3c24x0var.h
==============================================================================
--- head/sys/arm/s3c2xx0/s3c24x0var.h	Wed Sep 24 12:41:39 2014	(r272070)
+++ head/sys/arm/samsung/s3c2xx0/s3c24x0var.h	Thu Sep 25 11:38:26 2014	(r272103)
@@ -34,7 +34,7 @@
 #ifndef _ARM_S3C24X0VAR_H_
 #define _ARM_S3C24X0VAR_H_
 
-#include <arm/s3c2xx0/s3c2xx0var.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0var.h>
 
 struct s3c24x0_softc {
 	struct s3c2xx0_softc  sc_sx;

Modified: head/sys/arm/samsung/s3c2xx0/std.ln2410sbc
==============================================================================
--- head/sys/arm/s3c2xx0/std.ln2410sbc	Wed Sep 24 12:41:39 2014	(r272070)
+++ head/sys/arm/samsung/s3c2xx0/std.ln2410sbc	Thu Sep 25 11:38:26 2014	(r272103)
@@ -1,5 +1,5 @@
 #$FreeBSD$
-include "../s3c2xx0/std.s3c2410"
+include "../samsung/s3c2xx0/std.s3c2410"
 
 makeoptions	KERNPHYSADDR=0x30000000
 makeoptions	KERNVIRTADDR=0xc0000000

Modified: head/sys/arm/samsung/s3c2xx0/std.s3c2410
==============================================================================
--- head/sys/arm/s3c2xx0/std.s3c2410	Wed Sep 24 12:41:39 2014	(r272070)
+++ head/sys/arm/samsung/s3c2xx0/std.s3c2410	Thu Sep 25 11:38:26 2014	(r272103)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-files	"../s3c2xx0/files.s3c2xx0"
+files	"../samsung/s3c2xx0/files.s3c2xx0"
 cpu	CPU_ARM9
 machine 	arm
 

Modified: head/sys/arm/samsung/s3c2xx0/uart_bus_s3c2410.c
==============================================================================
--- head/sys/arm/s3c2xx0/uart_bus_s3c2410.c	Wed Sep 24 12:41:39 2014	(r272070)
+++ head/sys/arm/samsung/s3c2xx0/uart_bus_s3c2410.c	Thu Sep 25 11:38:26 2014	(r272103)
@@ -15,7 +15,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/uart/uart_bus.h>
 #include <dev/uart/uart_cpu.h>
 
-#include <arm/s3c2xx0/s3c24x0reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0reg.h>
 
 #include "uart_if.h"
 

Modified: head/sys/arm/samsung/s3c2xx0/uart_cpu_s3c2410.c
==============================================================================
--- head/sys/arm/s3c2xx0/uart_cpu_s3c2410.c	Wed Sep 24 12:41:39 2014	(r272070)
+++ head/sys/arm/samsung/s3c2xx0/uart_cpu_s3c2410.c	Thu Sep 25 11:38:26 2014	(r272103)
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/uart/uart.h>
 #include <dev/uart/uart_cpu.h>
 
-#include <arm/s3c2xx0/s3c2xx0var.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0var.h>
 
 bus_space_tag_t uart_bus_space_io;
 bus_space_tag_t uart_bus_space_mem;

Modified: head/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c
==============================================================================
--- head/sys/arm/s3c2xx0/uart_dev_s3c2410.c	Wed Sep 24 12:41:39 2014	(r272070)
+++ head/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c	Thu Sep 25 11:38:26 2014	(r272103)
@@ -41,10 +41,10 @@ __FBSDID("$FreeBSD$");
 #include <dev/uart/uart.h>
 #include <dev/uart/uart_cpu.h>
 #include <dev/uart/uart_bus.h>
-#include <arm/s3c2xx0/s3c2440reg.h>
-#include <arm/s3c2xx0/uart_dev_s3c2410.h>
-#include <arm/s3c2xx0/s3c2xx0reg.h>
-#include <arm/s3c2xx0/s3c2xx0var.h>
+#include <arm/samsung/s3c2xx0/s3c2440reg.h>
+#include <arm/samsung/s3c2xx0/uart_dev_s3c2410.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0reg.h>
+#include <arm/samsung/s3c2xx0/s3c2xx0var.h>
 #include "uart_if.h"
 
 /* Finds the subirq from the parent */

Modified: head/sys/dev/usb/controller/ohci_s3c24x0.c
==============================================================================
--- head/sys/dev/usb/controller/ohci_s3c24x0.c	Thu Sep 25 10:59:01 2014	(r272102)
+++ head/sys/dev/usb/controller/ohci_s3c24x0.c	Thu Sep 25 11:38:26 2014	(r272103)
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/rman.h>
 
-#include <arm/s3c2xx0/s3c24x0reg.h>
+#include <arm/samsung/s3c2xx0/s3c24x0reg.h>
 
 static device_probe_t ohci_s3c24x0_probe;
 static device_attach_t ohci_s3c24x0_attach;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409251138.s8PBcRR9020580>