![Kim Phillips](/assets/img/avatar_default.png)
u-boot environments, esp. when boards are shared across multiple users, can get pretty large and time consuming to visually parse. The grepenv command this patch adds can be used in lieu of printenv to facilitate searching. grepenv works like printenv but limits its output only to environment strings (variable name and value pairs) that match the user specified substring. the following examples are on a board with a 5313 byte environment that spans multiple screen pages: Example 1: summarize ethernet configuration: => grepenv eth TSEC etact=FM1@DTSEC2 eth=FM1@DTSEC4 ethact=FM1@DTSEC2 eth1addr=00:E0:0C:00:8b:01 eth2addr=00:E0:0C:00:8b:02 eth3addr=00:E0:0C:00:8b:03 eth4addr=00:E0:0C:00:8b:04 eth5addr=00:E0:0C:00:8b:05 eth6addr=00:E0:0C:00:8b:06 eth7addr=00:E0:0C:00:8b:07 eth8addr=00:E0:0C:00:8b:08 eth9addr=00:E0:0C:00:8b:09 ethaddr=00:E0:0C:00:8b:00 netdev=eth0 uprcw=setenv ethact $eth;setenv filename p4080ds/R_PPSXX_0xe/rcw_0xe_2sgmii_rev2_high.bin;setenv start 0xe8000000;protect off all;run upimage;protect on all upuboot=setenv ethact $eth;setenv filename u-boot.bin;setenv start eff80000;protect off all;run upimage;protect on all upucode=setenv ethact $eth;setenv filename fsl_fman_ucode_P4080_101_6.bin;setenv start 0xef000000;protect off all;run upimage;protect on all usdboot=setenv ethact $eth;tftp 1000000 $dir/$bootfile;tftp 2000000 $dir/initramfs.cpio.gz.uboot;tftp c00000 $dir/p4080ds-usdpaa.dtb;setenv bootargs root=/dev/ram rw console=ttyS0,115200 $othbootargs;bootm 1000000 2000000 c00000; => Example 2: detect unused env vars: => grepenv etact etact=FM1@DTSEC2 => Example 3: reveal hardcoded variables; e.g., for fdtaddr: => grepenv fdtaddr fdtaddr=c00000 nfsboot=setenv bootargs root=/dev/nfs rw nfsroot=$serverip:$rootpath ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off console=$consoledev,$baudrate $othbootargs;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr - $fdtaddr ramboot=setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr => grep $fdtaddr fdtaddr=c00000 my_boot=bootm 0x40000000 0x41000000 0x00c00000 my_dtb=tftp 0x00c00000 $prefix/p4080ds.dtb nohvboot=tftp 1000000 $dir/$bootfile;tftp 2000000 $dir/$ramdiskfile;tftp c00000 $dir/$fdtfile;setenv bootargs root=/dev/ram rw ramdisk_size=0x10000000 console=ttyS0,115200;bootm 1000000 2000000 c00000; => This patch also enables the grepenv command by default on corenet_ds based boards (and repositions the DHCP command entry to keep the list sorted). Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Cc: Kumar Gala <kumar.gala@freescale.com> Cc: Andy Fleming <afleming@freescale.com>
104 lines
3.2 KiB
C
104 lines
3.2 KiB
C
/*
|
|
* Declarations for System V style searching functions.
|
|
* Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
|
|
* This file is part of the GNU C Library.
|
|
*
|
|
* The GNU C Library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* The GNU C Library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with the GNU C Library; if not, write to the Free
|
|
* Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
* 02111-1307 USA.
|
|
*/
|
|
|
|
/*
|
|
* Based on code from uClibc-0.9.30.3
|
|
* Extensions for use within U-Boot
|
|
* Copyright (C) 2010 Wolfgang Denk <wd@denx.de>
|
|
*/
|
|
|
|
#ifndef _SEARCH_H
|
|
#define _SEARCH_H 1
|
|
|
|
#include <stddef.h>
|
|
|
|
#define __set_errno(val) do { errno = val; } while (0)
|
|
|
|
/* Action which shall be performed in the call the hsearch. */
|
|
typedef enum {
|
|
FIND,
|
|
ENTER
|
|
} ACTION;
|
|
|
|
typedef struct entry {
|
|
char *key;
|
|
char *data;
|
|
} ENTRY;
|
|
|
|
/* Opaque type for internal use. */
|
|
struct _ENTRY;
|
|
|
|
/*
|
|
* Family of hash table handling functions. The functions also
|
|
* have reentrant counterparts ending with _r. The non-reentrant
|
|
* functions all work on a signle internal hashing table.
|
|
*/
|
|
|
|
/* Data type for reentrant functions. */
|
|
struct hsearch_data {
|
|
struct _ENTRY *table;
|
|
unsigned int size;
|
|
unsigned int filled;
|
|
};
|
|
|
|
/* Create a new hashing table which will at most contain NEL elements. */
|
|
extern int hcreate_r(size_t __nel, struct hsearch_data *__htab);
|
|
|
|
/* Destroy current internal hashing table. */
|
|
extern void hdestroy_r(struct hsearch_data *__htab);
|
|
|
|
/*
|
|
* Search for entry matching ITEM.key in internal hash table. If
|
|
* ACTION is `FIND' return found entry or signal error by returning
|
|
* NULL. If ACTION is `ENTER' replace existing data (if any) with
|
|
* ITEM.data.
|
|
* */
|
|
extern int hsearch_r(ENTRY __item, ACTION __action, ENTRY ** __retval,
|
|
struct hsearch_data *__htab);
|
|
|
|
/*
|
|
* Search for an entry matching `MATCH'. Otherwise, Same semantics
|
|
* as hsearch_r().
|
|
*/
|
|
extern int hmatch_r(const char *__match, int __last_idx, ENTRY ** __retval,
|
|
struct hsearch_data *__htab);
|
|
/*
|
|
* Search for an entry whose key or data contains `MATCH'. Otherwise,
|
|
* Same semantics as hsearch_r().
|
|
*/
|
|
extern int hstrstr_r(const char *__match, int __last_idx, ENTRY ** __retval,
|
|
struct hsearch_data *__htab);
|
|
|
|
/* Search and delete entry matching ITEM.key in internal hash table. */
|
|
extern int hdelete_r(const char *__key, struct hsearch_data *__htab);
|
|
|
|
extern ssize_t hexport_r(struct hsearch_data *__htab,
|
|
const char __sep, char **__resp, size_t __size);
|
|
|
|
extern int himport_r(struct hsearch_data *__htab,
|
|
const char *__env, size_t __size, const char __sep,
|
|
int __flag);
|
|
|
|
/* Flags for himport_r() */
|
|
#define H_NOCLEAR 1 /* do not clear hash table before importing */
|
|
|
|
#endif /* search.h */
|