From d667b90d536f330ff31fa57c4ebcabf2ff86f57a Mon Sep 17 00:00:00 2001 From: Andrew Turner Date: Thu, 7 May 2015 12:38:23 +0000 Subject: [PATCH] Clean up the ARM kernel configs to use 'include"file"'. --- sys/arm/conf/AML8726 | 2 +- sys/arm/conf/APALIS-IMX6 | 2 +- sys/arm/conf/ARMADAXP | 4 ++-- sys/arm/conf/ARNDALE | 2 +- sys/arm/conf/ARNDALE-OCTA | 2 +- sys/arm/conf/ATMEL | 4 ++-- sys/arm/conf/AVILA | 6 +++--- sys/arm/conf/BEAGLEBONE | 4 ++-- sys/arm/conf/BWCT | 4 ++-- sys/arm/conf/CAMBRIA | 6 +++--- sys/arm/conf/CHROMEBOOK | 2 +- sys/arm/conf/CHROMEBOOK-PEACH-PIT | 2 +- sys/arm/conf/CHROMEBOOK-SNOW | 2 +- sys/arm/conf/CHROMEBOOK-SPRING | 2 +- sys/arm/conf/CNS11XXNAS | 4 ++-- sys/arm/conf/COLIBRI-VF50 | 2 +- sys/arm/conf/COSMIC | 2 +- sys/arm/conf/CRB | 4 ++-- sys/arm/conf/CUBIEBOARD | 4 ++-- sys/arm/conf/CUBIEBOARD2 | 4 ++-- sys/arm/conf/DB-78XXX | 4 ++-- sys/arm/conf/DB-88F5XXX | 4 ++-- sys/arm/conf/DB-88F6XXX | 4 ++-- sys/arm/conf/DIGI-CCWMX53 | 2 +- sys/arm/conf/DOCKSTAR | 4 ++-- sys/arm/conf/DREAMPLUG-1001 | 4 ++-- sys/arm/conf/EA3250 | 4 ++-- sys/arm/conf/EB9200 | 4 ++-- sys/arm/conf/EFIKA_MX | 2 +- sys/arm/conf/EP80219 | 4 ++-- sys/arm/conf/ETHERNUT5 | 4 ++-- sys/arm/conf/EXYNOS5.common | 2 +- sys/arm/conf/EXYNOS5250 | 4 ++-- sys/arm/conf/EXYNOS5420 | 4 ++-- sys/arm/conf/GUMSTIX | 4 ++-- sys/arm/conf/HL200 | 4 ++-- sys/arm/conf/HL201 | 4 ++-- sys/arm/conf/IMX53 | 2 +- sys/arm/conf/IMX53-QSB | 2 +- sys/arm/conf/IMX6 | 2 +- sys/arm/conf/IQ31244 | 4 ++-- sys/arm/conf/KB920X | 4 ++-- sys/arm/conf/LN2410SBC | 2 +- sys/arm/conf/NSLU | 6 +++--- sys/arm/conf/PANDABOARD | 2 +- sys/arm/conf/QILA9G20 | 4 ++-- sys/arm/conf/QUARTZ | 2 +- sys/arm/conf/RADXA | 2 +- sys/arm/conf/RADXA-LITE | 2 +- sys/arm/conf/RK3188 | 4 ++-- sys/arm/conf/RPI-B | 6 +++--- sys/arm/conf/RPI2 | 6 +++--- sys/arm/conf/SAM9260EK | 4 ++-- sys/arm/conf/SAM9G20EK | 4 ++-- sys/arm/conf/SAM9X25EK | 4 ++-- sys/arm/conf/SHEEVAPLUG | 4 ++-- sys/arm/conf/SN9G45 | 4 ++-- sys/arm/conf/SOCKIT.common | 2 +- sys/arm/conf/TS7800 | 4 ++-- sys/arm/conf/VERSATILEPB | 2 +- sys/arm/conf/VIRT | 4 ++-- sys/arm/conf/VYBRID | 4 ++-- sys/arm/conf/WANDBOARD-DUAL | 2 +- sys/arm/conf/WANDBOARD-QUAD | 2 +- sys/arm/conf/WANDBOARD-SOLO | 2 +- sys/arm/conf/ZEDBOARD | 2 +- 66 files changed, 110 insertions(+), 110 deletions(-) diff --git a/sys/arm/conf/AML8726 b/sys/arm/conf/AML8726 index a6b4a8e4cdc8..125a53dba708 100644 --- a/sys/arm/conf/AML8726 +++ b/sys/arm/conf/AML8726 @@ -20,7 +20,7 @@ ident AML8726 -include "std.armv6" +include "std.armv6" include "../amlogic/aml8726/std.aml8726" options HZ=100 diff --git a/sys/arm/conf/APALIS-IMX6 b/sys/arm/conf/APALIS-IMX6 index ceb21c7f4ab8..ce8a0d5221a1 100644 --- a/sys/arm/conf/APALIS-IMX6 +++ b/sys/arm/conf/APALIS-IMX6 @@ -19,7 +19,7 @@ #NO_UNIVERSE -include "IMX6" +include "IMX6" ident APALIS-IMX6 makeoptions MODULES_OVERRIDE="" diff --git a/sys/arm/conf/ARMADAXP b/sys/arm/conf/ARMADAXP index ed4aa2ddc5a8..6d51c16ca712 100644 --- a/sys/arm/conf/ARMADAXP +++ b/sys/arm/conf/ARMADAXP @@ -20,8 +20,8 @@ ident MV-88F78XX0 -include "std.armv6" -include "../mv/armadaxp/std.mv78x60" +include "std.armv6" +include "../mv/armadaxp/std.mv78x60" options SOC_MV_ARMADAXP diff --git a/sys/arm/conf/ARNDALE b/sys/arm/conf/ARNDALE index 964f9e40041c..1c16d131cfca 100644 --- a/sys/arm/conf/ARNDALE +++ b/sys/arm/conf/ARNDALE @@ -19,7 +19,7 @@ #NO_UNIVERSE -include "EXYNOS5250" +include "EXYNOS5250" ident ARNDALE #FDT diff --git a/sys/arm/conf/ARNDALE-OCTA b/sys/arm/conf/ARNDALE-OCTA index ad937ee5a662..a4faaa0387c8 100644 --- a/sys/arm/conf/ARNDALE-OCTA +++ b/sys/arm/conf/ARNDALE-OCTA @@ -19,7 +19,7 @@ #NO_UNIVERSE -include "EXYNOS5420" +include "EXYNOS5420" ident ARNDALE-OCTA #FDT diff --git a/sys/arm/conf/ATMEL b/sys/arm/conf/ATMEL index 2e8da7d1ac81..c3b6035b4286 100644 --- a/sys/arm/conf/ATMEL +++ b/sys/arm/conf/ATMEL @@ -6,8 +6,8 @@ ident ATMEL -include "std.arm" -include "../at91/std.atmel" +include "std.arm" +include "../at91/std.atmel" # Typical values for most SoCs and board configurations. Will not work for # at91sam9g45 or on some boards with non u-boot boot loaders. diff --git a/sys/arm/conf/AVILA b/sys/arm/conf/AVILA index b356b353768c..fd4d62a6de0a 100644 --- a/sys/arm/conf/AVILA +++ b/sys/arm/conf/AVILA @@ -20,10 +20,10 @@ ident AVILA -include "std.arm" -include "../xscale/ixp425/std.ixp425" +include "std.arm" +include "../xscale/ixp425/std.ixp425" # NB: memory mapping is defined in std.avila -include "../xscale/ixp425/std.avila" +include "../xscale/ixp425/std.avila" options XSCALE_CACHE_READ_WRITE_ALLOCATE #To statically compile in device wiring instead of /boot/device.hints hints "AVILA.hints" # Default places to look for devices. diff --git a/sys/arm/conf/BEAGLEBONE b/sys/arm/conf/BEAGLEBONE index 997a62ee5240..97e2d3d2c1f7 100644 --- a/sys/arm/conf/BEAGLEBONE +++ b/sys/arm/conf/BEAGLEBONE @@ -23,8 +23,8 @@ ident BEAGLEBONE -include "std.armv6" -include "../ti/am335x/std.am335x" +include "std.armv6" +include "../ti/am335x/std.am335x" makeoptions MODULES_EXTRA="dtb/am335x" diff --git a/sys/arm/conf/BWCT b/sys/arm/conf/BWCT index d483a00ea68d..a6f8e4991ae5 100644 --- a/sys/arm/conf/BWCT +++ b/sys/arm/conf/BWCT @@ -21,10 +21,10 @@ ident BWCT -include "std.arm" +include "std.arm" options VERBOSE_INIT_ARM -include "../at91/std.bwct" +include "../at91/std.bwct" #To statically compile in device wiring instead of /boot/device.hints hints "BWCT.hints" diff --git a/sys/arm/conf/CAMBRIA b/sys/arm/conf/CAMBRIA index 1cf7fb918469..c25521ba5900 100644 --- a/sys/arm/conf/CAMBRIA +++ b/sys/arm/conf/CAMBRIA @@ -20,10 +20,10 @@ ident CAMBRIA -include "std.arm" -include "../xscale/ixp425/std.ixp435" +include "std.arm" +include "../xscale/ixp425/std.ixp435" # NB: memory mapping is defined in std.avila -include "../xscale/ixp425/std.avila" +include "../xscale/ixp425/std.avila" options XSCALE_CACHE_READ_WRITE_ALLOCATE #To statically compile in device wiring instead of /boot/device.hints hints "CAMBRIA.hints" # Default places to look for devices. diff --git a/sys/arm/conf/CHROMEBOOK b/sys/arm/conf/CHROMEBOOK index 94591517cce4..059f24344f4b 100644 --- a/sys/arm/conf/CHROMEBOOK +++ b/sys/arm/conf/CHROMEBOOK @@ -17,7 +17,7 @@ # # $FreeBSD$ -include "EXYNOS5250" +include "EXYNOS5250" ident CHROMEBOOK hints "CHROMEBOOK.hints" diff --git a/sys/arm/conf/CHROMEBOOK-PEACH-PIT b/sys/arm/conf/CHROMEBOOK-PEACH-PIT index e01128c99778..87284c2eff90 100644 --- a/sys/arm/conf/CHROMEBOOK-PEACH-PIT +++ b/sys/arm/conf/CHROMEBOOK-PEACH-PIT @@ -19,7 +19,7 @@ #NO_UNIVERSE -include "EXYNOS5420" +include "EXYNOS5420" ident CHROMEBOOK-PEACH-PIT hints "CHROMEBOOK-PEACH-PIT.hints" diff --git a/sys/arm/conf/CHROMEBOOK-SNOW b/sys/arm/conf/CHROMEBOOK-SNOW index e9242d1b47e1..aee3dc07b5d9 100644 --- a/sys/arm/conf/CHROMEBOOK-SNOW +++ b/sys/arm/conf/CHROMEBOOK-SNOW @@ -19,7 +19,7 @@ #NO_UNIVERSE -include "CHROMEBOOK" +include "CHROMEBOOK" ident CHROMEBOOK-SNOW #FDT diff --git a/sys/arm/conf/CHROMEBOOK-SPRING b/sys/arm/conf/CHROMEBOOK-SPRING index 1b791ac652bc..9714d3402ca4 100644 --- a/sys/arm/conf/CHROMEBOOK-SPRING +++ b/sys/arm/conf/CHROMEBOOK-SPRING @@ -19,7 +19,7 @@ #NO_UNIVERSE -include "CHROMEBOOK" +include "CHROMEBOOK" ident CHROMEBOOK-SPRING #FDT diff --git a/sys/arm/conf/CNS11XXNAS b/sys/arm/conf/CNS11XXNAS index d906a2b00054..710a4715576e 100644 --- a/sys/arm/conf/CNS11XXNAS +++ b/sys/arm/conf/CNS11XXNAS @@ -20,14 +20,14 @@ ident CNS11XXNAS -include "std.arm" +include "std.arm" #options PHYSADDR=0x10000000 #options KERNPHYSADDR=0x10200000 #options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm #options FLASHADDR=0x50000000 #options LOADERRAMADDR=0x00000000 -include "../cavium/cns11xx/std.econa" +include "../cavium/cns11xx/std.econa" makeoptions MODULES_OVERRIDE="" diff --git a/sys/arm/conf/COLIBRI-VF50 b/sys/arm/conf/COLIBRI-VF50 index 9f73f6987f2f..81581f6bf842 100644 --- a/sys/arm/conf/COLIBRI-VF50 +++ b/sys/arm/conf/COLIBRI-VF50 @@ -19,7 +19,7 @@ #NO_UNIVERSE -include "VYBRID" +include "VYBRID" ident COLIBRI-VF50 #FDT diff --git a/sys/arm/conf/COSMIC b/sys/arm/conf/COSMIC index 72ae5c20b07b..61b99a743d33 100644 --- a/sys/arm/conf/COSMIC +++ b/sys/arm/conf/COSMIC @@ -19,7 +19,7 @@ #NO_UNIVERSE -include "VYBRID" +include "VYBRID" ident COSMIC #FDT diff --git a/sys/arm/conf/CRB b/sys/arm/conf/CRB index f5cc9322b410..69b0ebd1696e 100644 --- a/sys/arm/conf/CRB +++ b/sys/arm/conf/CRB @@ -19,13 +19,13 @@ ident CRB -include "std.arm" +include "std.arm" options PHYSADDR=0x00000000 options KERNPHYSADDR=0x00200000 options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm options COUNTS_PER_SEC=400000000 -include "../xscale/i8134x/std.crb" +include "../xscale/i8134x/std.crb" makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols diff --git a/sys/arm/conf/CUBIEBOARD b/sys/arm/conf/CUBIEBOARD index 8f856bd279bf..26283d4381b6 100644 --- a/sys/arm/conf/CUBIEBOARD +++ b/sys/arm/conf/CUBIEBOARD @@ -21,8 +21,8 @@ ident CUBIEBOARD -include "std.armv6" -include "../allwinner/std.a10" +include "std.armv6" +include "../allwinner/std.a10" options HZ=100 options SCHED_4BSD # 4BSD scheduler diff --git a/sys/arm/conf/CUBIEBOARD2 b/sys/arm/conf/CUBIEBOARD2 index 15d028f9271e..45311c39930e 100644 --- a/sys/arm/conf/CUBIEBOARD2 +++ b/sys/arm/conf/CUBIEBOARD2 @@ -21,8 +21,8 @@ ident CUBIEBOARD2 -include "std.armv6" -include "../allwinner/a20/std.a20" +include "std.armv6" +include "../allwinner/a20/std.a20" options HZ=100 options SCHED_ULE # ULE scheduler diff --git a/sys/arm/conf/DB-78XXX b/sys/arm/conf/DB-78XXX index 2e7fa3605759..e59e4264721e 100644 --- a/sys/arm/conf/DB-78XXX +++ b/sys/arm/conf/DB-78XXX @@ -5,8 +5,8 @@ # ident DB-88F78XX -include "std.arm" -include "../mv/discovery/std.db78xxx" +include "std.arm" +include "../mv/discovery/std.db78xxx" options SOC_MV_DISCOVERY diff --git a/sys/arm/conf/DB-88F5XXX b/sys/arm/conf/DB-88F5XXX index 7cc06a0407f8..f1729f060a1b 100644 --- a/sys/arm/conf/DB-88F5XXX +++ b/sys/arm/conf/DB-88F5XXX @@ -5,8 +5,8 @@ # ident DB-88F5XXX -include "std.arm" -include "../mv/orion/std.db88f5xxx" +include "std.arm" +include "../mv/orion/std.db88f5xxx" options SOC_MV_ORION diff --git a/sys/arm/conf/DB-88F6XXX b/sys/arm/conf/DB-88F6XXX index afec0e726534..4018bcddc8b8 100644 --- a/sys/arm/conf/DB-88F6XXX +++ b/sys/arm/conf/DB-88F6XXX @@ -5,8 +5,8 @@ # ident DB-88F6XXX -include "std.arm" -include "../mv/kirkwood/std.db88f6xxx" +include "std.arm" +include "../mv/kirkwood/std.db88f6xxx" options SOC_MV_KIRKWOOD diff --git a/sys/arm/conf/DIGI-CCWMX53 b/sys/arm/conf/DIGI-CCWMX53 index 20dec9c0f533..65239c141eb5 100644 --- a/sys/arm/conf/DIGI-CCWMX53 +++ b/sys/arm/conf/DIGI-CCWMX53 @@ -19,7 +19,7 @@ #NO_UNIVERSE -include "IMX53" +include "IMX53" ident DIGI-CCWMX53 makeoptions WITHOUT_MODULES="ahc" diff --git a/sys/arm/conf/DOCKSTAR b/sys/arm/conf/DOCKSTAR index c6308cd905e7..9e739805b16a 100644 --- a/sys/arm/conf/DOCKSTAR +++ b/sys/arm/conf/DOCKSTAR @@ -21,8 +21,8 @@ ident DOCKSTAR -include "std.arm" -include "../mv/kirkwood/std.db88f6xxx" +include "std.arm" +include "../mv/kirkwood/std.db88f6xxx" makeoptions FDT_DTS_FILE=dockstar.dts diff --git a/sys/arm/conf/DREAMPLUG-1001 b/sys/arm/conf/DREAMPLUG-1001 index f97b5642529f..f44599e2712c 100644 --- a/sys/arm/conf/DREAMPLUG-1001 +++ b/sys/arm/conf/DREAMPLUG-1001 @@ -24,8 +24,8 @@ ident DREAMPLUG-1001 -include "std.arm" -include "../mv/kirkwood/std.db88f6xxx" +include "std.arm" +include "../mv/kirkwood/std.db88f6xxx" makeoptions FDT_DTS_FILE=dreamplug-1001.dts diff --git a/sys/arm/conf/EA3250 b/sys/arm/conf/EA3250 index bcb8276a94b2..8f135051b96f 100644 --- a/sys/arm/conf/EA3250 +++ b/sys/arm/conf/EA3250 @@ -5,8 +5,8 @@ # ident EA3250 -include "std.arm" -include "../lpc/std.lpc" +include "std.arm" +include "../lpc/std.lpc" hints "EA3250.hints" makeoptions MODULES_OVERRIDE="" diff --git a/sys/arm/conf/EB9200 b/sys/arm/conf/EB9200 index bf0c41b1feca..afcc530cd5ec 100644 --- a/sys/arm/conf/EB9200 +++ b/sys/arm/conf/EB9200 @@ -16,8 +16,8 @@ ident EB9200 -include "std.arm" -include "../at91/std.eb9200" +include "std.arm" +include "../at91/std.eb9200" # The AT91 platform doesn't use /boot/loader, so we have to statically wire # hints. hints "EB9200.hints" diff --git a/sys/arm/conf/EFIKA_MX b/sys/arm/conf/EFIKA_MX index 81edae855f6d..dc22943ffc3a 100644 --- a/sys/arm/conf/EFIKA_MX +++ b/sys/arm/conf/EFIKA_MX @@ -20,7 +20,7 @@ ident EFIKA_MX -include "std.armv6" +include "std.armv6" include "../freescale/imx/std.imx51" makeoptions WITHOUT_MODULES="ahc" diff --git a/sys/arm/conf/EP80219 b/sys/arm/conf/EP80219 index 6f2bef8b090c..301849c302b8 100644 --- a/sys/arm/conf/EP80219 +++ b/sys/arm/conf/EP80219 @@ -19,13 +19,13 @@ ident EP80219 -include "std.arm" +include "std.arm" options PHYSADDR=0xa0000000 options KERNPHYSADDR=0xa0200000 options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm #options ARM32_NEW_VM_LAYOUT -include "../xscale/i80321/std.ep80219" +include "../xscale/i80321/std.ep80219" makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols diff --git a/sys/arm/conf/ETHERNUT5 b/sys/arm/conf/ETHERNUT5 index f01ea0d138a0..c91869ad7e2f 100644 --- a/sys/arm/conf/ETHERNUT5 +++ b/sys/arm/conf/ETHERNUT5 @@ -21,8 +21,8 @@ ident ETHERNUT5 -include "std.arm" -include "../at91/std.ethernut5" +include "std.arm" +include "../at91/std.ethernut5" # To statically compile in device wiring instead of /boot/device.hints hints "ETHERNUT5.hints" diff --git a/sys/arm/conf/EXYNOS5.common b/sys/arm/conf/EXYNOS5.common index 2f9693582c85..0bd6ad66cb97 100644 --- a/sys/arm/conf/EXYNOS5.common +++ b/sys/arm/conf/EXYNOS5.common @@ -20,7 +20,7 @@ makeoptions WERROR="-Werror" -include "std.armv6" +include "std.armv6" options HZ=100 options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption diff --git a/sys/arm/conf/EXYNOS5250 b/sys/arm/conf/EXYNOS5250 index 156d8564eba1..e22239f41fcf 100644 --- a/sys/arm/conf/EXYNOS5250 +++ b/sys/arm/conf/EXYNOS5250 @@ -18,8 +18,8 @@ # $FreeBSD$ ident EXYNOS5250 -include "EXYNOS5.common" -include "../samsung/exynos/std.exynos5250" +include "EXYNOS5.common" +include "../samsung/exynos/std.exynos5250" #FDT options FDT diff --git a/sys/arm/conf/EXYNOS5420 b/sys/arm/conf/EXYNOS5420 index 0f2c2c780a8a..b55151a7c949 100644 --- a/sys/arm/conf/EXYNOS5420 +++ b/sys/arm/conf/EXYNOS5420 @@ -18,8 +18,8 @@ # $FreeBSD$ ident EXYNOS5420 -include "EXYNOS5.common" -include "../samsung/exynos/std.exynos5420" +include "EXYNOS5.common" +include "../samsung/exynos/std.exynos5420" #FDT options FDT diff --git a/sys/arm/conf/GUMSTIX b/sys/arm/conf/GUMSTIX index 9ba6155cc3d8..048bd3c680cb 100644 --- a/sys/arm/conf/GUMSTIX +++ b/sys/arm/conf/GUMSTIX @@ -19,7 +19,7 @@ # $FreeBSD$ ident GUMSTIX -include "std.arm" +include "std.arm" cpu CPU_XSCALE_PXA2X0 # This probably wants to move somewhere else. Maybe we can create a basic @@ -31,7 +31,7 @@ options PHYSADDR=0xa0000000 options KERNPHYSADDR=0xa0200000 options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm -include "../xscale/pxa/std.pxa" +include "../xscale/pxa/std.pxa" makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols diff --git a/sys/arm/conf/HL200 b/sys/arm/conf/HL200 index 8d22da5943a5..43a8148abe72 100644 --- a/sys/arm/conf/HL200 +++ b/sys/arm/conf/HL200 @@ -21,8 +21,8 @@ ident HL200 -include "std.arm" -include "../at91/std.hl200" +include "std.arm" +include "../at91/std.hl200" #To statically compile in device wiring instead of /boot/device.hints hints "KB920X.hints" diff --git a/sys/arm/conf/HL201 b/sys/arm/conf/HL201 index 4ec6da36fcd6..2eed9d562c5e 100644 --- a/sys/arm/conf/HL201 +++ b/sys/arm/conf/HL201 @@ -21,8 +21,8 @@ ident HL201 -include "std.arm" -include "../at91/std.hl201" +include "std.arm" +include "../at91/std.hl201" makeoptions MODULES_OVERRIDE="" diff --git a/sys/arm/conf/IMX53 b/sys/arm/conf/IMX53 index 3275bfc93377..d07d6ad0edf4 100644 --- a/sys/arm/conf/IMX53 +++ b/sys/arm/conf/IMX53 @@ -20,7 +20,7 @@ ident IMX53 -include "std.armv6" +include "std.armv6" include "../freescale/imx/std.imx53" options SOC_IMX53 diff --git a/sys/arm/conf/IMX53-QSB b/sys/arm/conf/IMX53-QSB index fdde591b13b0..5fa907c01b4c 100644 --- a/sys/arm/conf/IMX53-QSB +++ b/sys/arm/conf/IMX53-QSB @@ -19,7 +19,7 @@ #NO_UNIVERSE -include "IMX53" +include "IMX53" ident IMX53-QSB options HZ=250 # 4ms scheduling quantum diff --git a/sys/arm/conf/IMX6 b/sys/arm/conf/IMX6 index 5ead99b2bf4c..332681ab4c3e 100644 --- a/sys/arm/conf/IMX6 +++ b/sys/arm/conf/IMX6 @@ -19,7 +19,7 @@ # $FreeBSD$ ident IMX6 -include "std.armv6" +include "std.armv6" include "../freescale/imx/std.imx6" options SOC_IMX6 diff --git a/sys/arm/conf/IQ31244 b/sys/arm/conf/IQ31244 index 403a0c2e8f9b..ae8eae8bf9e2 100644 --- a/sys/arm/conf/IQ31244 +++ b/sys/arm/conf/IQ31244 @@ -19,14 +19,14 @@ ident IQ31244 -include "std.arm" +include "std.arm" options PHYSADDR=0xa0000000 options KERNPHYSADDR=0xa0200000 options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm options FLASHADDR=0xf0000000 options LOADERRAMADDR=0x00000000 -include "../xscale/i80321/std.iq31244" +include "../xscale/i80321/std.iq31244" makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X index 6d91ad80e0c0..79be31ab6151 100644 --- a/sys/arm/conf/KB920X +++ b/sys/arm/conf/KB920X @@ -22,8 +22,8 @@ ident KB920X -include "std.arm" -include "../at91/std.kb920x" +include "std.arm" +include "../at91/std.kb920x" # The AT91 platform doesn't use /boot/loader, so we have to statically wire # hints. hints "KB920X.hints" diff --git a/sys/arm/conf/LN2410SBC b/sys/arm/conf/LN2410SBC index ae3c62a94fac..a154c325e6ce 100644 --- a/sys/arm/conf/LN2410SBC +++ b/sys/arm/conf/LN2410SBC @@ -19,7 +19,7 @@ ident LN2410SBC -include "std.arm" +include "std.arm" 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. diff --git a/sys/arm/conf/NSLU b/sys/arm/conf/NSLU index 00a29028bc32..665910a07e5c 100644 --- a/sys/arm/conf/NSLU +++ b/sys/arm/conf/NSLU @@ -21,7 +21,7 @@ ident NSLU -include "std.arm" +include "std.arm" # XXX What is defined in std.avila does not exactly match the following: #options PHYSADDR=0x10000000 #options KERNPHYSADDR=0x10200000 @@ -29,9 +29,9 @@ include "std.arm" #options FLASHADDR=0x50000000 #options LOADERRAMADDR=0x00000000 -include "../xscale/ixp425/std.ixp425" +include "../xscale/ixp425/std.ixp425" # NB: memory mapping is defined in std.avila (see also comment above) -include "../xscale/ixp425/std.avila" +include "../xscale/ixp425/std.avila" options XSCALE_CACHE_READ_WRITE_ALLOCATE #To statically compile in device wiring instead of /boot/device.hints hints "NSLU.hints" # Default places to look for devices. diff --git a/sys/arm/conf/PANDABOARD b/sys/arm/conf/PANDABOARD index e58c953b5632..41e2900671b8 100644 --- a/sys/arm/conf/PANDABOARD +++ b/sys/arm/conf/PANDABOARD @@ -27,7 +27,7 @@ ident PANDABOARD hints "PANDABOARD.hints" -include "std.armv6" +include "std.armv6" include "../ti/omap4/pandaboard/std.pandaboard" options HZ=100 diff --git a/sys/arm/conf/QILA9G20 b/sys/arm/conf/QILA9G20 index 2f9b6093272b..1d6bff91c297 100644 --- a/sys/arm/conf/QILA9G20 +++ b/sys/arm/conf/QILA9G20 @@ -22,8 +22,8 @@ ident QILA9G20 -include "std.arm" -include "../at91/std.qila9g20" +include "std.arm" +include "../at91/std.qila9g20" #To statically compile in device wiring instead of /boot/device.hints hints "QILA9G20.hints" diff --git a/sys/arm/conf/QUARTZ b/sys/arm/conf/QUARTZ index 04f1b5c94749..9c981850b4c0 100644 --- a/sys/arm/conf/QUARTZ +++ b/sys/arm/conf/QUARTZ @@ -19,7 +19,7 @@ #NO_UNIVERSE -include "VYBRID" +include "VYBRID" ident QUARTZ #FDT diff --git a/sys/arm/conf/RADXA b/sys/arm/conf/RADXA index ad5eadfae41f..8801f6728e91 100644 --- a/sys/arm/conf/RADXA +++ b/sys/arm/conf/RADXA @@ -20,7 +20,7 @@ #NO_UNIVERSE -include "RK3188" +include "RK3188" ident RADXA # Flattened Device Tree diff --git a/sys/arm/conf/RADXA-LITE b/sys/arm/conf/RADXA-LITE index c07462d9b58b..72529411a6ba 100644 --- a/sys/arm/conf/RADXA-LITE +++ b/sys/arm/conf/RADXA-LITE @@ -20,7 +20,7 @@ #NO_UNIVERSE -include "RK3188" +include "RK3188" ident RADXA-LITE # Flattened Device Tree diff --git a/sys/arm/conf/RK3188 b/sys/arm/conf/RK3188 index 46bc334ec02f..9afa7ab7ac59 100644 --- a/sys/arm/conf/RK3188 +++ b/sys/arm/conf/RK3188 @@ -20,8 +20,8 @@ ident RK3188 -include "std.armv6" -include "../rockchip/std.rk30xx" +include "std.armv6" +include "../rockchip/std.rk30xx" options HZ=100 options SCHED_ULE # ULE scheduler diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B index 309a499d0094..9193bcae037f 100644 --- a/sys/arm/conf/RPI-B +++ b/sys/arm/conf/RPI-B @@ -20,9 +20,9 @@ ident RPI-B -include "std.armv6" -include "../broadcom/bcm2835/std.rpi" -include "../broadcom/bcm2835/std.bcm2835" +include "std.armv6" +include "../broadcom/bcm2835/std.rpi" +include "../broadcom/bcm2835/std.bcm2835" options HZ=100 options SCHED_4BSD # 4BSD scheduler diff --git a/sys/arm/conf/RPI2 b/sys/arm/conf/RPI2 index dbb67d976460..3c820fb8443a 100644 --- a/sys/arm/conf/RPI2 +++ b/sys/arm/conf/RPI2 @@ -20,9 +20,9 @@ ident RPI2 -include "std.armv6" -include "../broadcom/bcm2835/std.rpi" -include "../broadcom/bcm2835/std.bcm2836" +include "std.armv6" +include "../broadcom/bcm2835/std.rpi" +include "../broadcom/bcm2835/std.bcm2836" options HZ=100 options SCHED_4BSD # 4BSD scheduler diff --git a/sys/arm/conf/SAM9260EK b/sys/arm/conf/SAM9260EK index 30680c509516..a3c77598752f 100644 --- a/sys/arm/conf/SAM9260EK +++ b/sys/arm/conf/SAM9260EK @@ -21,8 +21,8 @@ ident SAM9260EK -include "std.arm" -include "../at91/std.sam9260ek" +include "std.arm" +include "../at91/std.sam9260ek" # To statically compile in device wiring instead of /boot/device.hints hints "SAM9260EK.hints" diff --git a/sys/arm/conf/SAM9G20EK b/sys/arm/conf/SAM9G20EK index 4d961c7beeea..e12a143272e2 100644 --- a/sys/arm/conf/SAM9G20EK +++ b/sys/arm/conf/SAM9G20EK @@ -19,8 +19,8 @@ ident SAM9G20EK -include "std.arm" -include "../at91/std.sam9g20ek" +include "std.arm" +include "../at91/std.sam9g20ek" #To statically compile in device wiring instead of /boot/device.hints hints "SAM9G20EK.hints" diff --git a/sys/arm/conf/SAM9X25EK b/sys/arm/conf/SAM9X25EK index 49afe99fdb84..08dc1f59a0fd 100644 --- a/sys/arm/conf/SAM9X25EK +++ b/sys/arm/conf/SAM9X25EK @@ -21,8 +21,8 @@ ident SAM9X25EK -include "std.arm" -include "../at91/std.sam9x25ek" +include "std.arm" +include "../at91/std.sam9x25ek" #To statically compile in device wiring instead of /boot/device.hints hints "SAM9G20EK.hints" diff --git a/sys/arm/conf/SHEEVAPLUG b/sys/arm/conf/SHEEVAPLUG index e013e7502a35..9797cc061be2 100644 --- a/sys/arm/conf/SHEEVAPLUG +++ b/sys/arm/conf/SHEEVAPLUG @@ -6,8 +6,8 @@ #NO_UNIVERSE ident SHEEVAPLUG -include "std.arm" -include "../mv/kirkwood/std.db88f6xxx" +include "std.arm" +include "../mv/kirkwood/std.db88f6xxx" options SOC_MV_KIRKWOOD diff --git a/sys/arm/conf/SN9G45 b/sys/arm/conf/SN9G45 index bf46503afd0b..e85d613400f3 100644 --- a/sys/arm/conf/SN9G45 +++ b/sys/arm/conf/SN9G45 @@ -21,8 +21,8 @@ ident SN9G45 -include "std.arm" -include "../at91/std.sn9g45" +include "std.arm" +include "../at91/std.sn9g45" #To statically compile in device wiring instead of /boot/device.hints #hints "SN9G45.hints" diff --git a/sys/arm/conf/SOCKIT.common b/sys/arm/conf/SOCKIT.common index eb87fd6e9f13..ff817f89554f 100644 --- a/sys/arm/conf/SOCKIT.common +++ b/sys/arm/conf/SOCKIT.common @@ -18,7 +18,7 @@ # # $FreeBSD$ -include "std.armv6" +include "std.armv6" include "../altera/socfpga/std.socfpga" makeoptions MODULES_OVERRIDE="" diff --git a/sys/arm/conf/TS7800 b/sys/arm/conf/TS7800 index ab9fe5beee02..1a565c43fb6f 100644 --- a/sys/arm/conf/TS7800 +++ b/sys/arm/conf/TS7800 @@ -5,8 +5,8 @@ # ident TS7800 -include "std.arm" -include "../mv/orion/std.ts7800" +include "std.arm" +include "../mv/orion/std.ts7800" options SOC_MV_ORION diff --git a/sys/arm/conf/VERSATILEPB b/sys/arm/conf/VERSATILEPB index 182e56ce3af8..d1fc77ab2c44 100644 --- a/sys/arm/conf/VERSATILEPB +++ b/sys/arm/conf/VERSATILEPB @@ -22,7 +22,7 @@ ident VERSATILEPB machine arm armv6 cpu CPU_ARM1176 -include "std.armv6" +include "std.armv6" files "../versatile/files.versatile" makeoptions MODULES_OVERRIDE="" diff --git a/sys/arm/conf/VIRT b/sys/arm/conf/VIRT index 0f67b84023b2..58efec41f85a 100644 --- a/sys/arm/conf/VIRT +++ b/sys/arm/conf/VIRT @@ -20,8 +20,8 @@ ident VIRT -include "std.armv6" -include "../qemu/std.virt" +include "std.armv6" +include "../qemu/std.virt" options HZ=100 options SCHED_4BSD # 4BSD scheduler diff --git a/sys/arm/conf/VYBRID b/sys/arm/conf/VYBRID index 8fb01985ced2..7e01756c1b39 100644 --- a/sys/arm/conf/VYBRID +++ b/sys/arm/conf/VYBRID @@ -19,8 +19,8 @@ # $FreeBSD$ ident VYBRID -include "std.armv6" -include "../freescale/vybrid/std.vybrid" +include "std.armv6" +include "../freescale/vybrid/std.vybrid" makeoptions WERROR="-Werror" diff --git a/sys/arm/conf/WANDBOARD-DUAL b/sys/arm/conf/WANDBOARD-DUAL index 66e2535a4b2b..c3a2d4d5e5f9 100644 --- a/sys/arm/conf/WANDBOARD-DUAL +++ b/sys/arm/conf/WANDBOARD-DUAL @@ -19,7 +19,7 @@ #NO_UNIVERSE -include "IMX6" +include "IMX6" ident WANDBOARD-DUAL # Flattened Device Tree diff --git a/sys/arm/conf/WANDBOARD-QUAD b/sys/arm/conf/WANDBOARD-QUAD index 830a445fc99c..ac1e49220aea 100644 --- a/sys/arm/conf/WANDBOARD-QUAD +++ b/sys/arm/conf/WANDBOARD-QUAD @@ -19,7 +19,7 @@ #NO_UNIVERSE -include "IMX6" +include "IMX6" ident WANDBOARD-QUAD # Flattened Device Tree diff --git a/sys/arm/conf/WANDBOARD-SOLO b/sys/arm/conf/WANDBOARD-SOLO index ad56365c6d06..0fed03d7aa79 100644 --- a/sys/arm/conf/WANDBOARD-SOLO +++ b/sys/arm/conf/WANDBOARD-SOLO @@ -17,7 +17,7 @@ # # $FreeBSD$ -include "IMX6" +include "IMX6" ident WANDBOARD-SOLO nooptions SMP diff --git a/sys/arm/conf/ZEDBOARD b/sys/arm/conf/ZEDBOARD index 7c108a19fc48..3c31b7452e06 100644 --- a/sys/arm/conf/ZEDBOARD +++ b/sys/arm/conf/ZEDBOARD @@ -21,7 +21,7 @@ ident ZEDBOARD -include "std.armv6" +include "std.armv6" include "../xilinx/zedboard/std.zedboard" options SCHED_ULE # ULE scheduler