diff options
Diffstat (limited to '')
| -rw-r--r-- | testsuites/libtests/ofw01/init.c | 16 | ||||
| -rw-r--r-- | testsuites/libtests/ofw01/some.c | 4 | ||||
| -rw-r--r-- | testsuites/libtests/ofw01/some.dts | 31 |
3 files changed, 39 insertions, 12 deletions
diff --git a/testsuites/libtests/ofw01/init.c b/testsuites/libtests/ofw01/init.c index 6006121cc7..6afed33475 100644 --- a/testsuites/libtests/ofw01/init.c +++ b/testsuites/libtests/ofw01/init.c @@ -37,6 +37,7 @@ #include <bsp/fdt.h> #include <ofw/ofw.h> #include <ofw/ofw_test.h> +#include <rtems/score/isr.h> #include "some.h" @@ -50,7 +51,20 @@ const void *__real_bsp_fdt_get(void); const void *__wrap_bsp_fdt_get(void) { - if (test_bin != NULL) { + uintptr_t sp; + + sp = (uintptr_t) __builtin_frame_address(0); + RTEMS_OBFUSCATE_VARIABLE(sp); + + /* + * Use the stack pointer to check if we have to return the real device tree + * since bsp_fdt_get() may get called before the BSS is cleared to zero. + */ + if ( + (sp < (uintptr_t) _ISR_Stack_area_begin || + sp >= (uintptr_t) _ISR_Stack_area_end) && + test_bin != NULL + ) { return test_bin; } diff --git a/testsuites/libtests/ofw01/some.c b/testsuites/libtests/ofw01/some.c index 91251e71b0..7ce8760316 100644 --- a/testsuites/libtests/ofw01/some.c +++ b/testsuites/libtests/ofw01/some.c @@ -4,9 +4,9 @@ * WARNING: Automatically generated -- do not edit! */ -#include <sys/types.h> +#include <rtems.h> -const unsigned char some_bin[] = { +RTEMS_ALIGNED(8) const unsigned char some_bin[] = { 0xd0, 0x0d, 0xfe, 0xed, 0x00, 0x00, 0x02, 0xcf, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x02, 0x70, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f, diff --git a/testsuites/libtests/ofw01/some.dts b/testsuites/libtests/ofw01/some.dts index 6ed8aeb069..6a5023414f 100644 --- a/testsuites/libtests/ofw01/some.dts +++ b/testsuites/libtests/ofw01/some.dts @@ -1,16 +1,29 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + /* * Copyright (c) 2020 Niteesh G S <niteesh.gs@gmail.com>. All rights reserved. - * Copyright (c) 2015 embedded brains GmbH. All rights reserved. + * Copyright (c) 2015 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. */ /dts-v1/; |