Module Name: src
Committed By: jmcneill
Date: Fri Oct 28 20:37:04 UTC 2022
Modified Files:
src/sys/arch/arm/xilinx: zynq_platform.c
src/sys/arch/evbarm: Makefile
src/sys/arch/evbarm/conf: README.evbarm
Removed Files:
src/sys/arch/arm/zynq: files.zynq zynq7000_board.c zynq7000_intr.h
zynq7000_reg.h zynq7000_sdhc.c zynq7000_uart.c zynq7000_usb.c
zynq7000_var.h zynq_axi.c zynq_cemac.c zynq_dma.c zynq_slcr.c
zynq_slcrreg.h zynq_slcrvar.h zynq_space.c zynq_uart.c
zynq_uartreg.h zynq_uartvar.h zynq_usb.c zynq_usbreg.h
zynq_usbvar.h
src/sys/arch/evbarm/conf: PARALLELLA ZEDBOARD files.parallella
files.zedboard files.zynq mk.zynq std.zynq
src/sys/arch/evbarm/zynq: platform.h zynq_machdep.c
Log Message:
Retire PARALLELLA and ZEDBOARD kernel configs.
The Zynq-7000 port has been converted to Devicetree and is supported
by the GENERIC kernel now.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/xilinx/zynq_platform.c
cvs rdiff -u -r1.2 -r0 src/sys/arch/arm/zynq/files.zynq \
src/sys/arch/arm/zynq/zynq7000_reg.h src/sys/arch/arm/zynq/zynq7000_var.h \
src/sys/arch/arm/zynq/zynq_dma.c src/sys/arch/arm/zynq/zynq_usbreg.h \
src/sys/arch/arm/zynq/zynq_usbvar.h
cvs rdiff -u -r1.5 -r0 src/sys/arch/arm/zynq/zynq7000_board.c \
src/sys/arch/arm/zynq/zynq_uart.c
cvs rdiff -u -r1.1 -r0 src/sys/arch/arm/zynq/zynq7000_intr.h \
src/sys/arch/arm/zynq/zynq7000_sdhc.c \
src/sys/arch/arm/zynq/zynq7000_uart.c \
src/sys/arch/arm/zynq/zynq7000_usb.c src/sys/arch/arm/zynq/zynq_cemac.c \
src/sys/arch/arm/zynq/zynq_slcr.c src/sys/arch/arm/zynq/zynq_slcrreg.h \
src/sys/arch/arm/zynq/zynq_slcrvar.h src/sys/arch/arm/zynq/zynq_uartreg.h \
src/sys/arch/arm/zynq/zynq_uartvar.h
cvs rdiff -u -r1.3 -r0 src/sys/arch/arm/zynq/zynq_axi.c
cvs rdiff -u -r1.4 -r0 src/sys/arch/arm/zynq/zynq_space.c
cvs rdiff -u -r1.7 -r0 src/sys/arch/arm/zynq/zynq_usb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/Makefile
cvs rdiff -u -r1.9 -r0 src/sys/arch/evbarm/conf/PARALLELLA
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/conf/README.evbarm
cvs rdiff -u -r1.8 -r0 src/sys/arch/evbarm/conf/ZEDBOARD
cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/conf/files.parallella \
src/sys/arch/evbarm/conf/files.zedboard
cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/files.zynq \
src/sys/arch/evbarm/conf/mk.zynq
cvs rdiff -u -r1.7 -r0 src/sys/arch/evbarm/conf/std.zynq
cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/zynq/platform.h
cvs rdiff -u -r1.17 -r0 src/sys/arch/evbarm/zynq/zynq_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/xilinx/zynq_platform.c
diff -u src/sys/arch/arm/xilinx/zynq_platform.c:1.8 src/sys/arch/arm/xilinx/zynq_platform.c:1.9
--- src/sys/arch/arm/xilinx/zynq_platform.c:1.8 Thu Oct 27 20:37:10 2022
+++ src/sys/arch/arm/xilinx/zynq_platform.c Fri Oct 28 20:37:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: zynq_platform.c,v 1.8 2022/10/27 20:37:10 jmcneill Exp $ */
+/* $NetBSD: zynq_platform.c,v 1.9 2022/10/28 20:37:03 jmcneill Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include "arml2cc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zynq_platform.c,v 1.8 2022/10/27 20:37:10 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zynq_platform.c,v 1.9 2022/10/28 20:37:03 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -75,7 +75,7 @@ __KERNEL_RCSID(0, "$NetBSD: zynq_platfor
#define ZYNQ_ARMCORE_VBASE (ZYNQ_GPV_VBASE + ZYNQ_GPV_SIZE)
#define ZYNQ_ARMCORE_PBASE 0xf8f00000
-#define ZYNQ_ARMCORE_SIZE 0x00003000
+#define ZYNQ_ARMCORE_SIZE 0x00100000
#define ZYNQ_OCM_VBASE (ZYNQ_ARMCORE_VBASE + ZYNQ_ARMCORE_SIZE)
#define ZYNQ_OCM_PBASE 0xfff00000
Index: src/sys/arch/evbarm/Makefile
diff -u src/sys/arch/evbarm/Makefile:1.10 src/sys/arch/evbarm/Makefile:1.11
--- src/sys/arch/evbarm/Makefile:1.10 Fri Jan 23 12:34:09 2015
+++ src/sys/arch/evbarm/Makefile Fri Oct 28 20:37:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/01/23 12:34:09 hkenken Exp $
+# $NetBSD: Makefile,v 1.11 2022/10/28 20:37:04 jmcneill Exp $
# Makefile for evbarm tags file and boot blocks
@@ -39,7 +39,6 @@ SEVBARM+= ${SYSDIR}/arch/evbarm/smdk2xx0
SEVBARM+= ${SYSDIR}/arch/evbarm/tisdp24xx/*.[ch]
SEVBARM+= ${SYSDIR}/arch/evbarm/tsarm/*.[ch]
SEVBARM+= ${SYSDIR}/arch/evbarm/viper/*.[ch]
-SEVBARM+= ${SYSDIR}/arch/evbarm/zynq/*.[ch]
SEVBARM+= ${SYSDIR}/arch/arm/xscale/*.[ch]
AEVBARM= ${SYSDIR}/arch/evbarm/adi_brh/*.S
@@ -67,7 +66,6 @@ AEVBARM+= ${SYSDIR}/arch/arm/xscale/*.S
AEVBARM+= ${SYSDIR}/arch/evbarm/integrator/*.S
AEVBARM+= ${SYSDIR}/arch/evbarm/iq80310/*.S
AEVBARM+= ${SYSDIR}/arch/evbarm/iq80321/*.S
-AEVBARM+= ${SYSDIR}/arch/evbarm/zynq/*.S
# Directories in which to place tags links
DEVBARM= include
Index: src/sys/arch/evbarm/conf/README.evbarm
diff -u src/sys/arch/evbarm/conf/README.evbarm:1.33 src/sys/arch/evbarm/conf/README.evbarm:1.34
--- src/sys/arch/evbarm/conf/README.evbarm:1.33 Sat Jun 26 09:13:00 2021
+++ src/sys/arch/evbarm/conf/README.evbarm Fri Oct 28 20:37:04 2022
@@ -1,4 +1,4 @@
-$NetBSD: README.evbarm,v 1.33 2021/06/26 09:13:00 rin Exp $
+$NetBSD: README.evbarm,v 1.34 2022/10/28 20:37:04 jmcneill Exp $
config date boards
-------------------------------------------------------------------------------
@@ -48,7 +48,6 @@ OPENBLOCKS_AX3 2013/09/30 Plat'Home. Ope
OPENRD 2012/08/10 open-rd.org Marvell Orion board
OSK5912 2007/01/06 TI OMAP 5912 OSK board
PANDABOARD 2012/08/20 TI OMAP4430 PandaBoard
-PARALLELLA 2015/01/23 Xilinx Zynq and Epiphany multi-core chips
PEPPER 2016/10/15 Gumstix Inc. Pepper SBC(Single Board Computer)
POGO 2016/05/12 CloudEngines Pogoplug NAS
RPI 2012/07/26 Raspberry Pi
@@ -65,4 +64,3 @@ TWINTAIL 2005/02/26 Genetec corp. "Twint
VIPER 2005/06/06 Arcom Viper PXA255 ARM board
VTC100 2016/07/04 NEXCOM VTC100
ZAO425 2003/05/23 NOVATEC NTNP425B "ZAO425" IXP425 eval board
-ZEDBOARD 2015/01/23 Xilinx Zynq-7000
