svn commit: r230856 - in projects/armv6/sys/arm: conf omap ti
ti/omap4 ti/omap4/pandaboard
Oleksandr Tymoshenko
gonzo at FreeBSD.org
Wed Feb 1 02:16:16 UTC 2012
Author: gonzo
Date: Wed Feb 1 02:16:15 2012
New Revision: 230856
URL: http://svn.freebsd.org/changeset/base/230856
Log:
Change directory layout: use manufacturer as a top-level directory,
not SoC family. The plan is to get more TI products on board.
Suggested by: Damjan Marion
Added:
projects/armv6/sys/arm/ti/
- copied from r230844, projects/armv6/sys/arm/omap/
Deleted:
projects/armv6/sys/arm/omap/
Modified:
projects/armv6/sys/arm/conf/PANDABOARD
projects/armv6/sys/arm/ti/omap.c
projects/armv6/sys/arm/ti/omap4/files.omap44xx
projects/armv6/sys/arm/ti/omap4/omap44xx.c
projects/armv6/sys/arm/ti/omap4/omap4_intr.c
projects/armv6/sys/arm/ti/omap4/omap4_prcm_clks.c
projects/armv6/sys/arm/ti/omap4/omap4_scm_padconf.c
projects/armv6/sys/arm/ti/omap4/omap4_timer.c
projects/armv6/sys/arm/ti/omap4/pandaboard/files.pandaboard
projects/armv6/sys/arm/ti/omap4/pandaboard/pandaboard.c
projects/armv6/sys/arm/ti/omap4/pandaboard/std.pandaboard
projects/armv6/sys/arm/ti/omap4/std.omap44xx
projects/armv6/sys/arm/ti/omap4/uart_cpu_omap4.c
projects/armv6/sys/arm/ti/omap_cpuid.c
projects/armv6/sys/arm/ti/omap_machdep.c
projects/armv6/sys/arm/ti/omap_prcm.c
projects/armv6/sys/arm/ti/omapvar.h
Modified: projects/armv6/sys/arm/conf/PANDABOARD
==============================================================================
--- projects/armv6/sys/arm/conf/PANDABOARD Wed Feb 1 01:36:46 2012 (r230855)
+++ projects/armv6/sys/arm/conf/PANDABOARD Wed Feb 1 02:16:15 2012 (r230856)
@@ -28,7 +28,7 @@ ident PANDABOARD
hints "PANDABOARD.hints"
-include "../omap/omap4/pandaboard/std.pandaboard"
+include "../ti/omap4/pandaboard/std.pandaboard"
#To statically compile in device wiring instead of /boot/device.hints
makeoptions MODULES_OVERRIDE=""
Modified: projects/armv6/sys/arm/ti/omap.c
==============================================================================
--- projects/armv6/sys/arm/omap/omap.c Tue Jan 31 19:45:32 2012 (r230844)
+++ projects/armv6/sys/arm/ti/omap.c Wed Feb 1 02:16:15 2012 (r230856)
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/bus.h>
-#include <arm/omap/omapvar.h>
+#include <arm/ti/omapvar.h>
static int omap_probe(device_t);
static void omap_identify(driver_t *, device_t);
Modified: projects/armv6/sys/arm/ti/omap4/files.omap44xx
==============================================================================
--- projects/armv6/sys/arm/omap/omap4/files.omap44xx Tue Jan 31 19:45:32 2012 (r230844)
+++ projects/armv6/sys/arm/ti/omap4/files.omap44xx Wed Feb 1 02:16:15 2012 (r230856)
@@ -10,20 +10,20 @@ arm/arm/cpufunc_asm_arm11.S standard
arm/arm/cpufunc_asm_armv7.S standard
arm/arm/irq_dispatch.S standard
-arm/omap/omap_machdep.c standard
-arm/omap/omap.c standard
-arm/omap/omap_cpuid.c standard
-arm/omap/omap_prcm.c standard
-arm/omap/omap_scm.c standard
-arm/omap/omap_if.m standard
+arm/ti/omap_machdep.c standard
+arm/ti/omap.c standard
+arm/ti/omap_cpuid.c standard
+arm/ti/omap_prcm.c standard
+arm/ti/omap_scm.c standard
+arm/ti/omap_if.m standard
-arm/omap/omap4/omap4_if.m standard
-arm/omap/omap4/omap44xx.c standard
-arm/omap/omap4/omap4_intr.c standard
-arm/omap/omap4/omap4_prcm_clks.c standard
-arm/omap/omap4/omap4_scm_padconf.c standard
-arm/omap/omap4/omap4_timer.c standard
+arm/ti/omap4/omap4_if.m standard
+arm/ti/omap4/omap44xx.c standard
+arm/ti/omap4/omap4_intr.c standard
+arm/ti/omap4/omap4_prcm_clks.c standard
+arm/ti/omap4/omap4_scm_padconf.c standard
+arm/ti/omap4/omap4_timer.c standard
-arm/omap/omap4/uart_cpu_omap4.c optional uart
+arm/ti/omap4/uart_cpu_omap4.c optional uart
dev/uart/uart_dev_ns8250.c optional uart
Modified: projects/armv6/sys/arm/ti/omap4/omap44xx.c
==============================================================================
--- projects/armv6/sys/arm/omap/omap4/omap44xx.c Tue Jan 31 19:45:32 2012 (r230844)
+++ projects/armv6/sys/arm/ti/omap4/omap44xx.c Wed Feb 1 02:16:15 2012 (r230856)
@@ -40,10 +40,10 @@ __FBSDID("$FreeBSD$");
#define _ARM32_BUS_DMA_PRIVATE
#include <machine/bus.h>
-#include <arm/omap/omapvar.h>
-#include <arm/omap/omap_scm.h>
-#include <arm/omap/omap4/omap4var.h>
-#include <arm/omap/omap4/omap44xx_reg.h>
+#include <arm/ti/omapvar.h>
+#include <arm/ti/omap_scm.h>
+#include <arm/ti/omap4/omap4var.h>
+#include <arm/ti/omap4/omap44xx_reg.h>
#include "omap_if.h"
#include "omap4_if.h"
Modified: projects/armv6/sys/arm/ti/omap4/omap4_intr.c
==============================================================================
--- projects/armv6/sys/arm/omap/omap4/omap4_intr.c Tue Jan 31 19:45:32 2012 (r230844)
+++ projects/armv6/sys/arm/ti/omap4/omap4_intr.c Wed Feb 1 02:16:15 2012 (r230856)
@@ -36,9 +36,9 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <arm/omap/omapvar.h>
-#include <arm/omap/omap4/omap4var.h>
-#include <arm/omap/omap4/omap44xx_reg.h>
+#include <arm/ti/omapvar.h>
+#include <arm/ti/omap4/omap4var.h>
+#include <arm/ti/omap4/omap44xx_reg.h>
#include "omap4_if.h"
Modified: projects/armv6/sys/arm/ti/omap4/omap4_prcm_clks.c
==============================================================================
--- projects/armv6/sys/arm/omap/omap4/omap4_prcm_clks.c Tue Jan 31 19:45:32 2012 (r230844)
+++ projects/armv6/sys/arm/ti/omap4/omap4_prcm_clks.c Wed Feb 1 02:16:15 2012 (r230856)
@@ -47,9 +47,9 @@ __FBSDID("$FreeBSD$");
#include <machine/resource.h>
#include <machine/intr.h>
-#include <arm/omap/omapvar.h>
-#include <arm/omap/omap_prcm.h>
-#include <arm/omap/omap4/omap44xx_reg.h>
+#include <arm/ti/omapvar.h>
+#include <arm/ti/omap_prcm.h>
+#include <arm/ti/omap4/omap44xx_reg.h>
#include "omap_if.h"
Modified: projects/armv6/sys/arm/ti/omap4/omap4_scm_padconf.c
==============================================================================
--- projects/armv6/sys/arm/omap/omap4/omap4_scm_padconf.c Tue Jan 31 19:45:32 2012 (r230844)
+++ projects/armv6/sys/arm/ti/omap4/omap4_scm_padconf.c Wed Feb 1 02:16:15 2012 (r230856)
@@ -46,10 +46,10 @@ __FBSDID("$FreeBSD$");
#include <machine/resource.h>
#include <machine/intr.h>
-#include <arm/omap/omapvar.h>
-#include <arm/omap/omap_scm.h>
-#include <arm/omap/omap4/omap4var.h>
-#include <arm/omap/omap4/omap44xx_reg.h>
+#include <arm/ti/omapvar.h>
+#include <arm/ti/omap_scm.h>
+#include <arm/ti/omap4/omap4var.h>
+#include <arm/ti/omap4/omap44xx_reg.h>
/*
Modified: projects/armv6/sys/arm/ti/omap4/omap4_timer.c
==============================================================================
--- projects/armv6/sys/arm/omap/omap4/omap4_timer.c Tue Jan 31 19:45:32 2012 (r230844)
+++ projects/armv6/sys/arm/ti/omap4/omap4_timer.c Wed Feb 1 02:16:15 2012 (r230856)
@@ -47,10 +47,10 @@ __FBSDID("$FreeBSD$");
#include <machine/resource.h>
#include <machine/intr.h>
-#include <arm/omap/omap4/omap4var.h>
-#include <arm/omap/omap_prcm.h>
+#include <arm/ti/omap4/omap4var.h>
+#include <arm/ti/omap_prcm.h>
-#include <arm/omap/omap4/omap44xx_reg.h>
+#include <arm/ti/omap4/omap44xx_reg.h>
#include "omap4_if.h"
Modified: projects/armv6/sys/arm/ti/omap4/pandaboard/files.pandaboard
==============================================================================
--- projects/armv6/sys/arm/omap/omap4/pandaboard/files.pandaboard Tue Jan 31 19:45:32 2012 (r230844)
+++ projects/armv6/sys/arm/ti/omap4/pandaboard/files.pandaboard Wed Feb 1 02:16:15 2012 (r230856)
@@ -1,3 +1,3 @@
# $FreeBSD$
-arm/omap/omap4/pandaboard/pandaboard.c standard
+arm/ti/omap4/pandaboard/pandaboard.c standard
Modified: projects/armv6/sys/arm/ti/omap4/pandaboard/pandaboard.c
==============================================================================
--- projects/armv6/sys/arm/omap/omap4/pandaboard/pandaboard.c Tue Jan 31 19:45:32 2012 (r230844)
+++ projects/armv6/sys/arm/ti/omap4/pandaboard/pandaboard.c Wed Feb 1 02:16:15 2012 (r230856)
@@ -42,9 +42,9 @@ __FBSDID("$FreeBSD$");
#include <machine/pmap.h>
#include <machine/vmparam.h>
-#include <arm/omap/omapvar.h>
-#include <arm/omap/omap4/omap4var.h>
-#include <arm/omap/omap4/omap44xx_reg.h>
+#include <arm/ti/omapvar.h>
+#include <arm/ti/omap4/omap4var.h>
+#include <arm/ti/omap4/omap44xx_reg.h>
/* Registers in the SCRM that control the AUX clocks */
#define SCRM_ALTCLKSRC (OMAP44XX_SCRM_VBASE + 0x110)
Modified: projects/armv6/sys/arm/ti/omap4/pandaboard/std.pandaboard
==============================================================================
--- projects/armv6/sys/arm/omap/omap4/pandaboard/std.pandaboard Tue Jan 31 19:45:32 2012 (r230844)
+++ projects/armv6/sys/arm/ti/omap4/pandaboard/std.pandaboard Wed Feb 1 02:16:15 2012 (r230856)
@@ -1,4 +1,4 @@
# $FreeBSD$
-include "../omap/omap4/std.omap44xx"
-files "../omap/omap4/pandaboard/files.pandaboard"
+include "../ti/omap4/std.omap44xx"
+files "../ti/omap4/pandaboard/files.pandaboard"
Modified: projects/armv6/sys/arm/ti/omap4/std.omap44xx
==============================================================================
--- projects/armv6/sys/arm/omap/omap4/std.omap44xx Tue Jan 31 19:45:32 2012 (r230844)
+++ projects/armv6/sys/arm/ti/omap4/std.omap44xx Wed Feb 1 02:16:15 2012 (r230856)
@@ -1,7 +1,7 @@
# Omap4430 generic configuration
#$FreeBSD$
-files "../omap/omap4/files.omap44xx"
-include "../omap/std.omap"
+files "../ti/omap4/files.omap44xx"
+include "../ti/std.omap"
makeoption ARM_LITTLE_ENDIAN
# Physical memory starts at 0x80000000. We assume images are loaded at
Modified: projects/armv6/sys/arm/ti/omap4/uart_cpu_omap4.c
==============================================================================
--- projects/armv6/sys/arm/omap/omap4/uart_cpu_omap4.c Tue Jan 31 19:45:32 2012 (r230844)
+++ projects/armv6/sys/arm/ti/omap4/uart_cpu_omap4.c Wed Feb 1 02:16:15 2012 (r230856)
@@ -39,8 +39,8 @@ __FBSDID("$FreeBSD$");
#include <dev/uart/uart.h>
#include <dev/uart/uart_cpu.h>
-#include <arm/omap/omapvar.h>
-#include <arm/omap/omap4/omap44xx_reg.h>
+#include <arm/ti/omapvar.h>
+#include <arm/ti/omap4/omap44xx_reg.h>
bus_space_tag_t uart_bus_space_io;
bus_space_tag_t uart_bus_space_mem;
Modified: projects/armv6/sys/arm/ti/omap_cpuid.c
==============================================================================
--- projects/armv6/sys/arm/omap/omap_cpuid.c Tue Jan 31 19:45:32 2012 (r230844)
+++ projects/armv6/sys/arm/ti/omap_cpuid.c Wed Feb 1 02:16:15 2012 (r230856)
@@ -45,11 +45,11 @@ __FBSDID("$FreeBSD$");
#include <machine/resource.h>
#include <machine/intr.h>
-#include <arm/omap/omapvar.h>
-#include <arm/omap/omap_cpuid.h>
+#include <arm/ti/omapvar.h>
+#include <arm/ti/omap_cpuid.h>
-#include <arm/omap/omap4/omap44xx_reg.h>
-#include <arm/omap/omap3/omap35xx_reg.h>
+#include <arm/ti/omap4/omap44xx_reg.h>
+#include <arm/ti/omap3/omap35xx_reg.h>
#define OMAP4_STD_FUSE_DIE_ID_0 0x2200
#define OMAP4_ID_CODE 0x2204
Modified: projects/armv6/sys/arm/ti/omap_machdep.c
==============================================================================
--- projects/armv6/sys/arm/omap/omap_machdep.c Tue Jan 31 19:45:32 2012 (r230844)
+++ projects/armv6/sys/arm/ti/omap_machdep.c Wed Feb 1 02:16:15 2012 (r230856)
@@ -57,11 +57,11 @@ __FBSDID("$FreeBSD$");
#define DEBUG_INITARM
#define VERBOSE_INIT_ARM
-#include <arm/omap/omapvar.h>
-#include <arm/omap/omap_prcm.h>
+#include <arm/ti/omapvar.h>
+#include <arm/ti/omap_prcm.h>
#if defined(SOC_OMAP4)
-#include <arm/omap/omap4/omap44xx_reg.h>
+#include <arm/ti/omap4/omap44xx_reg.h>
const struct pmap_devmap omap_devmap[] = {
/*
* Add the main memory areas,
@@ -118,7 +118,7 @@ const struct pmap_devmap omap_devmap[] =
};
#elif defined(SOC_OMAP3)
-#include <arm/omap/omap3/omap35xx_reg.h>
+#include <arm/ti/omap3/omap35xx_reg.h>
const struct pmap_devmap omap_devmap[] = {
/*
* For the moment, map devices with PA==VA.
Modified: projects/armv6/sys/arm/ti/omap_prcm.c
==============================================================================
--- projects/armv6/sys/arm/omap/omap_prcm.c Tue Jan 31 19:45:32 2012 (r230844)
+++ projects/armv6/sys/arm/ti/omap_prcm.c Wed Feb 1 02:16:15 2012 (r230856)
@@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$");
#include <machine/resource.h>
#include <machine/intr.h>
-#include <arm/omap/omap_prcm.h>
+#include <arm/ti/omap_prcm.h>
#include "omap_if.h"
Modified: projects/armv6/sys/arm/ti/omapvar.h
==============================================================================
--- projects/armv6/sys/arm/omap/omapvar.h Tue Jan 31 19:45:32 2012 (r230844)
+++ projects/armv6/sys/arm/ti/omapvar.h Wed Feb 1 02:16:15 2012 (r230856)
@@ -50,7 +50,7 @@
#include <machine/resource.h>
#include <machine/intr.h>
-#include <arm/omap/omap_cpuid.h>
+#include <arm/ti/omap_cpuid.h>
/*
More information about the svn-src-projects
mailing list