From f50ff845108bbe182e5255b3d723f925cb560c30 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 2 Jan 2019 12:04:55 -0600 Subject: [PATCH] configs/pizero: Remove the partial support for the Raspberry Pi Zero. This port was started with the best of intentions but was never completed. The board support can still be found in the Obsoleted repository. --- Documentation/NuttX.html | 8 +- Documentation/README.html | 4 +- README.txt | 2 - configs/Kconfig | 22 ----- configs/README.txt | 5 - configs/pizero/Kconfig | 4 - configs/pizero/README.txt | 104 --------------------- configs/pizero/include/board.h | 60 ------------ configs/pizero/nsh/defconfig | 45 --------- configs/pizero/scripts/Make.defs | 125 ------------------------- configs/pizero/scripts/sdram.ld | 138 ---------------------------- configs/pizero/src/.gitignore | 2 - configs/pizero/src/Makefile | 45 --------- configs/pizero/src/bcm_appinit.c | 89 ------------------ configs/pizero/src/bcm_bringup.c | 64 ------------- configs/pizero/src/bcm_initialize.c | 120 ------------------------ configs/pizero/src/pizero.h | 67 -------------- 17 files changed, 7 insertions(+), 897 deletions(-) delete mode 100644 configs/pizero/Kconfig delete mode 100644 configs/pizero/README.txt delete mode 100644 configs/pizero/include/board.h delete mode 100644 configs/pizero/nsh/defconfig delete mode 100644 configs/pizero/scripts/Make.defs delete mode 100644 configs/pizero/scripts/sdram.ld delete mode 100644 configs/pizero/src/.gitignore delete mode 100644 configs/pizero/src/Makefile delete mode 100644 configs/pizero/src/bcm_appinit.c delete mode 100644 configs/pizero/src/bcm_bringup.c delete mode 100644 configs/pizero/src/bcm_initialize.c delete mode 100644 configs/pizero/src/pizero.h diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html index 5e85f3d9683..c12aa0de76e 100644 --- a/Documentation/NuttX.html +++ b/Documentation/NuttX.html @@ -8,7 +8,7 @@

NuttX RTOS

-

Last Updated: November 18, 2018

+

Last Updated: January 2, 2019

@@ -2144,7 +2144,11 @@ Raspberry Pi Zero. This support was provided for the Raspberry Pi Zero which is based on the BCM2835. Basic logic is in place but the port is incomplete and completely untested as of the NuttX-7.23 released. - Refer to the NuttX board README file for further information. + Refer to the NuttX board README file for further information. +

+

+ NOTE:: Support for the Raspberry Pi Zero was never completed. + The incompleted was removed from the prepository but can still be be found in the Obsoleted repository.

diff --git a/Documentation/README.html b/Documentation/README.html index a9c274414b7..eab374689de 100644 --- a/Documentation/README.html +++ b/Documentation/README.html @@ -8,7 +8,7 @@

NuttX README Files

-

Last Updated: December 3, 2018

+

Last Updated: January 2, 2019

@@ -239,8 +239,6 @@ nuttx/ | | `- README.txt | |- pic32mz-starterkit/ | | `- README.txt - | |- pizero/ - | | `- README.txt | |- qemu-i486/ | | `- README.txt | |- sabre-6quad/ diff --git a/README.txt b/README.txt index 35565fa5848..16d6e6aff3f 100644 --- a/README.txt +++ b/README.txt @@ -1912,8 +1912,6 @@ nuttx/ | | `- README.txt | |- pic32mz-starterkit/ | | `- README.txt - | |- pizero/ - | | `- README.txt | |- qemu-i486/ | | `- README.txt | |- sabre-6quad/ diff --git a/configs/Kconfig b/configs/Kconfig index a181d9f0360..f3834686c16 100644 --- a/configs/Kconfig +++ b/configs/Kconfig @@ -1043,24 +1043,6 @@ config ARCH_BOARD_NUCLEO_L476RG ---help--- STMicro Nucleo L476RG board based on the STMicro STM32L476RGT6 MCU. -config ARCH_BOARD_RASPBERRY_PIZERO - bool "Raspberry Pi Zero" - depends on ARCH_CHIP_BCM2835 - ---help--- - This is the port of NuttX to the Raspberry Pi Zero. There are two - versions of the Raspberry Pi Zero: (1) This standard version and - (2) the Raspberry Pi Zero W with wireless support (selected with - CONFIG_ARCH_BOARD_RASPBERRY_PIZEROW. - -config ARCH_BOARD_RASPBERRY_PIZEROW - bool "Raspberry Pi Zero W" - depends on ARCH_CHIP_BCM2835 - ---help--- - This is the port of NuttX to the Raspberry Pi Zero W. There are two - versions of the Raspberry Pi Zero: (1) This standard version - (selected with CONFIG_ARCH_BOARD_RASPBERRY_PIZEROW) and (2) this - Raspberry Pi Zero W version with wireless support. - config ARCH_BOARD_QEMU_I486 bool "Qemu i486 Mode" depends on ARCH_X86 || ARCH_I486 @@ -1864,7 +1846,6 @@ config ARCH_BOARD default "pic32mx-starterkit" if ARCH_BOARD_PIC32MX_STARTERKIT default "pic32mx7mmb" if ARCH_BOARD_PIC32MX7MMB default "pic32mz-starterkit" if ARCH_BOARD_PIC32MZ_STARTERKIT - default "pizero" if ARCH_BOARD_RASPBERRY_PIZERO || ARCH_BOARD_RASPBERRY_PIZEROW default "qemu-i486" if ARCH_BOARD_QEMU_I486 default "sabre-6quad" if ARCH_BOARD_SABRE_6QUAD default "sama5d2-xult" if ARCH_BOARD_SAMA5D2_XULT @@ -2261,9 +2242,6 @@ endif if ARCH_BOARD_PIC32MZ_STARTERKIT source "configs/pic32mz-starterkit/Kconfig" endif -if ARCH_BOARD_RASPBERRY_PIZERO || ARCH_BOARD_RASPBERRY_PIZEROW -source "configs/pizero/Kconfig" -endif if ARCH_BOARD_QEMU_I486 source "configs/qemu-i486/Kconfig" endif diff --git a/configs/README.txt b/configs/README.txt index d671da9a384..552ec3faebe 100644 --- a/configs/README.txt +++ b/configs/README.txt @@ -585,11 +585,6 @@ configs/pic32mz-starterkit See www.microchip.com for further information. -configs/pizero - This directory holds the port of NuttX to the Raspberry Pi Zero and - the similar Raspberry Pi Zero W with wireless suppoprt. These boards - are based on the BCM2835 A1176 CPU. - configs/qemu-i486 Port of NuttX to QEMU in i486 mode. This port will also run on real i486 hardwared (Google the Bifferboard). diff --git a/configs/pizero/Kconfig b/configs/pizero/Kconfig deleted file mode 100644 index f72f3c094ce..00000000000 --- a/configs/pizero/Kconfig +++ /dev/null @@ -1,4 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see the file kconfig-language.txt in the NuttX tools repository. -# diff --git a/configs/pizero/README.txt b/configs/pizero/README.txt deleted file mode 100644 index 03fa4518853..00000000000 --- a/configs/pizero/README.txt +++ /dev/null @@ -1,104 +0,0 @@ -README -====== - - This README file discusses the port of NuttX to the Raspberry Pi Zero. - The Raspberry Pi Zero is based on the Broadcom BCM2835 CPU. This is the - same Broadcom chip used in the Raspberry Pi Model A, B, B+, the Compute - Module. - -STATUS -====== - - 2017-10-09: This is a work in progress. The port is not complete and - will not build to completion. Missing logic includes: - - - GPIO support, - - System timer initialization, and - - Serial driver. - - 2017-10-19: Much of that logic is in place but there are a few things - still missing. - - - Mini-UART Baud divisor calculation, - - Start-up logic. My understand from what I have read on the Internet - is the PiZero OS starts up in hypervisor mode with the MMU and I- and - D-Caches enabled. This probably means that the standard, classic ARM - startup logic at at arch/arm/src/arm/up_head.S will need to be replaced - with some custom logic. - - No testing has yet been performed. - -Basic Setup -=========== - - +------------+ - | | - | +--+ - | USB | | <----------------------------> USB Power Source - | +--+ +------------+ - | | | +--+ - | +--+ | | | <---> Keyboard - | USB | | <-------->| USB +--+ - | +--+ | HUB | - | | | +--+ - | | | | | <---> Mouse - | | | +--+ - | | +------------+ - | Mini +--+ - | HDMI | | <----------------------------> Monitor/TV - | +--+ - | | - +------------+ - - You might be able to use the hub to power the Pi Zero, but I was not - able to do that; my hub would not switch on power until it was enumerated - by the host (the Raspberry Pi Zero), but then I could not power the Pi - with the hub because it was not providing power. Chicken'n'Egg. - -NuttX Boot Sequence -=================== - - To be provided. - -Configurations -============== - - Information Common to All Configurations - ---------------------------------------- - Each Raspberry Pi Zero configuration is maintained in a sub-directory - and can be selected as follow: - - tools/configure.sh [OPTIONS] pizero/ - - Where [OPTIONS] include -l to configure for a Linux host platform and - -c means to configure for a Windows Cygwin host platform. -h will give - you the list of all options. - - Before building, make sure the PATH environment variable includes the - correct path to the directory than holds your toolchain binaries. - - And then build NuttX by simply typing the following. At the conclusion of - the make, the nuttx binary will reside in an ELF file called, simply, nuttx. - - make - - The that is provided above as an argument to the tools/configure.sh - must be is one of the following. - - NOTES: - - 1. These configurations use the mconf-based configuration tool. To - change any of these configurations using that tool, you should: - - a. Build and install the kconfig-mconf tool. See nuttx/README.txt - see additional README.txt files in the NuttX tools repository. - - b. Execute 'make menuconfig' in nuttx/ in order to start the - reconfiguration process. - - Configuration Sub-directories - ----------------------------- - - nsh: - - This simple configuration directory provide the NuttShell (NSH). diff --git a/configs/pizero/include/board.h b/configs/pizero/include/board.h deleted file mode 100644 index 142fe873384..00000000000 --- a/configs/pizero/include/board.h +++ /dev/null @@ -1,60 +0,0 @@ -/**************************************************************************** - * configs/pizero/include/board.h - * - * Copyright (C) 2017 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -#ifndef __CONFIGS_PIZERO_INCLUDE_BOARD_H -#define __CONFIGS_PIZERO_INCLUDE_BOARD_H - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -#if defined(__cplusplus) -extern "C" -{ -#endif - -#if defined(__cplusplus) -} -#endif - -#endif /* __CONFIGS_PIZERO_INCLUDE_BOARD_H */ diff --git a/configs/pizero/nsh/defconfig b/configs/pizero/nsh/defconfig deleted file mode 100644 index f4d7d184dec..00000000000 --- a/configs/pizero/nsh/defconfig +++ /dev/null @@ -1,45 +0,0 @@ -# CONFIG_NSH_ARGCAT is not set -# CONFIG_NSH_CMDOPT_HEXDUMP is not set -# CONFIG_NSH_CMDPARMS is not set -CONFIG_ARCH="arm" -CONFIG_ARCH_BOARD="pizero" -CONFIG_ARCH_BOARD_RASPBERRY_PIZERO=y -CONFIG_ARCH_CHIP_BCM2708=y -CONFIG_ARCH_CHIP_BCM2835=y -CONFIG_ARCH_LOWVECTORS=y -CONFIG_ARCH_STACKDUMP=y -CONFIG_BCM2708_MINI_UART=y -CONFIG_BCM2708_MINI_UART_SERIAL_CONSOLE=y -CONFIG_BOARD_LOOPSPERMSEC=16717 -CONFIG_BOOT_RUNFROMSDRAM=y -CONFIG_BUILTIN=y -CONFIG_DISABLE_POLL=y -CONFIG_FS_PROCFS=y -CONFIG_HAVE_CXX=y -CONFIG_HAVE_CXXINITIALIZE=y -CONFIG_HOST_WINDOWS=y -CONFIG_INTELHEX_BINARY=y -CONFIG_MAX_TASKS=16 -CONFIG_MAX_WDOGPARMS=2 -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NFILE_STREAMS=8 -CONFIG_NSH_BUILTIN_APPS=y -CONFIG_NSH_FILEIOSIZE=512 -CONFIG_NSH_LINELEN=64 -CONFIG_NSH_READLINE=y -CONFIG_PREALLOC_MQ_MSGS=4 -CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 -CONFIG_RAM_SIZE=369098752 -CONFIG_RAM_START=0x00000000 -CONFIG_RAW_BINARY=y -CONFIG_RR_INTERVAL=200 -CONFIG_SCHED_TICKLESS=y -CONFIG_SCHED_WAITPID=y -CONFIG_SDCLONE_DISABLE=y -CONFIG_START_DAY=6 -CONFIG_START_MONTH=12 -CONFIG_START_YEAR=2011 -CONFIG_SYSTEM_NSH=y -CONFIG_USEC_PER_TICK=1 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/configs/pizero/scripts/Make.defs b/configs/pizero/scripts/Make.defs deleted file mode 100644 index 96cd92632dd..00000000000 --- a/configs/pizero/scripts/Make.defs +++ /dev/null @@ -1,125 +0,0 @@ -############################################################################ -# configs/pizero/scripts/Make.defs -# -# Copyright (C) 2017 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# 3. Neither the name NuttX nor the names of its contributors may be -# used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -############################################################################ - -include ${TOPDIR}/.config -include ${TOPDIR}/tools/Config.mk -include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs - -LDSCRIPT=sdram.ld - -ifeq ($(WINTOOL),y) - # Windows-native toolchains - DIRLINK = $(TOPDIR)/tools/copydir.sh - DIRUNLINK = $(TOPDIR)/tools/unlink.sh - MKDEP = $(TOPDIR)/tools/mkwindeps.sh - ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" - ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" -else - # Linux/Cygwin-native toolchain - MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) - ARCHINCLUDES = -I. -isystem $(TOPDIR)/include - ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) -endif - -CC = $(CROSSDEV)gcc -CXX = $(CROSSDEV)g++ -CPP = $(CROSSDEV)gcc -E -LD = $(CROSSDEV)ld -AR = $(CROSSDEV)ar rcs -NM = $(CROSSDEV)nm -OBJCOPY = $(CROSSDEV)objcopy -OBJDUMP = $(CROSSDEV)objdump - -ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'} -ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1} - -ifeq ($(ARCHCCMAJOR),2) - OLDGCC = y -else ifeq ($(ARCHCCMAJOR),3) - OLDGCC = y -else - OLDGCC = n -endif - -ifeq ($(CONFIG_DEBUG_SYMBOLS),y) - ARCHOPTIMIZATION = -g -endif - -ifneq ($(CONFIG_DEBUG_NOOPT),y) - ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer -endif - -ifeq ($(OLDGCC),y) - ARCHCPUFLAGS = -mtune=arm1176jz-s -march=armv6zk -mfloat-abi=soft -else - ARCHCPUFLAGS = -mfpu=vfp -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -endif - -ARCHCFLAGS = -fno-builtin -ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fcheck-new -ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -ARCHWARNINGSXX = -Wall -Wshadow -Wundef -ARCHDEFINES = -ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10 - -CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS) -CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS) -CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -AFLAGS = $(CFLAGS) -D__ASSEMBLY__ - -NXFLATLDFLAGS1 = -r -d -warn-common -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections -LDNXFLATFLAGS = -e main -s 2048 - -ASMEXT = .S -OBJEXT = .o -LIBEXT = .a -EXEEXT = - -ifneq ($(CONFIG_ARM_TOOLCHAIN),BUILDROOT) - LDFLAGS += -nostartfiles -nodefaultlibs -endif -ifeq ($(CONFIG_DEBUG_SYMBOLS),y) - LDFLAGS += -g -endif - -HOSTCC = gcc -HOSTINCLUDES = -I. -HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe -HOSTLDFLAGS = diff --git a/configs/pizero/scripts/sdram.ld b/configs/pizero/scripts/sdram.ld deleted file mode 100644 index 99b4e87bb64..00000000000 --- a/configs/pizero/scripts/sdram.ld +++ /dev/null @@ -1,138 +0,0 @@ -/**************************************************************************** - * configs/pizero/scripts/sdram.ld - * - * Copyright (C) 2017 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/* The Pi Zero has 512MiB of SDRAM beginning at physical (and virtual) - * address zero. In this configuration, the last 160MiB is reserved for - * video RAM. The first 16KiB is reserved for vectors, the second 18KiB - * is reserved for the pages table, and the .txt can then begian after that. - */ - -MEMORY -{ - vectors (WR) : ORIGIN = 0x00000000, LENGTH = 16K - pgtable (WR) : ORIGIN = 0x00004000, LENGTH = 16K - sdram (WRX) : ORIGIN = 0x00008000, LENGTH = 352M - 32K - vdram (WRX) : ORIGIN = 0x16000000, LENGTH = 160M -} - -OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") -OUTPUT_ARCH(arm) -ENTRY(entry) -ENTRY(_stext) - -SECTIONS -{ - .text : - { - _stext = ABSOLUTE(.); - *(.vectors) - *(.text .text.*) - *(.fixup) - *(.gnu.warning) - *(.rodata .rodata.*) - *(.gnu.linkonce.t.*) - *(.glue_7) - *(.glue_7t) - *(.got) - *(.gcc_except_table) - *(.gnu.linkonce.r.*) - *(.ARM.extab*) - *(.gnu.linkonce.armextab.*) - _etext = ABSOLUTE(.); - } > sdram - - .init_section : - { - _sinit = ABSOLUTE(.); - *(.init_array .init_array.*) - _einit = ABSOLUTE(.); - } > sdram - - .ARM.extab : - { - *(.ARM.extab*) - } > sdram - - /* .ARM.exidx is sorted, so has to go in its own output section. */ - - PROVIDE_HIDDEN (__exidx_start = .); - .ARM.exidx : - { - *(.ARM.exidx* .gnu.linkonce.armexidx.*) - } > sdram - PROVIDE_HIDDEN (__exidx_end = .); - - .data : - { - _sdata = ABSOLUTE(.); - *(.data .data.*) - *(.gnu.linkonce.d.*) - CONSTRUCTORS - _edata = ABSOLUTE(.); - } > sdram - - .bss : - { - _sbss = ABSOLUTE(.); - *(.bss .bss.*) - *(.gnu.linkonce.b.*) - *(COMMON) - _ebss = ABSOLUTE(.); - } > sdram - - /* Uninitialized data */ - - .noinit : - { - _snoinit = ABSOLUTE(.); - *(.noinit*) - _enoinit = ABSOLUTE(.); - } > sdram - - /* Stabs debugging sections. */ - - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_info 0 : { *(.debug_info) } - .debug_line 0 : { *(.debug_line) } - .debug_pubnames 0 : { *(.debug_pubnames) } - .debug_aranges 0 : { *(.debug_aranges) } -} diff --git a/configs/pizero/src/.gitignore b/configs/pizero/src/.gitignore deleted file mode 100644 index 726d936e1e3..00000000000 --- a/configs/pizero/src/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/.depend -/Make.dep diff --git a/configs/pizero/src/Makefile b/configs/pizero/src/Makefile deleted file mode 100644 index b83a5ff49a3..00000000000 --- a/configs/pizero/src/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################ -# configs/pizero/src/Makefile -# -# Copyright (C) 2017 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# 3. Neither the name NuttX nor the names of its contributors may be -# used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -############################################################################ - --include $(TOPDIR)/Make.defs - -ASRCS = -CSRCS = bcm_initialize.c bcm_bringup.c - -ifeq ($(CONFIG_LIB_BOARDCTL),y) -CSRCS += bcm_appinit.c -endif - -include $(TOPDIR)/configs/Board.mk diff --git a/configs/pizero/src/bcm_appinit.c b/configs/pizero/src/bcm_appinit.c deleted file mode 100644 index 51685309a61..00000000000 --- a/configs/pizero/src/bcm_appinit.c +++ /dev/null @@ -1,89 +0,0 @@ -/**************************************************************************** - * config/pizero/src/bcm_appinit.c - * - * Copyright (C) 2017 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -#include -#include - -#include - -#include "pizero.h" - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: board_app_initialize - * - * Description: - * Perform application specific initialization. This function is never - * called directly from application code, but only indirectly via the - * (non-standard) boardctl() interface using the command BOARDIOC_INIT. - * - * Input Parameters: - * arg - The boardctl() argument is passed to the board_app_initialize() - * implementation without modification. The argument has no - * meaning to NuttX; the meaning of the argument is a contract - * between the board-specific initalization logic and the - * matching application logic. The value cold be such things as a - * mode enumeration value, a set of DIP switch switch settings, a - * pointer to configuration data read from a file or serial FLASH, - * or whatever you would like to do with it. Every implementation - * should accept zero/NULL as a default configuration. - * - * Returned Value: - * Zero (OK) is returned on success; a negated errno value is returned on - * any failure to indicate the nature of the failure. - * - ****************************************************************************/ - -int board_app_initialize(uintptr_t arg) -{ -#ifdef CONFIG_BOARD_INITIALIZE - /* Board initialization already performed by board_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return bcm_bringup(); -#endif -} diff --git a/configs/pizero/src/bcm_bringup.c b/configs/pizero/src/bcm_bringup.c deleted file mode 100644 index 362f96b55bf..00000000000 --- a/configs/pizero/src/bcm_bringup.c +++ /dev/null @@ -1,64 +0,0 @@ -/**************************************************************************** - * config/pizero/src/bcm_bringup.c - * - * Copyright (C) 2017 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include -#include - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: bcm_bringup - * - * Description: - * Perform architecture-specific initialization - * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). - * - * CONFIG_BOARD_INITIALIZE=n && CONFIG_LIB_BOARDCTL=y : - * Called from the NSH library - * - ****************************************************************************/ - -int bcm_bringup(void) -{ - return OK; -} diff --git a/configs/pizero/src/bcm_initialize.c b/configs/pizero/src/bcm_initialize.c deleted file mode 100644 index b19613ec165..00000000000 --- a/configs/pizero/src/bcm_initialize.c +++ /dev/null @@ -1,120 +0,0 @@ -/************************************************************************************ - * configs/pizero/src/bcm_initialize.c - * - * Copyright (C) 2017 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ************************************************************************************/ - -/************************************************************************************ - * Included Files - ************************************************************************************/ - -#include - -#include - -#include - -#include "bcm_boot.h" -#include "pizero.h" - -/************************************************************************************ - * Public Functions - ************************************************************************************/ - -/**************************************************************************** - * Name: bcm_memory_initialize - * - * Description: - * All BCM2708 architectures must provide the following entry point. This - * entry point is called early in the initialization before memory has - * been configured. This board-specific function is responsible for - * configuring any on-board memories. - * - * Logic in bcm_memory_initialize must be careful to avoid using any - * global variables because those will be uninitialized at the time this - * function is called. - * - * Input Parameters: - * None - * - * Returned Value: - * None - * - ****************************************************************************/ - -void bcm_memory_initialize(void) -{ -} - -/**************************************************************************** - * Name: bcm_board_initialize - * - * Description: - * All BCM2708 architectures must provide the following entry point. This - * entry point is called in the initialization phase -- after - * bcm_memory_initialize and after all memory has been configured and - * mapped but before any devices have been initialized. - * - * Input Parameters: - * None - * - * Returned Value: - * None - * - ****************************************************************************/ - -void bcm_board_initialize(void) -{ -} - -/**************************************************************************** - * Name: board_initialize - * - * Description: - * If CONFIG_BOARD_INITIALIZE is selected, then an additional - * initialization call will be performed in the boot-up sequence to a - * function called board_initialize(). board_initialize() will be - * called immediately after up_initialize() is called and just before the - * initial application is started. This additional initialization phase - * may be used, for example, to initialize board-specific device drivers. - * - ****************************************************************************/ - -#ifdef CONFIG_BOARD_INITIALIZE -void board_initialize(void) -{ - /* Perform board-specific initialization */ - - (void)bcm_bringup(); -} -#endif - diff --git a/configs/pizero/src/pizero.h b/configs/pizero/src/pizero.h deleted file mode 100644 index 08397acbe61..00000000000 --- a/configs/pizero/src/pizero.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** - * configs/pizero/include/board.h - * - * Copyright (C) 2017 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -#ifndef __CONFIGS_PIZERO_INCLUDE_BOARD_H -#define __CONFIGS_PIZERO_INCLUDE_BOARD_H - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: bcm_bringup - * - * Description: - * Perform architecture-specific initialization - * - * CONFIG_BOARD_INITIALIZE=y : - * Called from board_initialize(). - * - * CONFIG_BOARD_INITIALIZE=y && CONFIG_LIB_BOARDCTL=y : - * Called from the NSH library - * - ****************************************************************************/ - -int bcm_bringup(void); - -#endif /* __CONFIGS_PIZERO_INCLUDE_BOARD_H */