From 0b4cdd16b015a683fe1fd725702e6f20e9a87dda Mon Sep 17 00:00:00 2001 From: ian Date: Sun, 28 Jul 2013 17:37:30 +0000 Subject: Rename the existing std.imx and imx.files to std.imx51 and files.imx51, to pave the way for adding imx6 support. --- sys/arm/conf/EFIKA_MX | 2 +- sys/arm/freescale/imx/files.imx51 | 51 +++++++++++++++++++++++++++++++++++++++ sys/arm/freescale/imx/imx.files | 51 --------------------------------------- sys/arm/freescale/imx/std.imx | 15 ------------ sys/arm/freescale/imx/std.imx51 | 15 ++++++++++++ 5 files changed, 67 insertions(+), 67 deletions(-) create mode 100644 sys/arm/freescale/imx/files.imx51 delete mode 100644 sys/arm/freescale/imx/imx.files delete mode 100644 sys/arm/freescale/imx/std.imx create mode 100644 sys/arm/freescale/imx/std.imx51 diff --git a/sys/arm/conf/EFIKA_MX b/sys/arm/conf/EFIKA_MX index e2b4ddc..71edb8c 100644 --- a/sys/arm/conf/EFIKA_MX +++ b/sys/arm/conf/EFIKA_MX @@ -19,7 +19,7 @@ ident EFIKA_MX -include "../freescale/imx/std.imx" +include "../freescale/imx/std.imx51" makeoptions WITHOUT_MODULES="ahc" diff --git a/sys/arm/freescale/imx/files.imx51 b/sys/arm/freescale/imx/files.imx51 new file mode 100644 index 0000000..dd2a975 --- /dev/null +++ b/sys/arm/freescale/imx/files.imx51 @@ -0,0 +1,51 @@ +# $FreeBSD$ +arm/arm/bus_space_asm_generic.S standard +arm/arm/bus_space_generic.c standard +arm/arm/cpufunc_asm_armv5.S standard +arm/arm/cpufunc_asm_arm11.S standard +arm/arm/cpufunc_asm_armv7.S standard +arm/arm/irq_dispatch.S standard +kern/kern_clocksource.c standard + +# Init +arm/freescale/imx/imx_machdep.c standard +arm/freescale/imx/common.c standard +arm/freescale/imx/bus_space.c standard + +# Dummy serial console +#arm/freescale/imx/console.c standard + +# TrustZone Interrupt Controller +arm/freescale/imx/tzic.c standard + +# IOMUX - external pins multiplexor +arm/freescale/imx/imx51_iomux.c optional iomux + +# GPIO +arm/freescale/imx/imx51_gpio.c optional gpio + +# Generic Periodic Timer +arm/freescale/imx/imx_gpt.c standard + +# Clock Configuration Manager +arm/freescale/imx/imx51_ccm.c standard + +# i.MX5xx PATA controller +dev/ata/chipsets/ata-fsl.c optional imxata + +# UART driver +dev/uart/uart_dev_imx.c optional uart + +# USB join controller (1 OTG, 3 EHCI) +dev/usb/controller/ehci_imx.c optional ehci + +# Watchdog +arm/freescale/imx/imx_wdog.c optional imxwdt + +# i2c +arm/freescale/imx/i2c.c optional fsliic +dev/ofw/ofw_iicbus.c optional fsliic + +# IPU - Image Processing Unit (frame buffer also) +arm/freescale/imx/imx51_ipuv3.c optional sc + diff --git a/sys/arm/freescale/imx/imx.files b/sys/arm/freescale/imx/imx.files deleted file mode 100644 index dd2a975..0000000 --- a/sys/arm/freescale/imx/imx.files +++ /dev/null @@ -1,51 +0,0 @@ -# $FreeBSD$ -arm/arm/bus_space_asm_generic.S standard -arm/arm/bus_space_generic.c standard -arm/arm/cpufunc_asm_armv5.S standard -arm/arm/cpufunc_asm_arm11.S standard -arm/arm/cpufunc_asm_armv7.S standard -arm/arm/irq_dispatch.S standard -kern/kern_clocksource.c standard - -# Init -arm/freescale/imx/imx_machdep.c standard -arm/freescale/imx/common.c standard -arm/freescale/imx/bus_space.c standard - -# Dummy serial console -#arm/freescale/imx/console.c standard - -# TrustZone Interrupt Controller -arm/freescale/imx/tzic.c standard - -# IOMUX - external pins multiplexor -arm/freescale/imx/imx51_iomux.c optional iomux - -# GPIO -arm/freescale/imx/imx51_gpio.c optional gpio - -# Generic Periodic Timer -arm/freescale/imx/imx_gpt.c standard - -# Clock Configuration Manager -arm/freescale/imx/imx51_ccm.c standard - -# i.MX5xx PATA controller -dev/ata/chipsets/ata-fsl.c optional imxata - -# UART driver -dev/uart/uart_dev_imx.c optional uart - -# USB join controller (1 OTG, 3 EHCI) -dev/usb/controller/ehci_imx.c optional ehci - -# Watchdog -arm/freescale/imx/imx_wdog.c optional imxwdt - -# i2c -arm/freescale/imx/i2c.c optional fsliic -dev/ofw/ofw_iicbus.c optional fsliic - -# IPU - Image Processing Unit (frame buffer also) -arm/freescale/imx/imx51_ipuv3.c optional sc - diff --git a/sys/arm/freescale/imx/std.imx b/sys/arm/freescale/imx/std.imx deleted file mode 100644 index 60903f6..0000000 --- a/sys/arm/freescale/imx/std.imx +++ /dev/null @@ -1,15 +0,0 @@ -# $FreeBSD$ -machine arm armv6 -cpu CPU_CORTEXA -makeoptions ARM_LITTLE_ENDIAN -options ARM_L2_PIPT - -options KERNVIRTADDR=0xc0100000 -makeoptions KERNVIRTADDR=0xc0100000 -options KERNPHYSADDR=0x90100000 -makeoptions KERNPHYSADDR=0x90100000 -options PHYSADDR=0x90000000 -options STARTUP_PAGETABLE_ADDR=0x91000000 - -files "../freescale/imx/imx.files" - diff --git a/sys/arm/freescale/imx/std.imx51 b/sys/arm/freescale/imx/std.imx51 new file mode 100644 index 0000000..6c70ef9 --- /dev/null +++ b/sys/arm/freescale/imx/std.imx51 @@ -0,0 +1,15 @@ +# $FreeBSD$ +machine arm armv6 +cpu CPU_CORTEXA +makeoptions ARM_LITTLE_ENDIAN +options ARM_L2_PIPT + +options KERNVIRTADDR=0xc0100000 +makeoptions KERNVIRTADDR=0xc0100000 +options KERNPHYSADDR=0x90100000 +makeoptions KERNPHYSADDR=0x90100000 +options PHYSADDR=0x90000000 +options STARTUP_PAGETABLE_ADDR=0x91000000 + +files "../freescale/imx/files.imx51" + -- cgit v1.1