svn commit: r336436 - in head/sys: arm/arm arm/conf arm/include arm/xscale arm/xscale/ixp425 conf dev/cfi dev/hwpmc dev/usb/controller modules/cfi
Warner Losh
imp at FreeBSD.org
Tue Jul 17 23:23:52 UTC 2018
Author: imp
Date: Tue Jul 17 23:23:45 2018
New Revision: 336436
URL: https://svnweb.freebsd.org/changeset/base/336436
Log:
Remove kernel support for armeb
Remove all the big-endian arm architectures (ixp425 and ixp435)
support in the kernel and associated drivers.
Differential Revision: https://reviews.freebsd.org/D16257
Deleted:
head/sys/arm/conf/AVILA
head/sys/arm/conf/AVILA.hints
head/sys/arm/conf/CAMBRIA
head/sys/arm/conf/CAMBRIA.hints
head/sys/arm/conf/NSLU
head/sys/arm/conf/NSLU.hints
head/sys/arm/xscale/ixp425/avila_ata.c
head/sys/arm/xscale/ixp425/avila_gpio.c
head/sys/arm/xscale/ixp425/avila_led.c
head/sys/arm/xscale/ixp425/avila_machdep.c
head/sys/arm/xscale/ixp425/cambria_exp_space.c
head/sys/arm/xscale/ixp425/cambria_fled.c
head/sys/arm/xscale/ixp425/cambria_gpio.c
head/sys/arm/xscale/ixp425/cambria_led.c
head/sys/arm/xscale/ixp425/files.avila
head/sys/arm/xscale/ixp425/files.ixp425
head/sys/arm/xscale/ixp425/if_npe.c
head/sys/arm/xscale/ixp425/if_npereg.h
head/sys/arm/xscale/ixp425/ixdp425_pci.c
head/sys/arm/xscale/ixp425/ixdp425reg.h
head/sys/arm/xscale/ixp425/ixp425.c
head/sys/arm/xscale/ixp425/ixp425_a4x_io.S
head/sys/arm/xscale/ixp425/ixp425_a4x_space.c
head/sys/arm/xscale/ixp425/ixp425_iic.c
head/sys/arm/xscale/ixp425/ixp425_intr.h
head/sys/arm/xscale/ixp425/ixp425_mem.c
head/sys/arm/xscale/ixp425/ixp425_npe.c
head/sys/arm/xscale/ixp425/ixp425_npereg.h
head/sys/arm/xscale/ixp425/ixp425_npevar.h
head/sys/arm/xscale/ixp425/ixp425_pci.c
head/sys/arm/xscale/ixp425/ixp425_pci_asm.S
head/sys/arm/xscale/ixp425/ixp425_pci_space.c
head/sys/arm/xscale/ixp425/ixp425_qmgr.c
head/sys/arm/xscale/ixp425/ixp425_qmgr.h
head/sys/arm/xscale/ixp425/ixp425_space.c
head/sys/arm/xscale/ixp425/ixp425_timer.c
head/sys/arm/xscale/ixp425/ixp425_wdog.c
head/sys/arm/xscale/ixp425/ixp425reg.h
head/sys/arm/xscale/ixp425/ixp425var.h
head/sys/arm/xscale/ixp425/std.avila
head/sys/arm/xscale/ixp425/std.ixp425
head/sys/arm/xscale/ixp425/std.ixp435
head/sys/arm/xscale/ixp425/uart_bus_ixp425.c
head/sys/arm/xscale/ixp425/uart_cpu_ixp425.c
head/sys/arm/xscale/std.xscale-be
head/sys/dev/cfi/cfi_bus_ixp4xx.c
head/sys/dev/usb/controller/ehci_ixp4xx.c
Modified:
head/sys/arm/arm/cpufunc.c
head/sys/arm/arm/elf_trampoline.c
head/sys/arm/arm/identcpu-v4.c
head/sys/arm/conf/NOTES
head/sys/arm/include/cpufunc.h
head/sys/arm/include/intr.h
head/sys/arm/include/pmap-v4.h
head/sys/conf/files.arm
head/sys/conf/kern.mk
head/sys/conf/options.arm
head/sys/dev/hwpmc/hwpmc_xscale.h
head/sys/modules/cfi/Makefile
Modified: head/sys/arm/arm/cpufunc.c
==============================================================================
--- head/sys/arm/arm/cpufunc.c Tue Jul 17 23:23:39 2018 (r336435)
+++ head/sys/arm/arm/cpufunc.c Tue Jul 17 23:23:45 2018 (r336436)
@@ -65,11 +65,6 @@ __FBSDID("$FreeBSD$");
#include <arm/xscale/i8134x/i81342reg.h>
#endif
-#ifdef CPU_XSCALE_IXP425
-#include <arm/xscale/ixp425/ixp425reg.h>
-#include <arm/xscale/ixp425/ixp425var.h>
-#endif
-
/* PRIMARY CACHE VARIABLES */
int arm_picache_size;
int arm_picache_line_size;
@@ -259,7 +254,7 @@ struct cpu_functions pj4bv7_cpufuncs = {
};
#endif /* CPU_MV_PJ4B */
-#if defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425)
+#if defined(CPU_XSCALE_PXA2X0)
struct cpu_functions xscale_cpufuncs = {
/* CPU functions */
@@ -309,7 +304,7 @@ struct cpu_functions xscale_cpufuncs = {
xscale_setup /* cpu setup */
};
#endif
-/* CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 */
+/* CPU_XSCALE_PXA2X0 */
#ifdef CPU_XSCALE_81342
struct cpu_functions xscalec3_cpufuncs = {
@@ -467,7 +462,7 @@ u_int cpu_reset_needs_v4_MMU_disable; /* flag used in
#if defined(CPU_ARM9) || \
defined (CPU_ARM9E) || \
defined(CPU_ARM1176) || \
- defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \
+ defined(CPU_XSCALE_PXA2X0) || \
defined(CPU_FA526) || defined(CPU_MV_PJ4B) || \
defined(CPU_XSCALE_81342) || \
defined(CPU_CORTEXA) || defined(CPU_KRAIT)
@@ -725,18 +720,6 @@ set_cpufuncs(void)
goto out;
}
#endif /* CPU_XSCALE_PXA2X0 */
-#ifdef CPU_XSCALE_IXP425
- if (cputype == CPU_ID_IXP425_533 || cputype == CPU_ID_IXP425_400 ||
- cputype == CPU_ID_IXP425_266 || cputype == CPU_ID_IXP435) {
-
- cpufuncs = xscale_cpufuncs;
- cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */
- get_cachetype_cp15();
- pmap_pte_init_xscale();
-
- goto out;
- }
-#endif /* CPU_XSCALE_IXP425 */
/*
* Bzzzz. And the answer was ...
*/
@@ -950,8 +933,7 @@ fa526_setup(void)
}
#endif /* CPU_FA526 */
-#if defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \
- defined(CPU_XSCALE_81342)
+#if defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_81342)
void
xscale_setup(void)
{
@@ -1017,4 +999,4 @@ xscale_setup(void)
__asm __volatile("mcr p15, 0, %0, c1, c0, 1"
: : "r" (auxctl));
}
-#endif /* CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 */
+#endif /* CPU_XSCALE_PXA2X0 */
Modified: head/sys/arm/arm/elf_trampoline.c
==============================================================================
--- head/sys/arm/arm/elf_trampoline.c Tue Jul 17 23:23:39 2018 (r336435)
+++ head/sys/arm/arm/elf_trampoline.c Tue Jul 17 23:23:45 2018 (r336436)
@@ -70,7 +70,7 @@ extern void fa526_idcache_wbinv_all(void);
#elif defined(CPU_ARM9E)
#define cpu_idcache_wbinv_all armv5_ec_idcache_wbinv_all
extern void armv5_ec_idcache_wbinv_all(void);
-#elif defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425)
+#elif defined(CPU_XSCALE_PXA2X0)
#define cpu_idcache_wbinv_all xscale_cache_purgeID
extern void xscale_cache_purgeID(void);
#elif defined(CPU_XSCALE_81342)
Modified: head/sys/arm/arm/identcpu-v4.c
==============================================================================
--- head/sys/arm/arm/identcpu-v4.c Tue Jul 17 23:23:39 2018 (r336435)
+++ head/sys/arm/arm/identcpu-v4.c Tue Jul 17 23:23:45 2018 (r336436)
@@ -119,13 +119,6 @@ static const char * const pxa27x_steppings[16] = {
"rev 12", "rev 13", "rev 14", "rev 15",
};
-static const char * const ixp425_steppings[16] = {
- "step 0 (A0)", "rev 1 (ARMv5TE)", "rev 2", "rev 3",
- "rev 4", "rev 5", "rev 6", "rev 7",
- "rev 8", "rev 9", "rev 10", "rev 11",
- "rev 12", "rev 13", "rev 14", "rev 15",
-};
-
struct cpuidtab {
u_int32_t cpuid;
enum cpu_class cpu_class;
@@ -199,17 +192,6 @@ const struct cpuidtab cpuids[] = {
pxa255_steppings },
{ CPU_ID_PXA210C, CPU_CLASS_XSCALE, "PXA210",
pxa2x0_steppings },
-
- { CPU_ID_IXP425_533, CPU_CLASS_XSCALE, "IXP425 533MHz",
- ixp425_steppings },
- { CPU_ID_IXP425_400, CPU_CLASS_XSCALE, "IXP425 400MHz",
- ixp425_steppings },
- { CPU_ID_IXP425_266, CPU_CLASS_XSCALE, "IXP425 266MHz",
- ixp425_steppings },
-
- /* XXX ixp435 steppings? */
- { CPU_ID_IXP435, CPU_CLASS_XSCALE, "IXP435",
- ixp425_steppings },
{ CPU_ID_MV88FR131, CPU_CLASS_MARVELL, "Feroceon 88FR131",
generic_steppings },
Modified: head/sys/arm/conf/NOTES
==============================================================================
--- head/sys/arm/conf/NOTES Tue Jul 17 23:23:39 2018 (r336435)
+++ head/sys/arm/conf/NOTES Tue Jul 17 23:23:45 2018 (r336436)
@@ -6,8 +6,6 @@ cpu CPU_ARM9
cpu CPU_ARM9E
cpu CPU_FA526
cpu CPU_XSCALE_81342
-cpu CPU_XSCALE_IXP425
-cpu CPU_XSCALE_IXP435
cpu CPU_XSCALE_PXA2X0
files "../at91/files.at91"
@@ -19,8 +17,6 @@ files "../mv/orion/files.db88f5xxx"
files "../mv/orion/files.ts7800"
files "../xscale/i8134x/files.crb"
files "../xscale/i8134x/files.i81342"
-files "../xscale/ixp425/files.avila"
-files "../xscale/ixp425/files.ixp425"
files "../xscale/pxa/files.pxa"
options PHYSADDR=0x00000000
Modified: head/sys/arm/include/cpufunc.h
==============================================================================
--- head/sys/arm/include/cpufunc.h Tue Jul 17 23:23:39 2018 (r336435)
+++ head/sys/arm/include/cpufunc.h Tue Jul 17 23:23:45 2018 (r336436)
@@ -314,8 +314,7 @@ void armv5_ec_idcache_wbinv_range(vm_offset_t, vm_size
#if defined(CPU_ARM9) || defined(CPU_ARM9E) || \
defined(CPU_FA526) || \
- defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \
- defined(CPU_XSCALE_81342)
+ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_81342)
void armv4_tlb_flushID (void);
void armv4_tlb_flushD (void);
@@ -325,8 +324,7 @@ void armv4_drain_writebuf (void);
void armv4_idcache_inv_all (void);
#endif
-#if defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \
- defined(CPU_XSCALE_81342)
+#if defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_81342)
void xscale_cpwait (void);
void xscale_cpu_sleep (int mode);
@@ -364,7 +362,7 @@ void xscale_cache_flushD_rng (vm_offset_t start, vm_si
void xscale_context_switch (void);
void xscale_setup (void);
-#endif /* CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 */
+#endif /* CPU_XSCALE_PXA2X0 */
#ifdef CPU_XSCALE_81342
Modified: head/sys/arm/include/intr.h
==============================================================================
--- head/sys/arm/include/intr.h Tue Jul 17 23:23:39 2018 (r336435)
+++ head/sys/arm/include/intr.h Tue Jul 17 23:23:45 2018 (r336436)
@@ -75,8 +75,7 @@ int intr_pic_ipi_setup(u_int, const char *, intr_ipi_h
#define NIRQ IRQ_GPIO_MAX
#elif defined(SOC_MV_DISCOVERY)
#define NIRQ 96
-#elif defined(CPU_ARM9) || defined(SOC_MV_KIRKWOOD) || \
- defined(CPU_XSCALE_IXP435)
+#elif defined(CPU_ARM9) || defined(SOC_MV_KIRKWOOD)
#define NIRQ 64
#elif defined(CPU_CORTEXA)
#define NIRQ 1020
Modified: head/sys/arm/include/pmap-v4.h
==============================================================================
--- head/sys/arm/include/pmap-v4.h Tue Jul 17 23:23:39 2018 (r336435)
+++ head/sys/arm/include/pmap-v4.h Tue Jul 17 23:23:45 2018 (r336436)
@@ -63,8 +63,7 @@
#define ARM_MMU_GENERIC 0
#endif
-#if (defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \
- defined(CPU_XSCALE_81342))
+#if (defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_81342))
#define ARM_MMU_XSCALE 1
#else
#define ARM_MMU_XSCALE 0
Modified: head/sys/conf/files.arm
==============================================================================
--- head/sys/conf/files.arm Tue Jul 17 23:23:39 2018 (r336435)
+++ head/sys/conf/files.arm Tue Jul 17 23:23:45 2018 (r336436)
@@ -33,14 +33,14 @@ arm/arm/cpufunc_asm.S standard
arm/arm/cpufunc_asm_arm9.S optional cpu_arm9 | cpu_arm9e
arm/arm/cpufunc_asm_arm11.S optional cpu_arm1176
arm/arm/cpufunc_asm_arm11x6.S optional cpu_arm1176
-arm/arm/cpufunc_asm_armv4.S optional cpu_arm9 | cpu_arm9e | cpu_fa526 | cpu_xscale_pxa2x0 | cpu_xscale_ixp425 | cpu_xscale_81342
+arm/arm/cpufunc_asm_armv4.S optional cpu_arm9 | cpu_arm9e | cpu_fa526 | cpu_xscale_pxa2x0 | cpu_xscale_81342
arm/arm/cpufunc_asm_armv5_ec.S optional cpu_arm9e
arm/arm/cpufunc_asm_armv6.S optional cpu_arm1176
arm/arm/cpufunc_asm_armv7.S optional cpu_cortexa | cpu_krait | cpu_mv_pj4b
arm/arm/cpufunc_asm_fa526.S optional cpu_fa526
arm/arm/cpufunc_asm_pj4b.S optional cpu_mv_pj4b
arm/arm/cpufunc_asm_sheeva.S optional cpu_arm9e
-arm/arm/cpufunc_asm_xscale.S optional cpu_xscale_pxa2x0 | cpu_xscale_ixp425 | cpu_xscale_81342
+arm/arm/cpufunc_asm_xscale.S optional cpu_xscale_pxa2x0 | cpu_xscale_81342
arm/arm/cpufunc_asm_xscale_c3.S optional cpu_xscale_81342
arm/arm/cpuinfo.c standard
arm/arm/cpu_asm-v6.S optional armv7 | armv6
Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk Tue Jul 17 23:23:39 2018 (r336435)
+++ head/sys/conf/kern.mk Tue Jul 17 23:23:45 2018 (r336436)
@@ -279,7 +279,6 @@ CFLAGS+= -std=${CSTD}
LD_EMULATION_aarch64=aarch64elf
LD_EMULATION_amd64=elf_x86_64_fbsd
LD_EMULATION_arm=armelf_fbsd
-LD_EMULATION_armeb=armelfb_fbsd
LD_EMULATION_armv6=armelf_fbsd
LD_EMULATION_armv7=armelf_fbsd
LD_EMULATION_i386=elf_i386_fbsd
Modified: head/sys/conf/options.arm
==============================================================================
--- head/sys/conf/options.arm Tue Jul 17 23:23:39 2018 (r336435)
+++ head/sys/conf/options.arm Tue Jul 17 23:23:45 2018 (r336436)
@@ -17,8 +17,6 @@ CPU_KRAIT opt_global.h
CPU_FA526 opt_global.h
CPU_MV_PJ4B opt_global.h
CPU_XSCALE_81342 opt_global.h
-CPU_XSCALE_IXP425 opt_global.h
-CPU_XSCALE_IXP435 opt_global.h
CPU_XSCALE_PXA2X0 opt_global.h
SMP_ON_UP opt_global.h # Runtime detection of MP extensions
DEV_GIC opt_global.h
@@ -30,7 +28,6 @@ INTRNG opt_global.h
IPI_IRQ_START opt_smp.h
IPI_IRQ_END opt_smp.h
FREEBSD_BOOT_LOADER opt_global.h
-IXP4XX_FLASH_SIZE opt_global.h
KERNBASE opt_global.h
KERNVIRTADDR opt_global.h
LINUX_BOOT_ABI opt_global.h
Modified: head/sys/dev/hwpmc/hwpmc_xscale.h
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_xscale.h Tue Jul 17 23:23:39 2018 (r336435)
+++ head/sys/dev/hwpmc/hwpmc_xscale.h Tue Jul 17 23:23:45 2018 (r336436)
@@ -42,9 +42,6 @@
#define XSCALE_PMNC_PMNRESET 0x02 /* Performance Counter Reset */
#define XSCALE_PMNC_CCNTRESET 0x04 /* Clock Counter Reset */
#define XSCALE_PMNC_CCNTDIV 0x08 /* Clock Counter Divider */
-/* IXP425 only -- first generation */
-#define XSCALE_PMNC_EVT0_MASK 0x00ff000
-#define XSCALE_PMNC_EVT1_MASK 0xff00000
#define XSCALE_INTEN_CCNT 0x01 /* Enable Clock Counter Int. */
#define XSCALE_INTEN_PMN0 0x02 /* Enable PMN0 Interrupts */
Modified: head/sys/modules/cfi/Makefile
==============================================================================
--- head/sys/modules/cfi/Makefile Tue Jul 17 23:23:39 2018 (r336435)
+++ head/sys/modules/cfi/Makefile Tue Jul 17 23:23:45 2018 (r336436)
@@ -3,15 +3,8 @@
.PATH: ${SRCTOP}/sys/dev/cfi
KMOD= cfi
-SRCS= ${_cfi_bus} cfi_core.c cfi_dev.c
+SRCS= cfi_bus_fdt.c ofw_bus_if.h cfi_core.c cfi_dev.c
SRCS+= bus_if.h device_if.h opt_cfi.h
-
-.if ${MACHINE} == "arm"
-_cfi_bus= cfi_bus_fdt.c cfi_bus_ixp4xx.c ofw_bus_if.h
-.endif
-.if ${MACHINE} == "powerpc"
-_cfi_bus= cfi_bus_fdt.c ofw_bus_if.h
-.endif
opt_cfi.h:
echo "#define CFI_SUPPORT_STRATAFLASH 1" > ${.TARGET}
More information about the svn-src-all
mailing list