summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/powerpc
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2018-04-24 07:17:46 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-04-24 10:24:22 +0200
commit2101f54bef0daab3cadb1013d18f139240e723c3 (patch)
tree80da9bf1b50b17993e0bf5c1137706a47995ee53 /c/src/lib/libbsp/powerpc
parentbsps/powerpc: Move bootloader to bsps (diff)
downloadrtems-2101f54bef0daab3cadb1013d18f139240e723c3.tar.bz2
bsps: Move uboot_getenv.c to bsps
This patch is a part of the BSP source reorganization. Update #3285.
Diffstat (limited to 'c/src/lib/libbsp/powerpc')
-rw-r--r--c/src/lib/libbsp/powerpc/gen5200/Makefile.am2
-rw-r--r--c/src/lib/libbsp/powerpc/gen83xx/Makefile.am2
-rw-r--r--c/src/lib/libbsp/powerpc/shared/uboot_getenv.c74
3 files changed, 2 insertions, 76 deletions
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index 46d5cd0cc1..5892c93627 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -96,7 +96,7 @@ librtemsbsp_a_SOURCES += ../shared/showbats.c
librtemsbsp_a_SOURCES += ../shared/src/memcpy.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/bspidle.c
librtemsbsp_a_SOURCES += ../shared/uboot_dump_bdinfo.c
-librtemsbsp_a_SOURCES += ../shared/uboot_getenv.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/u-boot/uboot_getenv.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/start/bspreset.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/start/bspstart.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/start/cpuinit.c
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index 88500631d3..f58165307d 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -41,7 +41,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/start/bspreset.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/start/bsprestart.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bsp-uboot-board-info.c
-librtemsbsp_a_SOURCES += ../shared/uboot_getenv.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/u-boot/uboot_getenv.c
# clock
librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/clock.c
diff --git a/c/src/lib/libbsp/powerpc/shared/uboot_getenv.c b/c/src/lib/libbsp/powerpc/shared/uboot_getenv.c
deleted file mode 100644
index 43ef4af81b..0000000000
--- a/c/src/lib/libbsp/powerpc/shared/uboot_getenv.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * COPYRIGHT (c) 1989-2008.
- * On-Line Applications Research Corporation (OAR).
- *
- * 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.
- */
-
-#include <bsp.h>
-
-/*
- * If the BSP variant does not have UBoot, then disable all contents
- * of this file.
- */
-#if defined(HAS_UBOOT)
-
-#include <stdint.h>
-#include <string.h>
-
-/* Assumed to be provided by BSP */
-extern const uint8_t *uboot_environment;
-extern const size_t uboot_environment_size;
-
-/*
- * The U-Boot source code appears to use the CRC32 code from zlib.
- * But I cannot find a way to get the crc32() in zlib code to
- * generate the CRC found in the Flash on the Icecube board.
- * So for now, always return TRUE.
- */
-static int bsp_uboot_environ_check_crc(void)
-{
-#if 0
- unsigned long crc;
- unsigned long max;
-
- for (max=0 ; max <= 0x20000 ; max+=4 ) {
- crc = crc32( 0, NULL, 0 );
- crc = crc32( crc, &uboot_environment[4], max);
- printk( "crc=0x%08lx need %0x max=%d\n", crc,
- *(int *)uboot_environment, max );
- }
-#endif
- return 1;
-}
-
-const char *bsp_uboot_getenv(
- const char *name
-)
-{
- char lhs[64];
- size_t i, j;
-
- if ( !bsp_uboot_environ_check_crc() )
- return NULL;
-
- for ( i=4 ; i<uboot_environment_size ; i++ ) {
- memset( lhs, '\0', sizeof(lhs) );
- for( j=0 ; uboot_environment[i] != '=' && j<sizeof(lhs) ; i++, j++ ) {
- lhs[j] = uboot_environment[i];
- }
- if ( !strncmp( name, lhs, sizeof(lhs) ) ) {
- return (const char *)&uboot_environment[i+1];
- }
-
- for ( i++ ; uboot_environment[i] && i<uboot_environment_size ; i++ )
- ;
- if ( !uboot_environment[i+1] )
- return NULL;
- }
- return NULL;
-}
-
-#endif /* defined(HAS_UBOOT) */