diff options
Diffstat (limited to '')
-rw-r--r-- | bsps/shared/start/bsp-fdt.c | 49 |
1 files changed, 35 insertions, 14 deletions
diff --git a/bsps/shared/start/bsp-fdt.c b/bsps/shared/start/bsp-fdt.c index 50a485eb16..79f31733e1 100644 --- a/bsps/shared/start/bsp-fdt.c +++ b/bsps/shared/start/bsp-fdt.c @@ -1,15 +1,28 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + /* - * Copyright (c) 2015, 2017 embedded brains GmbH. All rights reserved. + * Copyright (C) 2015, 2017 embedded brains GmbH & Co. KG * - * embedded brains GmbH - * Dornierstr. 4 - * 82178 Puchheim - * Germany - * <rtems@embedded-brains.de> + * 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. * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. + * 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 <sys/param.h> @@ -19,6 +32,10 @@ #include <bsp/fdt.h> #include <bsp/linker-symbols.h> +#ifdef BSP_DTB_IS_SUPPORTED +#include BSP_DTB_HEADER_PATH +#endif + #ifndef BSP_FDT_IS_SUPPORTED #warning "BSP FDT support indication not defined" #endif @@ -28,17 +45,17 @@ #endif #ifdef BSP_FDT_BLOB_READ_ONLY -static const uint32_t -bsp_fdt_blob[BSP_FDT_BLOB_SIZE_MAX / sizeof(uint32_t)] CPU_STRUCTURE_ALIGNMENT = +static RTEMS_ALIGNED(8) const uint32_t +bsp_fdt_blob[BSP_FDT_BLOB_SIZE_MAX / sizeof(uint32_t)] = { 0xdeadbeef }; #else -static uint32_t -bsp_fdt_blob[BSP_FDT_BLOB_SIZE_MAX / sizeof(uint32_t)] CPU_STRUCTURE_ALIGNMENT; +static RTEMS_ALIGNED(8) uint32_t +bsp_fdt_blob[BSP_FDT_BLOB_SIZE_MAX / sizeof(uint32_t)]; #endif void bsp_fdt_copy(const void *src) { - const uint32_t *s = (const uint32_t *) src; + const volatile uint32_t *s = (const uint32_t *) src; #ifdef BSP_FDT_BLOB_COPY_TO_READ_ONLY_LOAD_AREA uint32_t *d = (uint32_t *) ((uintptr_t) &bsp_fdt_blob[0] - (uintptr_t) bsp_section_rodata_begin @@ -63,5 +80,9 @@ void bsp_fdt_copy(const void *src) const void *bsp_fdt_get(void) { +#ifdef BSP_DTB_IS_SUPPORTED + return system_dtb; +#else return &bsp_fdt_blob[0]; +#endif } |